From 7e0f088b91888a60e86ab8be67c8de529cbbeccd Mon Sep 17 00:00:00 2001
From: "patrick.lambert" <patrick.mh.lambert@inrae.fr>
Date: Wed, 24 Mar 2021 09:46:51 +0100
Subject: [PATCH] creation of analysis package
---
.../fishRIOBasin_Sapidissima_Rjava.xml | 16 ++++++++--------
.../AnalyseFishDistribution.java | 4 +++-
.../AnalyseLikelihoodOfPresence.java | 4 +++-
.../AnalyseSpawnerFeatures.java | 4 +++-
.../{species => analysis}/AnalyseSpawnerRun.java | 4 +++-
.../java/{species => analysis}/Calibrate.java | 2 +-
.../ExportLenghtAgeDistribution.java | 4 +++-
.../ExportMeanRecruitment.java | 4 +++-
.../ExportPopulationStatus.java | 4 +++-
.../{species => analysis}/ExportRecruitment.java | 4 +++-
.../ExportSpeciesRange.java | 4 +++-
.../IdentifyPopulation.java | 4 +++-
.../{species => analysis}/TypeTrajectoryCV.java | 5 ++++-
.../WriteBiomassFluxes.java | 4 +++-
.../WriteCurrentNutrientExportFluxes.java | 4 +++-
.../WriteCurrentNutrientImportFluxes.java | 4 +++-
.../WriteEffectiveAndBiomassExportFluxes.java | 4 +++-
.../WriteEffectiveAndBiomassImportFluxes.java | 4 +++-
.../WriteEffectivesFluxes.java | 4 +++-
.../WriteNutrientExportFluxes.java | 5 +++--
.../WriteNutrientImportFluxes.java | 5 +++--
21 files changed, 67 insertions(+), 30 deletions(-)
rename src/main/java/{species => analysis}/AnalyseFishDistribution.java (98%)
rename src/main/java/{species => analysis}/AnalyseLikelihoodOfPresence.java (98%)
rename src/main/java/{species => analysis}/AnalyseSpawnerFeatures.java (98%)
rename src/main/java/{species => analysis}/AnalyseSpawnerRun.java (98%)
rename src/main/java/{species => analysis}/Calibrate.java (99%)
rename src/main/java/{species => analysis}/ExportLenghtAgeDistribution.java (97%)
rename src/main/java/{species => analysis}/ExportMeanRecruitment.java (93%)
rename src/main/java/{species => analysis}/ExportPopulationStatus.java (95%)
rename src/main/java/{species => analysis}/ExportRecruitment.java (93%)
rename src/main/java/{species => analysis}/ExportSpeciesRange.java (93%)
rename src/main/java/{species => analysis}/IdentifyPopulation.java (94%)
rename src/main/java/{species => analysis}/TypeTrajectoryCV.java (97%)
rename src/main/java/{species => analysis}/WriteBiomassFluxes.java (97%)
rename src/main/java/{species => analysis}/WriteCurrentNutrientExportFluxes.java (93%)
rename src/main/java/{species => analysis}/WriteCurrentNutrientImportFluxes.java (93%)
rename src/main/java/{species => analysis}/WriteEffectiveAndBiomassExportFluxes.java (97%)
rename src/main/java/{species => analysis}/WriteEffectiveAndBiomassImportFluxes.java (98%)
rename src/main/java/{species => analysis}/WriteEffectivesFluxes.java (98%)
rename src/main/java/{species => analysis}/WriteNutrientExportFluxes.java (92%)
rename src/main/java/{species => analysis}/WriteNutrientImportFluxes.java (93%)
diff --git a/data/input/northeastamerica/fishRIOBasin_Sapidissima_Rjava.xml b/data/input/northeastamerica/fishRIOBasin_Sapidissima_Rjava.xml
index 2678c28..1775d48 100644
--- a/data/input/northeastamerica/fishRIOBasin_Sapidissima_Rjava.xml
+++ b/data/input/northeastamerica/fishRIOBasin_Sapidissima_Rjava.xml
@@ -283,18 +283,18 @@
<!--<species.WriteEffectiveAndBiomassImportFluxes> <synchronisationMode>ASYNCHRONOUS</synchronisationMode> <exportSeason>SPRING</exportSeason>
<fileNameOutput>effectiveBiomassFluxesBeforeReproduction</fileNameOutput> </species.WriteEffectiveAndBiomassImportFluxes> -->
- <species.AnalyseSpawnerFeatures>
+ <analysis.AnalyseSpawnerFeatures>
<synchronisationMode>ASYNCHRONOUS</synchronisationMode>
<analysisSeason>SPRING</analysisSeason>
<memorySize>30</memorySize>
- </species.AnalyseSpawnerFeatures>
+ </analysis.AnalyseSpawnerFeatures>
- <species.AnalyseFishDistribution>
+ <analysis.AnalyseFishDistribution>
<synchronisationMode>ASYNCHRONOUS</synchronisationMode>
<analysisSeason>SPRING</analysisSeason>
<memorySize>30</memorySize>
<minimumRecruitsForPopulatedBasin>50</minimumRecruitsForPopulatedBasin>
- </species.AnalyseFishDistribution>
+ </analysis.AnalyseFishDistribution>
<species.ReproduceAndSurviveAfterReproductionWithDiagnose>
<synchronisationMode>ASYNCHRONOUS</synchronisationMode>
@@ -342,15 +342,15 @@
</processesEachStep>
<processesAtEnd>
- <species.AnalyseLikelihoodOfPresence>
+ <analysis.AnalyseLikelihoodOfPresence>
<synchronisationMode>ASYNCHRONOUS</synchronisationMode>
<presenceFileName>data/input/northeastamerica/nea_presence.csv</presenceFileName>
<period>obs_1900_1950</period>
<minimumRecruitsForPopulatedBasin>50</minimumRecruitsForPopulatedBasin>
<epsilon>0.001</epsilon>
- </species.AnalyseLikelihoodOfPresence>
+ </analysis.AnalyseLikelihoodOfPresence>
- <species.IdentifyPopulation>
+ <analysis.IdentifyPopulation>
<synchronisationMode>ASYNCHRONOUS</synchronisationMode>
<consoleDisplay>false</consoleDisplay>
<years>
@@ -358,7 +358,7 @@
</years>
<fluxesSeason>SPRING</fluxesSeason>
<fileNameOutput>effectiveFluxes</fileNameOutput>
- </species.IdentifyPopulation>
+ </analysis.IdentifyPopulation>
</processesAtEnd>
</processes>
<useCemetery>false</useCemetery>
diff --git a/src/main/java/species/AnalyseFishDistribution.java b/src/main/java/analysis/AnalyseFishDistribution.java
similarity index 98%
rename from src/main/java/species/AnalyseFishDistribution.java
rename to src/main/java/analysis/AnalyseFishDistribution.java
index 70681ab..fee2d2e 100644
--- a/src/main/java/species/AnalyseFishDistribution.java
+++ b/src/main/java/analysis/AnalyseFishDistribution.java
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package species;
+package analysis;
import java.util.HashMap;
import java.util.Map;
@@ -34,6 +34,8 @@ import fr.cemagref.simaqualife.pilot.Pilot;
import miscellaneous.QueueMemory;
import miscellaneous.TreeMapForCentile;
import observer.ObservableRecord;
+import species.DiadromousFish;
+import species.DiadromousFishGroup;
/**
*
diff --git a/src/main/java/species/AnalyseLikelihoodOfPresence.java b/src/main/java/analysis/AnalyseLikelihoodOfPresence.java
similarity index 98%
rename from src/main/java/species/AnalyseLikelihoodOfPresence.java
rename to src/main/java/analysis/AnalyseLikelihoodOfPresence.java
index ca4a123..fe406f7 100644
--- a/src/main/java/species/AnalyseLikelihoodOfPresence.java
+++ b/src/main/java/analysis/AnalyseLikelihoodOfPresence.java
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package species;
+package analysis;
import java.io.FileReader;
import java.util.Locale;
@@ -31,6 +31,8 @@ import com.thoughtworks.xstream.io.xml.DomDriver;
import environment.RiverBasin;
import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess;
import fr.cemagref.simaqualife.pilot.Pilot;
+import species.DiadromousFish;
+import species.DiadromousFishGroup;
/**
*
diff --git a/src/main/java/species/AnalyseSpawnerFeatures.java b/src/main/java/analysis/AnalyseSpawnerFeatures.java
similarity index 98%
rename from src/main/java/species/AnalyseSpawnerFeatures.java
rename to src/main/java/analysis/AnalyseSpawnerFeatures.java
index d3ddb75..4eae1a8 100644
--- a/src/main/java/species/AnalyseSpawnerFeatures.java
+++ b/src/main/java/analysis/AnalyseSpawnerFeatures.java
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package species;
+package analysis;
import java.util.HashMap;
import java.util.Map;
@@ -31,6 +31,8 @@ import environment.Time.Season;
import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess;
import fr.cemagref.simaqualife.pilot.Pilot;
import miscellaneous.QueueMemory;
+import species.DiadromousFish;
+import species.DiadromousFishGroup;
import species.DiadromousFish.Gender;
/**
diff --git a/src/main/java/species/AnalyseSpawnerRun.java b/src/main/java/analysis/AnalyseSpawnerRun.java
similarity index 98%
rename from src/main/java/species/AnalyseSpawnerRun.java
rename to src/main/java/analysis/AnalyseSpawnerRun.java
index e221033..05caa25 100644
--- a/src/main/java/species/AnalyseSpawnerRun.java
+++ b/src/main/java/analysis/AnalyseSpawnerRun.java
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package species;
+package analysis;
import java.util.ArrayList;
import java.util.List;
@@ -33,6 +33,8 @@ import fr.cemagref.observation.kernel.ObservablesHandler;
import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess;
import fr.cemagref.simaqualife.pilot.Pilot;
import observer.ObservableRecord;
+import species.DiadromousFish;
+import species.DiadromousFishGroup;
/**
*
diff --git a/src/main/java/species/Calibrate.java b/src/main/java/analysis/Calibrate.java
similarity index 99%
rename from src/main/java/species/Calibrate.java
rename to src/main/java/analysis/Calibrate.java
index 840a641..d19950a 100644
--- a/src/main/java/species/Calibrate.java
+++ b/src/main/java/analysis/Calibrate.java
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package species;
+package analysis;
import java.io.IOException;
diff --git a/src/main/java/species/ExportLenghtAgeDistribution.java b/src/main/java/analysis/ExportLenghtAgeDistribution.java
similarity index 97%
rename from src/main/java/species/ExportLenghtAgeDistribution.java
rename to src/main/java/analysis/ExportLenghtAgeDistribution.java
index 709ff4b..6e73a4c 100644
--- a/src/main/java/species/ExportLenghtAgeDistribution.java
+++ b/src/main/java/analysis/ExportLenghtAgeDistribution.java
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package species;
+package analysis;
import java.io.BufferedWriter;
import java.io.File;
@@ -32,6 +32,8 @@ import environment.Time;
import environment.Time.Season;
import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess;
import fr.cemagref.simaqualife.pilot.Pilot;
+import species.DiadromousFish;
+import species.DiadromousFishGroup;
import species.DiadromousFish.Stage;
/**
diff --git a/src/main/java/species/ExportMeanRecruitment.java b/src/main/java/analysis/ExportMeanRecruitment.java
similarity index 93%
rename from src/main/java/species/ExportMeanRecruitment.java
rename to src/main/java/analysis/ExportMeanRecruitment.java
index 59e1d33..3fab68d 100644
--- a/src/main/java/species/ExportMeanRecruitment.java
+++ b/src/main/java/analysis/ExportMeanRecruitment.java
@@ -1,4 +1,4 @@
-package species;
+package analysis;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
@@ -9,6 +9,8 @@ import environment.Time;
import environment.Time.Season;
import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess;
import fr.cemagref.simaqualife.pilot.Pilot;
+import species.DiadromousFish;
+import species.DiadromousFishGroup;
import java.io.BufferedWriter;
import java.io.File;
diff --git a/src/main/java/species/ExportPopulationStatus.java b/src/main/java/analysis/ExportPopulationStatus.java
similarity index 95%
rename from src/main/java/species/ExportPopulationStatus.java
rename to src/main/java/analysis/ExportPopulationStatus.java
index ab9edaf..9f55605 100644
--- a/src/main/java/species/ExportPopulationStatus.java
+++ b/src/main/java/analysis/ExportPopulationStatus.java
@@ -1,4 +1,4 @@
-package species;
+package analysis;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
@@ -9,6 +9,8 @@ import environment.Time;
import environment.Time.Season;
import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess;
import fr.cemagref.simaqualife.pilot.Pilot;
+import species.DiadromousFish;
+import species.DiadromousFishGroup;
import java.io.BufferedWriter;
import java.io.File;
diff --git a/src/main/java/species/ExportRecruitment.java b/src/main/java/analysis/ExportRecruitment.java
similarity index 93%
rename from src/main/java/species/ExportRecruitment.java
rename to src/main/java/analysis/ExportRecruitment.java
index b29699e..6d7f23d 100644
--- a/src/main/java/species/ExportRecruitment.java
+++ b/src/main/java/analysis/ExportRecruitment.java
@@ -1,4 +1,4 @@
-package species;
+package analysis;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
@@ -9,6 +9,8 @@ import environment.Time;
import environment.Time.Season;
import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess;
import fr.cemagref.simaqualife.pilot.Pilot;
+import species.DiadromousFish;
+import species.DiadromousFishGroup;
import java.io.BufferedWriter;
import java.io.File;
diff --git a/src/main/java/species/ExportSpeciesRange.java b/src/main/java/analysis/ExportSpeciesRange.java
similarity index 93%
rename from src/main/java/species/ExportSpeciesRange.java
rename to src/main/java/analysis/ExportSpeciesRange.java
index f580e1a..f9ca25e 100644
--- a/src/main/java/species/ExportSpeciesRange.java
+++ b/src/main/java/analysis/ExportSpeciesRange.java
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package species;
+package analysis;
import java.io.BufferedWriter;
import java.io.File;
@@ -30,6 +30,8 @@ import com.thoughtworks.xstream.io.xml.DomDriver;
import environment.Time;
import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess;
import fr.cemagref.simaqualife.pilot.Pilot;
+import species.DiadromousFish;
+import species.DiadromousFishGroup;
/**
*
diff --git a/src/main/java/species/IdentifyPopulation.java b/src/main/java/analysis/IdentifyPopulation.java
similarity index 94%
rename from src/main/java/species/IdentifyPopulation.java
rename to src/main/java/analysis/IdentifyPopulation.java
index d6d5961..670d818 100644
--- a/src/main/java/species/IdentifyPopulation.java
+++ b/src/main/java/analysis/IdentifyPopulation.java
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package species;
+package analysis;
import java.io.BufferedWriter;
import java.io.File;
@@ -34,6 +34,8 @@ import environment.RiverBasin;
import environment.Time;
import environment.Time.Season;
import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess;
+import species.DiadromousFish;
+import species.DiadromousFishGroup;
/**
*
diff --git a/src/main/java/species/TypeTrajectoryCV.java b/src/main/java/analysis/TypeTrajectoryCV.java
similarity index 97%
rename from src/main/java/species/TypeTrajectoryCV.java
rename to src/main/java/analysis/TypeTrajectoryCV.java
index 5dfcbef..c76340c 100644
--- a/src/main/java/species/TypeTrajectoryCV.java
+++ b/src/main/java/analysis/TypeTrajectoryCV.java
@@ -1,8 +1,11 @@
-package species;
+package analysis;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess;
+import species.DiadromousFish;
+import species.DiadromousFishGroup;
+
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileReader;
diff --git a/src/main/java/species/WriteBiomassFluxes.java b/src/main/java/analysis/WriteBiomassFluxes.java
similarity index 97%
rename from src/main/java/species/WriteBiomassFluxes.java
rename to src/main/java/analysis/WriteBiomassFluxes.java
index 0c18ddc..54efdad 100644
--- a/src/main/java/species/WriteBiomassFluxes.java
+++ b/src/main/java/analysis/WriteBiomassFluxes.java
@@ -1,4 +1,4 @@
-package species;
+package analysis;
import java.io.BufferedWriter;
import java.io.File;
@@ -15,6 +15,8 @@ import environment.Time;
import environment.Time.Season;
import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess;
import fr.cemagref.simaqualife.pilot.Pilot;
+import species.DiadromousFish;
+import species.DiadromousFishGroup;
import species.DiadromousFish.Stage;
/**
diff --git a/src/main/java/species/WriteCurrentNutrientExportFluxes.java b/src/main/java/analysis/WriteCurrentNutrientExportFluxes.java
similarity index 93%
rename from src/main/java/species/WriteCurrentNutrientExportFluxes.java
rename to src/main/java/analysis/WriteCurrentNutrientExportFluxes.java
index 7840608..1815f41 100644
--- a/src/main/java/species/WriteCurrentNutrientExportFluxes.java
+++ b/src/main/java/analysis/WriteCurrentNutrientExportFluxes.java
@@ -1,4 +1,4 @@
-package species;
+package analysis;
import java.io.BufferedWriter;
import java.io.File;
@@ -12,6 +12,8 @@ import com.thoughtworks.xstream.io.xml.DomDriver;
import environment.Time;
import environment.Time.Season;
import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess;
+import species.DiadromousFish;
+import species.DiadromousFishGroup;
public class WriteCurrentNutrientExportFluxes extends AquaNismsGroupProcess<DiadromousFish, DiadromousFishGroup> {
diff --git a/src/main/java/species/WriteCurrentNutrientImportFluxes.java b/src/main/java/analysis/WriteCurrentNutrientImportFluxes.java
similarity index 93%
rename from src/main/java/species/WriteCurrentNutrientImportFluxes.java
rename to src/main/java/analysis/WriteCurrentNutrientImportFluxes.java
index 06ca76f..5b95342 100644
--- a/src/main/java/species/WriteCurrentNutrientImportFluxes.java
+++ b/src/main/java/analysis/WriteCurrentNutrientImportFluxes.java
@@ -1,4 +1,4 @@
-package species;
+package analysis;
import java.io.BufferedWriter;
import java.io.File;
@@ -12,6 +12,8 @@ import com.thoughtworks.xstream.io.xml.DomDriver;
import environment.Time;
import environment.Time.Season;
import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess;
+import species.DiadromousFish;
+import species.DiadromousFishGroup;
public class WriteCurrentNutrientImportFluxes extends AquaNismsGroupProcess<DiadromousFish, DiadromousFishGroup> {
diff --git a/src/main/java/species/WriteEffectiveAndBiomassExportFluxes.java b/src/main/java/analysis/WriteEffectiveAndBiomassExportFluxes.java
similarity index 97%
rename from src/main/java/species/WriteEffectiveAndBiomassExportFluxes.java
rename to src/main/java/analysis/WriteEffectiveAndBiomassExportFluxes.java
index c106bda..5464b93 100644
--- a/src/main/java/species/WriteEffectiveAndBiomassExportFluxes.java
+++ b/src/main/java/analysis/WriteEffectiveAndBiomassExportFluxes.java
@@ -1,4 +1,4 @@
-package species;
+package analysis;
import java.io.BufferedWriter;
import java.io.File;
@@ -17,6 +17,8 @@ import environment.RiverBasin;
import environment.Time;
import environment.Time.Season;
import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess;
+import species.DiadromousFish;
+import species.DiadromousFishGroup;
import species.DiadromousFish.Stage;
public class WriteEffectiveAndBiomassExportFluxes extends AquaNismsGroupProcess<DiadromousFish, DiadromousFishGroup> {
diff --git a/src/main/java/species/WriteEffectiveAndBiomassImportFluxes.java b/src/main/java/analysis/WriteEffectiveAndBiomassImportFluxes.java
similarity index 98%
rename from src/main/java/species/WriteEffectiveAndBiomassImportFluxes.java
rename to src/main/java/analysis/WriteEffectiveAndBiomassImportFluxes.java
index 4d19b17..4be8260 100644
--- a/src/main/java/species/WriteEffectiveAndBiomassImportFluxes.java
+++ b/src/main/java/analysis/WriteEffectiveAndBiomassImportFluxes.java
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package species;
+package analysis;
import java.io.BufferedWriter;
import java.io.File;
@@ -34,6 +34,8 @@ import environment.Time;
import environment.Time.Season;
import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess;
import fr.cemagref.simaqualife.pilot.Pilot;
+import species.DiadromousFish;
+import species.DiadromousFishGroup;
import species.DiadromousFish.Stage;
/**
diff --git a/src/main/java/species/WriteEffectivesFluxes.java b/src/main/java/analysis/WriteEffectivesFluxes.java
similarity index 98%
rename from src/main/java/species/WriteEffectivesFluxes.java
rename to src/main/java/analysis/WriteEffectivesFluxes.java
index 1a92725..34829a7 100644
--- a/src/main/java/species/WriteEffectivesFluxes.java
+++ b/src/main/java/analysis/WriteEffectivesFluxes.java
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package species;
+package analysis;
import java.io.BufferedWriter;
import java.io.File;
@@ -34,7 +34,9 @@ import environment.Time;
import environment.Time.Season;
import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess;
import fr.cemagref.simaqualife.pilot.Pilot;
+import species.DiadromousFish;
import species.DiadromousFish.Stage;
+import species.DiadromousFishGroup;
@Deprecated
/**
diff --git a/src/main/java/species/WriteNutrientExportFluxes.java b/src/main/java/analysis/WriteNutrientExportFluxes.java
similarity index 92%
rename from src/main/java/species/WriteNutrientExportFluxes.java
rename to src/main/java/analysis/WriteNutrientExportFluxes.java
index 3ab9320..018a46f 100644
--- a/src/main/java/species/WriteNutrientExportFluxes.java
+++ b/src/main/java/analysis/WriteNutrientExportFluxes.java
@@ -1,4 +1,4 @@
-package species;
+package analysis;
import java.io.BufferedWriter;
import java.io.File;
@@ -13,13 +13,14 @@ import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess;
+import species.DiadromousFish;
+import species.DiadromousFishGroup;
@Deprecated
public class WriteNutrientExportFluxes extends AquaNismsGroupProcess<DiadromousFish, DiadromousFishGroup> {
private String fileName = "nutrientExportFluxes";
-
public static void main(String[] args) {
System.out.println((new XStream(new DomDriver())).toXML(new WriteNutrientExportFluxes()));
diff --git a/src/main/java/species/WriteNutrientImportFluxes.java b/src/main/java/analysis/WriteNutrientImportFluxes.java
similarity index 93%
rename from src/main/java/species/WriteNutrientImportFluxes.java
rename to src/main/java/analysis/WriteNutrientImportFluxes.java
index 127f05a..10a34e7 100644
--- a/src/main/java/species/WriteNutrientImportFluxes.java
+++ b/src/main/java/analysis/WriteNutrientImportFluxes.java
@@ -1,4 +1,4 @@
-package species;
+package analysis;
import java.io.BufferedWriter;
import java.io.File;
@@ -13,13 +13,14 @@ import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
import fr.cemagref.simaqualife.kernel.processes.AquaNismsGroupProcess;
+import species.DiadromousFish;
+import species.DiadromousFishGroup;
@Deprecated
public class WriteNutrientImportFluxes extends AquaNismsGroupProcess<DiadromousFish, DiadromousFishGroup> {
private String fileName = "fluxes";
-
public static void main(String[] args) {
System.out.println((new XStream(new DomDriver())).toXML(new WriteNutrientImportFluxes()));
--
GitLab