r267 - trunk/sensitivityexports - Isis-fish-data-commits

30 Nov 2011

Author: jcouteau
Date: 2011-11-30 10:37:50 +0100 (Wed, 30 Nov 2011)
New Revision: 267

Url: http://forge.codelutin.com/repositories/revision/isis-fish-data/267

Log:
#555 : Remplacer reproductionRate par MaturityOgive dans l'export d'AS SpawningBiomass


Modified:
   trunk/sensitivityexports/SensitivitySpawningBiomassReferenceY8.java
   trunk/sensitivityexports/SensitivitySpawningBiomassRelativeReferenceY11.java
   trunk/sensitivityexports/SensitivitySpawningBiomassRelativeY5.java
   trunk/sensitivityexports/SensitivitySpawningBiomassY2.java

Modified: trunk/sensitivityexports/SensitivitySpawningBiomassReferenceY8.java
===================================================================

--- trunk/sensitivityexports/SensitivitySpawningBiomassReferenceY8.java	2011-11-21 10:41:33 UTC (rev 266)
+++ trunk/sensitivityexports/SensitivitySpawningBiomassReferenceY8.java	2011-11-30 09:37:50 UTC (rev 267)
@@ -21,22 +21,6 @@
  */
 package sensitivityexports;
 
-import static org.nuiton.i18n.I18n._;
-
-import java.io.File;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.nuiton.math.matrix.MatrixIterator;
-import org.nuiton.math.matrix.MatrixND;
-
-import org.nuiton.topia.TopiaContext;
-import org.nuiton.util.ReverseFileReader;
-import scripts.ResultName;
 import fr.ifremer.isisfish.datastore.ResultStorage;
 import fr.ifremer.isisfish.datastore.SimulationStorage;
 import fr.ifremer.isisfish.entities.Population;
@@ -44,7 +28,22 @@
 import fr.ifremer.isisfish.export.SensitivityExport;
 import fr.ifremer.isisfish.types.TimeStep;
 import fr.ifremer.isisfish.util.Doc;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.nuiton.math.matrix.MatrixIterator;
+import org.nuiton.math.matrix.MatrixND;
+import org.nuiton.topia.TopiaContext;
+import org.nuiton.util.ReverseFileReader;
+import scripts.ResultName;
 
+import java.io.File;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.nuiton.i18n.I18n._;
+
 public class SensitivitySpawningBiomassReferenceY8 implements SensitivityExport {
 
     /** to use log facility, just put in your code: log.info("..."); */
@@ -78,7 +77,7 @@
         Map<Integer, Double> map =new HashMap<Integer,Double>();
 
         for (PopulationGroup group:groups) {
-            map.put(group.getId(),group.getReproductionRate());
+            map.put(group.getId(),group.getMaturityOgive());
         }
 
         tx.closeContext();
@@ -123,7 +122,7 @@
                     PopulationGroup group = (PopulationGroup) sems[1];
                     TimeStep step = (TimeStep) sems[0];
                     if (step.equals(lastStep)) {
-                        biomass += i.getValue() * group.getReproductionRate();
+                        biomass += i.getValue() * group.getMaturityOgive();
                     }
                 }
             }

Modified: trunk/sensitivityexports/SensitivitySpawningBiomassRelativeReferenceY11.java
===================================================================
--- trunk/sensitivityexports/SensitivitySpawningBiomassRelativeReferenceY11.java	2011-11-21 10:41:33 UTC (rev 266)
+++ trunk/sensitivityexports/SensitivitySpawningBiomassRelativeReferenceY11.java	2011-11-30 09:37:50 UTC (rev 267)
@@ -21,22 +21,6 @@
  */
 package sensitivityexports;
 
-import static org.nuiton.i18n.I18n._;
-
-import java.io.File;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.nuiton.math.matrix.MatrixIterator;
-import org.nuiton.math.matrix.MatrixND;
-import org.nuiton.topia.TopiaContext;
-
-import org.nuiton.util.ReverseFileReader;
-import scripts.ResultName;
 import fr.ifremer.isisfish.datastore.ResultStorage;
 import fr.ifremer.isisfish.datastore.SimulationStorage;
 import fr.ifremer.isisfish.entities.Population;
@@ -44,7 +28,22 @@
 import fr.ifremer.isisfish.export.SensitivityExport;
 import fr.ifremer.isisfish.types.TimeStep;
 import fr.ifremer.isisfish.util.Doc;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.nuiton.math.matrix.MatrixIterator;
+import org.nuiton.math.matrix.MatrixND;
+import org.nuiton.topia.TopiaContext;
+import org.nuiton.util.ReverseFileReader;
+import scripts.ResultName;
 
