Isis-fish-data-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- 322 discussions
Author: echatellier
Date: 2016-03-01 17:42:22 +0100 (Tue, 01 Mar 2016)
New Revision: 384
Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/384
Log:
Prepare release
Modified:
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2016-03-01 10:43:26 UTC (rev 383)
+++ trunk/pom.xml 2016-03-01 16:42:22 UTC (rev 384)
@@ -14,7 +14,7 @@
<packaging>jar</packaging>
<!--Version -->
- <version>4.4.0-SNAPSHOT</version>
+ <version>4.4.0</version>
<!--Description -->
<description>Data for Isis-fish</description>
@@ -74,7 +74,7 @@
<dependency>
<groupId>fr.ifremer</groupId>
<artifactId>isis-fish</artifactId>
- <version>4.4.0.0-SNAPSHOT</version>
+ <version>4.4.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
1
0
Author: echatellier
Date: 2016-03-01 11:43:26 +0100 (Tue, 01 Mar 2016)
New Revision: 383
Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/383
Log:
R?\195?\169?\195?\169criture des exports par pas de temps.
Modified:
trunk/exports/Abundances.java
trunk/exports/Biomasses.java
trunk/exports/CapturesNombre.java
trunk/exports/CapturesNombreStrategies.java
trunk/exports/CapturesPoids.java
trunk/exports/CapturesPoidsStrategies.java
trunk/exports/CellsDefinition.java
trunk/exports/EffortsMetier.java
trunk/exports/Lbar.java
trunk/exports/MetierZone.java
trunk/exports/NonActivite.java
trunk/exports/OwnerMargin.java
trunk/exports/Recruitment.java
trunk/exports/RegionDefinition.java
trunk/exports/RejetsNombre.java
trunk/exports/RejetsPoids.java
trunk/exports/VesselMargin.java
trunk/exports/ZonesDefinition.java
Modified: trunk/exports/Abundances.java
===================================================================
--- trunk/exports/Abundances.java 2016-02-12 10:12:36 UTC (rev 382)
+++ trunk/exports/Abundances.java 2016-03-01 10:43:26 UTC (rev 383)
@@ -29,7 +29,7 @@
import org.nuiton.math.matrix.*;
import fr.ifremer.isisfish.entities.*;
-import fr.ifremer.isisfish.export.Export;
+import fr.ifremer.isisfish.export.ExportStep;
import fr.ifremer.isisfish.types.TimeStep;
import resultinfos.MatrixAbundance;
import fr.ifremer.isisfish.datastore.SimulationStorage;
@@ -36,16 +36,8 @@
/**
* Abundances.java
- *
- * Created: 1 septembre 2006
- *
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
- * @version $Revision: 1.3 $
- *
- * Last update: $Date: 2007-05-24 09:30:07 $
- * by : $Author: bpoussin $
*/
-public class Abundances implements Export {
+public class Abundances implements ExportStep {
/** to use log facility, just put in your code: log.info("..."); */
static private Log log = LogFactory.getLog(Abundances.class);
@@ -71,10 +63,10 @@
@Override
public String getDescription() {
- return "Exporte les abondances en nombre tableau avec des lignes pop;id;zone;date;nombre.";
+ return "Exporte les abondances en nombre tableau avec des lignes step;pop;id;zone;nombre.";
}
- @Override
+ /*@Override
public void export(SimulationStorage simulation, Writer out) throws Exception {
for (Population pop : simulation.getParameter().getPopulations()) {
MatrixND mat = simulation.getResultStorage().getMatrix(pop, MatrixAbundance.NAME);
@@ -89,5 +81,31 @@
out.write(pop.getName() + ";" + group.getId() + ";" + zone.getName() + ";" + step.getStep() + ";" + val + "\n");
}
}
+ }*/
+
+ @Override
+ public void exportBegin(SimulationStorage simulation, Writer out) throws Exception {
+ out.write("step;population;group;zone;value\n");
}
+
+ @Override
+ public void export(SimulationStorage simulation, TimeStep step, Writer out) throws Exception {
+ for (Population pop : simulation.getParameter().getPopulations()) {
+ MatrixND mat = simulation.getResultStorage().getMatrix(step, pop, MatrixAbundance.NAME);
+ for (MatrixIterator i = mat.iterator(); i.hasNext();) {
+ i.next();
+ Object[] sems = i.getSemanticsCoordinates();
+ PopulationGroup group = (PopulationGroup) sems[0];
+ Zone zone = (Zone) sems[1];
+
+ double val = i.getValue();
+ out.write(step.getStep() + ";" + pop.getName() + ";" + group.getId() + ";" + zone.getName() + ";" + val + "\n");
+ }
+ }
+ }
+
+ @Override
+ public void exportEnd(SimulationStorage simulation, Writer out) throws Exception {
+
+ }
}
Modified: trunk/exports/Biomasses.java
===================================================================
--- trunk/exports/Biomasses.java 2016-02-12 10:12:36 UTC (rev 382)
+++ trunk/exports/Biomasses.java 2016-03-01 10:43:26 UTC (rev 383)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2006 - 2015 Ifremer, CodeLutin
+ * Copyright (C) 2006 - 2016 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
@@ -29,7 +29,7 @@
import org.nuiton.math.matrix.*;
import fr.ifremer.isisfish.entities.*;
-import fr.ifremer.isisfish.export.Export;
+import fr.ifremer.isisfish.export.ExportStep;
import fr.ifremer.isisfish.types.TimeStep;
import resultinfos.MatrixBiomass;
import fr.ifremer.isisfish.datastore.SimulationStorage;
@@ -36,16 +36,8 @@
/**
* Biomasses.java
- *
- * Created: 23 novembre 2006
- *
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
- * @version $Revision: 1.3 $
- *
- * Last update: $Date: 2007-05-24 09:30:07 $
- * by : $Author: bpoussin $
*/
-public class Biomasses implements Export {
+public class Biomasses implements ExportStep {
/** to use log facility, just put in your code: log.info("..."); */
static private Log log = LogFactory.getLog(Biomasses.class);
@@ -71,10 +63,10 @@
@Override
public String getDescription() {
- return "Exporte les biomasses tableau avec des lignes pop;id;zone;date;nombre";
+ return "Exporte les biomasses tableau avec des lignes step;pop;id;zone;nombre";
}
- @Override
+ /*@Override
public void export(SimulationStorage simulation, Writer out) throws Exception {
for (Population pop : simulation.getParameter().getPopulations()) {
MatrixND mat = simulation.getResultStorage().getMatrix(pop, MatrixBiomass.NAME);
@@ -89,5 +81,32 @@
out.write(pop.getName() + ";" + group.getId() + ";" + zone.getName() + ";" + step.getStep() + ";" + val + "\n");
}
}
+ }*/
+
+ @Override
+ public void exportBegin(SimulationStorage simulation, Writer out) throws Exception {
+ out.write("step;population;group;zone;value\n");
}
+
+ @Override
+ public void export(SimulationStorage simulation, TimeStep step, Writer out) throws Exception {
+ for (Population pop : simulation.getParameter().getPopulations()) {
+ MatrixND mat = simulation.getResultStorage().getMatrix(step, pop, MatrixBiomass.NAME);
+ for (MatrixIterator i = mat.iterator(); i.hasNext();) {
+ i.next();
+ Object[] sems = i.getSemanticsCoordinates();
+ PopulationGroup group = (PopulationGroup) sems[0];
+ Zone zone = (Zone) sems[1];
+
+ double val = i.getValue();
+ out.write(step.getStep() + ";" + pop.getName() + ";" + group.getId() + ";" + zone.getName() + ";" + val + "\n");
+ }
+ }
+
+ }
+
+ @Override
+ public void exportEnd(SimulationStorage simulation, Writer out) throws Exception {
+
+ }
}
Modified: trunk/exports/CapturesNombre.java
===================================================================
--- trunk/exports/CapturesNombre.java 2016-02-12 10:12:36 UTC (rev 382)
+++ trunk/exports/CapturesNombre.java 2016-03-01 10:43:26 UTC (rev 383)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2006 - 2015 Ifremer, CodeLutin
+ * Copyright (C) 2006 - 2016 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
@@ -26,7 +26,7 @@
import fr.ifremer.isisfish.entities.Population;
import fr.ifremer.isisfish.entities.PopulationGroup;
import fr.ifremer.isisfish.entities.Zone;
-import fr.ifremer.isisfish.export.Export;
+import fr.ifremer.isisfish.export.ExportStep;
import fr.ifremer.isisfish.types.TimeStep;
import resultinfos.MatrixCatchPerStrategyMetPerZonePop;
@@ -41,14 +41,9 @@
* CapturesNombre.java
*
* Export des captures en nombre de la forme :
- * Population ; Métier ; Groupe ; Zone ; Pas de temps ; Valeur
- *
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
- * @version $Revision: 1.4 $
- *
- * Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $
+ * Pas de temps ; Population ; Métier ; Groupe ; Zone ; Valeur
*/
-public class CapturesNombre implements Export {
+public class CapturesNombre implements ExportStep {
/** to use log facility, just put in your code: log.info("..."); */
static private Log log = LogFactory.getLog(CapturesNombre.class);
@@ -77,7 +72,7 @@
return "Export les captures en nombre de la simulation. tableau pop;metier;id;zone;nombre";
}
- @Override
+ /*@Override
public void export(SimulationStorage simulation, Writer out)
throws Exception {
TimeStep lastStep = simulation.getResultStorage().getLastStep();
@@ -103,5 +98,35 @@
}
}
}
+ }*/
+
+ @Override
+ public void exportBegin(SimulationStorage simulation, Writer out) throws Exception {
+ out.write("step;population;metier;group;zone;value\n");
}
+
+ @Override
+ public void export(SimulationStorage simulation, TimeStep step, Writer out) throws Exception {
+ for (Population pop : simulation.getParameter().getPopulations()) {
+ MatrixND mat = simulation.getResultStorage().getMatrix(step, pop, MatrixCatchPerStrategyMetPerZonePop.NAME);
+ mat = mat.sumOverDim(0); //sum on strategy
+ for (MatrixIterator i = mat.iterator(); i.hasNext();) {
+ i.next();
+ Object[] sems = i.getSemanticsCoordinates();
+ Metier metier = (Metier) sems[1];
+ PopulationGroup group = (PopulationGroup) sems[2];
+ Zone zone = (Zone) sems[3];
+
+ double val = i.getValue();
+ out.write(step.getStep() + ";" + pop.getName() + ";"
+ + metier.getName() + ";" + group.getId() + ";"
+ + zone.getName() + ";" + val + "\n");
+ }
+ }
+ }
+
+ @Override
+ public void exportEnd(SimulationStorage simulation, Writer out) throws Exception {
+
+ }
}
Modified: trunk/exports/CapturesNombreStrategies.java
===================================================================
--- trunk/exports/CapturesNombreStrategies.java 2016-02-12 10:12:36 UTC (rev 382)
+++ trunk/exports/CapturesNombreStrategies.java 2016-03-01 10:43:26 UTC (rev 383)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2006 - 2014 Ifremer, CodeLutin
+ * Copyright (C) 2006 - 2016 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
@@ -27,7 +27,7 @@
import fr.ifremer.isisfish.entities.PopulationGroup;
import fr.ifremer.isisfish.entities.Strategy;
import fr.ifremer.isisfish.entities.Zone;
-import fr.ifremer.isisfish.export.Export;
+import fr.ifremer.isisfish.export.ExportStep;
import fr.ifremer.isisfish.types.TimeStep;
import resultinfos.MatrixCatchPerStrategyMetPerZonePop;
@@ -42,14 +42,9 @@
* CapturesNombreStrategies.java
*
* Export des captures en nombre de la forme :
- * Population ; Stratégie ; Métier ; Groupe ; Zone ; Pas de temps ; Valeur
- *
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
- * @version $Revision: 1.4 $
- *
- * Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $
+ * Pas de temps ; Population ; Stratégie ; Métier ; Groupe ; Zone ; Valeur
*/
-public class CapturesNombreStrategies implements Export {
+public class CapturesNombreStrategies implements ExportStep {
/** to use log facility, just put in your code: log.info("..."); */
static private Log log = LogFactory.getLog(CapturesNombreStrategies.class);
@@ -75,10 +70,10 @@
@Override
public String getDescription() {
- return "Export les captures en nombre de la simulation. tableau pop;strategie;metier;id;zone;nombre";
+ return "Export les captures en nombre de la simulation. tableau step;pop;strategie;metier;id;zone;nombre";
}
- @Override
+ /*@Override
public void export(SimulationStorage simulation, Writer out) throws Exception {
TimeStep lastStep = simulation.getResultStorage().getLastStep();
@@ -106,5 +101,35 @@
}
}
}
+ }*/
+
+ @Override
+ public void exportBegin(SimulationStorage simulation, Writer out) throws Exception {
+ out.write("step;population;strategy;metier;group;zone;value\n");
}
+
+ @Override
+ public void export(SimulationStorage simulation, TimeStep step, Writer out) throws Exception {
+ for (Population pop : simulation.getParameter().getPopulations()) {
+ MatrixND mat = simulation.getResultStorage().getMatrix(step, pop, MatrixCatchPerStrategyMetPerZonePop.NAME);
+ for (MatrixIterator i = mat.iterator(); i.hasNext();) {
+ i.next();
+ Object[] sems = i.getSemanticsCoordinates();
+ Metier metier = (Metier) sems[1];
+ PopulationGroup group = (PopulationGroup) sems[2];
+ Zone zone = (Zone) sems[3];
+ Strategy strategy = (Strategy) sems[0];
+
+ double val = i.getValue();
+ out.write(step.getStep() + ";" + pop.getName() + ";" + strategy.getName() + ";"
+ + metier.getName() + ";" + group.getId() + ";"
+ + zone.getName() + ";" + val + "\n");
+ }
+ }
+ }
+
+ @Override
+ public void exportEnd(SimulationStorage simulation, Writer out) throws Exception {
+
+ }
}
Modified: trunk/exports/CapturesPoids.java
===================================================================
--- trunk/exports/CapturesPoids.java 2016-02-12 10:12:36 UTC (rev 382)
+++ trunk/exports/CapturesPoids.java 2016-03-01 10:43:26 UTC (rev 383)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2006 - 2015 Ifremer, CodeLutin
+ * Copyright (C) 2006 - 2016 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
@@ -26,7 +26,7 @@
import fr.ifremer.isisfish.entities.Population;
import fr.ifremer.isisfish.entities.PopulationGroup;
import fr.ifremer.isisfish.entities.Zone;
-import fr.ifremer.isisfish.export.Export;
+import fr.ifremer.isisfish.export.ExportStep;
import fr.ifremer.isisfish.types.TimeStep;
import resultinfos.MatrixCatchWeightPerStrategyMetPerZonePop;
@@ -41,14 +41,9 @@
* CapturesPoids.java
*
* Export des captures en poids de la forme :
- * Population ; Métier ; Groupe ; Zone ; Pas de temps ; Valeur
- *
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
- * @version $Revision: 1.4 $
- *
- * Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $
+ * Pas de temps ; Population ; Métier ; Groupe ; Zone ; Valeur
*/
-public class CapturesPoids implements Export {
+public class CapturesPoids implements ExportStep {
/** to use log facility, just put in your code: log.info("..."); */
static private Log log = LogFactory.getLog(CapturesPoids.class);
@@ -74,10 +69,10 @@
@Override
public String getDescription() {
- return "Export les captures en poids de la simulation. tableau pop;metier;id;zone;nombre";
+ return "Export les captures en poids de la simulation. tableau step;pop;metier;id;zone;nombre";
}
- @Override
+ /*@Override
public void export(SimulationStorage simulation, Writer out)
throws Exception {
TimeStep lastStep = simulation.getResultStorage().getLastStep();
@@ -97,12 +92,40 @@
Zone zone = (Zone) sems[3];
double val = i.getValue();
- out.write(pop.getName() + ";" + metier.getName() + ";"
- + group.getId() + ";" + zone.getName() + ";"
- + step.getStep() + ";" + val + "\n");
+ out.write(step.getStep() + ";" + pop.getName() + ";" + metier.getName() + ";"
+ + group.getId() + ";" + zone.getName() + ";" + val + "\n");
}
}
}
}
+ }*/
+
+ @Override
+ public void exportBegin(SimulationStorage simulation, Writer out) throws Exception {
+ out.write("step;population;metier;group;zone;value\n");
}
+
+ @Override
+ public void export(SimulationStorage simulation, TimeStep step, Writer out) throws Exception {
+ for (Population pop : simulation.getParameter().getPopulations()) {
+ MatrixND mat = simulation.getResultStorage().getMatrix(step, pop, MatrixCatchWeightPerStrategyMetPerZonePop.NAME);
+ mat = mat.sumOverDim(0); //sum on strategy
+ for (MatrixIterator i = mat.iterator(); i.hasNext();) {
+ i.next();
+ Object[] sems = i.getSemanticsCoordinates();
+ Metier metier = (Metier) sems[1];
+ PopulationGroup group = (PopulationGroup) sems[2];
+ Zone zone = (Zone) sems[3];
+
+ double val = i.getValue();
+ out.write(step.getStep() + ";" + pop.getName() + ";" + metier.getName() + ";"
+ + group.getId() + ";" + zone.getName() + ";" + val + "\n");
+ }
+ }
+ }
+
+ @Override
+ public void exportEnd(SimulationStorage simulation, Writer out) throws Exception {
+
+ }
}
Modified: trunk/exports/CapturesPoidsStrategies.java
===================================================================
--- trunk/exports/CapturesPoidsStrategies.java 2016-02-12 10:12:36 UTC (rev 382)
+++ trunk/exports/CapturesPoidsStrategies.java 2016-03-01 10:43:26 UTC (rev 383)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2006 - 2015 Ifremer, CodeLutin
+ * Copyright (C) 2006 - 2016 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
@@ -27,7 +27,7 @@
import fr.ifremer.isisfish.entities.PopulationGroup;
import fr.ifremer.isisfish.entities.Strategy;
import fr.ifremer.isisfish.entities.Zone;
-import fr.ifremer.isisfish.export.Export;
+import fr.ifremer.isisfish.export.ExportStep;
import fr.ifremer.isisfish.types.TimeStep;
import resultinfos.MatrixCatchWeightPerStrategyMetPerZonePop;
@@ -42,14 +42,9 @@
* CapturesPoidsStrategies.java
*
* Export des captures en poids de la forme :
- * Population ; Stratégie ; Métier ; Groupe ; Zone ; Pas de temps ; Valeur
- *
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
- * @version $Revision: 1.4 $
- *
- * Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $
+ * Pas de temps ; Population ; Stratégie ; Métier ; Groupe ; Zone ; Valeur
*/
-public class CapturesPoidsStrategies implements Export {
+public class CapturesPoidsStrategies implements ExportStep {
/** to use log facility, just put in your code: log.info("..."); */
static private Log log = LogFactory.getLog(CapturesPoidsStrategies.class);
@@ -75,10 +70,10 @@
@Override
public String getDescription() {
- return "Export les captures en poids de la simulation. tableau pop;strategie;metier;id;zone;nombre";
+ return "Export les captures en poids de la simulation. tableau step;pop;strategie;metier;id;zone;nombre";
}
- @Override
+ /*@Override
public void export(SimulationStorage simulation, Writer out)
throws Exception {
TimeStep lastStep = simulation.getResultStorage().getLastStep();
@@ -107,5 +102,35 @@
}
}
}
+ }*/
+
+ @Override
+ public void exportBegin(SimulationStorage simulation, Writer out) throws Exception {
+ out.write("step;population;strategy;metier;group;zone;value\n");
}
+
+ @Override
+ public void export(SimulationStorage simulation, TimeStep step, Writer out) throws Exception {
+ for (Population pop : simulation.getParameter().getPopulations()) {
+ MatrixND mat = simulation.getResultStorage().getMatrix(step, pop, MatrixCatchWeightPerStrategyMetPerZonePop.NAME);
+ for (MatrixIterator i = mat.iterator(); i.hasNext();) {
+ i.next();
+ Object[] sems = i.getSemanticsCoordinates();
+ Metier metier = (Metier) sems[1];
+ PopulationGroup group = (PopulationGroup) sems[2];
+ Zone zone = (Zone) sems[3];
+ Strategy strategy = (Strategy) sems[0];
+
+ double val = i.getValue();
+ out.write(step.getStep() + ";" + pop.getName() + ";" + strategy.getName() + ";"
+ + metier.getName() + ";" + group.getId() + ";"
+ + zone.getName() + ";" + val + "\n");
+ }
+ }
+ }
+
+ @Override
+ public void exportEnd(SimulationStorage simulation, Writer out) throws Exception {
+
+ }
}
Modified: trunk/exports/CellsDefinition.java
===================================================================
--- trunk/exports/CellsDefinition.java 2016-02-12 10:12:36 UTC (rev 382)
+++ trunk/exports/CellsDefinition.java 2016-03-01 10:43:26 UTC (rev 383)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2006 - 2014 Ifremer, CodeLutin
+ * Copyright (C) 2006 - 2016 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
@@ -30,20 +30,13 @@
import fr.ifremer.isisfish.datastore.SimulationStorage;
import fr.ifremer.isisfish.entities.Cell;
-import fr.ifremer.isisfish.export.Export;
+import fr.ifremer.isisfish.export.ExportStep;
+import fr.ifremer.isisfish.types.TimeStep;
/**
* CellsDefinition.java
- *
- * Created: 17 janvier 2007
- *
- * @author bpoussin <bpoussin(a)labs.libre-entreprise.org>
- * @version $Revision: 1.2 $
- *
- * Last update: $Date: 2007-05-24 09:30:07 $
- * by : $Author: bpoussin $
*/
-public class CellsDefinition implements Export {
+public class CellsDefinition implements ExportStep {
/** to use log facility, just put in your code: log.info("..."); */
static private Log log = LogFactory.getLog(CellsDefinition.class);
@@ -75,7 +68,7 @@
return "Export cell's position(longitute/latitute)";
}
- @Override
+ /*@Override
public void export(SimulationStorage simulation, Writer out) throws Exception {
TopiaContext tx = simulation.getStorage().beginTransaction();
List<Cell> cells = SimulationStorage.getFisheryRegion(tx).getCell();
@@ -85,5 +78,27 @@
}
tx.closeContext();
+ }*/
+
+ @Override
+ public void exportBegin(SimulationStorage simulation, Writer out) throws Exception {
+ out.write("cell;longitude;latitude\n");
}
+
+ @Override
+ public void export(SimulationStorage simulation, TimeStep step, Writer out) throws Exception {
+
+ }
+
+ @Override
+ public void exportEnd(SimulationStorage simulation, Writer out) throws Exception {
+ 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/EffortsMetier.java
===================================================================
--- trunk/exports/EffortsMetier.java 2016-02-12 10:12:36 UTC (rev 382)
+++ trunk/exports/EffortsMetier.java 2016-03-01 10:43:26 UTC (rev 383)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2006 - 2015 Ifremer, CodeLutin
+ * Copyright (C) 2006 - 2016 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
@@ -29,7 +29,7 @@
import org.nuiton.math.matrix.*;
import fr.ifremer.isisfish.entities.*;
-import fr.ifremer.isisfish.export.Export;
+import fr.ifremer.isisfish.export.ExportStep;
import fr.ifremer.isisfish.types.TimeStep;
import resultinfos.MatrixEffortPerStrategyMet;
import fr.ifremer.isisfish.datastore.SimulationStorage;
@@ -36,16 +36,8 @@
/**
* EffortsMetier.java
- *
- * Created: 23 novembre 2006
- *
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
- * @version $Revision: 1.3 $
- *
- * Last update: $Date: 2007-05-24 09:30:07 $
- * by : $Author: bpoussin $
*/
-public class EffortsMetier implements Export {
+public class EffortsMetier implements ExportStep {
/** to use log facility, just put in your code: log.info("..."); */
static private Log log = LogFactory.getLog(EffortsMetier.class);
@@ -71,10 +63,10 @@
@Override
public String getDescription() {
- return "retourne un tableau strategie;metier;date;effort";
+ return "retourne un tableau step;strategie;metier;effort";
}
- @Override
+ /*@Override
public void export(SimulationStorage simulation, Writer out) throws Exception {
MatrixND mat = simulation.getResultStorage().getMatrix(MatrixEffortPerStrategyMet.NAME);
for (MatrixIterator i = mat.iterator(); i.hasNext();) {
@@ -87,5 +79,29 @@
double val = i.getValue();
out.write(str.getName() +";"+ metier.getName() +";"+ step.getStep() +";"+ val +"\n");
}
+ }*/
+
+ @Override
+ public void exportBegin(SimulationStorage simulation, Writer out) throws Exception {
+ out.write("step;strategy;metier;value\n");
}
+
+ @Override
+ public void export(SimulationStorage simulation, TimeStep step, Writer out) throws Exception {
+ MatrixND mat = simulation.getResultStorage().getMatrix(step, MatrixEffortPerStrategyMet.NAME);
+ for (MatrixIterator i = mat.iterator(); i.hasNext();) {
+ i.next();
+ Object [] sems = i.getSemanticsCoordinates();
+ Strategy str = (Strategy)sems[0];
+ Metier metier = (Metier)sems[1];
+
+ double val = i.getValue();
+ out.write(step.getStep() +";" + str.getName() + ";" + metier.getName() + ";" + val + "\n");
+ }
+ }
+
+ @Override
+ public void exportEnd(SimulationStorage simulation, Writer out) throws Exception {
+
+ }
}
Modified: trunk/exports/Lbar.java
===================================================================
--- trunk/exports/Lbar.java 2016-02-12 10:12:36 UTC (rev 382)
+++ trunk/exports/Lbar.java 2016-03-01 10:43:26 UTC (rev 383)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2015 Ifremer, CodeLutin
+ * Copyright (C) 2015 - 2016 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
@@ -29,7 +29,7 @@
import org.nuiton.math.matrix.*;
import fr.ifremer.isisfish.entities.*;
-import fr.ifremer.isisfish.export.Export;
+import fr.ifremer.isisfish.export.ExportStep;
import fr.ifremer.isisfish.types.TimeStep;
import resultinfos.MatrixLbar;
import fr.ifremer.isisfish.datastore.SimulationStorage;
@@ -36,13 +36,8 @@
/**
* Population mean length.
- *
- * Created: 03/2015
- *
- * @author lgasche <anonymous(a)labs.libre-entreprise.org>
- * @version $Revision$
*/
-public class Lbar implements Export {
+public class Lbar implements ExportStep {
/** to use log facility, just put in your code: log.info("..."); */
static private Log log = LogFactory.getLog(Lbar.class);
@@ -68,10 +63,10 @@
@Override
public String getDescription() {
- return "Exporte les longueurs moyennes par pop par zone en tableau avec des lignes pop;zone;date;longueur.";
+ return "Exporte les longueurs moyennes par pop par zone en tableau avec des lignes step;pop;zone;longueur.";
}
- @Override
+ /*@Override
public void export(SimulationStorage simulation, Writer out) throws Exception {
for (Population pop : simulation.getParameter().getPopulations()) {
MatrixND mat = simulation.getResultStorage().getMatrix(pop, MatrixLbar.NAME);
@@ -85,5 +80,30 @@
out.write(pop.getName() + ";" + zone.getName() + ";" + step.getStep() + ";" + val + "\n");
}
}
+ }*/
+
+ @Override
+ public void exportBegin(SimulationStorage simulation, Writer out) throws Exception {
+ out.write("step;population;zone;value\n");
}
+
+ @Override
+ public void export(SimulationStorage simulation, TimeStep step, Writer out) throws Exception {
+ for (Population pop : simulation.getParameter().getPopulations()) {
+ MatrixND mat = simulation.getResultStorage().getMatrix(step, pop, MatrixLbar.NAME);
+ for (MatrixIterator i = mat.iterator(); i.hasNext();) {
+ i.next();
+ Object[] sems = i.getSemanticsCoordinates();
+ Zone zone = (Zone) sems[0];
+
+ double val = i.getValue();
+ out.write(step.getStep() + ";" + pop.getName() + ";" + zone.getName() + ";" + val + "\n");
+ }
+ }
+ }
+
+ @Override
+ public void exportEnd(SimulationStorage simulation, Writer out) throws Exception {
+
+ }
}
Modified: trunk/exports/MetierZone.java
===================================================================
--- trunk/exports/MetierZone.java 2016-02-12 10:12:36 UTC (rev 382)
+++ trunk/exports/MetierZone.java 2016-03-01 10:43:26 UTC (rev 383)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2006 - 2015 Ifremer, CodeLutin
+ * Copyright (C) 2006 - 2016 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
@@ -29,6 +29,7 @@
import org.nuiton.math.matrix.*;
import fr.ifremer.isisfish.export.Export;
+import fr.ifremer.isisfish.export.ExportStep;
import fr.ifremer.isisfish.types.TimeStep;
import resultinfos.MatrixMetierZone;
import fr.ifremer.isisfish.datastore.SimulationStorage;
@@ -35,16 +36,8 @@
/**
* MetierZone.java
- *
- * Created: 17 janvier 2007
- *
- * @author bpoussin <bpoussin(a)labs.libre-entreprise.org>
- * @version $Revision: 1.3 $
- *
- * Last update: $Date: 2007-05-24 09:30:07 $
- * by : $Author: bpoussin $
*/
-public class MetierZone implements Export {
+public class MetierZone implements ExportStep {
/** to use log facility, just put in your code: log.info("..."); */
static private Log log = LogFactory.getLog(MetierZone.class);
@@ -73,7 +66,7 @@
return "Export zone used by metier during simulation";
}
- @Override
+ /*@Override
public void export(SimulationStorage simulation, Writer out) throws Exception {
TimeStep lastStep = simulation.getResultStorage().getLastStep();
@@ -90,5 +83,28 @@
}
}
}
+ }*/
+
+ @Override
+ public void exportBegin(SimulationStorage simulation, Writer out) throws Exception {
+ out.write("step;metier;zone\n");
}
+
+ @Override
+ public void export(SimulationStorage simulation, TimeStep step, Writer out) throws Exception {
+ MatrixND mat = simulation.getResultStorage().getMatrix(step, MatrixMetierZone.NAME);
+ for (MatrixIterator i = mat.iterator(); i.hasNext();) {
+ i.next();
+ if (i.getValue() == 1) {
+ Object metier = i.getSemanticsCoordinates()[0];
+ Object zone = i.getSemanticsCoordinates()[1];
+ out.write(step.getStep() + ";" + metier + ";" + zone + "\n");
+ }
+ }
+ }
+
+ @Override
+ public void exportEnd(SimulationStorage simulation, Writer out) throws Exception {
+
+ }
}
Modified: trunk/exports/NonActivite.java
===================================================================
--- trunk/exports/NonActivite.java 2016-02-12 10:12:36 UTC (rev 382)
+++ trunk/exports/NonActivite.java 2016-03-01 10:43:26 UTC (rev 383)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2006 - 2015 Ifremer, CodeLutin
+ * Copyright (C) 2006 - 2016 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
@@ -29,7 +29,7 @@
import org.nuiton.math.matrix.*;
import fr.ifremer.isisfish.entities.*;
-import fr.ifremer.isisfish.export.Export;
+import fr.ifremer.isisfish.export.ExportStep;
import fr.ifremer.isisfish.types.TimeStep;
import resultinfos.MatrixNoActivity;
import fr.ifremer.isisfish.datastore.SimulationStorage;
@@ -36,16 +36,8 @@
/**
* NonActivite.java
- *
- * Created: 23 novembre 2006
- *
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
- * @version $Revision: 1.3 $
- *
- * Last update: $Date: 2007-05-24 09:30:07 $
- * by : $Author: bpoussin $
*/
-public class NonActivite implements Export {
+public class NonActivite implements ExportStep {
/** to use log facility, just put in your code: log.info("..."); */
static private Log log = LogFactory.getLog(NonActivite.class);
@@ -71,10 +63,10 @@
@Override
public String getDescription() {
- return "retourne un tableau strategie;metier;date;proportion";
+ return "retourne un tableau step;strategie;metier;proportion";
}
- @Override
+ /*@Override
public void export(SimulationStorage simulation, Writer out) throws Exception {
MatrixND mat = simulation.getResultStorage().getMatrix(MatrixNoActivity.NAME);
for (MatrixIterator i = mat.iterator(); i.hasNext();) {
@@ -87,5 +79,29 @@
double val = i.getValue();
out.write(str.getName() +";"+ metier.getName() +";"+ step.getStep() +";"+ val +"\n");
}
+ }*/
+
+ @Override
+ public void exportBegin(SimulationStorage simulation, Writer out) throws Exception {
+ out.write("step;strategy;metier;value\n");
}
+
+ @Override
+ public void export(SimulationStorage simulation, TimeStep step, Writer out) throws Exception {
+ MatrixND mat = simulation.getResultStorage().getMatrix(step, MatrixNoActivity.NAME);
+ for (MatrixIterator i = mat.iterator(); i.hasNext();) {
+ i.next();
+ Object [] sems = i.getSemanticsCoordinates();
+ Strategy str = (Strategy)sems[0];
+ Metier metier = (Metier)sems[1];
+
+ double val = i.getValue();
+ out.write(step.getStep() + ";" + str.getName() + ";" + metier.getName() + ";" + val +"\n");
+ }
+ }
+
+ @Override
+ public void exportEnd(SimulationStorage simulation, Writer out) throws Exception {
+
+ }
}
Modified: trunk/exports/OwnerMargin.java
===================================================================
--- trunk/exports/OwnerMargin.java 2016-02-12 10:12:36 UTC (rev 382)
+++ trunk/exports/OwnerMargin.java 2016-03-01 10:43:26 UTC (rev 383)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2006 - 2015 Ifremer, CodeLutin
+ * Copyright (C) 2006 - 2016 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
@@ -29,7 +29,7 @@
import org.nuiton.math.matrix.*;
import fr.ifremer.isisfish.entities.*;
-import fr.ifremer.isisfish.export.Export;
+import fr.ifremer.isisfish.export.ExportStep;
import fr.ifremer.isisfish.types.TimeStep;
import resultinfos.MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel;
import fr.ifremer.isisfish.datastore.SimulationStorage;
@@ -45,7 +45,7 @@
* Last update: $Date: 2007-05-24 09:30:07 $
* by : $Author: bpoussin $
*/
-public class OwnerMargin implements Export {
+public class OwnerMargin implements ExportStep {
/** to use log facility, just put in your code: log.info("..."); */
static private Log log = LogFactory.getLog(OwnerMargin.class);
@@ -74,7 +74,7 @@
return "Exporte les profits du patrons, retourne un tableau strategy;date;value";
}
- @Override
+ /*@Override
public void export(SimulationStorage simulation, Writer out) throws Exception {
MatrixND mat = simulation.getResultStorage().getMatrix(MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel.NAME);
for (MatrixIterator i = mat.iterator(); i.hasNext();) {
@@ -86,5 +86,28 @@
double val = i.getValue();
out.write(str.getName() +";"+ step.getStep() +";"+ val +"\n");
}
+ }*/
+
+ @Override
+ public void exportBegin(SimulationStorage simulation, Writer out) throws Exception {
+ out.write("step;strategy;value\n");
}
+
+ @Override
+ public void export(SimulationStorage simulation, TimeStep step, Writer out) throws Exception {
+ MatrixND mat = simulation.getResultStorage().getMatrix(step, MatrixOwnerMarginOverVariableCostsPerStrategyPerVessel.NAME);
+ for (MatrixIterator i = mat.iterator(); i.hasNext();) {
+ i.next();
+ Object[] sems = i.getSemanticsCoordinates();
+ Strategy str = (Strategy)sems[0];
+
+ double val = i.getValue();
+ out.write(step.getStep() + ";" + str.getName() + ";" + val + "\n");
+ }
+ }
+
+ @Override
+ public void exportEnd(SimulationStorage simulation, Writer out) throws Exception {
+
+ }
}
Modified: trunk/exports/Recruitment.java
===================================================================
--- trunk/exports/Recruitment.java 2016-02-12 10:12:36 UTC (rev 382)
+++ trunk/exports/Recruitment.java 2016-03-01 10:43:26 UTC (rev 383)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2015 Ifremer, CodeLutin
+ * Copyright (C) 2015 - 2016 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
@@ -29,7 +29,7 @@
import org.nuiton.math.matrix.*;
import fr.ifremer.isisfish.entities.*;
-import fr.ifremer.isisfish.export.Export;
+import fr.ifremer.isisfish.export.ExportStep;
import fr.ifremer.isisfish.types.TimeStep;
import resultinfos.MatrixRecruitment;
import fr.ifremer.isisfish.datastore.SimulationStorage;
@@ -36,13 +36,8 @@
/**
* Recruitment.
- *
- * Created: 03/2015
- *
- * @author lgasche <anonymous(a)labs.libre-entreprise.org>
- * @version $Revision$
*/
-public class Recruitment implements Export {
+public class Recruitment implements ExportStep {
/** to use log facility, just put in your code: log.info("..."); */
static private Log log = LogFactory.getLog(Recruitment.class);
@@ -71,7 +66,7 @@
return "Exporte le recrutement par pop par en tableau avec des lignes pop;date;recrutement.";
}
- @Override
+ /*@Override
public void export(SimulationStorage simulation, Writer out) throws Exception {
for (Population pop : simulation.getParameter().getPopulations()) {
MatrixND mat = simulation.getResultStorage().getMatrix(pop, MatrixRecruitment.NAME);
@@ -84,5 +79,28 @@
out.write(pop.getName() + ";" + step.getStep() + ";" + val + "\n");
}
}
+ }*/
+
+ @Override
+ public void exportBegin(SimulationStorage simulation, Writer out) throws Exception {
+ out.write("step;population;value\n");
}
+
+ @Override
+ public void export(SimulationStorage simulation, TimeStep step, Writer out) throws Exception {
+ for (Population pop : simulation.getParameter().getPopulations()) {
+ MatrixND mat = simulation.getResultStorage().getMatrix(step, pop, MatrixRecruitment.NAME);
+ for (MatrixIterator i = mat.iterator(); i.hasNext();) {
+ i.next();
+
+ double val = i.getValue();
+ out.write(pop.getName() + ";" + step.getStep() + ";" + val + "\n");
+ }
+ }
+ }
+
+ @Override
+ public void exportEnd(SimulationStorage simulation, Writer out) throws Exception {
+
+ }
}
Modified: trunk/exports/RegionDefinition.java
===================================================================
--- trunk/exports/RegionDefinition.java 2016-02-12 10:12:36 UTC (rev 382)
+++ trunk/exports/RegionDefinition.java 2016-03-01 10:43:26 UTC (rev 383)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2006 - 2015 Ifremer, CodeLutin
+ * Copyright (C) 2006 - 2016 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
@@ -29,21 +29,14 @@
import org.nuiton.topia.TopiaContext;
import fr.ifremer.isisfish.entities.*;
-import fr.ifremer.isisfish.export.Export;
+import fr.ifremer.isisfish.export.ExportStep;
+import fr.ifremer.isisfish.types.TimeStep;
import fr.ifremer.isisfish.datastore.SimulationStorage;
/**
* RegionDefinition.java
- *
- * Created: 17 janvier 2007
- *
- * @author bpoussin <bpoussin(a)labs.libre-entreprise.org>
- * @version $Revision: 1.3 $
- *
- * Last update: $Date: 2007-05-24 10:05:22 $
- * by : $Author: bpoussin $
*/
-public class RegionDefinition implements Export {
+public class RegionDefinition implements ExportStep {
/** to use log facility, just put in your code: log.info("..."); */
static private Log log = LogFactory.getLog(RegionDefinition.class);
@@ -75,7 +68,7 @@
return "Export region description";
}
- @Override
+ /*@Override
public void export(SimulationStorage simulation, Writer out) throws Exception {
// NomRegion LatituteMin LatitudeMax LongitudeMin LongitudeMax PasLatitude PasLongitude
TopiaContext tx = simulation.getStorage().beginTransaction();
@@ -91,5 +84,32 @@
"\n");
tx.closeContext();
+ }*/
+
+ @Override
+ public void exportBegin(SimulationStorage simulation, Writer out) throws Exception {
+ out.write("region;minlatitude;maxlalitude;minlongitude;maxlongitude;celllengthlatitude;celllengthlongitude\n");
}
+
+ @Override
+ public void export(SimulationStorage simulation, TimeStep step, Writer out) throws Exception {
+
+ }
+
+ @Override
+ public void exportEnd(SimulationStorage simulation, Writer out) throws Exception {
+ TopiaContext tx = simulation.getStorage().beginTransaction();
+ FisheryRegion region = SimulationStorage.getFisheryRegion(tx);
+
+ out.write(region.getName() + ";"
+ + region.getMinLatitude() + ";"
+ + region.getMaxLatitude() + ";"
+ + region.getMinLongitude() + ";"
+ + region.getMaxLongitude() + ";"
+ + region.getCellLengthLatitude() + ";"
+ + region.getCellLengthLongitude() +
+ "\n");
+
+ tx.closeContext();
+ }
}
Modified: trunk/exports/RejetsNombre.java
===================================================================
--- trunk/exports/RejetsNombre.java 2016-02-12 10:12:36 UTC (rev 382)
+++ trunk/exports/RejetsNombre.java 2016-03-01 10:43:26 UTC (rev 383)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2006 - 2015 Ifremer, CodeLutin
+ * Copyright (C) 2006 - 2016 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
@@ -33,21 +33,14 @@
import fr.ifremer.isisfish.entities.Population;
import fr.ifremer.isisfish.entities.PopulationGroup;
import fr.ifremer.isisfish.entities.Zone;
-import fr.ifremer.isisfish.export.Export;
+import fr.ifremer.isisfish.export.ExportStep;
import fr.ifremer.isisfish.types.TimeStep;
import resultinfos.MatrixDiscardsPerStrMetPerZonePop;
/**
* RejetsNombre.java
- *
- * Created: 23 novembre 2006
- *
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
- * @version $Revision: 1.4 $
- *
- * Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $
*/
-public class RejetsNombre implements Export {
+public class RejetsNombre implements ExportStep {
/** to use log facility, just put in your code: log.info("..."); */
static private Log log = LogFactory.getLog(RejetsNombre.class);
@@ -73,10 +66,10 @@
@Override
public String getDescription() {
- return "Export les rejets en nombre de la simulation. tableau pop;metier;id;zone;date;nombre";
+ return "Export les rejets en nombre de la simulation. tableau step;pop;metier;id;zone;nombre";
}
- @Override
+ /*@Override
public void export(SimulationStorage simulation, Writer out)
throws Exception {
TimeStep lastStep = simulation.getResultStorage().getLastStep();
@@ -103,5 +96,34 @@
}
}
}
+ }*/
+
+ @Override
+ public void exportBegin(SimulationStorage simulation, Writer out) throws Exception {
+ out.write("step;population;metier;group;zone;value\n");
}
+
+ @Override
+ public void export(SimulationStorage simulation, TimeStep step, Writer out) throws Exception {
+ for (Population pop : simulation.getParameter().getPopulations()) {
+ MatrixND mat = simulation.getResultStorage().getMatrix(step, pop, MatrixDiscardsPerStrMetPerZonePop.NAME);
+ mat = mat.sumOverDim(0); //sum on strategy
+ for (MatrixIterator i = mat.iterator(); i.hasNext();) {
+ i.next();
+ Object[] sems = i.getSemanticsCoordinates();
+ Metier metier = (Metier) sems[1];
+ PopulationGroup group = (PopulationGroup) sems[2];
+ Zone zone = (Zone) sems[3];
+
+ double val = i.getValue();
+ out.write(step.getStep() + ";" + pop.getName() + ";" + metier.getName() + ";"
+ + group.getId() + ";" + zone.getName() + ";" + val + "\n");
+ }
+ }
+ }
+
+ @Override
+ public void exportEnd(SimulationStorage simulation, Writer out) throws Exception {
+
+ }
}
Modified: trunk/exports/RejetsPoids.java
===================================================================
--- trunk/exports/RejetsPoids.java 2016-02-12 10:12:36 UTC (rev 382)
+++ trunk/exports/RejetsPoids.java 2016-03-01 10:43:26 UTC (rev 383)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2006 - 2015 Ifremer, CodeLutin
+ * Copyright (C) 2006 - 2016 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
@@ -33,21 +33,14 @@
import fr.ifremer.isisfish.entities.Population;
import fr.ifremer.isisfish.entities.PopulationGroup;
import fr.ifremer.isisfish.entities.Zone;
-import fr.ifremer.isisfish.export.Export;
+import fr.ifremer.isisfish.export.ExportStep;
import fr.ifremer.isisfish.types.TimeStep;
import resultinfos.MatrixDiscardsWeightPerStrMetPerZonePop;
/**
* RejetsPoids.java
- *
- * Created: 23 novembre 2006
- *
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
- * @version $Revision: 1.4 $
- *
- * Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $
*/
-public class RejetsPoids implements Export {
+public class RejetsPoids implements ExportStep {
/** to use log facility, just put in your code: log.info("..."); */
static private Log log = LogFactory.getLog(RejetsPoids.class);
@@ -73,10 +66,10 @@
@Override
public String getDescription() {
- return "Export les rejets en poids de la simulation. tableau pop;metier;id;zone;date;nombre";
+ return "Export les rejets en poids de la simulation. tableau step;pop;metier;id;zone;nombre";
}
- @Override
+ /*@Override
public void export(SimulationStorage simulation, Writer out)
throws Exception {
TimeStep lastStep = simulation.getResultStorage().getLastStep();
@@ -103,5 +96,34 @@
}
}
}
+ }*/
+
+ @Override
+ public void exportBegin(SimulationStorage simulation, Writer out) throws Exception {
+ out.write("step;population;metier;group;zone;value\n");
}
+
+ @Override
+ public void export(SimulationStorage simulation, TimeStep step, Writer out) throws Exception {
+ for (Population pop : simulation.getParameter().getPopulations()) {
+ MatrixND mat = simulation.getResultStorage().getMatrix(step, pop, MatrixDiscardsWeightPerStrMetPerZonePop.NAME);
+ mat = mat.sumOverDim(0); //sum on strategy
+ for (MatrixIterator i = mat.iterator(); i.hasNext();) {
+ i.next();
+ Object[] sems = i.getSemanticsCoordinates();
+ Metier metier = (Metier) sems[1];
+ PopulationGroup group = (PopulationGroup) sems[2];
+ Zone zone = (Zone) sems[3];
+
+ double val = i.getValue();
+ out.write(step.getStep() + ";" + pop.getName() + ";" + metier.getName() + ";"
+ + group.getId() + ";" + zone.getName() + ";" + val + "\n");
+ }
+ }
+ }
+
+ @Override
+ public void exportEnd(SimulationStorage simulation, Writer out) throws Exception {
+
+ }
}
Modified: trunk/exports/VesselMargin.java
===================================================================
--- trunk/exports/VesselMargin.java 2016-02-12 10:12:36 UTC (rev 382)
+++ trunk/exports/VesselMargin.java 2016-03-01 10:43:26 UTC (rev 383)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2006 - 2015 Ifremer, CodeLutin
+ * Copyright (C) 2006 - 2016 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
@@ -29,7 +29,7 @@
import org.nuiton.math.matrix.*;
import fr.ifremer.isisfish.entities.*;
-import fr.ifremer.isisfish.export.Export;
+import fr.ifremer.isisfish.export.ExportStep;
import fr.ifremer.isisfish.types.TimeStep;
import resultinfos.MatrixVesselMarginOverVariableCostsPerStrategyPerVessel;
import fr.ifremer.isisfish.datastore.SimulationStorage;
@@ -36,16 +36,8 @@
/**
* VesselMargin.java
- *
- * Created: 23 novembre 2006
- *
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
- * @version $Revision: 1.3 $
- *
- * Last update: $Date: 2007-05-24 09:30:07 $
- * by : $Author: bpoussin $
*/
-public class VesselMargin implements Export {
+public class VesselMargin implements ExportStep {
/** to use log facility, just put in your code: log.info("..."); */
static private Log log = LogFactory.getLog(VesselMargin.class);
@@ -71,10 +63,10 @@
@Override
public String getDescription() {
- return "cvs out strategy;date;value";
+ return "cvs out step;strategy;value";
}
- @Override
+ /*@Override
public void export(SimulationStorage simulation, Writer out) throws Exception {
MatrixND mat = simulation.getResultStorage().getMatrix(MatrixVesselMarginOverVariableCostsPerStrategyPerVessel.NAME);
for (MatrixIterator i = mat.iterator(); i.hasNext();) {
@@ -86,5 +78,28 @@
double val = i.getValue();
out.write(str.getName() +";"+ step.getStep() +";"+ val +"\n");
}
+ }*/
+
+ @Override
+ public void exportBegin(SimulationStorage simulation, Writer out) throws Exception {
+ out.write("step;strategy;value\n");
}
+
+ @Override
+ public void export(SimulationStorage simulation, TimeStep step, Writer out) throws Exception {
+ MatrixND mat = simulation.getResultStorage().getMatrix(step, MatrixVesselMarginOverVariableCostsPerStrategyPerVessel.NAME);
+ for (MatrixIterator i = mat.iterator(); i.hasNext();) {
+ i.next();
+ Object [] sems = i.getSemanticsCoordinates();
+ Strategy str = (Strategy)sems[0];
+
+ double val = i.getValue();
+ out.write(step.getStep() + ";" + str.getName() + ";" + val + "\n");
+ }
+ }
+
+ @Override
+ public void exportEnd(SimulationStorage simulation, Writer out) throws Exception {
+
+ }
}
Modified: trunk/exports/ZonesDefinition.java
===================================================================
--- trunk/exports/ZonesDefinition.java 2016-02-12 10:12:36 UTC (rev 382)
+++ trunk/exports/ZonesDefinition.java 2016-03-01 10:43:26 UTC (rev 383)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2006 - 2015 Ifremer, CodeLutin
+ * Copyright (C) 2006 - 2016 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
@@ -30,22 +30,14 @@
import org.nuiton.topia.TopiaContext;
import fr.ifremer.isisfish.entities.*;
-import fr.ifremer.isisfish.export.Export;
+import fr.ifremer.isisfish.export.ExportStep;
import fr.ifremer.isisfish.types.TimeStep;
import fr.ifremer.isisfish.datastore.SimulationStorage;
/**
* ZonesDefinition.java
- *
- * Created: 17 janvier 2007
- *
- * @author bpoussin <bpoussin(a)labs.libre-entreprise.org>
- * @version $Revision: 1.2 $
- *
- * Last update: $Date: 2007-05-24 09:30:07 $
- * by : $Author: bpoussin $
*/
-public class ZonesDefinition implements Export {
+public class ZonesDefinition implements ExportStep {
/** to use log facility, just put in your code: log.info("..."); */
static private Log log = LogFactory.getLog(ZonesDefinition.class);
@@ -77,7 +69,7 @@
return "Export cell's zone constitution";
}
- @Override
+ /*@Override
public void export(SimulationStorage simulation, Writer out) throws Exception {
TopiaContext tx = simulation.getStorage().beginTransaction();
List<Zone> zones = SimulationStorage.getFisheryRegion(tx).getZone();
@@ -93,5 +85,29 @@
}
tx.closeContext();
+ }*/
+
+ @Override
+ public void exportBegin(SimulationStorage simulation, Writer out) throws Exception {
+ out.write("step;zone;cell\n");
}
+
+ @Override
+ public void export(SimulationStorage simulation, TimeStep step, Writer out) throws Exception {
+ TopiaContext tx = simulation.getStorage().beginTransaction();
+ List<Zone> zones = SimulationStorage.getFisheryRegion(tx).getZone();
+
+ for (Zone zone : zones) {
+ for (Cell cell : zone.getCell()) {
+ out.write(step.getStep() + ";" + zone + ";" + cell + "\n");
+ }
+ }
+
+ tx.closeContext();
+ }
+
+ @Override
+ public void exportEnd(SimulationStorage simulation, Writer out) throws Exception {
+
+ }
}
1
0
r382 - in trunk: exports rules scripts simulationplans simulators
by echatellier@users.forge.codelutin.com 12 Feb '16
by echatellier@users.forge.codelutin.com 12 Feb '16
12 Feb '16
Author: echatellier
Date: 2016-02-12 11:12:36 +0100 (Fri, 12 Feb 2016)
New Revision: 382
Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/382
Log:
Fix javadoc on java 8
Modified:
trunk/exports/Abundances.java
trunk/exports/Biomasses.java
trunk/exports/CapturesNombre.java
trunk/exports/CapturesNombreStrategies.java
trunk/exports/CapturesPoids.java
trunk/exports/CapturesPoidsStrategies.java
trunk/exports/CellsDefinition.java
trunk/exports/EffortsMetier.java
trunk/exports/Lbar.java
trunk/exports/MetierZone.java
trunk/exports/NonActivite.java
trunk/exports/OwnerMargin.java
trunk/exports/Recruitment.java
trunk/exports/RegionDefinition.java
trunk/exports/RejetsNombre.java
trunk/exports/RejetsPoids.java
trunk/exports/VesselMargin.java
trunk/exports/ZonesDefinition.java
trunk/rules/Cantonnement.java
trunk/rules/CantonnementPreSimu.java
trunk/rules/ChangementParamControlablePresimu.java
trunk/rules/EffortReduction.java
trunk/rules/GraviteVPUE1.java
trunk/rules/InterdictionEngin.java
trunk/rules/InterdictionEnginPreSimu.java
trunk/rules/TACpoids.java
trunk/scripts/ObjectiveFunctionBaranov.java
trunk/scripts/RuleUtil.java
trunk/simulationplans/SimulationNumberRestriction.java
trunk/simulators/DefaultSimulator.java
Modified: trunk/exports/Abundances.java
===================================================================
--- trunk/exports/Abundances.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/exports/Abundances.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2006 - 2015 Ifremer, CodeLutin, Chatellier Eric
+ * Copyright (C) 2006 - 2016 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
@@ -39,7 +39,7 @@
*
* Created: 1 septembre 2006
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision: 1.3 $
*
* Last update: $Date: 2007-05-24 09:30:07 $
Modified: trunk/exports/Biomasses.java
===================================================================
--- trunk/exports/Biomasses.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/exports/Biomasses.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -39,7 +39,7 @@
*
* Created: 23 novembre 2006
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision: 1.3 $
*
* Last update: $Date: 2007-05-24 09:30:07 $
Modified: trunk/exports/CapturesNombre.java
===================================================================
--- trunk/exports/CapturesNombre.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/exports/CapturesNombre.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -43,7 +43,7 @@
* Export des captures en nombre de la forme :
* Population ; Métier ; Groupe ; Zone ; Pas de temps ; Valeur
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision: 1.4 $
*
* Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $
Modified: trunk/exports/CapturesNombreStrategies.java
===================================================================
--- trunk/exports/CapturesNombreStrategies.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/exports/CapturesNombreStrategies.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -44,7 +44,7 @@
* Export des captures en nombre de la forme :
* Population ; Stratégie ; Métier ; Groupe ; Zone ; Pas de temps ; Valeur
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision: 1.4 $
*
* Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $
Modified: trunk/exports/CapturesPoids.java
===================================================================
--- trunk/exports/CapturesPoids.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/exports/CapturesPoids.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -43,7 +43,7 @@
* Export des captures en poids de la forme :
* Population ; Métier ; Groupe ; Zone ; Pas de temps ; Valeur
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision: 1.4 $
*
* Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $
Modified: trunk/exports/CapturesPoidsStrategies.java
===================================================================
--- trunk/exports/CapturesPoidsStrategies.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/exports/CapturesPoidsStrategies.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -44,7 +44,7 @@
* Export des captures en poids de la forme :
* Population ; Stratégie ; Métier ; Groupe ; Zone ; Pas de temps ; Valeur
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision: 1.4 $
*
* Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $
Modified: trunk/exports/CellsDefinition.java
===================================================================
--- trunk/exports/CellsDefinition.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/exports/CellsDefinition.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -37,7 +37,7 @@
*
* Created: 17 janvier 2007
*
- * @author bpoussin <bpoussin(a)labs.libre-entreprise.org>
+ * @author bpoussin <bpoussin(a)labs.libre-entreprise.org>
* @version $Revision: 1.2 $
*
* Last update: $Date: 2007-05-24 09:30:07 $
Modified: trunk/exports/EffortsMetier.java
===================================================================
--- trunk/exports/EffortsMetier.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/exports/EffortsMetier.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -39,7 +39,7 @@
*
* Created: 23 novembre 2006
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision: 1.3 $
*
* Last update: $Date: 2007-05-24 09:30:07 $
Modified: trunk/exports/Lbar.java
===================================================================
--- trunk/exports/Lbar.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/exports/Lbar.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -39,7 +39,7 @@
*
* Created: 03/2015
*
- * @author lgasche <anonymous(a)labs.libre-entreprise.org>
+ * @author lgasche <anonymous(a)labs.libre-entreprise.org>
* @version $Revision$
*/
public class Lbar implements Export {
Modified: trunk/exports/MetierZone.java
===================================================================
--- trunk/exports/MetierZone.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/exports/MetierZone.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -38,7 +38,7 @@
*
* Created: 17 janvier 2007
*
- * @author bpoussin <bpoussin(a)labs.libre-entreprise.org>
+ * @author bpoussin <bpoussin(a)labs.libre-entreprise.org>
* @version $Revision: 1.3 $
*
* Last update: $Date: 2007-05-24 09:30:07 $
Modified: trunk/exports/NonActivite.java
===================================================================
--- trunk/exports/NonActivite.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/exports/NonActivite.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -39,7 +39,7 @@
*
* Created: 23 novembre 2006
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision: 1.3 $
*
* Last update: $Date: 2007-05-24 09:30:07 $
Modified: trunk/exports/OwnerMargin.java
===================================================================
--- trunk/exports/OwnerMargin.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/exports/OwnerMargin.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -39,7 +39,7 @@
*
* Created: 23 novembre 2006
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision: 1.3 $
*
* Last update: $Date: 2007-05-24 09:30:07 $
Modified: trunk/exports/Recruitment.java
===================================================================
--- trunk/exports/Recruitment.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/exports/Recruitment.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -39,7 +39,7 @@
*
* Created: 03/2015
*
- * @author lgasche <anonymous(a)labs.libre-entreprise.org>
+ * @author lgasche <anonymous(a)labs.libre-entreprise.org>
* @version $Revision$
*/
public class Recruitment implements Export {
Modified: trunk/exports/RegionDefinition.java
===================================================================
--- trunk/exports/RegionDefinition.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/exports/RegionDefinition.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -37,7 +37,7 @@
*
* Created: 17 janvier 2007
*
- * @author bpoussin <bpoussin(a)labs.libre-entreprise.org>
+ * @author bpoussin <bpoussin(a)labs.libre-entreprise.org>
* @version $Revision: 1.3 $
*
* Last update: $Date: 2007-05-24 10:05:22 $
Modified: trunk/exports/RejetsNombre.java
===================================================================
--- trunk/exports/RejetsNombre.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/exports/RejetsNombre.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -42,7 +42,7 @@
*
* Created: 23 novembre 2006
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision: 1.4 $
*
* Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $
Modified: trunk/exports/RejetsPoids.java
===================================================================
--- trunk/exports/RejetsPoids.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/exports/RejetsPoids.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -42,7 +42,7 @@
*
* Created: 23 novembre 2006
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision: 1.4 $
*
* Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $
Modified: trunk/exports/VesselMargin.java
===================================================================
--- trunk/exports/VesselMargin.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/exports/VesselMargin.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -39,7 +39,7 @@
*
* Created: 23 novembre 2006
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision: 1.3 $
*
* Last update: $Date: 2007-05-24 09:30:07 $
Modified: trunk/exports/ZonesDefinition.java
===================================================================
--- trunk/exports/ZonesDefinition.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/exports/ZonesDefinition.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -39,7 +39,7 @@
*
* Created: 17 janvier 2007
*
- * @author bpoussin <bpoussin(a)labs.libre-entreprise.org>
+ * @author bpoussin <bpoussin(a)labs.libre-entreprise.org>
* @version $Revision: 1.2 $
*
* Last update: $Date: 2007-05-24 09:30:07 $
Modified: trunk/rules/Cantonnement.java
===================================================================
--- trunk/rules/Cantonnement.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/rules/Cantonnement.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -52,7 +52,7 @@
*
* Created: 30 novembre 2006
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision: 1.5 $
*
* Last update: $Date: 2007-11-02 17:41:41 $
Modified: trunk/rules/CantonnementPreSimu.java
===================================================================
--- trunk/rules/CantonnementPreSimu.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/rules/CantonnementPreSimu.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -50,7 +50,7 @@
*
* Created: 30 novembre 2006
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision: 1.2 $
*
* Last update: $Date: 2007-01-24 18:25:34 $
Modified: trunk/rules/ChangementParamControlablePresimu.java
===================================================================
--- trunk/rules/ChangementParamControlablePresimu.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/rules/ChangementParamControlablePresimu.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -53,7 +53,7 @@
*
* Created: 30 novembre 2006
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision: 1.1 $
*
* Last update: $Date: 2007-01-24 18:25:34 $
Modified: trunk/rules/EffortReduction.java
===================================================================
--- trunk/rules/EffortReduction.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/rules/EffortReduction.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -39,7 +39,7 @@
*
* Created: 3 septembre 2008
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision$
*/
public class EffortReduction extends AbstractRule {
Modified: trunk/rules/GraviteVPUE1.java
===================================================================
--- trunk/rules/GraviteVPUE1.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/rules/GraviteVPUE1.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -46,7 +46,7 @@
*
* Created: 26 aout 2008
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision$
*
* Last update: $Date$
Modified: trunk/rules/InterdictionEngin.java
===================================================================
--- trunk/rules/InterdictionEngin.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/rules/InterdictionEngin.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -47,7 +47,7 @@
*
* Created: 30 novembre 2006
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision: 1.1 $
*
* Last update: $Date: 2007-01-24 18:25:34 $
Modified: trunk/rules/InterdictionEnginPreSimu.java
===================================================================
--- trunk/rules/InterdictionEnginPreSimu.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/rules/InterdictionEnginPreSimu.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -48,7 +48,7 @@
*
* Created: 30 novembre 2006
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision: 1.1 $
*
* Last update: $Date: 2007-01-24 18:25:34 $
Modified: trunk/rules/TACpoids.java
===================================================================
--- trunk/rules/TACpoids.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/rules/TACpoids.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -53,14 +53,16 @@
* TAC peut-etre utilise pour les differents TAC, en proportion des effectifs
* et/ou avec survie ou non.
*
+ * <ul>
* <li>Pour utiliser le tac proportionnel, il faut mettre dans le parametre
- * propTac une valeur > 0, le TAC sera alors recalcule a chaque mois de janvier.
+ * propTac une valeur > 0, le TAC sera alors recalcule a chaque mois de janvier.</li>
* <li>Pour utiliser la survie il faut mettre dans le parametre propSurvie une
- * valeur > 0, automatiquement les suvie seront ajoute aux effectifs
+ * valeur > 0, automatiquement les suvie seront ajoute aux effectifs</li>
+ * </ul>
*
* Created: 7 septembre 2006
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision: 1.3 $
*
* Last update: $Date: 290607 $
Modified: trunk/scripts/ObjectiveFunctionBaranov.java
===================================================================
--- trunk/scripts/ObjectiveFunctionBaranov.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/scripts/ObjectiveFunctionBaranov.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2012, 2014 Ifremer, CodeLutin, lgasche
+ * Copyright (C) 2012, 2016 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
@@ -29,7 +29,7 @@
*
* Created: 10 aout 2012
*
- * @author lgasche <user.name(a)vcs.hostName>
+ * @author lgasche <user.name(a)vcs.hostName>
* @version $Revision$
*
* Last update: $Date$
Modified: trunk/scripts/RuleUtil.java
===================================================================
--- trunk/scripts/RuleUtil.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/scripts/RuleUtil.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2006 - 2014 Ifremer, CodeLutin, Chatellier Eric
+ * Copyright (C) 2006 - 2016 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
@@ -38,7 +38,7 @@
*
* Created: 6 septembre 2006
*
- * @author anonymous <anonymous(a)labs.libre-entreprise.org>
+ * @author anonymous <anonymous(a)labs.libre-entreprise.org>
* @version $Revision: 1.3 $
*
* Last update: $Date: 2007-11-20 15:51:05 $
Modified: trunk/simulationplans/SimulationNumberRestriction.java
===================================================================
--- trunk/simulationplans/SimulationNumberRestriction.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/simulationplans/SimulationNumberRestriction.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -2,7 +2,7 @@
* #%L
* IsisFish data
* %%
- * Copyright (C) 2006 - 2014 Ifremer, CodeLutin
+ * Copyright (C) 2006 - 2016 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
@@ -34,7 +34,7 @@
*
* Created: 2 mars 2007
*
- * @author bpoussin <bpoussin(a)labs.libre-entreprise.org>
+ * @author bpoussin <bpoussin(a)labs.libre-entreprise.org>
* @version $Revision: 1.2 $
*
* Last update: $Date: 2007-03-09 15:27:21 $ by : $Author: bpoussin $
Modified: trunk/simulators/DefaultSimulator.java
===================================================================
--- trunk/simulators/DefaultSimulator.java 2016-01-18 09:39:47 UTC (rev 381)
+++ trunk/simulators/DefaultSimulator.java 2016-02-12 10:12:36 UTC (rev 382)
@@ -74,6 +74,7 @@
* overwrite this method to return you SiMatrix version
* @param context
* @return
+ * @throws TopiaException
*/
protected SiMatrix newSiMatrix(SimulationContext context) throws TopiaException {
return new SiMatrix(context);
@@ -85,6 +86,8 @@
* @param context
* @param siMatrix
* @return
+ * @throws TopiaException
+ * @throws StorageException
*/
protected GravityModel newGravityModel(SimulationContext context, SiMatrix siMatrix) throws TopiaException, StorageException {
return new GravityModel(context, siMatrix);
1
0
Author: echatellier
Date: 2016-01-18 10:39:47 +0100 (Mon, 18 Jan 2016)
New Revision: 381
Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/381
Log:
Fix concurrentModificationException
Modified:
tags/4.3.1/rules/CantonnementPreSimu.java
Modified: tags/4.3.1/rules/CantonnementPreSimu.java
===================================================================
--- tags/4.3.1/rules/CantonnementPreSimu.java 2016-01-18 09:10:26 UTC (rev 380)
+++ tags/4.3.1/rules/CantonnementPreSimu.java 2016-01-18 09:39:47 UTC (rev 381)
@@ -157,7 +157,8 @@
}
else {
log.info("l engin du métier est bien concerné");
- List<MetierSeasonInfo> saisons = metier.getMetierSeasonInfo();
+ // copy to update metier season info in loop
+ List<MetierSeasonInfo> saisons = new ArrayList<>(metier.getMetierSeasonInfo());
for (MetierSeasonInfo saisonmetier : saisons){
int inter = siMatrix.nbCellInter(saisonmetier.getZone(), param_zone);
if (inter != 0) {
1
0
Author: echatellier
Date: 2016-01-18 10:10:26 +0100 (Mon, 18 Jan 2016)
New Revision: 380
Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/380
Log:
Fix concurrentModificationException
Modified:
trunk/rules/CantonnementPreSimu.java
Modified: trunk/rules/CantonnementPreSimu.java
===================================================================
--- trunk/rules/CantonnementPreSimu.java 2015-10-28 13:58:16 UTC (rev 379)
+++ trunk/rules/CantonnementPreSimu.java 2016-01-18 09:10:26 UTC (rev 380)
@@ -157,7 +157,8 @@
}
else {
log.info("l engin du métier est bien concerné");
- List<MetierSeasonInfo> saisons = metier.getMetierSeasonInfo();
+ // copy list to update metier season info in the loop
+ List<MetierSeasonInfo> saisons = new ArrayList<>(metier.getMetierSeasonInfo());
for (MetierSeasonInfo saisonmetier : saisons){
int inter = siMatrix.nbCellInter(saisonmetier.getZone(), param_zone);
if (inter != 0) {
1
0
Author: echatellier
Date: 2015-10-28 14:58:16 +0100 (Wed, 28 Oct 2015)
New Revision: 379
Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/379
Log:
Remove pop dimension in F result
Modified:
trunk/scripts/SiMatrix.java
Modified: trunk/scripts/SiMatrix.java
===================================================================
--- trunk/scripts/SiMatrix.java 2015-10-27 16:36:34 UTC (rev 378)
+++ trunk/scripts/SiMatrix.java 2015-10-28 13:58:16 UTC (rev 379)
@@ -1158,13 +1158,12 @@
double Mgroup = 0;
double NgroupRef = 0;
- List<Population> populations = Collections.singletonList(pop);
List<PopulationGroup> groups = pop.getPopulationGroup();
MatrixND tfgMatrix = MatrixFactory.getInstance().create(
MatrixFishingMortalityPerGroup.NAME,
- new List[]{populations, groups}, // On travaille sur les pops ET les groupes
- new String[]{n("Population"), n("Group")});
+ new List[]{groups}, // On travaille sur les groupes
+ new String[]{n("Group")});
for (PopulationGroup group : groups) {
@@ -1195,12 +1194,8 @@
catchPerStrategy = catchPerStrategy.sumOverDim(0); // Strategy
catchPerStrategy = catchPerStrategy.sumOverDim(1); // Metier
catchPerStrategy = catchPerStrategy.sumOverDim(3); // Zone : une pop peut avoir plusieurs zonespop dans ISIS
- List semgroup = catchPerStrategy.getSemantic(2);
- catchPerStrategy = catchPerStrategy.reduce(); // Enleve les dimensions de taille 1
- catchPerStrategy.setSemantic(0, semgroup); // Ne plait pas a Eric
+ catchPerStrategy = catchPerStrategy.reduceDims(0, 1, 3); // Enleve les dimensions de taille 1
Cgroup = catchPerStrategy.getValue(group);
- //log.info("Cgroup = " + Cgroup + "Year=" + step.getYear());
- //log.info("catchPerStrategy = " + catchPerStrategy + "Year=" + step.getYear());
// compute total mortality by suming naturalDeathRate and fishingMortalityOtherFleetsMatrix
MatrixND naturalDeathRatePop = pop.getNaturalDeathRateMatrix();
@@ -1217,7 +1212,8 @@
abundanceReferenceMonth = Month.JANUARY;
}
TimeStep refStep = new TimeStep(12 * step.getYear() + abundanceReferenceMonth.getMonthNumber());
- MatrixND abundancePopRef = resManager.getMatrix(refStep, pop, MatrixAbundanceBeginMonth.NAME); // Le timestep 0 correspond a janvier de la premiere annee et les annees sont numerotees a partir de zero
+ // Le timestep 0 correspond a janvier de la premiere annee et les annees sont numerotees a partir de zero
+ MatrixND abundancePopRef = resManager.getMatrix(refStep, pop, MatrixAbundanceBeginMonth.NAME);
abundancePopRef = abundancePopRef.sumOverDim(1); // somme sur Zone
abundancePopRef = abundancePopRef.reduce();
NgroupRef = abundancePopRef.getValue(group);
@@ -1224,22 +1220,16 @@
//log.info("NgroupRef = " + NgroupJan + "Year=" + step.getYear());
ObjectiveFunction f = new ObjectiveFunctionBaranov(Cgroup, Mgroup, NgroupRef);
- Fgroup = MinimisationUtil.fmin(0.0,2.0,1.0e-10, f); // step ??
+ Fgroup = MinimisationUtil.fmin(0.0, 2.0, 1.0e-10, f); // step ??
- //log.info("Fgroup = " + Fgroup);
+ tfgMatrix.setValue(group, Fgroup); // Bien faire attention a l'endroit ou on met cette etape (quelle boucle) ?
- tfgMatrix.setValue(pop, group, Fgroup); // Bien faire attention a l'endroit ou on met cette etape (quelle boucle) ?
-
} else {
//Fgroup = 0; // Ce n'est plus une valeur unique mais une matrice, est-ce que cette notation peut fonctionner ?
- tfgMatrix.setValue(pop, group, 0); // Bien faire attention a l'endroit ou on met cette etape (quelle boucle) ?
+ tfgMatrix.setValue(group, 0); // Bien faire attention a l'endroit ou on met cette etape (quelle boucle) ?
}
}
- //log.info("tfgMatrix = " + tfgMatrix);
- //log.info("tfg.DimensionNames = " + Arrays.toString(tfgMatrix.getDimensionNames()));
- //log.info("tfg.Semantics = " + Arrays.toString(tfgMatrix.getSemantics()));
-
return tfgMatrix;
}
@@ -1251,23 +1241,19 @@
public MatrixND totalFishingMortality(TimeStep step, Population pop, MatrixND fishingMortalityPerGroup) throws TopiaException {
MatrixND tfmMatrix = fishingMortalityPerGroup.copy();
tfmMatrix.setName(MatrixTotalFishingMortality.NAME);
- //log.info("tfmMatrix = " + tfmMatrix);
List<PopulationGroup> groups = pop.getPopulationGroup();
int groupMin = pop.getFbarGroupMin();
int groupMax = pop.getFbarGroupMax();
- int Nbre = (int)groupMax - (int)groupMin + 1;
- //log.info("Nbre = " + Nbre);
+ int groupCount = (int)groupMax - (int)groupMin + 1;
for (PopulationGroup group : groups) {
if (group.getId() == groupMin) {
// MatrixND getSubMatrix(int dim, Object, int nb)
- tfmMatrix = tfmMatrix.getSubMatrix(1, group, Nbre);
- tfmMatrix = tfmMatrix.meanOverDim(1);
+ tfmMatrix = tfmMatrix.getSubMatrix(0, group, groupCount);
+ tfmMatrix = tfmMatrix.meanOverDim(0);
tfmMatrix = tfmMatrix.reduce();
- //log.info("tfm.DimensionNames = " + Arrays.toString(tfmMatrix.getDimensionNames()));
- //log.info("tfm.Semantics = " + Arrays.toString(tfmMatrix.getSemantics()));
}
}
1
0
Author: echatellier
Date: 2015-10-27 17:36:34 +0100 (Tue, 27 Oct 2015)
New Revision: 378
Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/378
Log:
refs #7666: Ajouter l'?\195?\169quation de mortalit?\195?\169 par p?\195?\170che Other
Modified:
trunk/scripts/SiMatrix.java
Modified: trunk/scripts/SiMatrix.java
===================================================================
--- trunk/scripts/SiMatrix.java 2015-10-22 11:45:06 UTC (rev 377)
+++ trunk/scripts/SiMatrix.java 2015-10-27 16:36:34 UTC (rev 378)
@@ -1184,10 +1184,10 @@
catchPerStrategyTemp = resManager.getMatrix(loopstep, pop, MatrixCatchPerStrategyMetPerZonePop.NAME);
}
if (catchPerStrategy == null) {
- catchPerStrategy = catchPerStrategyTemp.copy();
- // On clone la matrice car si on fait les operations sur celle contenue dans le cache on la modifie et donc on recupere des resultats faux.
+ catchPerStrategy = catchPerStrategyTemp.copy();
+ // On clone la matrice car si on fait les operations sur celle contenue dans le cache on la modifie et donc on recupere des resultats faux.
} else {
- catchPerStrategy = catchPerStrategy.add(catchPerStrategyTemp); // Pour avoir la somme des captures sur les 12 mois
+ catchPerStrategy = catchPerStrategy.add(catchPerStrategyTemp); // Pour avoir la somme des captures sur les 12 mois
}
}
@@ -1202,10 +1202,14 @@
//log.info("Cgroup = " + Cgroup + "Year=" + step.getYear());
//log.info("catchPerStrategy = " + catchPerStrategy + "Year=" + step.getYear());
+ // compute total mortality by suming naturalDeathRate and fishingMortalityOtherFleetsMatrix
MatrixND naturalDeathRatePop = pop.getNaturalDeathRateMatrix();
naturalDeathRatePop = naturalDeathRatePop.meanOverDim(1); // moyenne sur Zone
naturalDeathRatePop = naturalDeathRatePop.reduce(); // Enleve les dimensions de taille 1
- Mgroup = naturalDeathRatePop.getValue(group);
+ MatrixND fishingMortalityOther = pop.getFishingMortalityOtherFleetsMatrix();
+ fishingMortalityOther = fishingMortalityOther.meanOverDim(1); // moyenne sur Zone
+ fishingMortalityOther = fishingMortalityOther.reduce(); // Enleve les dimensions de taille 1
+ Mgroup = naturalDeathRatePop.getValue(group) + fishingMortalityOther.getValue(group);
//log.info("Mgroup= " + Mgroup + "Year=" + step.getYear());
Month abundanceReferenceMonth = pop.getAbundanceReferenceMonth();
1
0
Author: echatellier
Date: 2015-10-22 13:45:06 +0200 (Thu, 22 Oct 2015)
New Revision: 377
Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/377
Log:
fixes #7666: Ajouter l'?\195?\169quation de mortalit?\195?\169 par p?\195?\170che Other
Modified:
trunk/pom.xml
trunk/scripts/SiMatrix.java
trunk/scripts/SiMatrixEffortByCell.java
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2015-10-15 08:50:55 UTC (rev 376)
+++ trunk/pom.xml 2015-10-22 11:45:06 UTC (rev 377)
@@ -36,7 +36,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
+ <version>3.3</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
@@ -49,7 +49,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.3.2</version>
+ <version>1.4.0</version>
<executions>
<execution>
<goals>
Modified: trunk/scripts/SiMatrix.java
===================================================================
--- trunk/scripts/SiMatrix.java 2015-10-15 08:50:55 UTC (rev 376)
+++ trunk/scripts/SiMatrix.java 2015-10-22 11:45:06 UTC (rev 377)
@@ -236,6 +236,21 @@
return result;
}
+ /**
+ * Since 4.4, FishingMortalityOtherFleets must be added everewhere NaturalDeathRate was
+ * used.
+ *
+ * @param step current step
+ * @param group group
+ * @param zone zone
+ * @return
+ */
+ public double getTotalDeathRate(TimeStep step, PopulationGroup group, Zone zone) {
+ double n = group.getNaturalDeathRate(zone);
+ double o = group.getFishingMortalityOtherFleets(zone);
+ return n + o;
+ }
+
///////////////////////////////////////////////////////////////////////////
//
// Toutes les methodes suivantes ne sont utiles que pour
@@ -442,7 +457,7 @@
*/
private double totalCatchRate(TimeStep step, PopulationGroup group, Zone zone,
double totalFishingMortality) throws TopiaException {
- double M = group.getNaturalDeathRate(zone) / Month.NUMBER_OF_MONTH;
+ double M = getTotalDeathRate(step, group, zone) / Month.NUMBER_OF_MONTH;
if (M == 0) {
// normalement il devrait y avoir de la mortalite naturelle
if (log.isWarnEnabled()) {
@@ -935,7 +950,7 @@
PopulationGroup group = groups.get(g);
for (int z = 0; z < zones.size(); z++) {
Zone zone = zones.get(z);
- double M = group.getNaturalDeathRate(zone)
+ double M = getTotalDeathRate(step, group, zone)
/ (double) Month.NUMBER_OF_MONTH;
double value = (double) Math.exp(-M);
@@ -962,7 +977,7 @@
IsisFishException {
double F = totalFishingMortality(step, matrixFishingMortality)
.getValue(group, zone); //totalFishingMortality(step, group, zone); // rem perf: totalFishingMortality a deja ete calcule
- double M = group.getNaturalDeathRate(zone)
+ double M = getTotalDeathRate(step, group, zone)
/ (double) Month.NUMBER_OF_MONTH;
double result = Math.exp(-(F + M));
Modified: trunk/scripts/SiMatrixEffortByCell.java
===================================================================
--- trunk/scripts/SiMatrixEffortByCell.java 2015-10-15 08:50:55 UTC (rev 376)
+++ trunk/scripts/SiMatrixEffortByCell.java 2015-10-22 11:45:06 UTC (rev 377)
@@ -256,7 +256,7 @@
double F = totalFishingMortalityPerCell(step,
matrixFishingMortalityPerCell).getValue(group, zone, cell); //totalFishingMortality(step, group, zone); // rem perf: totalFishingMortality a deja ete calcule
- double M = group.getNaturalDeathRate(zone)
+ double M = getTotalDeathRate(step, group, zone)
/ (double) Month.NUMBER_OF_MONTH;
double result = (double) Math.exp(-(F + M));
@@ -499,7 +499,7 @@
private double totalCatchRatePerCell(TimeStep step, PopulationGroup group,
Zone zone, double totalFishingMortalityPerCell)
throws TopiaException {
- double M = group.getNaturalDeathRate(zone) / Month.NUMBER_OF_MONTH;
+ double M = getTotalDeathRate(step, group, zone) / Month.NUMBER_OF_MONTH;
if (M == 0) {
// normalement il devrait y avoir de la mortalite naturelle
if (log.isWarnEnabled()) {
1
0
Author: echatellier
Date: 2015-10-15 10:50:55 +0200 (Thu, 15 Oct 2015)
New Revision: 376
Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/376
Log:
Add comment
Modified:
trunk/resultinfos/MatrixTotalFishingMortality.java
Modified: trunk/resultinfos/MatrixTotalFishingMortality.java
===================================================================
--- trunk/resultinfos/MatrixTotalFishingMortality.java 2015-10-15 08:49:28 UTC (rev 375)
+++ trunk/resultinfos/MatrixTotalFishingMortality.java 2015-10-15 08:50:55 UTC (rev 376)
@@ -24,6 +24,8 @@
import fr.ifremer.isisfish.result.AbstractResultInfo;
/**
+ * F.
+ *
* Matrix with 1 dimension
* Dimension 1 : TimeStep
*/
1
0
Author: echatellier
Date: 2015-10-15 10:49:28 +0200 (Thu, 15 Oct 2015)
New Revision: 375
Url: http://forge.codelutin.com/projects/isis-fish-data/repository/revisions/375
Log:
Fix migration error
Modified:
trunk/scripts/SiMatrix.java
Modified: trunk/scripts/SiMatrix.java
===================================================================
--- trunk/scripts/SiMatrix.java 2015-10-15 08:36:16 UTC (rev 374)
+++ trunk/scripts/SiMatrix.java 2015-10-15 08:49:28 UTC (rev 375)
@@ -1035,7 +1035,7 @@
List<Zone> zones = (List<Zone>)N.getSemantic(1);
MatrixND result = MatrixFactory.getInstance().create(
- MatrixBiomassBeginMonth.NAME, new List[] { groups, zones },
+ MatrixAbundanceBeginMonth.NAME, new List[] { groups, zones },
new String[] { n("Groups"), n("Zones") });
for (int g = 0; g < groups.size(); g++) {
1
0