r313 - in branches/4.2.2: exports rules scripts sensitivityanalysis sensitivityexports simulationplans simulators
Author: echatellier Date: 2013-12-01 23:05:23 +0100 (Sun, 01 Dec 2013) New Revision: 313 Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/313 Log: Format and correct some codes Modified: branches/4.2.2/exports/Abundances.java branches/4.2.2/exports/Biomasses.java branches/4.2.2/exports/CapturesNombre.java branches/4.2.2/exports/CapturesNombreStrategies.java branches/4.2.2/exports/CapturesPoids.java branches/4.2.2/exports/CapturesPoidsStrategies.java branches/4.2.2/exports/CellsDefinition.java branches/4.2.2/exports/EffortsMetier.java branches/4.2.2/exports/MetierZone.java branches/4.2.2/exports/NonActivite.java branches/4.2.2/exports/OwnerMargin.java branches/4.2.2/exports/RegionDefinition.java branches/4.2.2/exports/RejetsNombre.java branches/4.2.2/exports/RejetsPoids.java branches/4.2.2/exports/VesselMargin.java branches/4.2.2/exports/ZonesDefinition.java branches/4.2.2/rules/Cantonnement.java branches/4.2.2/rules/CantonnementPreSimu.java branches/4.2.2/rules/ChangementParamControlablePresimu.java branches/4.2.2/rules/EffortReduction.java branches/4.2.2/rules/GraviteVPUE1.java branches/4.2.2/rules/InterdictionEngin.java branches/4.2.2/rules/InterdictionEnginPreSimu.java branches/4.2.2/rules/TACpoids.java branches/4.2.2/rules/TailleMin.java branches/4.2.2/rules/TotalClosure.java branches/4.2.2/scripts/GravityModel.java branches/4.2.2/scripts/MinimisationUtil.java branches/4.2.2/scripts/ObjectiveFunction.java branches/4.2.2/scripts/ObjectiveFunctionBaranov.java branches/4.2.2/scripts/ResultName.java branches/4.2.2/scripts/RuleUtil.java branches/4.2.2/scripts/SiMatrix.java branches/4.2.2/sensitivityanalysis/DOptimal.java branches/4.2.2/sensitivityanalysis/Fast.java branches/4.2.2/sensitivityanalysis/Morris.java branches/4.2.2/sensitivityanalysis/OptimumLHS.java branches/4.2.2/sensitivityanalysis/RandomLHS.java branches/4.2.2/sensitivityanalysis/RegularExpandGrid.java branches/4.2.2/sensitivityanalysis/RegularFractions.java branches/4.2.2/sensitivityanalysis/Sobol.java branches/4.2.2/sensitivityexports/SensitivityBiomassReferenceY9.java branches/4.2.2/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java branches/4.2.2/sensitivityexports/SensitivityBiomassRelativeY6.java branches/4.2.2/sensitivityexports/SensitivityBiomassY3.java branches/4.2.2/sensitivityexports/SensitivityCatchWeightReferenceY7.java branches/4.2.2/sensitivityexports/SensitivityCatchWeightRelativeReferenceY10.java branches/4.2.2/sensitivityexports/SensitivityCatchWeightRelativeY4.java branches/4.2.2/sensitivityexports/SensitivityCatchWeightY1.java branches/4.2.2/sensitivityexports/SensitivitySpawningBiomassReferenceY8.java branches/4.2.2/sensitivityexports/SensitivitySpawningBiomassRelativeReferenceY11.java branches/4.2.2/sensitivityexports/SensitivitySpawningBiomassRelativeY5.java branches/4.2.2/sensitivityexports/SensitivitySpawningBiomassY2.java branches/4.2.2/simulationplans/CalibrationSimplexePasVariable2Capturabilite.java branches/4.2.2/simulationplans/SimulationNumberRestriction.java branches/4.2.2/simulators/DefaultSimulator.java branches/4.2.2/simulators/SimulatorEffortByCell.java Modified: branches/4.2.2/exports/Abundances.java =================================================================== --- branches/4.2.2/exports/Abundances.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/exports/Abundances.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -37,7 +37,7 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; /** - * Abundance.java + * Abundances.java * * Created: 1 septembre 2006 * @@ -52,8 +52,8 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(Abundances.class); - protected String [] necessaryResult = { - ResultName.MATRIX_ABUNDANCE + protected String[] necessaryResult = { + ResultName.MATRIX_ABUNDANCE }; @Override @@ -80,15 +80,15 @@ public void export(SimulationStorage simulation, Writer out) throws Exception { for (Population pop : simulation.getParameter().getPopulations()) { MatrixND mat = simulation.getResultStorage().getMatrix(pop, ResultName.MATRIX_ABUNDANCE); - for (MatrixIterator i=mat.iterator(); i.hasNext();) { + for (MatrixIterator i = mat.iterator(); i.hasNext();) { i.next(); - Object [] sems = i.getSemanticsCoordinates(); - TimeStep step = (TimeStep)sems[0]; - PopulationGroup group = (PopulationGroup)sems[1]; - Zone zone = (Zone)sems[2]; + Object[] sems = i.getSemanticsCoordinates(); + TimeStep step = (TimeStep) sems[0]; + PopulationGroup group = (PopulationGroup) sems[1]; + Zone zone = (Zone) sems[2]; double val = i.getValue(); - out.write(pop.getName() +";"+ group.getId() +";"+ zone.getName() +";"+ step.getStep() +";"+ val +"\n"); + out.write(pop.getName() + ";" + group.getId() + ";" + zone.getName() + ";" + step.getStep() + ";" + val + "\n"); } } } Modified: branches/4.2.2/exports/Biomasses.java =================================================================== --- branches/4.2.2/exports/Biomasses.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/exports/Biomasses.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -53,8 +53,8 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(Biomasses.class); - protected String [] necessaryResult = { - ResultName.MATRIX_BIOMASS + protected String[] necessaryResult = { + ResultName.MATRIX_BIOMASS }; @Override @@ -81,15 +81,15 @@ public void export(SimulationStorage simulation, Writer out) throws Exception { for (Population pop : simulation.getParameter().getPopulations()) { MatrixND mat = simulation.getResultStorage().getMatrix(pop, ResultName.MATRIX_BIOMASS); - for (MatrixIterator i=mat.iterator(); i.hasNext();) { + for (MatrixIterator i = mat.iterator(); i.hasNext();) { i.next(); - Object [] sems = i.getSemanticsCoordinates(); - TimeStep step = (TimeStep)sems[0]; - PopulationGroup group = (PopulationGroup)sems[1]; - Zone zone = (Zone)sems[2]; - + Object[] sems = i.getSemanticsCoordinates(); + TimeStep step = (TimeStep) sems[0]; + PopulationGroup group = (PopulationGroup) sems[1]; + Zone zone = (Zone) sems[2]; + double val = i.getValue(); - out.write(pop.getName() +";"+ group.getId() +";"+ zone.getName() +";"+ step.getStep() +";"+ val +"\n"); + out.write(pop.getName() + ";" + group.getId() + ";" + zone.getName() + ";" + step.getStep() + ";" + val + "\n"); } } } Modified: branches/4.2.2/exports/CapturesNombre.java =================================================================== --- branches/4.2.2/exports/CapturesNombre.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/exports/CapturesNombre.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -54,7 +54,9 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(CapturesNombre.class); - protected String[] necessaryResult = { ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP }; + protected String[] necessaryResult = { + ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP + }; @Override public String[] getNecessaryResult() { @@ -82,8 +84,7 @@ TimeStep lastStep = simulation.getResultStorage().getLastStep(); for (Population pop : simulation.getParameter().getPopulations()) { - for (TimeStep step = new TimeStep(0); !step.after(lastStep); step = step - .next()) { + for (TimeStep step = new TimeStep(0); !step.after(lastStep); step = step.next()) { MatrixND mat = simulation.getResultStorage().getMatrix(step, pop, ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP); if (mat != null) { // can be null if simulation is stopped before last year simulation Modified: branches/4.2.2/exports/CapturesNombreStrategies.java =================================================================== --- branches/4.2.2/exports/CapturesNombreStrategies.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/exports/CapturesNombreStrategies.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -55,7 +55,9 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(CapturesNombreStrategies.class); - protected String[] necessaryResult = { ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP }; + protected String[] necessaryResult = { + ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP + }; @Override public String[] getNecessaryResult() { @@ -78,8 +80,7 @@ } @Override - public void export(SimulationStorage simulation, Writer out) - throws Exception { + public void export(SimulationStorage simulation, Writer out) throws Exception { TimeStep lastStep = simulation.getResultStorage().getLastStep(); for (Population pop : simulation.getParameter().getPopulations()) { Modified: branches/4.2.2/exports/CapturesPoids.java =================================================================== --- branches/4.2.2/exports/CapturesPoids.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/exports/CapturesPoids.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -54,7 +54,9 @@ /** 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_PER_ZONE_POP }; + protected String[] necessaryResult = { + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP + }; @Override public String[] getNecessaryResult() { Modified: branches/4.2.2/exports/CapturesPoidsStrategies.java =================================================================== --- branches/4.2.2/exports/CapturesPoidsStrategies.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/exports/CapturesPoidsStrategies.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -55,7 +55,9 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(CapturesPoidsStrategies.class); - protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP }; + protected String[] necessaryResult = { + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP + }; @Override public String[] getNecessaryResult() { Modified: branches/4.2.2/exports/CellsDefinition.java =================================================================== --- branches/4.2.2/exports/CellsDefinition.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/exports/CellsDefinition.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -50,11 +50,11 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(CellsDefinition.class); - public String [] necessaryResult = { - // put here all necessary result for this rule - // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + protected String [] necessaryResult = { + // put here all necessary result for this rule + // example: + // ResultName.MATRIX_BIOMASS, + // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, }; @Override Modified: branches/4.2.2/exports/EffortsMetier.java =================================================================== --- branches/4.2.2/exports/EffortsMetier.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/exports/EffortsMetier.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -54,7 +54,7 @@ static private Log log = LogFactory.getLog(EffortsMetier.class); protected String [] necessaryResult = { - ResultName.MATRIX_EFFORT_PER_STRATEGY_MET + ResultName.MATRIX_EFFORT_PER_STRATEGY_MET }; @Override @@ -80,7 +80,7 @@ @Override public void export(SimulationStorage simulation, Writer out) throws Exception { MatrixND mat = simulation.getResultStorage().getMatrix(ResultName.MATRIX_EFFORT_PER_STRATEGY_MET); - for (MatrixIterator i=mat.iterator(); i.hasNext();) { + for (MatrixIterator i = mat.iterator(); i.hasNext();) { i.next(); Object [] sems = i.getSemanticsCoordinates(); TimeStep step = (TimeStep)sems[0]; Modified: branches/4.2.2/exports/MetierZone.java =================================================================== --- branches/4.2.2/exports/MetierZone.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/exports/MetierZone.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -51,8 +51,8 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(MetierZone.class); - public String [] necessaryResult = { - ResultName.MATRIX_METIER_ZONE, + protected String [] necessaryResult = { + ResultName.MATRIX_METIER_ZONE, }; @Override @@ -82,7 +82,7 @@ for (TimeStep step = new TimeStep(0); !step.after(lastStep); step = step.next() ) { MatrixND mat = simulation.getResultStorage().getMatrix(step, ResultName.MATRIX_METIER_ZONE); if (mat != null) { // can be null if simulation is stopped before last year simulation - for (MatrixIterator i=mat.iterator(); i.hasNext();) { + for (MatrixIterator i = mat.iterator(); i.hasNext();) { i.next(); if (i.getValue() == 1) { Object metier = i.getSemanticsCoordinates()[0]; Modified: branches/4.2.2/exports/NonActivite.java =================================================================== --- branches/4.2.2/exports/NonActivite.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/exports/NonActivite.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -54,7 +54,7 @@ static private Log log = LogFactory.getLog(NonActivite.class); protected String [] necessaryResult = { - ResultName.MATRIX_NO_ACTIVITY + ResultName.MATRIX_NO_ACTIVITY }; @Override @@ -80,7 +80,7 @@ @Override public void export(SimulationStorage simulation, Writer out) throws Exception { MatrixND mat = simulation.getResultStorage().getMatrix(ResultName.MATRIX_NO_ACTIVITY); - for (MatrixIterator i=mat.iterator(); i.hasNext();) { + for (MatrixIterator i = mat.iterator(); i.hasNext();) { i.next(); Object [] sems = i.getSemanticsCoordinates(); TimeStep step = (TimeStep)sems[0]; Modified: branches/4.2.2/exports/OwnerMargin.java =================================================================== --- branches/4.2.2/exports/OwnerMargin.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/exports/OwnerMargin.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -54,7 +54,7 @@ static private Log log = LogFactory.getLog(OwnerMargin.class); protected String [] necessaryResult = { - ResultName.MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL + ResultName.MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL }; @Override @@ -80,9 +80,9 @@ @Override public void export(SimulationStorage simulation, Writer out) throws Exception { MatrixND mat = simulation.getResultStorage().getMatrix(ResultName.MATRIX_OWNER_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL); - for (MatrixIterator i=mat.iterator(); i.hasNext();) { + for (MatrixIterator i = mat.iterator(); i.hasNext();) { i.next(); - Object [] sems = i.getSemanticsCoordinates(); + Object[] sems = i.getSemanticsCoordinates(); TimeStep step = (TimeStep)sems[0]; Strategy str = (Strategy)sems[1]; Modified: branches/4.2.2/exports/RegionDefinition.java =================================================================== --- branches/4.2.2/exports/RegionDefinition.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/exports/RegionDefinition.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -49,11 +49,11 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(RegionDefinition.class); - public String [] necessaryResult = { - // put here all necessary result for this rule - // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + protected String [] necessaryResult = { + // put here all necessary result for this rule + // example: + // ResultName.MATRIX_BIOMASS, + // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, }; @Override Modified: branches/4.2.2/exports/RejetsNombre.java =================================================================== --- branches/4.2.2/exports/RejetsNombre.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/exports/RejetsNombre.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -54,7 +54,9 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(RejetsNombre.class); - protected String[] necessaryResult = { ResultName.MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP }; + protected String[] necessaryResult = { + ResultName.MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP + }; @Override public String[] getNecessaryResult() { Modified: branches/4.2.2/exports/RejetsPoids.java =================================================================== --- branches/4.2.2/exports/RejetsPoids.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/exports/RejetsPoids.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -54,8 +54,8 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(RejetsPoids.class); - protected String[] necessaryResult = { ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP - + protected String[] necessaryResult = { + ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP }; @Override Modified: branches/4.2.2/exports/VesselMargin.java =================================================================== --- branches/4.2.2/exports/VesselMargin.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/exports/VesselMargin.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -54,7 +54,7 @@ static private Log log = LogFactory.getLog(VesselMargin.class); protected String [] necessaryResult = { - ResultName.MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL + ResultName.MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL }; @Override @@ -80,7 +80,7 @@ @Override public void export(SimulationStorage simulation, Writer out) throws Exception { MatrixND mat = simulation.getResultStorage().getMatrix(ResultName.MATRIX_VESSEL_MARGIN_OVER_VARIABLE_COSTS_PER_STRATEGY_PER_VESSEL); - for (MatrixIterator i=mat.iterator(); i.hasNext();) { + for (MatrixIterator i = mat.iterator(); i.hasNext();) { i.next(); Object [] sems = i.getSemanticsCoordinates(); TimeStep step = (TimeStep)sems[0]; Modified: branches/4.2.2/exports/ZonesDefinition.java =================================================================== --- branches/4.2.2/exports/ZonesDefinition.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/exports/ZonesDefinition.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -51,11 +51,11 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(ZonesDefinition.class); - public String [] necessaryResult = { - // put here all necessary result for this rule - // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + protected String [] necessaryResult = { + // put here all necessary result for this rule + // example: + // ResultName.MATRIX_BIOMASS, + // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, }; @Override Modified: branches/4.2.2/rules/Cantonnement.java =================================================================== --- branches/4.2.2/rules/Cantonnement.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/rules/Cantonnement.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -50,6 +50,8 @@ /** * Cantonnement.java * + * Remplace aussi Cantonnement Engin + * * Created: 30 novembre 2006 * * @author anonymous <anonymous@labs.libre-entreprise.org> @@ -58,10 +60,6 @@ * Last update: $Date: 2007-11-02 17:41:41 $ * by : $Author: bpoussin $ */ - -/** - * Remplace aussi Cantonnement Engin - */ public class Cantonnement extends AbstractRule { /** to use log facility, just put in your code: log.info("..."); */ @@ -80,12 +78,12 @@ @Doc(value="End month") public Month param_endMonth = Month.DECEMBER; - public String [] necessaryResult = { - // put here all necessary result for this rule - // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, - ResultName.MATRIX_NO_ACTIVITY, + protected String [] necessaryResult = { + // put here all necessary result for this rule + // example: + // ResultName.MATRIX_BIOMASS, + // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + ResultName.MATRIX_NO_ACTIVITY, }; @Override @@ -126,7 +124,7 @@ public boolean condition(SimulationContext context, TimeStep step, Metier metier) throws Exception { if (step.before(param_beginStep)) { return false; - } else if(step.after(param_endStep)) { + } else if (step.after(param_endStep)) { return false; } @@ -204,7 +202,7 @@ zoneCantonnement.addAllCell(tmpCells); i.remove(); } - List<Zone> newZone = new ArrayList<Zone>(); + List<Zone> newZone = new ArrayList<>(); newZone.add(zoneCantonnement); infoMetier.setZone(newZone); } else { @@ -219,10 +217,10 @@ metierMon.addforbiddenMetier(metier); List<Strategy> strategies = siMatrix.getStrategies(step); - for(Strategy str : strategies){ + for (Strategy str : strategies) { StrategyMonthInfo info = str.getStrategyMonthInfo(step.getMonth()); double prop = info.getProportionMetier(metier); - if (prop != 0){ + if (prop != 0) { noActivity.setValue(str , metier, prop); info.setProportionMetier(metier, 0); } Modified: branches/4.2.2/rules/CantonnementPreSimu.java =================================================================== --- branches/4.2.2/rules/CantonnementPreSimu.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/rules/CantonnementPreSimu.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -73,15 +73,15 @@ @Doc(value="End month") public Month param_endMonth = Month.DECEMBER; - protected Map<Month, MatrixND> tableNonActivite = new HashMap<Month, MatrixND>(); + protected Map<Month, MatrixND> tableNonActivite = new HashMap<>(); protected boolean affectNonActivite = false; - public String [] necessaryResult = { - // put here all necessary result for this rule - // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, - ResultName.MATRIX_NO_ACTIVITY, + protected String [] necessaryResult = { + // put here all necessary result for this rule + // example: + // ResultName.MATRIX_BIOMASS, + // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + ResultName.MATRIX_NO_ACTIVITY, }; @Override @@ -107,7 +107,8 @@ if (effort != null){ for (Month month : chomageMonth) { StrategyMonthInfo InfoMois = strategy.getStrategyMonthInfo(month); -//this.p.tableNonActivite=Regle_action_lib.reportNonActivite(this.p.tableNonActivite, listestrategies.get(i), metier, mois, InfoMois.getProportionMetier(metier)); + // this.p.tableNonActivite=Regle_action_lib.reportNonActivite(this.p.tableNonActivite, + // listestrategies.get(i), metier, mois, InfoMois.getProportionMetier(metier)); log.info("debut reportNonActivite"); // on regarde si on a déjà une entrée pour le mois courant @@ -160,16 +161,16 @@ else { log.info("l engin du métier est bien concerné"); List<MetierSeasonInfo> saisons = metier.getMetierSeasonInfo(); - for (MetierSeasonInfo saisonmetier: saisons){ + for (MetierSeasonInfo saisonmetier : saisons){ int inter = siMatrix.nbCellInter(saisonmetier.getZone(), param_zone); - if (inter != 0){ + if (inter != 0) { List<Cell> MailleMetier = siMatrix.getCells(saisonmetier.getZone()); // les mailles qui reste dans la zone metier - List<Cell> newCellMetier = new ArrayList<Cell>(MailleMetier); + List<Cell> newCellMetier = new ArrayList<>(MailleMetier); newCellMetier.removeAll(maillefermee); - List<Month> saison=saisonmetier.getMonths(); + List<Month> saison = saisonmetier.getMonths(); if (saison.containsAll(SaisonFermee)){ log.info("il y a bien intersection entre la zone métier et le cantonnement pour la saison "+saison.toString()); // calcule de la zone restante: Modified: branches/4.2.2/rules/ChangementParamControlablePresimu.java =================================================================== --- branches/4.2.2/rules/ChangementParamControlablePresimu.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/rules/ChangementParamControlablePresimu.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -77,11 +77,11 @@ @Doc(value="New param controlable value") public String param_newParamValue = "80"; - public String [] necessaryResult = { - // put here all necessary result for this rule - // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + protected String [] necessaryResult = { + // put here all necessary result for this rule + // example: + // ResultName.MATRIX_BIOMASS, + // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, }; @Override Modified: branches/4.2.2/rules/EffortReduction.java =================================================================== --- branches/4.2.2/rules/EffortReduction.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/rules/EffortReduction.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -57,9 +57,13 @@ @Doc("Pourcentage de reduction d effort applique.") public double param_PercentReduction = 0.5; - boolean first = true; + protected boolean first = true; - protected String[] necessaryResult = {}; + protected String[] necessaryResult = { + // put here all necessary result for this rule + // example: + // ResultName.MATRIX_BIOMASS, + }; /** * @return the necessaryResult Modified: branches/4.2.2/rules/GraviteVPUE1.java =================================================================== --- branches/4.2.2/rules/GraviteVPUE1.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/rules/GraviteVPUE1.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -59,21 +59,20 @@ static private Log log = LogFactory.getLog(GraviteVPUE1.class); /** stocke la somme des prop initiales [str x month] */ - private MatrixND SommePropInitial = null; - /** stocke par strat*met, la dernière attractivite pour chaque mois [str x met x month] */ + protected MatrixND SommePropInitial = null; /** permet de stocker les CPUE nominales [str x met] */ - private MatrixND valuePerUnitOfEffort = null; + protected MatrixND valuePerUnitOfEffort = null; - public String[] necessaryResult = { - // put here all necessary result for this rule - // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, - ResultName.MATRIX_GROSS_VALUE_OF_LANDINGS_PER_STRATEGY_MET, - //ResultName.MATRIX_EFFORT_PER_STRATEGY_MET, - ResultName.MATRIX_EFFORT_NOMINAL_PER_STRATEGY_MET, // garder la , + // Booleen permettant que ne boucler que sur un seul metier dans la preaction : + protected boolean first = true; + protected String[] necessaryResult = { + // put here all necessary result for this rule + // example: + // ResultName.MATRIX_BIOMASS, + ResultName.MATRIX_GROSS_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + ResultName.MATRIX_EFFORT_NOMINAL_PER_STRATEGY_MET }; @Override @@ -146,7 +145,6 @@ SommePropInitial.setValue(str, info.getMonth(), somme); } } - } /** @@ -164,8 +162,6 @@ return step.getYear() > 0; } - // Booleen permettant que ne boucler que sur un seul metier dans la preaction : - boolean first = true; /** * Si la condition est vrai alors cette action est executee avant le pas Modified: branches/4.2.2/rules/InterdictionEngin.java =================================================================== --- branches/4.2.2/rules/InterdictionEngin.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/rules/InterdictionEngin.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -71,11 +71,11 @@ @Doc(value="do the doc of param endMonth") public Month param_endMonth = Month.DECEMBER; - public String [] necessaryResult = { - // put here all necessary result for this rule - // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + protected String [] necessaryResult = { + // put here all necessary result for this rule + // example: + // ResultName.MATRIX_BIOMASS, + // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, }; @Override @@ -167,7 +167,7 @@ // 1er cas:l'effort est reporte sur un metier de la meme strategie, // n'ayant pas l'espece comme capture principale et pechant avec le meme engin - List<EffortDescription> MetiersPossibles = new ArrayList<EffortDescription>(Strat.getSetOfVessels().getPossibleMetiers()); + List<EffortDescription> MetiersPossibles = new ArrayList<>(Strat.getSetOfVessels().getPossibleMetiers()); // on verifie que les metiers sont bien pratiques au mois courant, // qu'ils n'ont pas le meme engin et qu'ils ne sont pas @@ -184,7 +184,7 @@ // on repartit maintenant l'effort entre les differents metiers // possibles dans la meme strategie si un metier possible existe bien - if (MetiersPossibles.size() != 0){ + if (MetiersPossibles.size() != 0) { int NbMetier=MetiersPossibles.size(); for (EffortDescription effort : MetiersPossibles) { Metier met = effort.getPossibleMetiers(); @@ -203,7 +203,7 @@ siMatrix.getMetiers(step)); matNonActivite.setValue(Strat, metier, StratMonthInfo.getProportionMetier(metier)); - StratMonthInfo.setProportionMetier(metier,0); + StratMonthInfo.setProportionMetier(metier, 0); } } Modified: branches/4.2.2/rules/InterdictionEnginPreSimu.java =================================================================== --- branches/4.2.2/rules/InterdictionEnginPreSimu.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/rules/InterdictionEnginPreSimu.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -70,14 +70,14 @@ @Doc(value="do the doc of param endMonth") public Month param_endMonth = Month.DECEMBER; - protected Map<Month, MatrixND> tableNonActivite = new HashMap<Month, MatrixND>(); + protected Map<Month, MatrixND> tableNonActivite = new HashMap<>(); protected boolean affectNonActivite = false; - public String [] necessaryResult = { - // put here all necessary result for this rule - // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + protected String [] necessaryResult = { + // put here all necessary result for this rule + // example: + // ResultName.MATRIX_BIOMASS, + // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, }; @Override @@ -207,7 +207,7 @@ @Override public void preAction(SimulationContext context, TimeStep step, Metier metier) throws Exception { // on ne doit le faire qu'une seul fois quelque soit le nombre de metier - affectNonActivite=true; + affectNonActivite = true; MatrixND mat = tableNonActivite.get(step.getMonth()); MetierMonitor metierMon = context.getMetierMonitor(); @@ -215,8 +215,7 @@ if (noActivity == null) { metierMon.setNoActivity(step, mat.copy()); - } - else { + } else { noActivity = noActivity.add(mat); } // fin Modified: branches/4.2.2/rules/TACpoids.java =================================================================== --- branches/4.2.2/rules/TACpoids.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/rules/TACpoids.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -87,13 +87,13 @@ @Doc("TAC in tons") public double param_tacInTons = 900; - boolean affectation = false; + protected boolean affectation = false; protected String[] necessaryResult = { - // put here all necessary result for this rule - // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + // put here all necessary result for this rule + // example: + // ResultName.MATRIX_BIOMASS, + // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, }; /** Modified: branches/4.2.2/rules/TailleMin.java =================================================================== --- branches/4.2.2/rules/TailleMin.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/rules/TailleMin.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin, Stéphanie Mahevas, Chatellier Eric + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin, Stéphanie Mahevas, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -79,7 +79,7 @@ protected boolean affectation = true; - public String[] necessaryResult = { + protected String[] necessaryResult = { // put here all necessary result for this rule // example: // ResultName.MATRIX_BIOMASS, Modified: branches/4.2.2/rules/TotalClosure.java =================================================================== --- branches/4.2.2/rules/TotalClosure.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/rules/TotalClosure.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -57,8 +57,8 @@ public Month param_beginMonth = Month.JANUARY; public Month param_endMonth = Month.JANUARY; - public String[] necessaryResult = { - ResultName.MATRIX_NO_ACTIVITY + protected String[] necessaryResult = { + ResultName.MATRIX_NO_ACTIVITY }; @Override @@ -77,6 +77,7 @@ */ @Override public void init(SimulationContext context) throws Exception { + } /** Modified: branches/4.2.2/scripts/GravityModel.java =================================================================== --- branches/4.2.2/scripts/GravityModel.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/scripts/GravityModel.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2006 - 2013 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: branches/4.2.2/scripts/MinimisationUtil.java =================================================================== --- branches/4.2.2/scripts/MinimisationUtil.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/scripts/MinimisationUtil.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2012 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 2012, 2013 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: branches/4.2.2/scripts/ObjectiveFunction.java =================================================================== --- branches/4.2.2/scripts/ObjectiveFunction.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/scripts/ObjectiveFunction.java 2013-12-01 22:05:23 UTC (rev 313) @@ -1,6 +1,9 @@ /* - * Copyright (C) 2012 lgasche - * + * #%L + * IsisFish data + * %% + * Copyright (C) 2012, 2013 Ifremer, CodeLutin, lgasche + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the @@ -14,6 +17,7 @@ * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% */ package scripts; Modified: branches/4.2.2/scripts/ObjectiveFunctionBaranov.java =================================================================== --- branches/4.2.2/scripts/ObjectiveFunctionBaranov.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/scripts/ObjectiveFunctionBaranov.java 2013-12-01 22:05:23 UTC (rev 313) @@ -1,6 +1,9 @@ /* - * Copyright (C) 2012 lgasche - * + * #%L + * IsisFish data + * %% + * Copyright (C) 2012, 2013 Ifremer, CodeLutin, lgasche + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the @@ -14,6 +17,7 @@ * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% */ package scripts; Modified: branches/4.2.2/scripts/ResultName.java =================================================================== --- branches/4.2.2/scripts/ResultName.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/scripts/ResultName.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2013 Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: branches/4.2.2/scripts/RuleUtil.java =================================================================== --- branches/4.2.2/scripts/RuleUtil.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/scripts/RuleUtil.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: branches/4.2.2/scripts/SiMatrix.java =================================================================== --- branches/4.2.2/scripts/SiMatrix.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/scripts/SiMatrix.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2006 - 2013 Ifremer, Code Lutin, Benjamin Poussin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -1493,12 +1493,6 @@ return result; } - /////////////////////////////////////////////////////////////////////////// - // - // - // - /////////////////////////////////////////////////////////////////////////// - /** * @param step * @return @@ -1526,12 +1520,6 @@ return result; } - /////////////////////////////////////////////////////////////////////////// - // - // - // - /////////////////////////////////////////////////////////////////////////// - /** * * @@ -1556,11 +1544,6 @@ return result; } - /////////////////////////////////////////////////////////////////////////// - // - // - // - /////////////////////////////////////////////////////////////////////////// public MatrixND matrixEffortNominalPerStrategyMet(TimeStep step) throws TopiaException { List<Strategy> strategies = getStrategies(step); @@ -1614,7 +1597,7 @@ MatrixND catchPerStrategy = null; - for (TimeStep loopstep = new TimeStep(step.getYear() * 12); loopstep.beforeOrEquals(step); loopstep=loopstep.next()){ + for (TimeStep loopstep = new TimeStep(step.getYear() * 12); loopstep.beforeOrEquals(step); loopstep=loopstep.next()) { // On fait cette boucle pour contourner les aspects de cache qui font que les resultats ne sont pas recuperes //s'ils ont deja ete calcules une fois (meme s'ils ont change depuis) // beforeOrEquals sert a bien prendre Decembre aussi Modified: branches/4.2.2/sensitivityanalysis/DOptimal.java =================================================================== --- branches/4.2.2/sensitivityanalysis/DOptimal.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/sensitivityanalysis/DOptimal.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Jean Couteau + * Copyright (C) 2009 - 2013 Ifremer, Code Lutin, Jean Couteau * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: branches/4.2.2/sensitivityanalysis/Fast.java =================================================================== --- branches/4.2.2/sensitivityanalysis/Fast.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/sensitivityanalysis/Fast.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Jean Couteau + * Copyright (C) 2009 - 2013 Ifremer, Code Lutin, Jean Couteau * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -24,10 +24,8 @@ import java.io.File; import java.util.List; -import java.util.Map; import fr.ifremer.isisfish.simulator.sensitivity.*; -import org.apache.commons.lang3.StringUtils; import org.nuiton.j2r.REngine; import org.nuiton.j2r.RException; import org.nuiton.j2r.RProxy; @@ -35,8 +33,6 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.simulator.SimulationParameter; -import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.util.Doc; import org.nuiton.j2r.types.RDataFrame; Modified: branches/4.2.2/sensitivityanalysis/Morris.java =================================================================== --- branches/4.2.2/sensitivityanalysis/Morris.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/sensitivityanalysis/Morris.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Jean Couteau + * Copyright (C) 2009 - 2013 Ifremer, Code Lutin, Jean Couteau * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: branches/4.2.2/sensitivityanalysis/OptimumLHS.java =================================================================== --- branches/4.2.2/sensitivityanalysis/OptimumLHS.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/sensitivityanalysis/OptimumLHS.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Jean Couteau + * Copyright (C) 2009 - 2013 Ifremer, Code Lutin, Jean Couteau * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -37,7 +37,6 @@ import fr.ifremer.isisfish.simulator.sensitivity.Scenario; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityException; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityScenarios; -import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.util.Doc; import org.nuiton.j2r.types.RDataFrame; Modified: branches/4.2.2/sensitivityanalysis/RandomLHS.java =================================================================== --- branches/4.2.2/sensitivityanalysis/RandomLHS.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/sensitivityanalysis/RandomLHS.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Jean Couteau + * Copyright (C) 2009 - 2013 Ifremer, Code Lutin, Jean Couteau * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -39,7 +39,6 @@ import fr.ifremer.isisfish.simulator.sensitivity.Scenario; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityException; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityScenarios; -import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.util.Doc; /** Modified: branches/4.2.2/sensitivityanalysis/RegularExpandGrid.java =================================================================== --- branches/4.2.2/sensitivityanalysis/RegularExpandGrid.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/sensitivityanalysis/RegularExpandGrid.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Jean Couteau + * Copyright (C) 2009 - 2013 Ifremer, Code Lutin, Jean Couteau * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: branches/4.2.2/sensitivityanalysis/RegularFractions.java =================================================================== --- branches/4.2.2/sensitivityanalysis/RegularFractions.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/sensitivityanalysis/RegularFractions.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Jean Couteau + * Copyright (C) 2009 - 2013 Ifremer, Code Lutin, Jean Couteau * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -35,13 +35,10 @@ import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.sensitivity.AbstractSensitivityAnalysis; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; -import fr.ifremer.isisfish.simulator.sensitivity.Domain; import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.Scenario; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityException; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityScenarios; -import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.util.Doc; public class RegularFractions extends AbstractSensitivityAnalysis { Modified: branches/4.2.2/sensitivityanalysis/Sobol.java =================================================================== --- branches/4.2.2/sensitivityanalysis/Sobol.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/sensitivityanalysis/Sobol.java 2013-12-01 22:05:23 UTC (rev 313) @@ -24,7 +24,6 @@ import java.io.File; import java.util.List; -import java.util.Map; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.simulator.sensitivity.*; @@ -34,7 +33,6 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationParameter; -import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.util.Doc; import org.nuiton.j2r.types.RDataFrame; Modified: branches/4.2.2/sensitivityexports/SensitivityBiomassReferenceY9.java =================================================================== --- branches/4.2.2/sensitivityexports/SensitivityBiomassReferenceY9.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/sensitivityexports/SensitivityBiomassReferenceY9.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Jean Couteau + * Copyright (C) 2009 - 2013 Ifremer, Code Lutin, Jean Couteau * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: branches/4.2.2/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java =================================================================== --- branches/4.2.2/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Jean Couteau + * Copyright (C) 2009 - 2013 Ifremer, Code Lutin, Jean Couteau * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: branches/4.2.2/sensitivityexports/SensitivityBiomassRelativeY6.java =================================================================== --- branches/4.2.2/sensitivityexports/SensitivityBiomassRelativeY6.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/sensitivityexports/SensitivityBiomassRelativeY6.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Jean Couteau + * Copyright (C) 2009 - 2013 Ifremer, Code Lutin, Jean Couteau * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: branches/4.2.2/sensitivityexports/SensitivityBiomassY3.java =================================================================== --- branches/4.2.2/sensitivityexports/SensitivityBiomassY3.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/sensitivityexports/SensitivityBiomassY3.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Jean Couteau + * Copyright (C) 2009 - 2013 Ifremer, Code Lutin, Jean Couteau * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: branches/4.2.2/sensitivityexports/SensitivityCatchWeightReferenceY7.java =================================================================== --- branches/4.2.2/sensitivityexports/SensitivityCatchWeightReferenceY7.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/sensitivityexports/SensitivityCatchWeightReferenceY7.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Jean Couteau + * Copyright (C) 2009 - 2013 Ifremer, Code Lutin, Jean Couteau * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: branches/4.2.2/sensitivityexports/SensitivityCatchWeightRelativeReferenceY10.java =================================================================== --- branches/4.2.2/sensitivityexports/SensitivityCatchWeightRelativeReferenceY10.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/sensitivityexports/SensitivityCatchWeightRelativeReferenceY10.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Jean Couteau + * Copyright (C) 2009 - 2013 Ifremer, Code Lutin, Jean Couteau * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -39,14 +39,15 @@ import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.Doc; -public class SensitivityCatchWeightRelativeReferenceY10 implements - SensitivityExport { +public class SensitivityCatchWeightRelativeReferenceY10 implements SensitivityExport { /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory .getLog(SensitivityCatchWeightRelativeReferenceY10.class); - protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP }; + protected String[] necessaryResult = { + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP + }; @Doc("Population") public Population param_pop; Modified: branches/4.2.2/sensitivityexports/SensitivityCatchWeightRelativeY4.java =================================================================== --- branches/4.2.2/sensitivityexports/SensitivityCatchWeightRelativeY4.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/sensitivityexports/SensitivityCatchWeightRelativeY4.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Jean Couteau + * Copyright (C) 2009 - 2013 Ifremer, Code Lutin, Jean Couteau * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -43,7 +43,9 @@ static private Log log = LogFactory .getLog(SensitivityCatchWeightRelativeY4.class); - protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP }; + protected String[] necessaryResult = { + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP + }; @Doc("Population") public Population param_pop; Modified: branches/4.2.2/sensitivityexports/SensitivityCatchWeightY1.java =================================================================== --- branches/4.2.2/sensitivityexports/SensitivityCatchWeightY1.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/sensitivityexports/SensitivityCatchWeightY1.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Jean Couteau + * Copyright (C) 2009 - 2013 Ifremer, Code Lutin, Jean Couteau * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -43,7 +43,9 @@ static private Log log = LogFactory .getLog(SensitivityCatchWeightY1.class); - protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP }; + protected String[] necessaryResult = { + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP + }; @Doc("Population") public Population param_pop; Modified: branches/4.2.2/sensitivityexports/SensitivitySpawningBiomassReferenceY8.java =================================================================== --- branches/4.2.2/sensitivityexports/SensitivitySpawningBiomassReferenceY8.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/sensitivityexports/SensitivitySpawningBiomassReferenceY8.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Jean Couteau, Chatellier Eric + * Copyright (C) 2009 - 2013 Ifremer, Code Lutin, Jean Couteau, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -50,13 +50,15 @@ static private Log log = LogFactory .getLog(SensitivitySpawningBiomassReferenceY8.class); - protected String[] necessaryResult = { ResultName.MATRIX_BIOMASS }; + protected String[] necessaryResult = { + ResultName.MATRIX_BIOMASS + }; @Doc("Population") public Population param_pop; @Doc("URL of the Biomasses.csv reference export file") - public String param_referenceBiomassCSV =""; + public String param_referenceBiomassCSV = ""; @Override public void export(SimulationStorage simulation, Writer out) Modified: branches/4.2.2/sensitivityexports/SensitivitySpawningBiomassRelativeReferenceY11.java =================================================================== --- branches/4.2.2/sensitivityexports/SensitivitySpawningBiomassRelativeReferenceY11.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/sensitivityexports/SensitivitySpawningBiomassRelativeReferenceY11.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Jean Couteau, Chatellier Eric + * Copyright (C) 2009 - 2013 Ifremer, Code Lutin, Jean Couteau, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -57,7 +57,7 @@ public Population param_pop; @Doc("URL of the Biomasses.csv reference export file") - public String param_referenceBiomassCSV =""; + public String param_referenceBiomassCSV = ""; @Override public void export(SimulationStorage simulation, Writer out) Modified: branches/4.2.2/sensitivityexports/SensitivitySpawningBiomassRelativeY5.java =================================================================== --- branches/4.2.2/sensitivityexports/SensitivitySpawningBiomassRelativeY5.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/sensitivityexports/SensitivitySpawningBiomassRelativeY5.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Jean Couteau, Chatellier Eric + * Copyright (C) 2009 - 2013 Ifremer, Code Lutin, Jean Couteau, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -45,7 +45,9 @@ static private Log log = LogFactory .getLog(SensitivitySpawningBiomassRelativeY5.class); - protected String[] necessaryResult = { ResultName.MATRIX_BIOMASS }; + protected String[] necessaryResult = { + ResultName.MATRIX_BIOMASS + }; @Doc("Population") public Population param_pop; Modified: branches/4.2.2/sensitivityexports/SensitivitySpawningBiomassY2.java =================================================================== --- branches/4.2.2/sensitivityexports/SensitivitySpawningBiomassY2.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/sensitivityexports/SensitivitySpawningBiomassY2.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Jean Couteau, Chatellier Eric + * Copyright (C) 2009 - 2013 Ifremer, Code Lutin, Jean Couteau, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -45,7 +45,9 @@ static private Log log = LogFactory .getLog(SensitivitySpawningBiomassY2.class); - protected String[] necessaryResult = { ResultName.MATRIX_BIOMASS }; + protected String[] necessaryResult = { + ResultName.MATRIX_BIOMASS + }; @Doc("Population") public Population param_pop; Modified: branches/4.2.2/simulationplans/CalibrationSimplexePasVariable2Capturabilite.java =================================================================== --- branches/4.2.2/simulationplans/CalibrationSimplexePasVariable2Capturabilite.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/simulationplans/CalibrationSimplexePasVariable2Capturabilite.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2007 - 2011 Ifremer, CodeLutin, Sigrid Lehuta + * Copyright (C) 2007 - 2013 Ifremer, CodeLutin, Sigrid Lehuta * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -110,7 +110,7 @@ //*** write the name of the simulated matrix that contains the data corresponding // to your observations (here MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP) - public String[] necessaryResult = { + protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP }; Modified: branches/4.2.2/simulationplans/SimulationNumberRestriction.java =================================================================== --- branches/4.2.2/simulationplans/SimulationNumberRestriction.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/simulationplans/SimulationNumberRestriction.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2011 Ifremer, CodeLutin + * Copyright (C) 2006 - 2013 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -49,11 +49,11 @@ @Doc(value = "do the doc of param max") public int param_max = 10; - public String[] necessaryResult = { - // put here all necessary result for this rule - // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + protected String[] necessaryResult = { + // put here all necessary result for this rule + // example: + // ResultName.MATRIX_BIOMASS, + // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, }; @Override Modified: branches/4.2.2/simulators/DefaultSimulator.java =================================================================== --- branches/4.2.2/simulators/DefaultSimulator.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/simulators/DefaultSimulator.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2006 - 2012 Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2006 - 2013 Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: branches/4.2.2/simulators/SimulatorEffortByCell.java =================================================================== --- branches/4.2.2/simulators/SimulatorEffortByCell.java 2013-11-28 09:19:52 UTC (rev 312) +++ branches/4.2.2/simulators/SimulatorEffortByCell.java 2013-12-01 22:05:23 UTC (rev 313) @@ -2,7 +2,7 @@ * #%L * IsisFish data * %% - * Copyright (C) 2009 - 2011 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2009 - 2013 Ifremer, Code Lutin, Benjamin Poussin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as
participants (1)
-
echatellier＠users.forge.codelutin.com