Author: jcouteau Date: 2009-04-13 11:42:54 +0000 (Mon, 13 Apr 2009) New Revision: 104 Removed: trunk/exports/SensitivityBiomass.java Modified: trunk/exports/SensitivityBiomassRelativeY6.java Log: Fixed Y6 export Deleted: trunk/exports/SensitivityBiomass.java =================================================================== --- trunk/exports/SensitivityBiomass.java 2009-04-13 08:49:24 UTC (rev 103) +++ trunk/exports/SensitivityBiomass.java 2009-04-13 11:42:54 UTC (rev 104) @@ -1,74 +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 SensitivityBiomass") -public class SensitivityBiomass implements SensitivityExport { - - /** to use log facility, just put in your code: log.info("..."); */ - static private Log log = LogFactory.getLog(SensitivityBiomass.class); - - protected String[] necessaryResult = { ResultName.MATRIX_BIOMASS }; - - @Doc("Population") - public Population param_pop; - - @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(param_pop.getName())) { - 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 "SensitivityBiomass"; - } - - @Override - public String getExtensionFilename() { - return ".csv"; - } - - @Override - public String[] getNecessaryResult() { - return this.necessaryResult; - } - -} Modified: trunk/exports/SensitivityBiomassRelativeY6.java =================================================================== --- trunk/exports/SensitivityBiomassRelativeY6.java 2009-04-13 08:49:24 UTC (rev 103) +++ trunk/exports/SensitivityBiomassRelativeY6.java 2009-04-13 11:42:54 UTC (rev 104) @@ -82,7 +82,7 @@ @Override public String getExportFilename() { - return "SensitivityBiomass"; + return "SensitivityBiomassRelative"; } @Override