r1294 - in branches/isis-fish-3.1.4/src: java/fr/ifremer/isisfish java/fr/ifremer/isisfish/datastore/migration java/fr/ifremer/isisfish/entities java/fr/ifremer/isisfish/equation java/fr/ifremer/isisfish/simulator java/fr/ifremer/isisfish/ui/simulator xmi
Author: bpoussin Date: 2008-08-12 15:23:29 +0000 (Tue, 12 Aug 2008) New Revision: 1294 Added: branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java Removed: branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/simulator/PopulationMonitorMultiThread.java Modified: branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/IsisConfig.java branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/entities/StrategyImpl.java branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/simulator/SimulationManager.java branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/ui/simulator/SimulatorListeners.java branches/isis-fish-3.1.4/src/xmi/isis-fish.zargo Log: - Implantation dans le modele des nouvelles equations - passage de version en 3.2.0 - ajout du code pour upgrader les tables (alter table) Modified: branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/IsisConfig.java 2008-08-12 15:23:26 UTC (rev 1293) +++ branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/IsisConfig.java 2008-08-12 15:23:29 UTC (rev 1294) @@ -42,10 +42,9 @@ */ public class IsisConfig extends IsisAbstractConfigMain { - protected final static VersionNumber version = new VersionNumber(3, 1, 4); + protected final static VersionNumber version = new VersionNumber(3, 2, 0); protected final static VersionNumber databaseVersion = new VersionNumber( - 0); -// FIXME a remettre apres les tests de simu version.getNumber(0), version.getNumber(1)); + version.getNumber(0), version.getNumber(1)); public static VersionNumber getVersionNumber() { return version; Modified: branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java =================================================================== --- branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java 2008-08-12 15:23:26 UTC (rev 1293) +++ branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java 2008-08-12 15:23:29 UTC (rev 1294) @@ -19,6 +19,8 @@ package fr.ifremer.isisfish.datastore.migration; import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; import javax.swing.JOptionPane; import org.apache.commons.logging.Log; @@ -99,19 +101,20 @@ return MigrationChoice.NO_MIGRATION; // force false during test // result; } - private void migrateTo3_2(Connection conn) { + private void migrateTo3_2(Connection conn) throws SQLException { log.info("Migrate to version 3.2"); //alteration du schema // nouvelles equations dans les tables - - // creation de valeur par defaut pour les equations - - - // recuperation des valeurs de ??? - - // creation de l'equation avec ces valeurs - - // sauvegarde de l'equation + + String [] sqls = new String[]{ + "alter table SETOFVESSELS add column TECHNICALEFFICIENCYEQUATION VARCHAR(255);", + "alter table STRATEGY add column INACTIVITYEQUATIONUSED BIT default false;", + "alter table STRATEGY add column INACTIVITYEQUATION VARCHAR(255);", + }; + for (String sql : sqls) { + PreparedStatement sta = conn.prepareStatement(sql); + sta.executeUpdate(); + } } } Modified: branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java =================================================================== --- branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2008-08-12 15:23:26 UTC (rev 1293) +++ branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2008-08-12 15:23:29 UTC (rev 1294) @@ -1,10 +1,19 @@ package fr.ifremer.isisfish.entities; +import static org.codelutin.i18n.I18n._; + +import fr.ifremer.isisfish.IsisFishDAOHelper; import java.io.Serializable; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.StorageException; +import fr.ifremer.isisfish.equation.Language; +import fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation; +import fr.ifremer.isisfish.types.Date; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.topia.TopiaException; /** * Implantation des operations pour l'entité SetOfVessels. @@ -13,6 +22,11 @@ private static final long serialVersionUID = 1L; + /** + * Logger for this class + */ + private static final Log log = LogFactory.getLog(SetOfVesselsImpl.class); + public FisheryRegion getFisheryRegion() { try { FisheryRegion result = RegionStorage.getFisheryRegion(getTopiaContext()); @@ -22,6 +36,68 @@ } } + /** + * override to change name of equation + * @see fr.ifremer.isisfish.entities.SetOfVesselsAbstract#setName(java.lang.String) + */ + @Override + public void setName(String value) { + super.setName(value); + Equation eq = getTechnicalEfficiencyEquation(); + if (eq != null) { + eq.setName(getName()); + } + } + + /** + * Compute or return inactivity days + * @param length length of group + * @param group group + * @return age in month + */ + @Override + public double getTechnicalEfficiency(Date date, Metier metier) { + double result = 0; + + try { + Gear gear = metier.getGear(); + Equation eq = getTechnicalEfficiencyEquation(); + if (eq != null) { + result = eq.evaluate("date", date, "metier", metier, "gear", gear); + } + } catch (Exception eee) { + if (log.isWarnEnabled()) { + log.warn("Error in technical efficiency equation"); + } + if (log.isDebugEnabled()) { + log.debug("StackTrace", eee); + } + } + return result; + } + + public void setEquationTechnicalEfficiency(String content) { + try { + Equation eq = getTechnicalEfficiencyEquation(); + + if (eq == null) { + EquationDAO dao = IsisFishDAOHelper.getEquationDAO(getTopiaContext()); + // create Growth equation + eq = dao.create(); + eq.setCategory("Inactivity"); + eq.setJavaInterface(SoVTechnicalEfficiencyEquation.class); + eq.setLanguage(Language.JAVA); + setTechnicalEfficiencyEquation(eq); + } + + eq.setName(getName()); + eq.setContent(content); + eq.update(); + } catch (TopiaException eee) { + throw new IsisFishRuntimeException(_("isisfish.change.equation"), eee); + } + } + /* (non-Javadoc) * @see fr.ifremer.isisfish.entities.FisheryRegionAbstract#toString() */ Modified: branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/entities/StrategyImpl.java =================================================================== --- branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2008-08-12 15:23:26 UTC (rev 1293) +++ branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2008-08-12 15:23:29 UTC (rev 1294) @@ -14,6 +14,8 @@ import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.StorageException; +import fr.ifremer.isisfish.equation.Language; +import fr.ifremer.isisfish.equation.StrategyInactivityEquation; import fr.ifremer.isisfish.types.Month; /** @@ -34,6 +36,19 @@ throw new IsisFishRuntimeException(eee); } } + + /** + * override to change name of equation + * @see fr.ifremer.isisfish.entities.StrategyAbstract#setName(java.lang.String) + */ + @Override + public void setName(String value) { + super.setName(value); + Equation eq = getInactivityEquation(); + if (eq != null) { + eq.setName(getName()); + } + } /* (non-Javadoc) * @see fr.ifremer.isisfish.entities.StrategyAbstract#getStrategyMonthInfo() @@ -88,6 +103,55 @@ return result; } + /** + * Compute or return inactivity days + * @param length length of group + * @param group group + * @return age in month + */ + public double getInactivityDays(Month month) { + double result = 0; + + StrategyMonthInfo info = getStrategyMonthInfo(month); + if (!getInactivityEquationUsed()) { + result = info.getMinInactivityDays(); + } else { + try { + Equation eq = getInactivityEquation(); + result = eq.evaluate("month", month, "info", info); + } catch (Exception eee) { + if (log.isWarnEnabled()) { + log.warn("Error in inactivityDays equation"); + } + if (log.isDebugEnabled()) { + log.debug("StackTrace", eee); + } + } + } + return result; + } + public void setEquationInactivity(String content) { + try { + Equation eq = getInactivityEquation(); + + if (eq == null) { + EquationDAO dao = IsisFishDAOHelper.getEquationDAO(getTopiaContext()); + // create Growth equation + eq = dao.create(); + eq.setCategory("Inactivity"); + eq.setJavaInterface(StrategyInactivityEquation.class); + eq.setLanguage(Language.JAVA); + setInactivityEquation(eq); + } + + eq.setName(getName()); + eq.setContent(content); + eq.update(); + } catch (TopiaException eee) { + throw new IsisFishRuntimeException(_("isisfish.change.equation"), eee); + } + } + /* (non-Javadoc) * @see fr.ifremer.isisfish.entities.StrategyAbstract#toString() */ Modified: branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java =================================================================== --- branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2008-08-12 15:23:26 UTC (rev 1293) +++ branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2008-08-12 15:23:29 UTC (rev 1294) @@ -152,7 +152,10 @@ public void computeNumberOfTrips() { TripType tripType = getTripType(); - int inactivity = getMinInactivityDays(); + // remplace un simple getMinInactivityDays(), pour pouvoir utiliser une + // equation si besoin (tout est pret, il ne manque que l'interface + // graphique pour saisir l'equation dans strategie + double inactivity = getStrategy().getInactivityDays(getMonth()); if(tripType != null && tripType.getTripDuration() != null && inactivity >= 0){ int nbDayMonth = getMonth().getNumbersOfDays(); double result = (int)((nbDayMonth - inactivity) / tripType.getTripDuration().getDay()); Added: branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java =================================================================== --- branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java (rev 0) +++ branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java 2008-08-12 15:23:29 UTC (rev 1294) @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2002-2008 Code Lutin, Benjamin Poussin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +package fr.ifremer.isisfish.equation; + +import fr.ifremer.isisfish.entities.Gear; +import fr.ifremer.isisfish.entities.Metier; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.util.Args; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public interface SoVTechnicalEfficiencyEquation { + + /** + * @param context + * @param metier le metier pour lequel on demande le calcul + * @param gear l'engin utilise par le metier + * @return + */ + @Args({"context", "metier", "gear"}) + public double compute(SimulationContext context, Metier metier, Gear gear) throws Exception; + +} Added: branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java =================================================================== --- branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java (rev 0) +++ branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java 2008-08-12 15:23:29 UTC (rev 1294) @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2002-2008 Code Lutin, Benjamin Poussin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +package fr.ifremer.isisfish.equation; + +import fr.ifremer.isisfish.entities.StrategyMonthInfo; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.types.Month; +import fr.ifremer.isisfish.util.Args; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public interface StrategyInactivityEquation { + + /** + * + * @param context + * @param month le mois courant de simulation + * @param info l'objet associe a la strategie pour le mois courant + * @return + */ + @Args({"context", "month", "info"}) + public double compute(SimulationContext context, Month month, StrategyMonthInfo info) throws Exception; + +} Deleted: branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java =================================================================== --- branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2008-08-12 15:23:26 UTC (rev 1293) +++ branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2008-08-12 15:23:29 UTC (rev 1294) @@ -1,372 +0,0 @@ -/* *##% - * Copyright (C) 2006 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * PopulationMonitor.java - * - * Created: 21 août 2006 15:41:18 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - -package fr.ifremer.isisfish.simulator; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.keyvalue.MultiKey; -import org.apache.commons.collections.map.MultiKeyMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixIterator; -import org.codelutin.math.matrix.MatrixND; - -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.PopulationGroup; -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import fr.ifremer.isisfish.entities.Species; -import fr.ifremer.isisfish.entities.Zone; -import fr.ifremer.isisfish.types.Date; -import fr.ifremer.isisfish.types.Month; - - -/** - * Classe permettant le suivi des populations de la simulation. - * - * FIXME: certain calcul sont les memes que ceux implanter dans les scripts - * a cause du groupe des juveniles qui n'est pas un vrai groupe de population. - * Il serait bon que ce groupe deviennent un vrai groupe et que ce code specifique - * puisse etre supprimer. - * - * - * @author poussin - */ -public class PopulationMonitor { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(PopulationMonitor.class); - - /** current number of fish by Pop */ - protected Map<Population, MatrixND> Ns = new HashMap<Population, MatrixND>(); - /** reproduction key: <date, pop> value:<MatrixND> */ - protected MultiKeyMap reproductions = new MultiKeyMap(); - /** discard key: <date, pop> value:<MatrixND> */ - protected MultiKeyMap discards = new MultiKeyMap(); - /** catch per population, only last catch is remaining */ - protected Map<Population, MatrixND> catchs = new HashMap<Population, MatrixND>(); - /** catch per population, only last catch is remaining */ - protected Map<Population, MatrixND> holdCatchs = new HashMap<Population, MatrixND>(); - protected double totalHoldCatch = 0; - - /** - * Return all population actualy in PopulationMonitor - * @return new list of Population - */ - public List<Population> getPopulations() { - ArrayList<Population> result = new ArrayList<Population>(Ns.keySet()); - return result; - } - - /** - * Return current biomass for species - * @param species - * @return - */ - public double getBiomass(Species species) { - double result = 0; - - for (Population pop : species.getPopulation()) { - result += getBiomass(pop); - } - - return result; - } - - /** - * Return current biomass for population - * @param pop - * @return - */ - public double getBiomass(Population pop) { - double result = 0; - - MatrixND n = getN(pop); - if (n != null) { - n = n.sumOverDim(1); - for (MatrixIterator i=n.iterator(); i.next();){ - Object [] coord = i.getSemanticsCoordinates(); - PopulationGroup group = (PopulationGroup)coord[0]; - result += i.getValue() * group.getMeanWeight(); - } - } - - return result; - } - - /** - * Return current numbers for population - * @param pop - * @return - */ - public MatrixND getN(Population pop) { - MatrixND result = Ns.get(pop); - - if (result != null) { - // change semantics with list from argument to ensure that - // semantics don't used too old context - result.setSemantics(0, pop.getPopulationGroup()); - result.setSemantics(1, pop.getPopulationZone()); - } - - return result; - } - - public void setN(Population pop, MatrixND mat) { - Ns.put(pop, mat); - } - - /** - * @return Returns the reproduction. - */ - public MatrixND getReproduction(Date date, Population pop) { - return (MatrixND)this.reproductions.get(date, pop); - } - - /** - * @param reproduction The reproduction to set. - */ - public void setReproduction(Date date, Population pop, MatrixND repro) { - this.reproductions.put(date, pop, repro); - } - - /** - * Applique de la mortalite naturelle aux poissons qui sont pas encore - * dans les classes de populations. (Reproduction) - * @param pop - */ - public void applyReproductionMortality(Population pop) { - for (MapIterator i=reproductions.mapIterator(); i.hasNext();) { - i.next(); - MultiKey key = (MultiKey)i.getKey(); - if (pop.equals(key.getKey(1))) { - MatrixND reproduction = (MatrixND)i.getValue(); - if (log.isTraceEnabled()) { - log.trace("Matrix repro before mortality: " + reproduction); - } - for(MatrixIterator mi=reproduction.iterator(); mi.next();){ - Object[] sems = mi.getSemanticsCoordinates(); - Zone z = (Zone)sems[0]; - double coeff = pop.getNaturalDeathBirth(z); - if (log.isTraceEnabled()) { - log.trace("NaturalDeath zone " + z + "=" + coeff); - } - mi.setValue(mi.getValue() * Math.exp(-coeff/Month.NUMBER_OF_MONTH)); - } - if (log.isTraceEnabled()) { - log.trace("Matrix repro after mortality: " + reproduction); - } - } - } - } - - /** - * @todo les reproductions qui sont trop veille pour encore servir - * doivent être supprimées. c-a-d date < currentDate - etalement - gap between repro recru - * Une autre facon de faire est de supprimer les repro == 0 car normalement - * toute la repro doit etre utilisé au bout d'un certain temps - * - * @param date - * @param pop - * @return - */ - public MatrixND getRecruitment(Date date, Population pop) { - MatrixND matEtalement = pop.getRecruitmentDistribution(); - int etalement = matEtalement.getDim(0); - - MatrixND result = MatrixFactory.getInstance().create( - new List[]{pop.getPopulationGroup(), pop.getPopulationZone()}); - - // pour chaque - for(int e=0; e<etalement; e++){ - // recuperation de la reproduction stucture en zone repro - Date d = new Date(date.getDate() - e - - pop.getMonthGapBetweenReproRecrutement()); - MatrixND repro = (MatrixND)reproductions.get(d, pop); - - if(repro != null){ // si une repro existe pour le mois - - // on fait la correspondance entre les zones repro et - // recrutement - - PopulationGroup classe; - int indiceClasse = 0; - // si on a change d'annee le recrutement ne se fait pas en - // classe 0 mais en classe 1, si on a change 2 fois d'annee - // le recrutement se fait en age 2, etc. - classe = pop.getPopulationGroup().get(indiceClasse); - - List<Zone> zoneRepros = pop.getReproductionZone(); - - // on multiplie la repro par le coeff de recrutement - double coeff = matEtalement.getValue(e); - - MatrixND matRepro = repro.copy(); - matRepro = matRepro.mults(coeff); - - matRepro.setSemantics(0, zoneRepros); - - MatrixND mapping = pop.getMappingZoneReproZoneRecru(); - for(Zone zoneRepro : zoneRepros){ - MatrixND submapping = mapping.getSubMatrix(0, new Object[]{zoneRepro}); - for (MatrixIterator i=submapping.iterator(); i.hasNext();) { - i.next(); - Object[] sem = i.getSemanticsCoordinates(); - Zone zoneRecru = (Zone)sem[1]; - double c = i.getValue(); - result.setValue(classe, zoneRecru, c*matRepro.getValue(zoneRepro) - +result.getValue(classe, zoneRecru)); - } - } - } - } - - if(pop.getSpecies().getAgeGroupType()){ - // conversion et retour de la matrice en vecteur - MatrixND N = pop.N2DToN1D(result); - // on applique les migrations et le changement d'age sur le resultat - // on suppose que la reproduction est toujours dans une seul saison - Date dateRepro = new Date(date.getDate() - - pop.getMonthGapBetweenReproRecrutement()); - - // recherche les saisons des differents mois entre les deux dates - List<PopulationSeasonInfo> infos = pop.getPopulationSeasonInfo(); - List<PopulationSeasonInfo> usedSeasons = new ArrayList<PopulationSeasonInfo>(); - - while (date.after(dateRepro)) { - dateRepro = dateRepro.next(); - Month month = dateRepro.getMonth(); - for (PopulationSeasonInfo info : infos) { - if (month.equals(info.getFirstMonth())) { - usedSeasons.add(info); - dateRepro = new Date(dateRepro.getDate() + info.getMonths().size() - 1); // -1 because, for have next() - break; - } - } - } - - for(PopulationSeasonInfo info : usedSeasons){ - Month month = info.getFirstMonth(); - MatrixND CA = info.getGroupChangeMatrix(month); - MatrixND MI = info.getMigrationMatrix(month, result); - MatrixND tmp0 = N.mult(CA); - MatrixND tmp2 = tmp0.mult(MI); - N = tmp2; - } - result = pop.split2D(N); - } - return result; - } - - /** - * @param catchPerStrategyMet - */ - public void holdCatch(Population pop, MatrixND catchPerStrategyMet) { - catchs.put(pop, catchPerStrategyMet); - - MatrixND holdCatch = holdCatchs.get(pop); - if (holdCatch == null) { - holdCatch = MatrixFactory.getInstance().create(catchPerStrategyMet); - holdCatchs.put(pop, holdCatch); - } else { - holdCatch.add(catchPerStrategyMet); - } - - // compute total - for(MatrixIterator i=catchPerStrategyMet.iterator(); i.next();){ - this.totalHoldCatch += i.getValue(); - } - - } - - /** - * @param pop - * @return - */ - public MatrixND getCatch(Population pop) { - MatrixND result = catchs.get(pop); - return result; - } - - /** - * @param pop - * @return - */ - public MatrixND getHoldCatch(Population pop) { - MatrixND result = holdCatchs.get(pop); - return result; - } - - /** - * @param pop - * @return - */ - public double getTotalHoldCatch(Population pop) { - double result = totalHoldCatch; - return result; - } - - /** - * raz capture cumulée de toutes les pops - */ - public void clearCatch() { - catchs.clear(); - holdCatchs.clear(); - totalHoldCatch = 0; - } - - /** - * @param date - * @param pop - * @return - */ - public MatrixND getDiscard(Date date, Population pop) { - MatrixND result = (MatrixND)discards.get(date, pop); - return result; - } - - public void addDiscard(Date date, Population pop, MatrixND discard) { - MatrixND tmp = (MatrixND)discards.get(date, pop); - if (tmp == null) { - tmp = discard.copy(); - discards.put(date, pop, tmp); - } else { - tmp.add(discard); - } - } -} - - Copied: branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java (from rev 1292, branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/simulator/PopulationMonitorMultiThread.java) =================================================================== --- branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java (rev 0) +++ branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2008-08-12 15:23:29 UTC (rev 1294) @@ -0,0 +1,399 @@ +/* *##% + * Copyright (C) 2006 + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +/* * + * PopulationMonitor.java + * + * Created: 21 août 2006 15:41:18 + * + * @author poussin + * @version $Revision: 428 $ + * + * Last update: $Date: 2007-10-15 14:56:13 +0200 (lun, 15 oct 2007) $ + * by : $Author: bpoussin $ + */ + +package fr.ifremer.isisfish.simulator; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.math.matrix.MatrixFactory; +import org.codelutin.math.matrix.MatrixIterator; +import org.codelutin.math.matrix.MatrixND; + +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.entities.PopulationGroup; +import fr.ifremer.isisfish.entities.PopulationSeasonInfo; +import fr.ifremer.isisfish.entities.Species; +import fr.ifremer.isisfish.entities.Zone; +import fr.ifremer.isisfish.types.Date; +import fr.ifremer.isisfish.types.Month; +import java.util.Collections; + + +/** + * Classe permettant le suivi des populations de la simulation. + * <p> + * Cette classe est normalement multi-thread safe + * <p> + * FIXME: certain calcul sont les memes que ceux implanter dans les scripts + * a cause du groupe des juveniles qui n'est pas un vrai groupe de population. + * Il serait bon que ce groupe deviennent un vrai groupe et que ce code specifique + * puisse etre supprimer. + * + * + * @author poussin + */ +public class PopulationMonitor { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(PopulationMonitor.class); + + /** La liste des pops monitorer par cette instance */ + protected List<Population> pops = null; + /** current number of fish by Pop */ + protected Map<Population, MatrixND> Ns = new HashMap<Population, MatrixND>(); + /** reproduction key: <date, pop> value:<MatrixND> */ + protected Map<Population, Map<Date, MatrixND>> reproductions = new HashMap<Population, Map<Date, MatrixND>>(); + /** discard key: <date, pop> value:<MatrixND> */ + protected Map<Population, Map<Date, MatrixND>> discards = new HashMap<Population, Map<Date, MatrixND>>(); + /** catch per population, only last catch is remaining */ + protected Map<Population, MatrixND> catchs = new HashMap<Population, MatrixND>(); + /** catch per population, only last catch is remaining */ + protected Map<Population, MatrixND> holdCatchs = new HashMap<Population, MatrixND>(); + protected double totalHoldCatch = 0; + + /** + * Initialise le monitor pour l'ensemble de pop passe en parametre. + * Normalement cet init est fait dans le thread principale de la simulation + * et il n'y a pas de besoin de le synchroniser. + * + * Cet init permet d'avoir ensuite le maxime de variable en lecture, et donc + * de permettre le multithreading de facon legere (pas de synchronise) et + * sur (pas de concurent modification exception) + * + * @param pops + */ + public void init(List<Population> pops) { + this.pops = Collections.unmodifiableList(new ArrayList<Population>(pops)); + for (Population pop : this.pops) { + reproductions.put(pop, new HashMap<Date, MatrixND>()); + discards.put(pop, new HashMap<Date, MatrixND>()); + } + } + + /** + * Return all population actualy in PopulationMonitor + * @return new list of Population + */ + public List<Population> getPopulations() { + return pops; + } + + /** + * Return current biomass for species + * @param species + * @return + */ + public double getBiomass(Species species) { + double result = 0; + + for (Population pop : species.getPopulation()) { + result += getBiomass(pop); + } + + return result; + } + + /** + * Return current biomass for population + * @param pop + * @return + */ + public double getBiomass(Population pop) { + double result = 0; + + MatrixND n = getN(pop); + if (n != null) { + n = n.sumOverDim(1); + for (MatrixIterator i=n.iterator(); i.next();){ + Object [] coord = i.getSemanticsCoordinates(); + PopulationGroup group = (PopulationGroup)coord[0]; + result += i.getValue() * group.getMeanWeight(); + } + } + + return result; + } + + /** + * Return current numbers for population + * @param pop + * @return + */ + public MatrixND getN(Population pop) { + MatrixND result = Ns.get(pop); + + if (result != null) { + // change semantics with list from argument to ensure that + // semantics don't used too old context + result.setSemantics(0, pop.getPopulationGroup()); + result.setSemantics(1, pop.getPopulationZone()); + } + + return result; + } + + public void setN(Population pop, MatrixND mat) { + Ns.put(pop, mat); + } + + /** + * @return Returns the reproduction. + */ + public MatrixND getReproduction(Date date, Population pop) { + return this.reproductions.get(pop).get(date); + } + + /** + * @param reproduction The reproduction to set. + */ + public void setReproduction(Date date, Population pop, MatrixND repro) { + reproductions.get(pop).put(date, repro); + } + + /** + * Applique de la mortalite naturelle aux poissons qui sont pas encore + * dans les classes de populations. (Reproduction) + * @param pop + */ + public void applyReproductionMortality(Population pop) { + for (MatrixND reproduction : reproductions.get(pop).values()) { + if (log.isTraceEnabled()) { + log.trace("Matrix repro before mortality: " + reproduction); + } + + for (MatrixIterator mi = reproduction.iterator(); mi.next();) { + Object[] sems = mi.getSemanticsCoordinates(); + Zone z = (Zone) sems[0]; + double coeff = pop.getNaturalDeathBirth(z); + if (log.isTraceEnabled()) { + log.trace("NaturalDeath zone " + z + "=" + coeff); + } + mi.setValue(mi.getValue() * Math.exp(-coeff / Month.NUMBER_OF_MONTH)); + } + if (log.isTraceEnabled()) { + log.trace("Matrix repro after mortality: " + reproduction); + } + } + } + + /** + * @todo les reproductions qui sont trop veille pour encore servir + * doivent être supprimées. c-a-d date < currentDate - etalement - gap between repro recru + * Une autre facon de faire est de supprimer les repro == 0 car normalement + * toute la repro doit etre utilisé au bout d'un certain temps + * + * @param date + * @param pop + * @return + */ + public MatrixND getRecruitment(Date date, Population pop) { + MatrixND matEtalement = pop.getRecruitmentDistribution(); + int etalement = matEtalement.getDim(0); + + MatrixND result = MatrixFactory.getInstance().create( + new List[]{pop.getPopulationGroup(), pop.getPopulationZone()}); + + // pour chaque + for(int e=0; e<etalement; e++){ + // recuperation de la reproduction stucture en zone repro + Date d = new Date(date.getDate() - e - + pop.getMonthGapBetweenReproRecrutement()); + MatrixND repro = (MatrixND)reproductions.get(pop).get(d); + + if(repro != null){ // si une repro existe pour le mois + + // on fait la correspondance entre les zones repro et + // recrutement + + PopulationGroup classe; + int indiceClasse = 0; + // si on a change d'annee le recrutement ne se fait pas en + // classe 0 mais en classe 1, si on a change 2 fois d'annee + // le recrutement se fait en age 2, etc. + classe = pop.getPopulationGroup().get(indiceClasse); + + List<Zone> zoneRepros = pop.getReproductionZone(); + + // on multiplie la repro par le coeff de recrutement + double coeff = matEtalement.getValue(e); + + MatrixND matRepro = repro.copy(); + matRepro = matRepro.mults(coeff); + + matRepro.setSemantics(0, zoneRepros); + + MatrixND mapping = pop.getMappingZoneReproZoneRecru(); + for(Zone zoneRepro : zoneRepros){ + MatrixND submapping = mapping.getSubMatrix(0, new Object[]{zoneRepro}); + for (MatrixIterator i=submapping.iterator(); i.hasNext();) { + i.next(); + Object[] sem = i.getSemanticsCoordinates(); + Zone zoneRecru = (Zone)sem[1]; + double c = i.getValue(); + result.setValue(classe, zoneRecru, c*matRepro.getValue(zoneRepro) + +result.getValue(classe, zoneRecru)); + } + } + } + } + + if(pop.getSpecies().getAgeGroupType()){ + // conversion et retour de la matrice en vecteur + MatrixND N = pop.N2DToN1D(result); + // on applique les migrations et le changement d'age sur le resultat + // on suppose que la reproduction est toujours dans une seul saison + Date dateRepro = new Date(date.getDate() - + pop.getMonthGapBetweenReproRecrutement()); + + // recherche les saisons des differents mois entre les deux dates + List<PopulationSeasonInfo> infos = pop.getPopulationSeasonInfo(); + List<PopulationSeasonInfo> usedSeasons = new ArrayList<PopulationSeasonInfo>(); + + while (date.after(dateRepro)) { + dateRepro = dateRepro.next(); + Month month = dateRepro.getMonth(); + for (PopulationSeasonInfo info : infos) { + if (month.equals(info.getFirstMonth())) { + usedSeasons.add(info); + dateRepro = new Date(dateRepro.getDate() + info.getMonths().size() - 1); // -1 because, for have next() + break; + } + } + } + + for(PopulationSeasonInfo info : usedSeasons){ + Month month = info.getFirstMonth(); + MatrixND CA = info.getGroupChangeMatrix(month); + MatrixND MI = info.getMigrationMatrix(month, result); + MatrixND tmp0 = N.mult(CA); + MatrixND tmp2 = tmp0.mult(MI); + N = tmp2; + } + result = pop.split2D(N); + } + return result; + } + + /** + * @param catchPerStrategyMet + */ + public void holdCatch(Population pop, MatrixND catchPerStrategyMet) { + catchs.put(pop, catchPerStrategyMet); + + MatrixND holdCatch = holdCatchs.get(pop); + if (holdCatch == null) { + holdCatch = MatrixFactory.getInstance().create(catchPerStrategyMet); + holdCatchs.put(pop, holdCatch); + } else { + holdCatch.add(catchPerStrategyMet); + } + + // compute total + for(MatrixIterator i=catchPerStrategyMet.iterator(); i.next();){ + this.totalHoldCatch += i.getValue(); + } + + } + + /** + * @param pop + * @return + */ + public MatrixND getCatch(Population pop) { + MatrixND result = catchs.get(pop); + return result; + } + + /** + * @param pop + * @return + */ + public MatrixND getHoldCatch(Population pop) { + MatrixND result = holdCatchs.get(pop); + return result; + } + + /** + * @param pop + * @return + */ + public double getTotalHoldCatch(Population pop) { + double result = totalHoldCatch; + return result; + } + + /** + * raz capture cumulée de toutes les pops + */ + public void clearCatch() { + catchs.clear(); + holdCatchs.clear(); + totalHoldCatch = 0; + } + + /** + * @param date + * @param pop + * @return + */ + public MatrixND getDiscard(Date date, Population pop) { + MatrixND result = discards.get(pop).get(date); + return result; + } + + /** + * FIXME: discards n'est jamais vider, on le conserve pour toutes les annees + * il serait bon de faire un peu le menage de temps en temps. + * + * @param date + * @param pop + * @param discard + */ + public void addDiscard(Date date, Population pop, MatrixND discard) { + Map<Date, MatrixND> oneDiscard = discards.get(pop); + synchronized(oneDiscard) { + MatrixND tmp = oneDiscard.get(date); + if (tmp == null) { + tmp = discard.copy(); + discards.get(pop).put(date, tmp); + } else { + tmp.add(discard); + } + } + } +} + + Deleted: branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/simulator/PopulationMonitorMultiThread.java =================================================================== --- branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/simulator/PopulationMonitorMultiThread.java 2008-08-12 15:23:26 UTC (rev 1293) +++ branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/simulator/PopulationMonitorMultiThread.java 2008-08-12 15:23:29 UTC (rev 1294) @@ -1,399 +0,0 @@ -/* *##% - * Copyright (C) 2006 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * PopulationMonitor.java - * - * Created: 21 août 2006 15:41:18 - * - * @author poussin - * @version $Revision: 428 $ - * - * Last update: $Date: 2007-10-15 14:56:13 +0200 (lun, 15 oct 2007) $ - * by : $Author: bpoussin $ - */ - -package fr.ifremer.isisfish.simulator; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixIterator; -import org.codelutin.math.matrix.MatrixND; - -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.PopulationGroup; -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import fr.ifremer.isisfish.entities.Species; -import fr.ifremer.isisfish.entities.Zone; -import fr.ifremer.isisfish.types.Date; -import fr.ifremer.isisfish.types.Month; -import java.util.Collections; - - -/** - * Classe permettant le suivi des populations de la simulation. - * <p> - * Cette classe est normalement multi-thread safe - * <p> - * FIXME: certain calcul sont les memes que ceux implanter dans les scripts - * a cause du groupe des juveniles qui n'est pas un vrai groupe de population. - * Il serait bon que ce groupe deviennent un vrai groupe et que ce code specifique - * puisse etre supprimer. - * - * - * @author poussin - */ -public class PopulationMonitorMultiThread { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(PopulationMonitorMultiThread.class); - - /** La liste des pops monitorer par cette instance */ - protected List<Population> pops = null; - /** current number of fish by Pop */ - protected Map<Population, MatrixND> Ns = new HashMap<Population, MatrixND>(); - /** reproduction key: <date, pop> value:<MatrixND> */ - protected Map<Population, Map<Date, MatrixND>> reproductions = new HashMap<Population, Map<Date, MatrixND>>(); - /** discard key: <date, pop> value:<MatrixND> */ - protected Map<Population, Map<Date, MatrixND>> discards = new HashMap<Population, Map<Date, MatrixND>>(); - /** catch per population, only last catch is remaining */ - protected Map<Population, MatrixND> catchs = new HashMap<Population, MatrixND>(); - /** catch per population, only last catch is remaining */ - protected Map<Population, MatrixND> holdCatchs = new HashMap<Population, MatrixND>(); - protected double totalHoldCatch = 0; - - /** - * Initialise le monitor pour l'ensemble de pop passe en parametre. - * Normalement cet init est fait dans le thread principale de la simulation - * et il n'y a pas de besoin de le synchroniser. - * - * Cet init permet d'avoir ensuite le maxime de variable en lecture, et donc - * de permettre le multithreading de facon legere (pas de synchronise) et - * sur (pas de concurent modification exception) - * - * @param pops - */ - public void init(List<Population> pops) { - this.pops = Collections.unmodifiableList(new ArrayList<Population>(pops)); - for (Population pop : this.pops) { - reproductions.put(pop, new HashMap<Date, MatrixND>()); - discards.put(pop, new HashMap<Date, MatrixND>()); - } - } - - /** - * Return all population actualy in PopulationMonitor - * @return new list of Population - */ - public List<Population> getPopulations() { - return pops; - } - - /** - * Return current biomass for species - * @param species - * @return - */ - public double getBiomass(Species species) { - double result = 0; - - for (Population pop : species.getPopulation()) { - result += getBiomass(pop); - } - - return result; - } - - /** - * Return current biomass for population - * @param pop - * @return - */ - public double getBiomass(Population pop) { - double result = 0; - - MatrixND n = getN(pop); - if (n != null) { - n = n.sumOverDim(1); - for (MatrixIterator i=n.iterator(); i.next();){ - Object [] coord = i.getSemanticsCoordinates(); - PopulationGroup group = (PopulationGroup)coord[0]; - result += i.getValue() * group.getMeanWeight(); - } - } - - return result; - } - - /** - * Return current numbers for population - * @param pop - * @return - */ - public MatrixND getN(Population pop) { - MatrixND result = Ns.get(pop); - - if (result != null) { - // change semantics with list from argument to ensure that - // semantics don't used too old context - result.setSemantics(0, pop.getPopulationGroup()); - result.setSemantics(1, pop.getPopulationZone()); - } - - return result; - } - - public void setN(Population pop, MatrixND mat) { - Ns.put(pop, mat); - } - - /** - * @return Returns the reproduction. - */ - public MatrixND getReproduction(Date date, Population pop) { - return this.reproductions.get(pop).get(date); - } - - /** - * @param reproduction The reproduction to set. - */ - public void setReproduction(Date date, Population pop, MatrixND repro) { - reproductions.get(pop).put(date, repro); - } - - /** - * Applique de la mortalite naturelle aux poissons qui sont pas encore - * dans les classes de populations. (Reproduction) - * @param pop - */ - public void applyReproductionMortality(Population pop) { - for (MatrixND reproduction : reproductions.get(pop).values()) { - if (log.isTraceEnabled()) { - log.trace("Matrix repro before mortality: " + reproduction); - } - - for (MatrixIterator mi = reproduction.iterator(); mi.next();) { - Object[] sems = mi.getSemanticsCoordinates(); - Zone z = (Zone) sems[0]; - double coeff = pop.getNaturalDeathBirth(z); - if (log.isTraceEnabled()) { - log.trace("NaturalDeath zone " + z + "=" + coeff); - } - mi.setValue(mi.getValue() * Math.exp(-coeff / Month.NUMBER_OF_MONTH)); - } - if (log.isTraceEnabled()) { - log.trace("Matrix repro after mortality: " + reproduction); - } - } - } - - /** - * @todo les reproductions qui sont trop veille pour encore servir - * doivent être supprimées. c-a-d date < currentDate - etalement - gap between repro recru - * Une autre facon de faire est de supprimer les repro == 0 car normalement - * toute la repro doit etre utilisé au bout d'un certain temps - * - * @param date - * @param pop - * @return - */ - public MatrixND getRecruitment(Date date, Population pop) { - MatrixND matEtalement = pop.getRecruitmentDistribution(); - int etalement = matEtalement.getDim(0); - - MatrixND result = MatrixFactory.getInstance().create( - new List[]{pop.getPopulationGroup(), pop.getPopulationZone()}); - - // pour chaque - for(int e=0; e<etalement; e++){ - // recuperation de la reproduction stucture en zone repro - Date d = new Date(date.getDate() - e - - pop.getMonthGapBetweenReproRecrutement()); - MatrixND repro = (MatrixND)reproductions.get(pop).get(d); - - if(repro != null){ // si une repro existe pour le mois - - // on fait la correspondance entre les zones repro et - // recrutement - - PopulationGroup classe; - int indiceClasse = 0; - // si on a change d'annee le recrutement ne se fait pas en - // classe 0 mais en classe 1, si on a change 2 fois d'annee - // le recrutement se fait en age 2, etc. - classe = pop.getPopulationGroup().get(indiceClasse); - - List<Zone> zoneRepros = pop.getReproductionZone(); - - // on multiplie la repro par le coeff de recrutement - double coeff = matEtalement.getValue(e); - - MatrixND matRepro = repro.copy(); - matRepro = matRepro.mults(coeff); - - matRepro.setSemantics(0, zoneRepros); - - MatrixND mapping = pop.getMappingZoneReproZoneRecru(); - for(Zone zoneRepro : zoneRepros){ - MatrixND submapping = mapping.getSubMatrix(0, new Object[]{zoneRepro}); - for (MatrixIterator i=submapping.iterator(); i.hasNext();) { - i.next(); - Object[] sem = i.getSemanticsCoordinates(); - Zone zoneRecru = (Zone)sem[1]; - double c = i.getValue(); - result.setValue(classe, zoneRecru, c*matRepro.getValue(zoneRepro) - +result.getValue(classe, zoneRecru)); - } - } - } - } - - if(pop.getSpecies().getAgeGroupType()){ - // conversion et retour de la matrice en vecteur - MatrixND N = pop.N2DToN1D(result); - // on applique les migrations et le changement d'age sur le resultat - // on suppose que la reproduction est toujours dans une seul saison - Date dateRepro = new Date(date.getDate() - - pop.getMonthGapBetweenReproRecrutement()); - - // recherche les saisons des differents mois entre les deux dates - List<PopulationSeasonInfo> infos = pop.getPopulationSeasonInfo(); - List<PopulationSeasonInfo> usedSeasons = new ArrayList<PopulationSeasonInfo>(); - - while (date.after(dateRepro)) { - dateRepro = dateRepro.next(); - Month month = dateRepro.getMonth(); - for (PopulationSeasonInfo info : infos) { - if (month.equals(info.getFirstMonth())) { - usedSeasons.add(info); - dateRepro = new Date(dateRepro.getDate() + info.getMonths().size() - 1); // -1 because, for have next() - break; - } - } - } - - for(PopulationSeasonInfo info : usedSeasons){ - Month month = info.getFirstMonth(); - MatrixND CA = info.getGroupChangeMatrix(month); - MatrixND MI = info.getMigrationMatrix(month, result); - MatrixND tmp0 = N.mult(CA); - MatrixND tmp2 = tmp0.mult(MI); - N = tmp2; - } - result = pop.split2D(N); - } - return result; - } - - /** - * @param catchPerStrategyMet - */ - public void holdCatch(Population pop, MatrixND catchPerStrategyMet) { - catchs.put(pop, catchPerStrategyMet); - - MatrixND holdCatch = holdCatchs.get(pop); - if (holdCatch == null) { - holdCatch = MatrixFactory.getInstance().create(catchPerStrategyMet); - holdCatchs.put(pop, holdCatch); - } else { - holdCatch.add(catchPerStrategyMet); - } - - // compute total - for(MatrixIterator i=catchPerStrategyMet.iterator(); i.next();){ - this.totalHoldCatch += i.getValue(); - } - - } - - /** - * @param pop - * @return - */ - public MatrixND getCatch(Population pop) { - MatrixND result = catchs.get(pop); - return result; - } - - /** - * @param pop - * @return - */ - public MatrixND getHoldCatch(Population pop) { - MatrixND result = holdCatchs.get(pop); - return result; - } - - /** - * @param pop - * @return - */ - public double getTotalHoldCatch(Population pop) { - double result = totalHoldCatch; - return result; - } - - /** - * raz capture cumulée de toutes les pops - */ - public void clearCatch() { - catchs.clear(); - holdCatchs.clear(); - totalHoldCatch = 0; - } - - /** - * @param date - * @param pop - * @return - */ - public MatrixND getDiscard(Date date, Population pop) { - MatrixND result = discards.get(pop).get(date); - return result; - } - - /** - * FIXME: discards n'est jamais vider, on le conserve pour toutes les annees - * il serait bon de faire un peu le menage de temps en temps. - * - * @param date - * @param pop - * @param discard - */ - public void addDiscard(Date date, Population pop, MatrixND discard) { - Map<Date, MatrixND> oneDiscard = discards.get(pop); - synchronized(oneDiscard) { - MatrixND tmp = oneDiscard.get(date); - if (tmp == null) { - tmp = discard.copy(); - discards.get(pop).put(date, tmp); - } else { - tmp.add(discard); - } - } - } -} - - Modified: branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/simulator/SimulationManager.java =================================================================== --- branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/simulator/SimulationManager.java 2008-08-12 15:23:26 UTC (rev 1293) +++ branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/simulator/SimulationManager.java 2008-08-12 15:23:29 UTC (rev 1294) @@ -67,7 +67,7 @@ static protected SimulationManager instance = null; -// protected boolean autoLaunch = false; + protected boolean autoLaunch = false; protected ListenerSet<SimulationQueueListener> listeners = new ListenerSet<SimulationQueueListener>(); protected PropertyChangeSupport propertyListeners = new PropertyChangeSupport(this); @@ -122,12 +122,12 @@ } -// /** -// * @return Returns the autoLaunch. -// */ -// public boolean isAutoLaunch() { -// return this.autoLaunch; -// } + /** + * @return Returns the autoLaunch. + */ + public boolean isAutoLaunch() { + return this.autoLaunch; + } public void addPropertyChangeListener(PropertyChangeListener listener) { propertyListeners.addPropertyChangeListener(listener); @@ -145,15 +145,32 @@ propertyListeners.removePropertyChangeListener(propertyName, listener); } -// /** -// * @param autoLaunch The autoLaunch to set. -// */ -// public void setAutoLaunch(boolean autoLaunch) { -// boolean oldValue = this.autoLaunch; -// this.autoLaunch = autoLaunch; -// propertyListeners.firePropertyChange("autoLaunch", oldValue, autoLaunch); -// } + /** + * @param autoLaunch The autoLaunch to set. + */ + public void setAutoLaunch(boolean autoLaunch) { + synchronized (this) { + boolean oldValue = this.autoLaunch; + this.autoLaunch = autoLaunch; + if (this.autoLaunch) { + this.notifyAll(); + } + propertyListeners.firePropertyChange("autoLaunch", oldValue, autoLaunch); + } + } + public void waitAutoLaunch() { + synchronized(this) { + while (!isAutoLaunch()) { + try { + this.wait(); + } catch (InterruptedException eee) { + log.warn("Error during wait autoLaunch flag", eee); + } + } + } + } + /** * Cree l'objet de gestion de la simulation en interne et le place dans la * bonne queue de simulation (local/remote). Appel le @@ -632,6 +649,7 @@ } public void run() { + simulationManager.waitAutoLaunch(); // l'item est independant, on ajoute toutes ces simulations en plus // mais pas dans la map pour qu'il n'y ait bien que l'initiale // plus celles en cours d'affichees @@ -671,6 +689,7 @@ } public void run() { + simulationManager.waitAutoLaunch(); try { // si l'simItem exist encore (que l'utilisateur ne la pas retire) while (simulationManager.exists(simItem.getPlanIdOrId()) && Modified: branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/ui/simulator/SimulatorListeners.java =================================================================== --- branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/ui/simulator/SimulatorListeners.java 2008-08-12 15:23:26 UTC (rev 1293) +++ branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/ui/simulator/SimulatorListeners.java 2008-08-12 15:23:29 UTC (rev 1294) @@ -115,10 +115,8 @@ * <code>false</code> otherwise */ public static boolean isSimulStartButtonEnabled(JTable table) { - return false; - // L'auto launche a disparu maintenant -// return !SimulationManager.getInstance().isAutoLaunch() && -// (table.getRowCount() > 0); + return !SimulationManager.getInstance().isAutoLaunch() && + (table.getRowCount() > 0); } /** Modified: branches/isis-fish-3.1.4/src/xmi/isis-fish.zargo =================================================================== (Binary files differ)
participants (1)
-
bpoussin＠users.labs.libre-entreprise.org