June 2009 - Isis-fish-data-commits - mailman.cloud.codelutin.com

r154 - trunk/exports
by chatellier＠users.labs.libre-entreprise.org 30 Jun '09

30 Jun '09

Author: chatellier Date: 2009-06-30 08:19:59 +0000 (Tue, 30 Jun 2009) New Revision: 154 Modified: trunk/exports/CellsDefinition.java trunk/exports/RegionDefinition.java trunk/exports/ZonesDefinition.java Log: Remove deprecated method use. Modified: trunk/exports/CellsDefinition.java =================================================================== --- trunk/exports/CellsDefinition.java 2009-06-30 08:15:25 UTC (rev 153) +++ trunk/exports/CellsDefinition.java 2009-06-30 08:19:59 UTC (rev 154) @@ -1,22 +1,19 @@ package exports; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import static org.codelutin.i18n.I18n._; import java.io.Writer; import java.util.List; -import static org.codelutin.i18n.I18n._; -import org.codelutin.math.matrix.*; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.topia.TopiaContext; -import fr.ifremer.isisfish.entities.*; +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.entities.Cell; import fr.ifremer.isisfish.export.Export; -import fr.ifremer.isisfish.types.Date; -import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.datastore.ResultStorage; +import fr.ifremer.isisfish.util.Doc; -import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) - /** * CellsDefinition.java * @@ -28,7 +25,7 @@ * Last update: $Date: 2007-05-24 09:30:07 $ * by : $Author: bpoussin $ */ - @Doc(value="do the doc of class CellsDefinition") +@Doc(value="do the doc of class CellsDefinition") public class CellsDefinition implements Export { /** to use log facility, just put in your code: log.info("..."); */ @@ -58,11 +55,14 @@ } public void export(SimulationStorage simulation, Writer out) throws Exception { - List<Cell> cells = simulation.getFisheryRegion().getCell(); + TopiaContext tx = simulation.getStorage().beginTransaction(); + List<Cell> cells = SimulationStorage.getFisheryRegion(tx).getCell(); for (Cell cell : cells) { out.write(cell + ";" + cell.getLongitude() + ";" + cell.getLatitude() + "\n"); } + + tx.closeContext(); } } Modified: trunk/exports/RegionDefinition.java =================================================================== --- trunk/exports/RegionDefinition.java 2009-06-30 08:15:25 UTC (rev 153) +++ trunk/exports/RegionDefinition.java 2009-06-30 08:19:59 UTC (rev 154) @@ -6,12 +6,11 @@ import java.io.Writer; import static org.codelutin.i18n.I18n._; -import org.codelutin.math.matrix.*; +import org.codelutin.topia.TopiaContext; import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) @@ -26,7 +25,7 @@ * Last update: $Date: 2007-05-24 10:05:22 $ * by : $Author: bpoussin $ */ - @Doc(value="do the doc of class RegionDefinition") +@Doc(value="do the doc of class RegionDefinition") public class RegionDefinition implements Export { /** to use log facility, just put in your code: log.info("..."); */ @@ -57,7 +56,9 @@ public void export(SimulationStorage simulation, Writer out) throws Exception { // NomRegion LatituteMin LatitudeMax LongitudeMin LongitudeMax PasLatitude PasLongitude - FisheryRegion region = simulation.getFisheryRegion(); + TopiaContext tx = simulation.getStorage().beginTransaction(); + FisheryRegion region = SimulationStorage.getFisheryRegion(tx); + out.write(region.getName() + ";" + region.getMinLatitude() + ";" + region.getMaxLatitude() + ";" @@ -66,6 +67,8 @@ + region.getCellLengthLatitude() + ";" + region.getCellLengthLongitude() + "\n"); + + tx.closeContext(); } } Modified: trunk/exports/ZonesDefinition.java =================================================================== --- trunk/exports/ZonesDefinition.java 2009-06-30 08:15:25 UTC (rev 153) +++ trunk/exports/ZonesDefinition.java 2009-06-30 08:19:59 UTC (rev 154) @@ -7,13 +7,12 @@ import java.util.List; import static org.codelutin.i18n.I18n._; -import org.codelutin.math.matrix.*; +import org.codelutin.topia.TopiaContext; import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.Date; import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) @@ -28,7 +27,7 @@ * Last update: $Date: 2007-05-24 09:30:07 $ * by : $Author: bpoussin $ */ - @Doc(value="do the doc of class ZoneDefinition") +@Doc(value="do the doc of class ZoneDefinition") public class ZonesDefinition implements Export { /** to use log facility, just put in your code: log.info("..."); */ @@ -58,7 +57,9 @@ } public void export(SimulationStorage simulation, Writer out) throws Exception { - List<Zone> zones = simulation.getFisheryRegion().getZone(); + TopiaContext tx = simulation.getStorage().beginTransaction(); + List<Zone> zones = SimulationStorage.getFisheryRegion(tx).getZone(); + Date lastDate = simulation.getResultStorage().getLastDate(); for (Date date = new Date(0); !date.after(lastDate); date = date.next() ) { @@ -68,6 +69,8 @@ } } } + + tx.closeContext(); } }

1 0

r153 - trunk/exports
by chatellier＠users.labs.libre-entreprise.org 30 Jun '09

30 Jun '09

Author: chatellier Date: 2009-06-30 08:15:25 +0000 (Tue, 30 Jun 2009) New Revision: 153 Modified: trunk/exports/GrossValueOfLandingsOtherSpecies.java Log: Update description Modified: trunk/exports/GrossValueOfLandingsOtherSpecies.java =================================================================== --- trunk/exports/GrossValueOfLandingsOtherSpecies.java 2009-06-30 08:13:59 UTC (rev 152) +++ trunk/exports/GrossValueOfLandingsOtherSpecies.java 2009-06-30 08:15:25 UTC (rev 153) @@ -52,7 +52,7 @@ } public String getDescription() { - return _("cvs out strategy;date;value"); + return _("CSV out strategy;metier;date;value (rule GraviteVPUE1LangEtGrossValueOtherSpeciesECOMOD must be selected for this export)"); } public void export(SimulationStorage simulation, Writer out) throws Exception {

1 0

r152 - trunk/exports
by chatellier＠users.labs.libre-entreprise.org 30 Jun '09

30 Jun '09

Author: chatellier Date: 2009-06-30 08:13:59 +0000 (Tue, 30 Jun 2009) New Revision: 152 Modified: trunk/exports/GrossValueOfLandingsOtherSpecies.java Log: Affichage d'un message si le resultat n'est pas disponible (NPE) Modified: trunk/exports/GrossValueOfLandingsOtherSpecies.java =================================================================== --- trunk/exports/GrossValueOfLandingsOtherSpecies.java 2009-06-24 10:36:06 UTC (rev 151) +++ trunk/exports/GrossValueOfLandingsOtherSpecies.java 2009-06-30 08:13:59 UTC (rev 152) @@ -15,12 +15,11 @@ import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.types.Date; import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) /** - * VesselMargin.java + * GrossValueOfLandingsOtherSpecies.java * * Created: 23 novembre 2006 * @@ -30,7 +29,7 @@ * Last update: $Date: 2007-05-24 09:30:07 $ * by : $Author: bpoussin $ */ - @Doc(value="do the doc of class VesselMargin") +@Doc(value="do the doc of class VesselMargin") public class GrossValueOfLandingsOtherSpecies implements Export { /** to use log facility, just put in your code: log.info("..."); */ @@ -39,7 +38,7 @@ protected String [] necessaryResult = { ResultName.MATRIX_GROSS_VALUE_OF_LANDINGS_OTHER_SPECIES_PER_STRATEGY_MET }; - + public String[] getNecessaryResult() { return this.necessaryResult; } @@ -47,26 +46,34 @@ public String getExportFilename() { return "GrossValueOfLandingsOtherSpecies"; } - + public String getExtensionFilename() { return ".csv"; } - + public String getDescription() { return _("cvs out strategy;date;value"); } public void export(SimulationStorage simulation, Writer out) throws Exception { MatrixND mat = simulation.getResultStorage().getMatrix(ResultName.MATRIX_GROSS_VALUE_OF_LANDINGS_OTHER_SPECIES_PER_STRATEGY_MET); - for (MatrixIterator i=mat.iterator(); i.hasNext();) { - i.next(); - Object [] sems = i.getSemanticsCoordinates(); - Date date = (Date)sems[0]; - Strategy str = (Strategy)sems[1]; - Metier met = (Metier) sems[2]; - double val = i.getValue(); - out.write(str.getName() +";"+met.getName() +";"+ date.getDate() +";"+ val +"\n"); + if (mat == null) { + if (log.isWarnEnabled()) { + log.warn(_("Can't export GrossValueOfLandingsOtherSpecies, no '" + + ResultName.MATRIX_GROSS_VALUE_OF_LANDINGS_OTHER_SPECIES_PER_STRATEGY_MET + "' result")); + } } + else { + for (MatrixIterator i=mat.iterator(); i.hasNext();) { + i.next(); + Object [] sems = i.getSemanticsCoordinates(); + Date date = (Date)sems[0]; + Strategy str = (Strategy)sems[1]; + Metier met = (Metier) sems[2]; + double val = i.getValue(); + out.write(str.getName() +";"+met.getName() +";"+ date.getDate() +";"+ val +"\n"); + } + } /* var Parametre=sim.getParametre(); var PDate=Packages.fr.ifremer.nodb.Date;

1 0

r151 - in trunk: exports rules scripts simulators
by chatellier＠users.labs.libre-entreprise.org 24 Jun '09

24 Jun '09

Author: chatellier Date: 2009-06-24 10:36:06 +0000 (Wed, 24 Jun 2009) New Revision: 151 Modified: trunk/exports/CapturesPoids.java trunk/exports/SensitivityCapturesWeightRelativeReferenceY10.java trunk/rules/GraviteCPUE.java trunk/scripts/GravityModel.java trunk/scripts/ResultName.java trunk/simulators/DefaultSimulator.java Log: Suppression du resultat MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET (renomm?\195?\169) Modified: trunk/exports/CapturesPoids.java =================================================================== --- trunk/exports/CapturesPoids.java 2009-06-22 13:14:48 UTC (rev 150) +++ trunk/exports/CapturesPoids.java 2009-06-24 10:36:06 UTC (rev 151) @@ -35,7 +35,7 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(CapturesPoids.class); - protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET }; + protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP }; public String[] getNecessaryResult() { return this.necessaryResult; @@ -61,7 +61,7 @@ for (Date date = new Date(0); !date.after(lastDate); date = date .next()) { MatrixND mat = simulation.getResultStorage().getMatrix(date, - pop, ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + pop, ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); if (mat != null) { // can be null if simulation is stopped before last year simulation mat = mat.sumOverDim(0); //sum on strategy for (MatrixIterator i = mat.iterator(); i.hasNext();) { Modified: trunk/exports/SensitivityCapturesWeightRelativeReferenceY10.java =================================================================== --- trunk/exports/SensitivityCapturesWeightRelativeReferenceY10.java 2009-06-22 13:14:48 UTC (rev 150) +++ trunk/exports/SensitivityCapturesWeightRelativeReferenceY10.java 2009-06-24 10:36:06 UTC (rev 151) @@ -75,7 +75,7 @@ MatrixND matlastdatereference = referenceResultStorage .getMatrix( new Date(lastDate.getDate() - i), - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP + " " + pop, tx); capturesWeightreference += matlastdatereference.sumAll(); @@ -83,7 +83,7 @@ MatrixND matfirstdatereference = referenceResultStorage .getMatrix( new Date(i), - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP + " " + pop, tx); capturesWeightfirstreference += matfirstdatereference .sumAll(); Modified: trunk/rules/GraviteCPUE.java =================================================================== --- trunk/rules/GraviteCPUE.java 2009-06-22 13:14:48 UTC (rev 150) +++ trunk/rules/GraviteCPUE.java 2009-06-24 10:36:06 UTC (rev 151) @@ -57,7 +57,7 @@ // example: // ResultName.MATRIX_BIOMASS, // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET, + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP, ResultName.MATRIX_EFFORT_PER_STRATEGY_MET, }; @@ -186,7 +186,7 @@ MatrixND temp = resultmanager.getMatrix( date.previousYear(), pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); // on somme sur les zones temp=temp.sumOverDim(3); // on somme sur les groupes Modified: trunk/scripts/GravityModel.java =================================================================== --- trunk/scripts/GravityModel.java 2009-06-22 13:14:48 UTC (rev 150) +++ trunk/scripts/GravityModel.java 2009-06-24 10:36:06 UTC (rev 151) @@ -633,7 +633,7 @@ private double getCatchWeightPerStrMetPerZonePop(Strategy str, Metier metier, PopulationGroup group, Zone zone, Date date) { MatrixND mat = resultManager.getMatrix(date, group.getPopulation(), - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); double result = 0; if (mat != null) { result = mat.getValue(str, metier, group, zone); Modified: trunk/scripts/ResultName.java =================================================================== --- trunk/scripts/ResultName.java 2009-06-22 13:14:48 UTC (rev 150) +++ trunk/scripts/ResultName.java 2009-06-24 10:36:06 UTC (rev 151) @@ -79,8 +79,6 @@ static final public String MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP = n_("matrixCatchWeightPerStrategyMetPerZonePop"); @Doc(value = "Disponible uniquement avec les simulations par Zone. do the doc of Result matrixFishingMortality") static final public String MATRIX_FISHING_MORTALITY = n_("matrixFishingMortality"); - @Doc(value = "do the doc of Result matrixCatchWeightPerStrategyMet") - static final public String MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET = n_("matrixCatchWeightPerStrategyMet"); @Doc(value = "do the doc of Result matrixAbundance") static final public String MATRIX_ABUNDANCE = n_("matrixAbundance"); @Doc(value = "do the doc of Result matrixBiomass") Modified: trunk/simulators/DefaultSimulator.java =================================================================== --- trunk/simulators/DefaultSimulator.java 2009-06-22 13:14:48 UTC (rev 150) +++ trunk/simulators/DefaultSimulator.java 2009-06-24 10:36:06 UTC (rev 151) @@ -488,7 +488,7 @@ resManager.addResult(date, pop, catchPerStrategyMetPerZonePop); if (resManager - .isEnabled(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET)) { + .isEnabled(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP)) { MatrixND catchWeightPerStrategyMet = siMatrix .matrixCatchWeightPerStrategyMetPerZonePop(date, pop, catchPerStrategyMetPerZonePop); @@ -501,7 +501,7 @@ resManager.addResult(date, pop, catchPerStrategyMetPerZoneMet); if (resManager - .isEnabled(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET)) { + .isEnabled(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_MET)) { MatrixND catchWeightPerStrategyMet = siMatrix .matrixCatchWeightPerStrategyMetPerZoneMet(date, pop, catchPerStrategyMetPerZoneMet);

1 0

r150 - trunk/analyseplans
by chatellier＠users.labs.libre-entreprise.org 22 Jun '09

22 Jun '09

Author: chatellier Date: 2009-06-22 13:14:48 +0000 (Mon, 22 Jun 2009) New Revision: 150 Modified: trunk/analyseplans/Max.java Log: Update doc Modified: trunk/analyseplans/Max.java =================================================================== --- trunk/analyseplans/Max.java 2009-06-20 19:04:07 UTC (rev 149) +++ trunk/analyseplans/Max.java 2009-06-22 13:14:48 UTC (rev 150) @@ -49,11 +49,10 @@ } /** - * Appel� au d�marrage de la simulation, cette m�thode permet d'initialiser + * Appelé au démarrage de la simulation, cette méthode permet d'initialiser * des valeurs * - * @param simulation - * La simulation pour lequel on utilise cette regle + * @param context La simulation pour lequel on utilise cette regle */ public void init(AnalysePlanContext context) throws Exception { @@ -80,8 +79,7 @@ * * @param context * plan context - * @param nextSimulation - * storage used for next simulation + * @param lastSimulation storage used for last simulation * @return true if we must do next simulation, false to stop plan * @throws Exception */

1 0

r149 - trunk/simulators
by chatellier＠users.labs.libre-entreprise.org 20 Jun '09

20 Jun '09

Author: chatellier Date: 2009-06-20 19:04:07 +0000 (Sat, 20 Jun 2009) New Revision: 149 Modified: trunk/simulators/DefaultSimulator.java Log: Reload rule parameters EACH YEAR (necessary after rollback) Modified: trunk/simulators/DefaultSimulator.java =================================================================== --- trunk/simulators/DefaultSimulator.java 2009-06-12 08:44:46 UTC (rev 148) +++ trunk/simulators/DefaultSimulator.java 2009-06-20 19:04:07 UTC (rev 149) @@ -111,8 +111,7 @@ control.setText("Rules initialisation:" + rules); for (Rule rule : rules) { rule.init(context); - log - .info("Rule " + rule.getClass().getSimpleName() + log.info("Rule " + rule.getClass().getSimpleName() + " initialized"); } @@ -125,6 +124,7 @@ // Simulation loop // while (date.getDate() < lastDate) { + // // if user stop simulation before last year // @@ -136,6 +136,13 @@ control.setProgress(date.getDate()); control.setText(_("begin step " + date)); + // + // Reload parameters for current step + // + control.setText(_("Reloading parameters")); + param.reloadContextParameters(); + rules = param.getRules(); + // raz des metiers interdits et des licences metierMonitor.clear();

1 0

r148 - trunk
by chatellier＠users.labs.libre-entreprise.org 12 Jun '09

12 Jun '09

Author: chatellier Date: 2009-06-12 08:44:46 +0000 (Fri, 12 Jun 2009) New Revision: 148 Modified: trunk/pom.xml Log: Re add compilation exclusions Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-06-12 08:27:01 UTC (rev 147) +++ trunk/pom.xml 2009-06-12 08:44:46 UTC (rev 148) @@ -28,6 +28,16 @@ <build> <sourceDirectory>${basedir}</sourceDirectory> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/simulations/**</exclude> + </excludes> + </configuration> + </plugin> + </plugins> </build>

1 0

r147 - in trunk: . sensitivity
by chatellier＠users.labs.libre-entreprise.org 12 Jun '09

12 Jun '09

Author: chatellier Date: 2009-06-12 08:27:01 +0000 (Fri, 12 Jun 2009) New Revision: 147 Modified: trunk/pom.xml trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java trunk/sensitivity/SensitivityCalculatorRFast.java trunk/sensitivity/SensitivityCalculatorRFrF2.java trunk/sensitivity/SensitivityCalculatorRMorris.java trunk/sensitivity/SensitivityCalculatorROptimumLHS.java trunk/sensitivity/SensitivityCalculatorRRandomLHS.java trunk/sensitivity/SensitivityCalculatorRSobol.java trunk/sensitivity/SensitivityCalculatorRegularFractions.java Log: Passage des datas sur la derniere version d'isis. Simplification du pom. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-06-12 08:14:51 UTC (rev 146) +++ trunk/pom.xml 2009-06-12 08:27:01 UTC (rev 147) @@ -1,17 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">  <modelVersion>4.0.0</modelVersion> -  -  <artifactId>isis-fish-data</artifactId> <name>IsisFish data</name> @@ -27,34 +20,27 @@ <description>Data for Isis-fish</description> <inceptionYear>2000</inceptionYear> -  - <issueManagement> - <url>http://labs.libre-entreprise.org/tracker/?group_id=8</url> - </issueManagement> + <properties> + <maven.test.skip>true</maven.test.skip> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.target>1.6</maven.compiler.target> + </properties> <build> <sourceDirectory>${basedir}</sourceDirectory> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - <excludes> - <exclude>**/simulations/**</exclude> - </excludes> - </configuration> - </plugin> - </plugins> </build> +  + <issueManagement> + <url>http://labs.libre-entreprise.org/tracker/?group_id=132</url> + </issueManagement> +  <dependencies> <dependency> <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.2.0.4-rc4-SNAPSHOT</version> + <version>3.2.0.5-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> @@ -66,40 +52,17 @@ </site> </distributionManagement> -  - <profiles> - <profile> - <id>codelutin-repository</id> + <repositories> + <repository> + <id>codelutin-lib</id> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + </repository> + </repositories> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - - <properties> - <maven.src.dir>${basedir}/src</maven.src.dir> - <maven.test.skip>true</maven.test.skip> - <maven.compile.source>1.5</maven.compile.source> - <maven.compile.target>1.5</maven.compile.target> - </properties> - - <repositories> - <repository> - <id>codelutin-lib</id> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>codelutin-plugin</id> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> - </pluginRepository> - </pluginRepositories> - </profile> - </profiles> - -  -  + <pluginRepositories> + <pluginRepository> + <id>codelutin-plugin</id> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + </pluginRepository> + </pluginRepositories> </project> Modified: trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2009-06-12 08:14:51 UTC (rev 146) +++ trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2009-06-12 08:27:01 UTC (rev 147) @@ -73,7 +73,7 @@ int k = 1; //number of sensitivity scenarios (initialization) int factorNumber = plan.getFactors().size(); //number of factors - List<Factor> factors = plan.getFactors(); //list of factors + List<Factor<?, ?>> factors = plan.getFactors(); //list of factors for (int i = 0; i < factorNumber; i++) { if (factors.get(i).getDomain() instanceof ContinuousDomain) { Modified: trunk/sensitivity/SensitivityCalculatorRFast.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRFast.java 2009-06-12 08:14:51 UTC (rev 146) +++ trunk/sensitivity/SensitivityCalculatorRFast.java 2009-06-12 08:27:01 UTC (rev 147) @@ -96,7 +96,7 @@ double[] dataframe = new double[0]; int nbExperiments = 0; int factorNumber = plan.getFactors().size(); - List<Factor> factors = plan.getFactors(); + List<Factor<?, ?>> factors = plan.getFactors(); SensitivityScenarios thisExperiment = new SensitivityScenarios(); List<Scenario> thisExperimentScenarios = thisExperiment.getScenarios(); Modified: trunk/sensitivity/SensitivityCalculatorRFrF2.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRFrF2.java 2009-06-12 08:14:51 UTC (rev 146) +++ trunk/sensitivity/SensitivityCalculatorRFrF2.java 2009-06-12 08:27:01 UTC (rev 147) @@ -77,7 +77,7 @@ double[] dataframe = new double[0]; int nbExperiments = 0; int factorNumber = plan.getFactors().size(); - List<Factor> factors = plan.getFactors(); + List<Factor<?, ?>> factors = plan.getFactors(); SensitivityScenarios thisExperiment = new SensitivityScenarios(); List<Scenario> thisExperimentScenarios = thisExperiment.getScenarios(); Modified: trunk/sensitivity/SensitivityCalculatorRMorris.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRMorris.java 2009-06-12 08:14:51 UTC (rev 146) +++ trunk/sensitivity/SensitivityCalculatorRMorris.java 2009-06-12 08:27:01 UTC (rev 147) @@ -90,7 +90,7 @@ double[] dataframe = new double[0]; int nbExperiments = 0; int factorNumber = plan.getFactors().size(); - List<Factor> factors = plan.getFactors(); + List<Factor<?, ?>> factors = plan.getFactors(); if (param_r == 0) { param_r = 4; Modified: trunk/sensitivity/SensitivityCalculatorROptimumLHS.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorROptimumLHS.java 2009-06-12 08:14:51 UTC (rev 146) +++ trunk/sensitivity/SensitivityCalculatorROptimumLHS.java 2009-06-12 08:27:01 UTC (rev 147) @@ -90,7 +90,7 @@ setIsisFactorsR(plan, outputdirectory); int factornumber = plan.getFactors().size(); - List<Factor> factors = plan.getFactors(); + List<Factor<?, ?>> factors = plan.getFactors(); double[] dataframe = new double[0]; SensitivityScenarios thisExperiment = new SensitivityScenarios(); List<Scenario> thisExperimentScenarios = thisExperiment.getScenarios(); Modified: trunk/sensitivity/SensitivityCalculatorRRandomLHS.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRRandomLHS.java 2009-06-12 08:14:51 UTC (rev 146) +++ trunk/sensitivity/SensitivityCalculatorRRandomLHS.java 2009-06-12 08:27:01 UTC (rev 147) @@ -89,7 +89,7 @@ double[] dataframe = new double[0]; SensitivityScenarios thisExperiment = new SensitivityScenarios(); List<Scenario> thisExperimentScenarios = thisExperiment.getScenarios(); - List<Factor> factors = plan.getFactors(); + List<Factor<?, ?>> factors = plan.getFactors(); //Test all factors, if one is discrete, return null for (int i = 0; i < factors.size(); i++) { Modified: trunk/sensitivity/SensitivityCalculatorRSobol.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRSobol.java 2009-06-12 08:14:51 UTC (rev 146) +++ trunk/sensitivity/SensitivityCalculatorRSobol.java 2009-06-12 08:27:01 UTC (rev 147) @@ -93,7 +93,7 @@ double[] dataframe = new double[0]; int nbExperiments = 0; int factorNumber = plan.getFactors().size(); - List<Factor> factors = plan.getFactors(); + List<Factor<?, ?>> factors = plan.getFactors(); SensitivityScenarios thisExperiment = new SensitivityScenarios(); List<Scenario> thisExperimentScenarios = thisExperiment.getScenarios(); Modified: trunk/sensitivity/SensitivityCalculatorRegularFractions.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRegularFractions.java 2009-06-12 08:14:51 UTC (rev 146) +++ trunk/sensitivity/SensitivityCalculatorRegularFractions.java 2009-06-12 08:27:01 UTC (rev 147) @@ -72,7 +72,7 @@ double[] dataframeplan = new double[0]; int nbExperiments = 0; int factorNumber = plan.getFactors().size(); - List<Factor> factors = plan.getFactors(); + List<Factor<?, ?>> factors = plan.getFactors(); SensitivityScenarios thisExperiment = new SensitivityScenarios(); List<Scenario> thisExperimentScenarios = thisExperiment.getScenarios();

1 0

r146 - trunk/rules
by chatellier＠users.labs.libre-entreprise.org 12 Jun '09

12 Jun '09

Author: chatellier Date: 2009-06-12 08:14:51 +0000 (Fri, 12 Jun 2009) New Revision: 146 Modified: trunk/rules/Cantonnement.java trunk/rules/CantonnementPreSimu.java Log: Le rechargement des parametres dans l'init n'est plus nec?\195?\169ssaire. Modified: trunk/rules/Cantonnement.java =================================================================== --- trunk/rules/Cantonnement.java 2009-06-05 09:49:57 UTC (rev 145) +++ trunk/rules/Cantonnement.java 2009-06-12 08:14:51 UTC (rev 146) @@ -85,17 +85,7 @@ * @param context La simulation pour lequel on utilise cette regle */ public void init(SimulationContext context) throws Exception { - - ZoneDAO zoneDao = IsisFishDAOHelper.getZoneDAO(context.getDB()); - GearDAO gearDao = IsisFishDAOHelper.getGearDAO(context.getDB()); - - // Rechargement du param_zone depuis le context courant - if (param_zone != null) { - param_zone = zoneDao.findByTopiaId(param_zone.getTopiaId()); - } - if (param_gear != null) { - param_gear = gearDao.findByTopiaId(param_gear.getTopiaId()); - } + } /** Modified: trunk/rules/CantonnementPreSimu.java =================================================================== --- trunk/rules/CantonnementPreSimu.java 2009-06-05 09:49:57 UTC (rev 145) +++ trunk/rules/CantonnementPreSimu.java 2009-06-12 08:14:51 UTC (rev 146) @@ -10,10 +10,7 @@ import scripts.SiMatrix; import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -117,22 +114,15 @@ /** * Appelé au démarrage de la simulation, cette méthode permet d'initialiser * des valeurs - * @param simulation La simulation pour lequel on utilise cette regle + * @param context La simulation pour lequel on utilise cette regle */ public void init(SimulationContext context) throws Exception { SiMatrix siMatrix = SiMatrix.getSiMatrix(context); // MetierDAO metierDao = IsisFishDAOHelper.getMetierDAO(context.getDB()); ZoneDAO zoneDao = IsisFishDAOHelper.getZoneDAO(context.getDB()); - GearDAO gearDao = IsisFishDAOHelper.getGearDAO(context.getDB()); MetierSeasonInfoDAO metierSeasonInfoDao = IsisFishDAOHelper.getMetierSeasonInfoDAO(context.getDB()); - - // Rechargement du param_zone depuis le context courant - param_zone = zoneDao.findByTopiaId(param_zone.getTopiaId()); - if (param_gear!=null){ - param_gear = gearDao.findByTopiaId(param_gear.getTopiaId()); - } - + // List<Metier> metiers = metierDao.findAll(); List<Month> SaisonFermee = Month.getMonths(param_beginMonth, param_endMonth); List<Cell> maillefermee = param_zone.getCell();

1 0

r145 - trunk/rules
by chatellier＠users.labs.libre-entreprise.org 05 Jun '09

05 Jun '09

Author: chatellier Date: 2009-06-05 09:49:57 +0000 (Fri, 05 Jun 2009) New Revision: 145 Modified: trunk/rules/Cantonnement.java Log: Rechargement des entit?\195?\169s parametres (session was closed) Modified: trunk/rules/Cantonnement.java =================================================================== --- trunk/rules/Cantonnement.java 2009-05-15 13:00:50 UTC (rev 144) +++ trunk/rules/Cantonnement.java 2009-06-05 09:49:57 UTC (rev 145) @@ -82,9 +82,20 @@ /** * Appelé au démarrage de la simulation, cette méthode permet d'initialiser * des valeurs - * @param simulation La simulation pour lequel on utilise cette regle + * @param context La simulation pour lequel on utilise cette regle */ public void init(SimulationContext context) throws Exception { + + ZoneDAO zoneDao = IsisFishDAOHelper.getZoneDAO(context.getDB()); + GearDAO gearDao = IsisFishDAOHelper.getGearDAO(context.getDB()); + + // Rechargement du param_zone depuis le context courant + if (param_zone != null) { + param_zone = zoneDao.findByTopiaId(param_zone.getTopiaId()); + } + if (param_gear != null) { + param_gear = gearDao.findByTopiaId(param_gear.getTopiaId()); + } } /**

1 0