Author: echatellier Date: 2020-01-13 15:20:28 +0100 (Mon, 13 Jan 2020) New Revision: 409 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/409 Log: #9225: Dans la m?\195?\169thode "Objective.eval" Ajouter 2?\195?\168me param?\195?\168tre SimulationStorage Modified: trunk/objectives/ObjectiveIterationCount.java trunk/pom.xml Modified: trunk/objectives/ObjectiveIterationCount.java =================================================================== --- trunk/objectives/ObjectiveIterationCount.java 2019-11-19 15:13:10 UTC (rev 408) +++ trunk/objectives/ObjectiveIterationCount.java 2020-01-13 14:20:28 UTC (rev 409) @@ -59,11 +59,12 @@ * Effectue une evaluation entre les exports et les observations. * * @param context optimization context + * @param simulation current simulation * @param exports exports - * @param observation observation + * @param observations observation * @return double value */ - public double eval(OptimizationContext context, List<MatrixND> exports, List<MatrixND> observations) { + public double eval(OptimizationContext context, SimulationStorage simulation, List<MatrixND> exports, List<MatrixND> observations) { double result = 0; if (context.getCurrentGeneration() == param_iterationCount - 1) { // because starts at 0 result = -1; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2019-11-19 15:13:10 UTC (rev 408) +++ trunk/pom.xml 2020-01-13 14:20:28 UTC (rev 409) @@ -65,7 +65,7 @@ <dependency> <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.4.2.0-SNAPSHOT</version> + <version>4.5.0.0-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies>