July 2014 - Isis-fish-commits - mailman.cloud.codelutin.com

r4064 - trunk/src/main/java/fr/ifremer/isisfish/entities
by bpoussin＠users.forge.codelutin.com July 24, 2014

July 24, 2014

Author: bpoussin Date: 2014-07-24 16:16:32 +0200 (Thu, 24 Jul 2014) New Revision: 4064 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4064 Log: prevent old metier in list Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2014-07-24 12:41:06 UTC (rev 4063) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2014-07-24 14:16:32 UTC (rev 4064) @@ -73,7 +73,7 @@ @Override public List<Metier> getMetierWithProportion() { - MatrixND mat = super.getProportionMetier(); + MatrixND mat = getProportionMetier(); List<Metier> result; if (mat == null) { result = Collections.EMPTY_LIST;

1 0

r4063 - trunk/src/main/java/fr/ifremer/isisfish/simulator
by echatellier＠users.forge.codelutin.com July 24, 2014

July 24, 2014

Author: echatellier Date: 2014-07-24 14:41:06 +0200 (Thu, 24 Jul 2014) New Revision: 4063 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4063 Log: Add necessary stuff on SimulationContext to delete to TopiaContext and remove use of TopiaContext in user scripts Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2014-07-24 09:26:29 UTC (rev 4062) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2014-07-24 12:41:06 UTC (rev 4063) @@ -26,6 +26,8 @@ package fr.ifremer.isisfish.simulator; import fr.ifremer.isisfish.IsisFish; +import fr.ifremer.isisfish.IsisFishDAOHelper; + import java.io.File; import java.util.HashMap; import java.util.LinkedHashSet; @@ -39,11 +41,14 @@ import org.nuiton.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityUtils; import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.IsisCache; + import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; + import org.nuiton.config.ApplicationConfig; import org.nuiton.config.OverwriteApplicationConfig; import org.nuiton.math.matrix.MatrixFactory; @@ -540,4 +545,301 @@ } return v; } + + /** + * Rollback region database transaction. + * + * @throws TopiaException + * @since 4.3.1.0 + */ + public void rollbackRuleChanges() throws TopiaException { + TopiaContext tx = getDB(); + tx.rollbackTransaction(); + } + + /** + * Commit result storage transaction. + * + * @throws TopiaException + * @since 4.3.1.0 + */ + public void commitResults() throws TopiaException { + TopiaContext tx = getDbResult(); + tx.commitTransaction(); + } + + /** + * Get {@link ActiveRuleDAO} on region database. + * + * @return ActiveRuleDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public ActiveRuleDAO getActiveRuleDAO() throws TopiaException { + return IsisFishDAOHelper.getActiveRuleDAO(getDB()); + } + + /** + * Get {@link CellDAO} on region database. + * + * @return CellDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public CellDAO getCellDAO() throws TopiaException { + return IsisFishDAOHelper.getCellDAO(getDB()); + } + + /** + * Get {@link EffortDescriptionDAO} on region database. + * + * @return EffortDescriptionDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public EffortDescriptionDAO getEffortDescriptionDAO() throws TopiaException { + return IsisFishDAOHelper.getEffortDescriptionDAO(getDB()); + } + + /** + * Get {@link EquationDAO} on region database. + * + * @return EquationDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public EquationDAO getEquationDAO() throws TopiaException { + return IsisFishDAOHelper.getEquationDAO(getDB()); + } + + /** + * Get {@link FisheryRegionDAO} on region database. + * + * @return FisheryRegionDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public FisheryRegionDAO getFisheryRegionDAO() throws TopiaException { + return IsisFishDAOHelper.getFisheryRegionDAO(getDB()); + } + + /** + * Get {@link GearDAO} on region database. + * + * @return GearDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public GearDAO getGearDAO() throws TopiaException { + return IsisFishDAOHelper.getGearDAO(getDB()); + } + + /** + * Get {@link MetierDAO} on region database. + * + * @return MetierDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public MetierDAO getMetierDAO() throws TopiaException { + return IsisFishDAOHelper.getMetierDAO(getDB()); + } + + /** + * Get {@link MetierSeasonInfoDAO} on region database. + * + * @return MetierSeasonInfoDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public MetierSeasonInfoDAO getMetierSeasonInfoDAO() throws TopiaException { + return IsisFishDAOHelper.getMetierSeasonInfoDAO(getDB()); + } + + /** + * Get {@link ObservationDAO} on region database. + * + * @return ObservationDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public ObservationDAO getObservationDAO() throws TopiaException { + return IsisFishDAOHelper.getObservationDAO(getDB()); + } + + /** + * Get {@link PopulationDAO} on region database. + * + * @return PopulationDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public PopulationDAO getPopulationDAO() throws TopiaException { + return IsisFishDAOHelper.getPopulationDAO(getDB()); + } + + /** + * Get {@link PopulationGroupDAO} on region database. + * + * @return PopulationGroupDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public PopulationGroupDAO getPopulationGroupDAO() throws TopiaException { + return IsisFishDAOHelper.getPopulationGroupDAO(getDB()); + } + + /** + * Get {@link PopulationSeasonInfoDAO} on region database. + * + * @return PopulationSeasonInfoDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public PopulationSeasonInfoDAO getPopulationSeasonInfoDAO() throws TopiaException { + return IsisFishDAOHelper.getPopulationSeasonInfoDAO(getDB()); + } + + /** + * Get {@link PortDAO} on region database. + * + * @return PortDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public PortDAO getPortDAO() throws TopiaException { + return IsisFishDAOHelper.getPortDAO(getDB()); + } + + /** + * Get {@link ResultDAO} on region database. + * + * @return ResultDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public ResultDAO getResultDAO() throws TopiaException { + return IsisFishDAOHelper.getResultDAO(getDB()); + } + + /** + * Get {@link SeasonDAO} on region database. + * + * @return SeasonDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public SeasonDAO getSeasonDAO() throws TopiaException { + return IsisFishDAOHelper.getSeasonDAO(getDB()); + } + + /** + * Get {@link SelectivityDAO} on region database. + * + * @return SelectivityDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public SelectivityDAO getSelectivityDAO() throws TopiaException { + return IsisFishDAOHelper.getSelectivityDAO(getDB()); + } + + /** + * Get {@link SetOfVesselsDAO} on region database. + * + * @return SetOfVesselsDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public SetOfVesselsDAO getSetOfVesselsDAO() throws TopiaException { + return IsisFishDAOHelper.getSetOfVesselsDAO(getDB()); + } + + /** + * Get {@link SpeciesDAO} on region database. + * + * @return SpeciesDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public SpeciesDAO getSpeciesDAO() throws TopiaException { + return IsisFishDAOHelper.getSpeciesDAO(getDB()); + } + + /** + * Get {@link StrategyDAO} on region database. + * + * @return StrategyDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public StrategyDAO getStrategyDAO() throws TopiaException { + return IsisFishDAOHelper.getStrategyDAO(getDB()); + } + + /** + * Get {@link StrategyMonthInfoDAO} on region database. + * + * @return StrategyMonthInfoDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public StrategyMonthInfoDAO getStrategyMonthInfoDAO() throws TopiaException { + return IsisFishDAOHelper.getStrategyMonthInfoDAO(getDB()); + } + + /** + * Get {@link TargetSpeciesDAO} on region database. + * + * @return TargetSpeciesDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public TargetSpeciesDAO getTargetSpeciesDAO() throws TopiaException { + return IsisFishDAOHelper.getTargetSpeciesDAO(getDB()); + } + + /** + * Get {@link TripTypeDAO} on region database. + * + * @return TripTypeDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public TripTypeDAO getTripTypeDAO() throws TopiaException { + return IsisFishDAOHelper.getTripTypeDAO(getDB()); + } + + /** + * Get {@link VariableDAO} on region database. + * + * @return VariableDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public VariableDAO getVariableDAO() throws TopiaException { + return IsisFishDAOHelper.getVariableDAO(getDB()); + } + + /** + * Get {@link VesselTypeDAO} on region database. + * + * @return VesselTypeDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public VesselTypeDAO getVesselTypeDAO() throws TopiaException { + return IsisFishDAOHelper.getVesselTypeDAO(getDB()); + } + + /** + * Get {@link ZoneDAO} on region database. + * + * @return ZoneDAO + * @throws TopiaException + * @since 4.3.1.0 + */ + public ZoneDAO getZoneDAO() throws TopiaException { + return IsisFishDAOHelper.getZoneDAO(getDB()); + } }

1 0

r4062 - trunk/src/main/java/fr/ifremer/isisfish/simulator
by bpoussin＠users.forge.codelutin.com July 24, 2014

July 24, 2014

Author: bpoussin Date: 2014-07-24 11:26:29 +0200 (Thu, 24 Jul 2014) New Revision: 4062 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4062 Log: - if script is not found just log warn (prevent NPE) - use SimulationParameterPropertiesHelper.toString for toString Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2014-07-24 09:13:47 UTC (rev 4061) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2014-07-24 09:26:29 UTC (rev 4062) @@ -534,7 +534,7 @@ getRegion().getStorage(), plan, propertiesParameters, "plan"); simulationPlans.add(plan); } - } catch (IsisFishException eee) { + } catch (Exception eee) { if (log.isWarnEnabled()) { log.warn("Can't find plan: " + name, eee); } @@ -631,7 +631,7 @@ Rule rule = RuleStorage.getRule(name).getNewInstance(); RuleHelper.populateRule(ruleIndex++, tx, rule, propertiesParameters); rules.add(rule); - } catch (IsisFishException eee) { + } catch (Exception eee) { if (log.isWarnEnabled()) { log.warn("Can't find rule: " + name, eee); } @@ -797,7 +797,7 @@ // 0 = only single sensitivity StorageHelper.populateStorageParams(0, getRegion().getStorage(), sensitivityAnalysis, propertiesParameters, "sensitivity"); - } catch (IsisFishException eee) { + } catch (Exception eee) { sensitivityAnalysis = null; if (log.isWarnEnabled()) { log.warn("Can't find sensitivity: " + sensitivityAnalysis, eee); @@ -857,7 +857,7 @@ propertiesParameters); sensitivityExports.add(sensitivityExport); } - } catch (IsisFishException eee) { + } catch (Exception eee) { if (log.isWarnEnabled()) { log.warn("Can't find SensitivityExport: " + name, eee); } @@ -956,7 +956,7 @@ // 0 = only single objective StorageHelper.populateStorageParams(0, getRegion().getStorage(), objective, propertiesParameters, "objective"); - } catch (IsisFishException eee) { + } catch (Exception eee) { objective = null; if (log.isWarnEnabled()) { log.warn("Can't find objective: " + objective, eee); @@ -1007,7 +1007,7 @@ observation = (Observation)beanUtils.convert(observationId, TopiaEntity.class); } optimizationExportsObservations.put(export, observation); - } catch (IsisFishException eee) { + } catch (Exception eee) { if (log.isWarnEnabled()) { log.warn("Can't find rule: " + name, eee); } @@ -1603,157 +1603,8 @@ */ @Override public String toString() { - StringBuilder result = new StringBuilder(); - result.append( - t("isisfish.params.toString.simulation.done", - getIsisFishVersion())).append('\n'); - result.append("--------------------\n"); - result.append(getDescription()).append('\n'); - result.append("--------------------\n"); - - if (getUseSimulationPlan()) { - result.append(t("isisfish.params.toString.plan.number", - getSimulationPlanNumber())); - } - - if (getUseCache()) { - result.append(t("isisfish.params.toString.use.cache", - getUseCache())); - } - - RegionStorage region = getRegion(); - result.append(t("isisfish.params.toString.fishery", region.getName())); - result.append(t("isisfish.params.toString.number.years", - getNumberOfYear())); - - // startegies - List<Strategy> strs = getStrategies(); - result.append(t("isisfish.params.toString.strategies")); - String sep = ""; - for (Strategy str : strs) { - result.append(sep).append(str.getName()); - sep = ","; - } - result.append("\n\n"); - - // populations - result.append(t("isisfish.params.toString.populations")); - sep = ""; - for (Population pop : getPopulations()) { - result.append(sep).append(pop.getName()); - sep = ","; - } - result.append("\n\n"); - - // rules - for (Rule rule : getRules()) { - String name = RuleStorage.getName(rule); - String param = ""; - try { - param = RuleStorage.getParamAsString(rule); - } catch (IsisFishException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't convert rule parameter to string for " - + name, eee); - } - } - result.append(t("isisfish.params.toString.rule", name)); - result.append('\n'); - result.append(param); - result.append("\n"); - - } - result.append("\n\n"); - - // simulation plans - for (SimulationPlan plan : getSimulationPlans()) { - String name = SimulationPlanStorage.getName(plan); - String param = ""; - try { - param = SimulationPlanStorage.getParamAsString(plan); - } catch (IsisFishException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't convert plan parameter to string for " - + name, eee); - } - } - result.append(t("isisfish.params.toString.plan", name)); - result.append('\n'); - result.append(param); - result.append('\n'); - - } - - if (getUseOptimization()) { - result.append(t("isisfish.params.toString.use.optimization", - getUseOptimization())); - } - if (objective != null) { - String name = ObjectiveStorage.getName(objective); - String param = ""; - try { - param = ObjectiveStorage.getParamAsString(objective); - } catch (IsisFishException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't convert objective parameter to string for " - + name, eee); - } - } - result.append(t("isisfish.params.toString.objective", name)); - result.append('\n'); - result.append(param); - result.append('\n'); - } - - if (optimization != null) { - String name = OptimizationStorage.getName(optimization); - String param = ""; - try { - param = OptimizationStorage.getParamAsString(optimization); - } catch (IsisFishException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't convert optimization parameter to string for " - + name, eee); - } - } - result.append(t("isisfish.params.toString.optimization", name)); - result.append('\n'); - result.append(param); - result.append('\n'); - } - - for (Map.Entry<Export, Observation> exportObservationEntry : getOptimizationExportsObservations().entrySet()) { - Export export = exportObservationEntry.getKey(); - Observation observation = exportObservationEntry.getValue(); - - String name = ExportStorage.getName(export); - result.append(t("isisfish.params.toString.optimizationExport", name)); - result.append('\n'); - if (observation != null) { - result.append(t("isisfish.params.toString.optimizationObservation", observation.getName())); - result.append('\n'); - } - } - - result.append('\n'); - result.append(t("isisfish.params.toString.script.generatedpresimulation")) - .append(":\n"); - result.append(getGeneratedPreScript()); - result.append('\n'); - result.append(t("isisfish.params.toString.script.presimulation")) - .append(":\n"); - result.append(getPreScript()); - result.append('\n'); - result.append(t("isisfish.params.toString.simul.logger.level", - getSimulLogLevel())); - result.append('\n'); - result.append(t("isisfish.params.toString.script.logger.level", - getScriptLogLevel())); - result.append('\n'); - result.append(t("isisfish.params.toString.lib.logger.level", - getLibLogLevel())); - result.append('\n'); - return result.toString(); + Properties prop = toProperties(); + return SimulationParameterPropertiesHelper.toString(prop); } /*

1 0

r4061 - trunk/src/main/java/fr/ifremer/isisfish/ui/widget
by echatellier＠users.forge.codelutin.com July 24, 2014

July 24, 2014

Author: echatellier Date: 2014-07-24 11:13:47 +0200 (Thu, 24 Jul 2014) New Revision: 4061 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4061 Log: fixes #5389: Correction d'un probl?\195?\168me de concurrence de thread Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2014-07-24 08:04:16 UTC (rev 4060) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2014-07-24 09:13:47 UTC (rev 4061) @@ -125,13 +125,14 @@ } // filter list - realIndexes.clear(); + List<Integer> newRealIndexes = new ArrayList<Integer>(); for (int i = 0; i < model.getSize(); ++i) { Object element = model.getElementAt(i); if (element.toString().contains(filterField.getText())) { - realIndexes.add(i); + newRealIndexes.add(i); } } + realIndexes = newRealIndexes; // prevent thread concurrency fireIntervalRemoved(this, 0, model.getSize()); fireIntervalAdded(this, 0, realIndexes.size());

1 0

r4060 - trunk
by echatellier＠users.forge.codelutin.com July 24, 2014

July 24, 2014

Author: echatellier Date: 2014-07-24 10:04:16 +0200 (Thu, 24 Jul 2014) New Revision: 4060 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4060 Log: Update libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-23 07:52:41 UTC (rev 4059) +++ trunk/pom.xml 2014-07-24 08:04:16 UTC (rev 4060) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.9</version> + <version>5.1</version> </parent> <groupId>fr.ifremer</groupId> @@ -486,7 +486,7 @@ <eugeneVersion>2.7.4</eugeneVersion> <topiaVersion>2.9.1</topiaVersion> <hibernateVersion>4.3.6.Final</hibernateVersion> - <nuitonI18nVersion>3.1</nuitonI18nVersion> + <nuitonI18nVersion>3.2</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> <redmine.releaseFiles>target/isis-fish-${project.version}-bin.zip</redmine.releaseFiles>

1 0

r4059 - trunk
by echatellier＠users.forge.codelutin.com July 23, 2014

July 23, 2014

Author: echatellier Date: 2014-07-23 09:52:41 +0200 (Wed, 23 Jul 2014) New Revision: 4059 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4059 Log: Update commons-logging (fix ThreadContext introspection) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-23 07:51:53 UTC (rev 4058) +++ trunk/pom.xml 2014-07-23 07:52:41 UTC (rev 4059) @@ -215,6 +215,7 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> + <version>1.2</version> </dependency> <dependency>

1 0

r4058 - trunk/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com July 23, 2014

July 23, 2014

Author: echatellier Date: 2014-07-23 09:51:53 +0200 (Wed, 23 Jul 2014) New Revision: 4058 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4058 Log: Fix removal of 'Zones' translation. Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-07-22 21:00:31 UTC (rev 4057) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-07-23 07:51:53 UTC (rev 4058) @@ -69,7 +69,7 @@ Use\ branches,\ switch\ not\ needed= User\ restart\ simulation\ %s= User\ stop\ simulation\ %s= -Zones= +Zones=Zones an\ alternative\ way\ to\ specify\ the\ scale.= could\ not\ close\ reader\ %1$s=could not close reader %1$s could\ not\ found\ %s= @@ -531,7 +531,7 @@ isisfish.input.tree.strategies=Strategies isisfish.input.tree.triptypes=Trip types isisfish.input.tree.vesseltypes=Vessel types -isisfish.input.tree.zones= +isisfish.input.tree.zones=Zones isisfish.launch.anonymous=read only isisfish.launch.email=email isisfish.launch.firstname=firstname @@ -729,7 +729,7 @@ isisfish.population.recruitment=Recruitment isisfish.population.reproduction=Reproduction isisfish.population.season=Season -isisfish.population.zones= +isisfish.population.zones=Zones isisfish.populationBasics.confirmCreateGroups=Warning, running groups creation wizard will delete all existing groups and objects which depend on it.\nDo you want to re-create groups ? isisfish.populationBasics.geographicID=Geographic identifier isisfish.populationBasics.groupMax=Max group @@ -808,7 +808,7 @@ isisfish.populationZones.selectPopulationAreas=Select the population areas isisfish.populationZones.selectRecruitmentAreas=Select the recruitment areas isisfish.populationZones.selectSpawningAreas=Select the spawning areas -isisfish.populationZones.title= +isisfish.populationZones.title=Zones isisfish.port.cell=Port cell isisfish.port.comments=Comments isisfish.port.name=Name Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-07-22 21:00:31 UTC (rev 4057) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-07-23 07:51:53 UTC (rev 4058) @@ -69,7 +69,7 @@ Use\ branches,\ switch\ not\ needed= User\ restart\ simulation\ %s= User\ stop\ simulation\ %s= -Zones= +Zones=Zones an\ alternative\ way\ to\ specify\ the\ scale.= could\ not\ close\ reader\ %1$s=could not close reader %1$s could\ not\ found\ %s= @@ -531,7 +531,7 @@ isisfish.input.tree.strategies=Stratégies isisfish.input.tree.triptypes=Types de marée isisfish.input.tree.vesseltypes=Types de navire -isisfish.input.tree.zones= +isisfish.input.tree.zones=Zones isisfish.launch.anonymous=lecture seule isisfish.launch.email=courriel isisfish.launch.firstname=nom @@ -724,7 +724,7 @@ isisfish.population.recruitment=Recrutement isisfish.population.reproduction=Reproduction isisfish.population.season=Saison -isisfish.population.zones= +isisfish.population.zones=Zones isisfish.populationBasics.confirmCreateGroups=Attention, la re-création des groupes supprimera les groupes existants et tous les objets qui en dépendent.\nÊtes vous sur de vouloir re-créer les groupes ? isisfish.populationBasics.geographicID=Identifiant géographique isisfish.populationBasics.groupMax=Group max @@ -803,7 +803,7 @@ isisfish.populationZones.selectPopulationAreas=Sélectionnez les zones des populations isisfish.populationZones.selectRecruitmentAreas=Sélectionnez les zones de recrutement isisfish.populationZones.selectSpawningAreas=Sélectionnez les zones de reproduction -isisfish.populationZones.title= +isisfish.populationZones.title=Zones isisfish.port.cell=Maille du port isisfish.port.comments=Commentaires isisfish.port.name=Nom

1 0

r4057 - in trunk/src/main: java/fr/ifremer/isisfish/simulator resources/i18n
by bpoussin＠users.forge.codelutin.com July 22, 2014

July 22, 2014

Author: bpoussin Date: 2014-07-22 23:00:31 +0200 (Tue, 22 Jul 2014) New Revision: 4057 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4057 Log: catch Exception to prevent NPE if optimisation class doesn't exist localy Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2014-07-22 20:30:17 UTC (rev 4056) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2014-07-22 21:00:31 UTC (rev 4057) @@ -903,7 +903,7 @@ // 0 = only single optimization StorageHelper.populateStorageParams(0, getRegion().getStorage(), optimization, propertiesParameters, "optimization"); - } catch (IsisFishException eee) { + } catch (Exception eee) { optimization = null; if (log.isWarnEnabled()) { log.warn("Can't find optimization: " + optimization, eee); Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-07-22 20:30:17 UTC (rev 4056) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-07-22 21:00:31 UTC (rev 4057) @@ -531,7 +531,7 @@ isisfish.input.tree.strategies=Strategies isisfish.input.tree.triptypes=Trip types isisfish.input.tree.vesseltypes=Vessel types -isisfish.input.tree.zones=Zones +isisfish.input.tree.zones= isisfish.launch.anonymous=read only isisfish.launch.email=email isisfish.launch.firstname=firstname @@ -729,7 +729,7 @@ isisfish.population.recruitment=Recruitment isisfish.population.reproduction=Reproduction isisfish.population.season=Season -isisfish.population.zones=Zones +isisfish.population.zones= isisfish.populationBasics.confirmCreateGroups=Warning, running groups creation wizard will delete all existing groups and objects which depend on it.\nDo you want to re-create groups ? isisfish.populationBasics.geographicID=Geographic identifier isisfish.populationBasics.groupMax=Max group @@ -808,7 +808,7 @@ isisfish.populationZones.selectPopulationAreas=Select the population areas isisfish.populationZones.selectRecruitmentAreas=Select the recruitment areas isisfish.populationZones.selectSpawningAreas=Select the spawning areas -isisfish.populationZones.title=Zones +isisfish.populationZones.title= isisfish.port.cell=Port cell isisfish.port.comments=Comments isisfish.port.name=Name Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-07-22 20:30:17 UTC (rev 4056) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-07-22 21:00:31 UTC (rev 4057) @@ -531,7 +531,7 @@ isisfish.input.tree.strategies=Stratégies isisfish.input.tree.triptypes=Types de marée isisfish.input.tree.vesseltypes=Types de navire -isisfish.input.tree.zones=Zones +isisfish.input.tree.zones= isisfish.launch.anonymous=lecture seule isisfish.launch.email=courriel isisfish.launch.firstname=nom @@ -724,7 +724,7 @@ isisfish.population.recruitment=Recrutement isisfish.population.reproduction=Reproduction isisfish.population.season=Saison -isisfish.population.zones=Zones +isisfish.population.zones= isisfish.populationBasics.confirmCreateGroups=Attention, la re-création des groupes supprimera les groupes existants et tous les objets qui en dépendent.\nÊtes vous sur de vouloir re-créer les groupes ? isisfish.populationBasics.geographicID=Identifiant géographique isisfish.populationBasics.groupMax=Group max @@ -803,7 +803,7 @@ isisfish.populationZones.selectPopulationAreas=Sélectionnez les zones des populations isisfish.populationZones.selectRecruitmentAreas=Sélectionnez les zones de recrutement isisfish.populationZones.selectSpawningAreas=Sélectionnez les zones de reproduction -isisfish.populationZones.title=Zones +isisfish.populationZones.title= isisfish.port.cell=Maille du port isisfish.port.comments=Commentaires isisfish.port.name=Nom

1 0

r4056 - trunk/src/main/java/fr/ifremer/isisfish/simulator
by bpoussin＠users.forge.codelutin.com July 22, 2014

July 22, 2014

Author: bpoussin Date: 2014-07-22 22:30:17 +0200 (Tue, 22 Jul 2014) New Revision: 4056 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4056 Log: bug fixes in getDiscard now return discard, before return all time null :( (error between getValue and getKey :() Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2014-07-22 20:02:09 UTC (rev 4055) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2014-07-22 20:30:17 UTC (rev 4056) @@ -333,14 +333,14 @@ MatrixND holdCatch = holdCatchs.get(pop); if (holdCatch == null) { - holdCatch = MatrixFactory.getInstance().create(catchPerStrategyMet); + holdCatch = catchPerStrategyMet.copy(); holdCatchs.put(pop, holdCatch); } else { holdCatch.add(catchPerStrategyMet); } // compute total - for (MatrixIterator i = catchPerStrategyMet.iterator(); i.next();) { + for (MatrixIterator i = catchPerStrategyMet.iteratorNotZero(); i.next();) { this.totalHoldCatch += i.getValue(); } // this.totalHoldCatch += catchPerStrategyMet.sumAll(); @@ -402,7 +402,7 @@ // seul le discard de l'annee en cours est disponible, sinon on doit // aller le chercher dans les resultats Map.Entry<TimeStep, MatrixND> discard = discards.get(pop); - if (discard != null && discard.getValue().equals(step)) { + if (discard != null && discard.getKey().equals(step)) { result = discard.getValue(); } return result;

1 0

r4055 - trunk/src/main/java/fr/ifremer/isisfish/util
by bpoussin＠users.forge.codelutin.com July 22, 2014

July 22, 2014

Author: bpoussin Date: 2014-07-22 22:02:09 +0200 (Tue, 22 Jul 2014) New Revision: 4055 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4055 Log: change mark size to 2, 1 doesn't work when file is created under windows (when EOF is reached mark fail with 1) Modified: trunk/src/main/java/fr/ifremer/isisfish/util/SimpleParser.java Modified: trunk/src/main/java/fr/ifremer/isisfish/util/SimpleParser.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/SimpleParser.java 2014-07-22 19:54:22 UTC (rev 4054) +++ trunk/src/main/java/fr/ifremer/isisfish/util/SimpleParser.java 2014-07-22 20:02:09 UTC (rev 4055) @@ -43,6 +43,9 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(SimpleParser.class); + // MARK_SIZE = 1 doesn't work when EOF is reached + static final private int MARK_SIZE = 2; + protected boolean intern; protected BufferedReader in; protected StringBuilder sb = new StringBuilder(); @@ -83,7 +86,7 @@ char c = (char)i; if (c == '\r') { // try to eat \n after \r - in.mark(1); + in.mark(MARK_SIZE); c = (char)in.read(); if (c != '\n') { in.reset(); @@ -102,7 +105,7 @@ if (i != -1) { // test if not eof - in.mark(1); + in.mark(MARK_SIZE); i = in.read(); in.reset(); }

1 0