+import java.io.File;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.nuiton.i18n.I18n._;
+
 public class SensitivitySpawningBiomassRelativeReferenceY11 implements
         SensitivityExport {
 
@@ -83,7 +82,7 @@
         Map<Integer, Double> map =new HashMap<Integer,Double>();
 
         for (PopulationGroup group:groups) {
-            map.put(group.getId(),group.getReproductionRate());
+            map.put(group.getId(),group.getMaturityOgive());
         }
 
         tx.closeContext();
@@ -134,7 +133,7 @@
                     TimeStep step = (TimeStep) sems[0];
                     if (step.equals(firstStep)) {
                         firstbiomass += i.getValue()
-                                * group.getReproductionRate();
+                                * group.getMaturityOgive();
                     }
                 }
 
@@ -148,7 +147,7 @@
                     TimeStep step = (TimeStep) sems[0];
                     if (step.equals(lastStep)) {
                         biomass = biomass + i.getValue()
-                                * group.getReproductionRate();
+                                * group.getMaturityOgive();
                     }
                 }
             }

Modified: trunk/sensitivityexports/SensitivitySpawningBiomassRelativeY5.java
===================================================================
--- trunk/sensitivityexports/SensitivitySpawningBiomassRelativeY5.java	2011-11-21 10:41:33 UTC (rev 266)
+++ trunk/sensitivityexports/SensitivitySpawningBiomassRelativeY5.java	2011-11-30 09:37:50 UTC (rev 267)
@@ -21,16 +21,6 @@
  */
 package sensitivityexports;
 
-import static org.nuiton.i18n.I18n._;
-
-import java.io.Writer;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.nuiton.math.matrix.MatrixIterator;
-import org.nuiton.math.matrix.MatrixND;
-
-import scripts.ResultName;
 import fr.ifremer.isisfish.datastore.ResultStorage;
 import fr.ifremer.isisfish.datastore.SimulationStorage;
 import fr.ifremer.isisfish.entities.Population;
@@ -38,7 +28,16 @@
 import fr.ifremer.isisfish.export.SensitivityExport;
 import fr.ifremer.isisfish.types.TimeStep;
 import fr.ifremer.isisfish.util.Doc;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.nuiton.math.matrix.MatrixIterator;
+import org.nuiton.math.matrix.MatrixND;
+import scripts.ResultName;
 
+import java.io.Writer;
+
+import static org.nuiton.i18n.I18n._;
+
 public class SensitivitySpawningBiomassRelativeY5 implements SensitivityExport {
 
     /** to use log facility, just put in your code: log.info("..."); */
@@ -72,7 +71,7 @@
                     TimeStep step = (TimeStep) sems[0];
                     if (step.equals(firstStep)) {
                         firstbiomass += i.getValue()
-                                * group.getReproductionRate();
+                                * group.getMaturityOgive();
                     }
                 }
 
@@ -85,7 +84,7 @@
                     PopulationGroup group = (PopulationGroup) sems[1];
                     TimeStep step = (TimeStep) sems[0];
                     if (step.equals(lastStep))
-                        biomass += i.getValue() * group.getReproductionRate();
+                        biomass += i.getValue() * group.getMaturityOgive();
                 }
             }
         }

Modified: trunk/sensitivityexports/SensitivitySpawningBiomassY2.java
===================================================================
--- trunk/sensitivityexports/SensitivitySpawningBiomassY2.java	2011-11-21 10:41:33 UTC (rev 266)
+++ trunk/sensitivityexports/SensitivitySpawningBiomassY2.java	2011-11-30 09:37:50 UTC (rev 267)
@@ -21,16 +21,6 @@
  */
 package sensitivityexports;
 
-import static org.nuiton.i18n.I18n._;
-
-import java.io.Writer;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.nuiton.math.matrix.MatrixIterator;
-import org.nuiton.math.matrix.MatrixND;
-
-import scripts.ResultName;
 import fr.ifremer.isisfish.datastore.ResultStorage;
 import fr.ifremer.isisfish.datastore.SimulationStorage;
 import fr.ifremer.isisfish.entities.Population;
@@ -38,7 +28,16 @@
 import fr.ifremer.isisfish.export.SensitivityExport;
 import fr.ifremer.isisfish.types.TimeStep;
 import fr.ifremer.isisfish.util.Doc;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.nuiton.math.matrix.MatrixIterator;
+import org.nuiton.math.matrix.MatrixND;
+import scripts.ResultName;
 
+import java.io.Writer;
+
+import static org.nuiton.i18n.I18n._;
+
 public class SensitivitySpawningBiomassY2 implements SensitivityExport {
 
     /** to use log facility, just put in your code: log.info("..."); */
@@ -69,7 +68,7 @@
                     TimeStep step = (TimeStep) sems[0];
                     PopulationGroup group = (PopulationGroup) sems[1];
                     if (step.equals(lastStep)) {
-                        biomass += i.getValue() * group.getReproductionRate();
+                        biomass += i.getValue() * group.getMaturityOgive();
                     }
                 }
             }

    

r267 - trunk/sensitivityexports

jcouteau＠users.forge.codelutin.com

tags

participants (1)