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); } /*