Author: bpoussin Date: 2008-08-12 15:10:04 +0000 (Tue, 12 Aug 2008) New Revision: 48 Modified: branches/3.2/scripts/SiMatrix.java Log: Ajout de l'equation d'efficacite technique Modified: branches/3.2/scripts/SiMatrix.java =================================================================== --- branches/3.2/scripts/SiMatrix.java 2008-08-12 13:10:38 UTC (rev 47) +++ branches/3.2/scripts/SiMatrix.java 2008-08-12 15:10:04 UTC (rev 48) @@ -951,7 +951,7 @@ StrategyMonthInfo smi = str.getStrategyMonthInfo(month); int nbTrips = smi.getNumberOfTrips(); double fishingTime = fishingTimePerTrip(str, metier, date); - double stdEffortPerHour = stdEffortPerHour(str.getSetOfVessels(), metier); + double stdEffortPerHour = stdEffortPerHour(date, str.getSetOfVessels(), metier); if(log.isDebugEnabled()) { log.debug( @@ -1121,12 +1121,14 @@ * @param metier * @return */ - private double stdEffortPerHour(SetOfVessels sov, Metier metier) { + private double stdEffortPerHour(Date date, SetOfVessels sov, Metier metier) { double result = 0; EffortDescription ed = sov.getPossibleMetiers(metier); if(ed != null){ double fstd = metier.getGear().getStandardisationFactor(); - double val = fstd * ed.getFishingOperation() * ed.getGearsNumberPerOperation(); + double etp = sov.getTechnicalEfficiency(date, metier); + double val = + fstd * etp * ed.getFishingOperation() * ed.getGearsNumberPerOperation(); result = val; } result = result/24; // 24 heures