r98 - trunk/exports - Isis-fish-data-commits

7 Apr 2009

Author: jcouteau
Date: 2009-04-07 15:25:54 +0000 (Tue, 07 Apr 2009)
New Revision: 98

Removed:
   trunk/exports/SensitivityBiomassPopage.java
   trunk/exports/SensitivityCapturesPoidsPopage.java
Log:
Remove unused exports

Deleted: trunk/exports/SensitivityBiomassPopage.java
===================================================================

--- trunk/exports/SensitivityBiomassPopage.java	2009-04-07 15:09:00 UTC (rev 97)
+++ trunk/exports/SensitivityBiomassPopage.java	2009-04-07 15:25:54 UTC (rev 98)
@@ -1,71 +0,0 @@
-package exports;
-
-import static org.codelutin.i18n.I18n._;
-
-import java.io.Writer;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixIterator;
-import org.codelutin.math.matrix.MatrixND;
-
-import scripts.ResultName;
-import fr.ifremer.isisfish.datastore.SimulationStorage;
-import fr.ifremer.isisfish.entities.Population;
-import fr.ifremer.isisfish.export.SensitivityExport;
-import fr.ifremer.isisfish.types.Date;
-import fr.ifremer.isisfish.util.Doc;
-
-@Doc("Doc for SensitivityBiomassPopage")
-public class SensitivityBiomassPopage implements SensitivityExport {
-
-    /** to use log facility, just put in your code: log.info("..."); */
-    static private Log log = LogFactory.getLog(SensitivityBiomassPopage.class);
-
-    protected String[] necessaryResult = { ResultName.MATRIX_BIOMASS };
-
-    @Override
-    public void export(SimulationStorage simulation, Writer out)
-            throws Exception {
-        Date lastDate = simulation.getResultStorage().getLastDate();
-        double biomass = 0.0;
-        for (Population pop : simulation.getParameter().getPopulations()) {
-            if (pop.getName().equals("popage")) {
-                MatrixND mat = simulation.getResultStorage().getMatrix(pop,
-                        ResultName.MATRIX_BIOMASS);
-                for (MatrixIterator i = mat.iterator(); i.hasNext();) {
-                    i.next();
-                    Object[] sems = i.getSemanticsCoordinates();
-                    Date date = (Date) sems[0];
-
-                    if (date.afterOrEquals(lastDate)) {
-                        biomass = biomass + i.getValue();
-                    }
-                }
-            }
-        }
-        out.write(Double.toString(biomass));
-
-    }
-
-    @Override
-    public String getDescription() {
-        return _("Biomass for the last time step. Biomass is the sum on the groups and zones");
-    }
-
-    @Override
-    public String getExportFilename() {
-        return "SensitivityBiomassPopage";
-    }
-
-    @Override
-    public String getExtensionFilename() {
-        return ".csv";
-    }
-
-    @Override
-    public String[] getNecessaryResult() {
-        return this.necessaryResult;
-    }
-
-}

Deleted: trunk/exports/SensitivityCapturesPoidsPopage.java
===================================================================
--- trunk/exports/SensitivityCapturesPoidsPopage.java	2009-04-07 15:09:00 UTC (rev 97)
+++ trunk/exports/SensitivityCapturesPoidsPopage.java	2009-04-07 15:25:54 UTC (rev 98)
@@ -1,75 +0,0 @@
-package exports;
-
-import static org.codelutin.i18n.I18n._;
-
-import java.io.Writer;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixIterator;
-import org.codelutin.math.matrix.MatrixND;
-
-import scripts.ResultName;
-import fr.ifremer.isisfish.datastore.SimulationStorage;
-import fr.ifremer.isisfish.entities.Population;
-import fr.ifremer.isisfish.export.SensitivityExport;
-import fr.ifremer.isisfish.types.Date;
-import fr.ifremer.isisfish.util.Doc;
-
-@Doc("Doc for SensitivityCapturesPoidsPopage")
-public class SensitivityCapturesPoidsPopage implements SensitivityExport {
-
-    /** to use log facility, just put in your code: log.info("..."); */
-    static private Log log = LogFactory.getLog(SensitivityCapturesPoidsPopage.class);
-
-    protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP };
-
-    @Override
-    public void export(SimulationStorage simulation, Writer out)
-            throws Exception {
-        Date lastDate = simulation.getResultStorage().getLastDate();
-        Double capturesWeight = 0.0;
-
-        for (Population pop : simulation.getParameter().getPopulations()) {
-            if (pop.getName().equals("popage")) {
-                for (Date date = new Date(0); !date.after(lastDate); date = date
-                        .next()) {
-                    MatrixND mat = simulation
-                            .getResultStorage()
-                            .getMatrix(
-                                    date,
-                                    pop,
-                                    ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP);
-                    if (mat != null) { // can be null if simulation is stopped before last year simulation
-                        mat = mat.sumOverDim(0); //sum on strategy
-                        for (MatrixIterator i = mat.iterator(); i.hasNext();) {
-                            i.next();                            
-                            capturesWeight=capturesWeight+i.getValue();
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public String getDescription() {
-        return _("Captures in weight for the last year for the popage population. Captures is the sum of zones, groups, metiers and strategies");
-    }
-
-    @Override
-    public String getExportFilename() {
-        return "SensitivityCapturesPoidsPopage";
-    }
-
-    @Override
-    public String getExtensionFilename() {
-        return ".csv";
-    }
-
-    @Override
-    public String[] getNecessaryResult() {
-        return this.necessaryResult;
-    }
-
-}

    

r98 - trunk/exports

jcouteau＠users.labs.libre-entreprise.org

tags

participants (1)