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

r3943 - in branches/4.0.1/src/main: java/fr/ifremer/isisfish/simulator java/fr/ifremer/isisfish/ui/simulator resources/i18n
by echatellier＠users.forge.codelutin.com April 9, 2014

April 9, 2014

Author: echatellier Date: 2014-04-09 17:47:18 +0200 (Wed, 09 Apr 2014) New Revision: 3943 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3943 Log: Fix useCache and useOptimization parameters Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2014-04-09 13:57:05 UTC (rev 3942) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2014-04-09 15:47:18 UTC (rev 3943) @@ -238,23 +238,23 @@ public void clearRules(); /** - * Return if optimization sould be used. + * Return if cache should be used. * * Default to : true. * - * @return use optimization + * @return use cache */ - public boolean getUseOptimization(); + public boolean getUseCache(); /** * Change use optimization parameter. * - * @param useOptimization use optimization to set + * @param useCache use cache to set */ - public void setUseOptimization(boolean useOptimization); + public void setUseCache(boolean useCache); /** - * Return if statistic sould be used. + * Return if statistic should be used. * * Default to false; * @@ -344,6 +344,10 @@ */ public void setSensitivityExport(List<SensitivityExport> sensitivityExport); + public boolean getUseOptimization(); + + public void setUseOptimization(boolean useOptimization); + /** * Return used optimization script. * Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java 2014-04-09 13:57:05 UTC (rev 3942) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java 2014-04-09 15:47:18 UTC (rev 3943) @@ -949,4 +949,17 @@ param.setOptimizationExportsObservations(exportsObservations); store(param); } + + @Override + public boolean getUseCache() { + SimulationParameter param = getParam(); + return param.getUseCache(); + } + + @Override + public void setUseCache(boolean useCache) { + SimulationParameter param = getParam(); + param.setUseCache(useCache); + store(param); + } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2014-04-09 13:57:05 UTC (rev 3942) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2014-04-09 15:47:18 UTC (rev 3943) @@ -50,6 +50,7 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.SortedProperties; import org.nuiton.util.StringUtil; +import org.nuiton.util.VersionUtil; import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFishDAOHelper; @@ -110,8 +111,8 @@ /** Le nom de l'objet script a utiliser pour faire la simulation. */ protected String simulatorName; - /** Utilisation ou non des optimisations. */ - protected Boolean useOptimization; + /** Utilisation ou non du cache. */ + protected Boolean useCache; /** Utilisation ou non des statistiques. */ protected Boolean useStatistic; @@ -179,6 +180,9 @@ /** Script utilisé pour les analyses de sensibilités. */ protected SensitivityAnalysis sensitivityAnalysis; + /** Utilisation d'un script de simulation. */ + protected Boolean useOptimization; + /** Script d'optimisation. */ protected Optimization optimization; @@ -661,28 +665,27 @@ } } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getUseOptimization() - */ @Override - public boolean getUseOptimization() { - - if (useOptimization == null) { + public boolean getUseCache() { + if (useCache == null) { if (propertiesParameters != null) { - useOptimization = Boolean.valueOf(propertiesParameters.getProperty("useOptimization", "false")); + // en version < 4.3, le parametre était nommé 'useOptimization' + // qualifiait le cache, il été renommé ensuite + if (VersionUtil.smallerThan(getIsisFishVersion(), "4.3.0.0")) { + useCache = Boolean.valueOf(propertiesParameters.getProperty("useOptimization", "true")); + } else { + useCache = Boolean.valueOf(propertiesParameters.getProperty("useCache", "true")); + } } else { - useOptimization = Boolean.FALSE; + useCache = Boolean.TRUE; } } - return useOptimization.booleanValue(); + return useCache.booleanValue(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setUseOptimization(boolean) - */ @Override - public void setUseOptimization(boolean useOptimization) { - this.useOptimization = useOptimization; + public void setUseCache(boolean useCache) { + this.useCache = useCache; } /* @@ -903,6 +906,29 @@ } @Override + public boolean getUseOptimization() { + if (useOptimization == null) { + if (propertiesParameters != null) { + // en version < 4.3, le parametre était nommé 'useOptimization' + // qualifiant le cache, il a été renommé ensuite + if (VersionUtil.smallerThan(getIsisFishVersion(), "4.3.0.0")) { + useOptimization = Boolean.FALSE; + } else { + useOptimization = Boolean.valueOf(propertiesParameters.getProperty("useOptimization", "false")); + } + } else { + useOptimization = Boolean.FALSE; + } + } + return useOptimization.booleanValue(); + } + + @Override + public void setUseOptimization(boolean useOptimization) { + this.useOptimization = useOptimization; + } + + @Override public void setOptimization(Optimization optimization) { this.optimization = optimization; } @@ -1496,13 +1522,12 @@ result.regionName = getRegionName(); result.numberOfYear = getNumberOfYear(); result.simulatorName = getSimulatorName(); - result.useOptimization = getUseOptimization(); + result.useCache = getUseCache(); result.useStatistic = getUseStatistic(); result.usePreScript = getUsePreScript(); result.preScript = getPreScript(); result.generatedPreScript = getGeneratedPreScript(); result.useSimulationPlan = getUseSimulationPlan(); - result.useOptimization = getUseOptimization(); result.simulationPlanNumber = getSimulationPlanNumber(); if (exportNames != null) { result.exportNames = new LinkedList<String>(exportNames); @@ -1522,6 +1547,7 @@ if (objective != null) { result.objective = objective; } + result.useOptimization = getUseOptimization(); if (optimization != null) { result.optimization = optimization; } @@ -1578,9 +1604,9 @@ getSimulationPlanNumber())); } - if (getUseOptimization()) { - result.append(t("isisfish.params.toString.use.optimization", - getUseOptimization())); + if (getUseCache()) { + result.append(t("isisfish.params.toString.use.cache", + getUseCache())); } RegionStorage region = getRegion(); @@ -1646,6 +1672,10 @@ } + if (getUseOptimization()) { + result.append(t("isisfish.params.toString.use.optimization", + getUseOptimization())); + } if (objective != null) { String name = ObjectiveStorage.getName(objective); String param = ""; @@ -1726,7 +1756,7 @@ result.setProperty("regionName", getRegionName()); result.setProperty("numberOfYear", String.valueOf(getNumberOfYear())); result.setProperty("simulatorName", getSimulatorName()); - result.setProperty("useOptimization", String.valueOf(getUseOptimization())); + result.setProperty("useCache", String.valueOf(getUseCache())); result.setProperty("useStatistic", String.valueOf(getUseStatistic())); // strategies Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2014-04-09 13:57:05 UTC (rev 3942) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2014-04-09 15:47:18 UTC (rev 3943) @@ -132,8 +132,8 @@ onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setUseStatistic(fieldSimulationStatistique.isSelected());'/> </cell> <cell columns="2" fill="horizontal"> - <JCheckBox id="fieldSimulationCache" text="isisfish.advancedParams.simulationCache" selected='{getContextValue(SimulAction.class).getSimulationParameter().getUseOptimization()}' - onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setUseOptimization(fieldSimulationCache.isSelected());'/> + <JCheckBox id="fieldSimulationCache" text="isisfish.advancedParams.simulationCache" selected='{getContextValue(SimulAction.class).getSimulationParameter().getUseCache()}' + onActionPerformed='getContextValue(SimulAction.class).getSimulationParameter().setUseCache(fieldSimulationCache.isSelected());'/> </cell> </row> <row> Modified: branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2014-04-09 13:57:05 UTC (rev 3942) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2014-04-09 15:47:18 UTC (rev 3943) @@ -697,7 +697,8 @@ isisfish.params.toString.simul.logger.level=Level of simulator's logger \: %1$s isisfish.params.toString.simulation.done=Simulation done with \: %1$s isisfish.params.toString.strategies=Strategies \: -isisfish.params.toString.use.optimization= +isisfish.params.toString.use.cache=Use simulation cache +isisfish.params.toString.use.optimization=Use optimization method isisfish.params.usePreSimulationScript=Use pre simulation script isisfish.params.useSimulationPlan=Use simulation plan isisfish.population.capturability=Capturability Modified: branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-04-09 13:57:05 UTC (rev 3942) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-04-09 15:47:18 UTC (rev 3943) @@ -696,6 +696,7 @@ isisfish.params.toString.simul.logger.level=niveau du logger de simulateur \: %1$s isisfish.params.toString.simulation.done=Simulation réalisée avec \: %1$s isisfish.params.toString.strategies=Stratégies d'exploitation \: +isisfish.params.toString.use.cache=Utiliser le cache de simulation isisfish.params.toString.use.optimization=Utiliser une méthode d'optimisation isisfish.params.useOptimization=Utiliser une méthode d'optimisation isisfish.params.usePreSimulationScript=Utiliser un script de pré-simulation

1 0

r3942 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher
by bpoussin＠users.forge.codelutin.com April 9, 2014

April 9, 2014

Author: bpoussin Date: 2014-04-09 15:57:05 +0200 (Wed, 09 Apr 2014) New Revision: 3942 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3942 Log: - add progress on root simulation - if simulation faild remove it Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java 2014-04-07 14:08:29 UTC (rev 3941) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java 2014-04-09 13:57:05 UTC (rev 3942) @@ -105,6 +105,8 @@ } } + control.setProgressMax(simNumber); + // wait until wall simulation for this generation are done while(!exception && !control.isStopSimulationRequest() && simNumber > done) { @@ -122,9 +124,6 @@ optimization.finish(optimizationContext); } - // on enleve le master plan des simulations en cours, vu que - // toutes les simu sont terminees - simulationService.fireStopEvent(this.job); } catch (Exception eee) { // add manual log // we are in a thread, IsisFishRuntimeException is displayed @@ -133,6 +132,10 @@ log.error(I18n._("isisfish.error.evaluate.optimization.script"), eee); } throw new IsisFishRuntimeException(I18n._("isisfish.error.evaluate.optimization.script"), eee); + } finally { + // on enleve le master plan des simulations en cours, vu que + // toutes les simu sont terminees (correctement ou echouee) + simulationService.fireStopEvent(this.job); } } @@ -179,6 +182,7 @@ } } done++; + control.setProgress(done); } @Override

1 0

r3941 - in branches/4.0.1/src/main/java/fr/ifremer/isisfish: simulator ui/simulator
by echatellier＠users.forge.codelutin.com April 7, 2014

April 7, 2014

Author: echatellier Date: 2014-04-07 16:08:29 +0200 (Mon, 07 Apr 2014) New Revision: 3941 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3941 Log: refs #4803: Rechargement des simulations Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Optimization.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContext.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Optimization.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Optimization.java 2014-04-07 12:20:23 UTC (rev 3940) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Optimization.java 2014-04-07 14:08:29 UTC (rev 3941) @@ -71,8 +71,9 @@ void nextSimulation(OptimizationContext context) throws Exception; /** - * Cette methode est appelee après chaque serie de simulation - soit apres firstSimulation et nextSimulation + * Cette methode est appelee après chaque serie de simulation soit apres firstSimulation et + * nextSimulation. + * * @param context */ void endSimulation(OptimizationContext context) throws Exception; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContext.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContext.java 2014-04-07 12:20:23 UTC (rev 3940) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContext.java 2014-04-07 14:08:29 UTC (rev 3941) @@ -112,7 +112,7 @@ } /** - * Create simulation. This new simulation is automaticaly added to + * Create simulation. This new simulation is automatically added to * next simulations. Database will be modified with factors in parameters */ public void newSimulation(Factor ... factors) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java 2014-04-07 12:20:23 UTC (rev 3940) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java 2014-04-07 14:08:29 UTC (rev 3941) @@ -72,7 +72,22 @@ protected FactorEditorListener factorEditorListener; public void init(OptimizationUI view) { + // get info + SimulAction simulAction = view.getContextValue(SimulAction.class); + SimulationParameter param = simulAction.getSimulationParameter(); RegionStorage regionStorage = view.getContextValue(RegionStorage.class); + + // refresh after simulation storage set + if (param.getObjective() != null) { + view.getFieldObjectiveMethodSelect().setSelectedItem(ObjectiveStorage.getName(param.getObjective())); + } + if (param.getOptimization() != null) { + view.getFieldOptimizationMethodSelect().setSelectedItem(OptimizationStorage.getName(param.getOptimization())); + } + // export/observation + view.getExportObservationTable().setModel(getExportObservationTableModel(view)); + + // order matters view.getExportObservationTable().getColumnModel().getColumn(0).setCellRenderer(new ExportTableCellRenderer()); ExportTableCellEditor editor = new ExportTableCellEditor(); editor.setRegionStorage(regionStorage); @@ -124,9 +139,7 @@ // creation new instance only when name change to not lose parameters value Objective objective = param.getObjective(); - if (objective != null && objective.getClass().getSimpleName().equals(objectiveName)) { - objective = param.getObjective(); - } else { + if (objective == null || !objective.getClass().getSimpleName().equals(objectiveName)) { try { ObjectiveStorage objectiveStorage = ObjectiveStorage.getObjective(objectiveName); objective = objectiveStorage.getNewInstance(); @@ -242,9 +255,7 @@ // creation new instance only when name change to not lose parameters value Optimization optimization = param.getOptimization(); - if (optimization != null && optimization.getClass().getSimpleName().equals(optimizationName)) { - optimization = param.getOptimization(); - } else { + if (optimization == null || !optimization.getClass().getSimpleName().equals(optimizationName)) { try { OptimizationStorage optimizationStorage = OptimizationStorage.getOptimization(optimizationName); optimization = optimizationStorage.getNewInstance(); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx 2014-04-07 12:20:23 UTC (rev 3940) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx 2014-04-07 14:08:29 UTC (rev 3941) @@ -35,15 +35,13 @@ handler.init(this); }*/ + // application will be refreshed by regionStorage change protected void regionStorageChanged() { handler.init(this); } public void refresh() { - // Objective names list - fieldObjectiveMethodSelect.setModel(handler.getObjectiveComboModel()); - // Optimization names list - fieldOptimizationMethodSelect.setModel(handler.getOptimizationComboModel()); + //handler.refresh(this); } ]]></script> @@ -55,7 +53,7 @@ <JLabel text="isisfish.optimization.objective"/> </cell> <cell fill="horizontal" weightx="1.0" columns="2"> - <JComboBox id="fieldObjectiveMethodSelect" model='{handler.getObjectiveComboModel()}' + <JComboBox id="fieldObjectiveMethodSelect" genericType="String" model='{handler.getObjectiveComboModel()}' onActionPerformed='handler.objectiveChanged(this)' renderer="{new fr.ifremer.isisfish.ui.models.optimization.ObjectiveComboRenderer()}"/> </cell> @@ -74,7 +72,7 @@ <JLabel text="isisfish.optimization.method"/> </cell> <cell fill="horizontal" weightx="1.0" columns="2"> - <JComboBox id="fieldOptimizationMethodSelect" model='{handler.getOptimizationComboModel()}' + <JComboBox id="fieldOptimizationMethodSelect" genericType="String" model='{handler.getOptimizationComboModel()}' onActionPerformed='handler.optimizationChanged(this)' renderer="{new fr.ifremer.isisfish.ui.models.optimization.OptimizationComboRenderer()}"/> </cell> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2014-04-07 12:20:23 UTC (rev 3940) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2014-04-07 14:08:29 UTC (rev 3941) @@ -127,6 +127,7 @@ }); } } + protected void initSimulationParams() { if (!isSensitivity()){ // prescript @@ -139,8 +140,8 @@ getParentContainer(SimulUI.class).getSensUI().refresh(); // optimization -// fieldSimulUseOptimization.setSelected(simulAction.getSimulationParameter().getUseOptimization()); -// getParentContainer(OptimizationUI.class).getOptimizationUI().refresh(); + fieldSimulUseOptimization.setSelected(simulAction.getSimulationParameter().getUseOptimization()); + getParentContainer(SimulUI.class).getOptimizationUI().refresh(); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2014-04-07 12:20:23 UTC (rev 3940) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2014-04-07 14:08:29 UTC (rev 3941) @@ -306,10 +306,8 @@ factorGroup = designPlan.getFactorGroup(); } } - else { - if (log.isInfoEnabled()) { - log.info("No xml design plan file found"); - } + else if (log.isInfoEnabled()) { + log.info("No xml design plan file found"); } } catch (Exception eee) { throw new IsisFishRuntimeException(t("isisfish.error.simulation.loadoldsimulation"), eee);

1 0

r3940 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator
by echatellier＠users.forge.codelutin.com April 7, 2014

April 7, 2014

Author: echatellier Date: 2014-04-07 14:20:23 +0200 (Mon, 07 Apr 2014) New Revision: 3940 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3940 Log: Fix region staore parameter to edit topia entities params Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java 2014-04-07 12:12:43 UTC (rev 3939) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java 2014-04-07 12:20:23 UTC (rev 3940) @@ -120,6 +120,7 @@ public void objectiveChanged(OptimizationUI view) { String objectiveName = (String)view.getFieldObjectiveMethodSelect().getSelectedItem(); SimulationParameter param = getSimulationParameter(view); + RegionStorage regionStorage = view.getContextValue(RegionStorage.class); // creation new instance only when name change to not lose parameters value Objective objective = param.getObjective(); @@ -146,6 +147,7 @@ view.getSimulObjectiveMethodParam().getColumnModel().getColumn(0).setCellRenderer(new ScriptParametersTableCellRenderer(objective)); ScriptParametersTableCellEditor editor = new ScriptParametersTableCellEditor(objective); + editor.setRegionStorage(regionStorage); editor.setFactorActionListener(getFactorActionListener(view)); view.getSimulObjectiveMethodParam().getColumnModel().getColumn(1).setCellEditor(editor); } @@ -236,6 +238,7 @@ public void optimizationChanged(OptimizationUI view) { String optimizationName = (String)view.getFieldOptimizationMethodSelect().getSelectedItem(); SimulationParameter param = getSimulationParameter(view); + RegionStorage regionStorage = view.getContextValue(RegionStorage.class); // creation new instance only when name change to not lose parameters value Optimization optimization = param.getOptimization(); @@ -262,6 +265,7 @@ view.getSimulOptimizationMethodParam().getColumnModel().getColumn(0).setCellRenderer(new ScriptParametersTableCellRenderer(optimization)); ScriptParametersTableCellEditor editor = new ScriptParametersTableCellEditor(optimization); + editor.setRegionStorage(regionStorage); editor.setFactorActionListener(getFactorActionListener(view)); view.getSimulOptimizationMethodParam().getColumnModel().getColumn(1).setCellEditor(editor); }

1 0

r3939 - in branches/4.0.1/src/main: java/fr/ifremer/isisfish/simulator java/fr/ifremer/isisfish/simulator/launcher resources/templates/script
by bpoussin＠users.forge.codelutin.com April 7, 2014

April 7, 2014

Author: bpoussin Date: 2014-04-07 14:12:43 +0200 (Mon, 07 Apr 2014) New Revision: 3939 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3939 Log: change Optimisation method name Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Optimization.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContext.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java branches/4.0.1/src/main/resources/templates/script/optimization.ftl Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Optimization.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Optimization.java 2014-04-07 10:43:17 UTC (rev 3938) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Optimization.java 2014-04-07 12:12:43 UTC (rev 3939) @@ -50,22 +50,37 @@ /** * Appele lors de l'initialisation. La premiere generation doit etre construite * dans l'init. - * - * @param context + * + * @param context */ - void init(OptimizationContext context); + void init(OptimizationContext context) throws Exception; /** + * La premiere generation doit etre construite dans cette methode + * dans l'init. + * + * @param context + */ + void firstSimulation(OptimizationContext context) throws Exception; + + /** * Génère une nouvelle série de simulation suivant le context d'optimisation. * * @param context context */ - void getNextSimulation(OptimizationContext context); + void nextSimulation(OptimizationContext context) throws Exception; /** + * Cette methode est appelee après chaque serie de simulation + soit apres firstSimulation et nextSimulation + * @param context + */ + void endSimulation(OptimizationContext context) throws Exception; + + /** * Cette methode est appelee lorsqu'il n'y a plus de simulation a faire * (init ou getNextSimulation n'ont pas fait appel a context.addSimulation) - * @param context + * @param context */ - void endSimulation(OptimizationContext context); + void finish(OptimizationContext context) throws Exception; } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContext.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContext.java 2014-04-07 10:43:17 UTC (rev 3938) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContext.java 2014-04-07 12:12:43 UTC (rev 3939) @@ -51,9 +51,6 @@ /** Simulation to do during next generation simulation */ protected List<SimulationStorage> nextSimulations; - protected int currentGeneration = 0; - protected int simNumber = 0; - public OptimizationContext(String id, SimulationParameter param, SimulationJob job) { super(id, param); this.job = job; @@ -78,7 +75,6 @@ if (CollectionUtils.isNotEmpty(result)) { generations.add(result); nextSimulations = null; - currentGeneration++; } return result; @@ -89,14 +85,21 @@ return result; } - public SimulationStorage getNewSimulation() { + /** + * Return new simulation. This new simulation is automaticaly added to + * next simulation. + * + * @return new Simulation + */ + public SimulationStorage newSimulation() { try { - String simId = id + "_" + simNumber; + String simId = id + "_" + number; SimulationParameter childParam = param.copy(); - childParam.setSimulationPlanNumber(simNumber); + childParam.setSimulationPlanNumber(number); SimulationStorage result = SimulationStorage.importAndRenameZip(job.getItem().getSimulationZip(), simId); - simNumber++; + incNumber(); + addSimulation(result); return result; } catch (Exception eee) { @@ -104,12 +107,16 @@ } } - public void addSimulation(SimulationStorage s) { + protected void addSimulation(SimulationStorage s) { getNextSimulations().add(s); } - public void addSimulation(Factor ... factors) { - SimulationStorage s = getNewSimulation(); + /** + * Create simulation. This new simulation is automaticaly added to + * next simulations. Database will be modified with factors in parameters + */ + public void newSimulation(Factor ... factors) { + SimulationStorage s = newSimulation(); Collection<Factor> colFactors = new ArrayList<Factor>(); Collections.addAll(colFactors, factors); @@ -117,16 +124,21 @@ SimulationParameter childParam = s.getParameter(); childParam.setGeneratedPreScript(script); - - addSimulation(s); } + /** + * Return the current generation. + * 0 for no generation + * 1 for one generation simulation + * ... + * @return + */ public int getCurrentGeneration() { - return currentGeneration; + return generations.size(); } public int getSimulationNumber() { - return simNumber; + return number; } public List<SimulationStorage> getGeneration(int n) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java 2014-04-07 10:43:17 UTC (rev 3938) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java 2014-04-07 12:12:43 UTC (rev 3939) @@ -21,6 +21,13 @@ import fr.ifremer.isisfish.simulator.OptimizationContext; import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.SimulationParameter; +import java.io.File; +import java.io.IOException; +import java.util.List; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18n; /** * Permet de generer l'enchainement des simulations d'optimisation. @@ -70,6 +77,7 @@ public void run() { try { optimization.init(optimizationContext); + optimization.firstSimulation(optimizationContext); List<SimulationStorage> sims = optimizationContext.clearNextSimulation(); while (!exception && !control.isStopSimulationRequest() @@ -104,13 +112,14 @@ } if (!exception && !control.isStopSimulationRequest()) { - optimization.getNextSimulation(optimizationContext); + optimization.endSimulation(optimizationContext); + optimization.nextSimulation(optimizationContext); sims = optimizationContext.clearNextSimulation(); } } if (!exception && !control.isStopSimulationRequest()) { - optimization.endSimulation(optimizationContext); + optimization.finish(optimizationContext); } // on enleve le master plan des simulations en cours, vu que Modified: branches/4.0.1/src/main/resources/templates/script/optimization.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/optimization.ftl 2014-04-07 10:43:17 UTC (rev 3938) +++ branches/4.0.1/src/main/resources/templates/script/optimization.ftl 2014-04-07 12:12:43 UTC (rev 3939) @@ -73,7 +73,7 @@ public class ${name} implements Optimization { /** to use log facility, just put in your code: log.info("..."); */ - private static Log log = LogFactory.getLog(${name}.class); + private static final Log log = LogFactory.getLog(${name}.class); protected String[] necessaryResult = { // put here all necessary result for this rule @@ -98,8 +98,7 @@ } /** - * Appele lors de l'initialisation. La premiere generation doit etre construite - * dans l'init via des appels a context.addSimulation(...) + * Appele lors de l'initialisation. * * @param context */ @@ -108,24 +107,40 @@ } /** + * La premiere generation doit etre construite dans cette methode + * via des appels a context.addSimulation(...) + * + * @param context + */ + public void firstSimulation(OptimizationContext context) throws Exception { + // TODO + } + + /** * Génère une nouvelle série de simulation suivant le context d'optimisation. * Pour cela vous devez appeler context.addSimulation(...) pour ajouter * des simulations pour la prochaine generation. * * @param context context - * @param region region - * @return simulations serie */ public void getNextSimulation(OptimizationContext context) { // TODO } /** - * Cette methode est appelee lorsqu'il n'y a plus de simulation a faire - * (init ou getNextSimulation n'ont pas fait appel a context.addSimulation) + * Cette methode est appelee après chaque serie de simulation + * soit apres startSimulation et nextSimulation * @param context */ public void endSimulation(OptimizationContext context) { } + + /** + * Cette methode est appelee lorsqu'il n'y a plus de simulation a faire + * (init ou getNextSimulation n'ont pas fait appel a context.addSimulation) + * @param context + */ + public void finish(OptimizationContext context) throws Exception; + }

1 0

r3938 - in branches/4.0.1: . src/main/java/fr/ifremer/isisfish/datastore src/main/xmi
by echatellier＠users.forge.codelutin.com April 7, 2014

April 7, 2014

Author: echatellier Date: 2014-04-07 12:43:17 +0200 (Mon, 07 Apr 2014) New Revision: 3938 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3938 Log: Update to hibernate 4.3.5 and fix createZip storage closing Modified: branches/4.0.1/pom.xml branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java branches/4.0.1/src/main/xmi/isis-fish.properties Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2014-04-06 16:10:33 UTC (rev 3937) +++ branches/4.0.1/pom.xml 2014-04-07 10:43:17 UTC (rev 3938) @@ -478,9 +478,9 @@  <jaxxVersion>2.6</jaxxVersion> - <eugeneVersion>2.6.3</eugeneVersion> - <topiaVersion>2.8.1.3</topiaVersion> - <hibernateVersion>4.2.11.Final</hibernateVersion> + <eugeneVersion>2.7.4</eugeneVersion> + <topiaVersion>2.9-SNAPSHOT</topiaVersion> + <hibernateVersion>4.3.5.Final</hibernateVersion> <nuitonI18nVersion>3.1-SNAPSHOT</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2014-04-06 16:10:33 UTC (rev 3937) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2014-04-07 10:43:17 UTC (rev 3938) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2012 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2006 - 2014 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -35,15 +35,10 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.SessionFactory; -import org.hibernate.internal.SessionFactoryImpl; -import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; -import org.hibernate.service.spi.Stoppable; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaNotFoundException; -import org.nuiton.topia.framework.TopiaContextImpl; import org.nuiton.util.ZipUtil; import fr.ifremer.isisfish.IsisFish; @@ -128,7 +123,8 @@ TopiaContext tx = getStorage().beginTransaction(); tx.backup(file, true); - tx.closeContext(); + //tx.closeContext(); + closeStorage(); } catch (TopiaException eee) { throw new IsisFishRuntimeException(t("isisfish.error.prepare.data"), eee); } @@ -230,33 +226,11 @@ public void closeStorage() throws TopiaException { if (storage != null) { -// closeDatabase(); - Stoppable pool = getHibernatePool(); - storage.closeContext(); - if (pool != null) { - pool.stop(); - } storage = null; } } - @Deprecated - protected Stoppable getHibernatePool() throws TopiaException { - Stoppable result = null; - if (storage instanceof TopiaContextImpl) { - SessionFactory factory = ((TopiaContextImpl)storage).getHibernateFactory(); - if(factory instanceof SessionFactoryImpl) { - SessionFactoryImpl sf = (SessionFactoryImpl)factory; - ConnectionProvider conn = sf.getConnectionProvider(); - if(conn instanceof Stoppable) { - result = (Stoppable)conn; - } - } - } - return result; - } - /* * @see fr.ifremer.isisfish.datastore.VersionStorage#delete(boolean) */ Modified: branches/4.0.1/src/main/xmi/isis-fish.properties =================================================================== --- branches/4.0.1/src/main/xmi/isis-fish.properties 2014-04-06 16:10:33 UTC (rev 3937) +++ branches/4.0.1/src/main/xmi/isis-fish.properties 2014-04-07 10:43:17 UTC (rev 3938) @@ -22,7 +22,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -model.tagvalue.copyright=/* Copyright (C) 1999 - 2012 Ifremer - Code Lutin */ +model.tagvalue.copyright=/* Copyright (C) 1999 - 2014 Ifremer - Code Lutin */ model.tagvalue.org.nuiton.math.matrix.MatrixND=fr.ifremer.isisfish.types.hibernate.MatrixType(name,dim,dimNames,semantics,data) model.tagvalue.fr.ifremer.isisfish.types.Month=fr.ifremer.isisfish.types.hibernate.MonthType model.tagvalue.fr.ifremer.isisfish.types.TimeStep=fr.ifremer.isisfish.types.hibernate.TimeStepType @@ -32,6 +32,7 @@ model.tagvalue.hibernateProxyInterface=none model.tagvalue.constantPrefix=PROPERTY_ model.tagvalue.useEnumerationName=true +model.tagvalue.doNotGenerateBooleanGetMethods=false fr.ifremer.isisfish.entities.ActiveRule.class.tagvalue.contextable=true fr.ifremer.isisfish.entities.Cell.class.tagvalue.contextable=true fr.ifremer.isisfish.entities.EffortDescription.class.tagvalue.contextable=true

1 0

r3937 - in branches/4.0.1/src/main: java/fr/ifremer/isisfish/simulator java/fr/ifremer/isisfish/simulator/launcher resources/i18n
by echatellier＠users.forge.codelutin.com April 6, 2014

April 6, 2014

Author: echatellier Date: 2014-04-06 18:10:33 +0200 (Sun, 06 Apr 2014) New Revision: 3937 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3937 Log: refs #4803: Gestion des exports et observation des optimisations Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2014-04-06 16:08:21 UTC (rev 3936) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2014-04-06 16:10:33 UTC (rev 3937) @@ -31,6 +31,7 @@ import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Map; import java.util.Set; import org.apache.commons.logging.Log; @@ -39,6 +40,7 @@ import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.datastore.ExportStorage; +import fr.ifremer.isisfish.entities.Observation; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.rule.Rule; @@ -166,6 +168,16 @@ } } + // optimization export + Map<Export, Observation> optimizationExportsObservations = param.getOptimizationExportsObservations(); + if (optimizationExportsObservations != null) { + for (Export export : optimizationExportsObservations.keySet()) { + for (String resultName : export.getNecessaryResult()) { + enabledResult.add(resultName); + } + } + } + log.info("Enabled result: " + enabledResult); } boolean result = enabledResult.contains(name); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2014-04-06 16:08:21 UTC (rev 3936) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2014-04-06 16:10:33 UTC (rev 3937) @@ -26,10 +26,13 @@ package fr.ifremer.isisfish.simulator; import static org.nuiton.i18n.I18n.t; + import java.io.File; import java.util.ArrayList; import java.util.List; +import java.util.Set; +import org.apache.commons.collections4.ListUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -94,7 +97,17 @@ if (sensitivityExports != null) { allExports.addAll(sensitivityExports); } - + + // third, optimization export + Set<Export> optimizationExports = parameters.getOptimizationExportsObservations().keySet(); + for (Export export : optimizationExports) { + // exclude export already added with regular exports + String exportName = ExportStorage.getName(export); + if (parameters.getExportNames() == null || !parameters.getExportNames().contains(exportName)) { + allExports.add(export); + } + } + // make exports if (!allExports.isEmpty()) { control.setText(t("isisfish.message.export.export")); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2014-04-06 16:08:21 UTC (rev 3936) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2014-04-06 16:10:33 UTC (rev 3937) @@ -54,6 +54,7 @@ import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.IsisFishException; +import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.ObjectiveStorage; import fr.ifremer.isisfish.datastore.OptimizationStorage; import fr.ifremer.isisfish.datastore.RegionStorage; @@ -885,7 +886,7 @@ try { OptimizationStorage optimizationStorage = OptimizationStorage.getOptimization(optimizationName); optimization = optimizationStorage.getNewInstance(); - // 0 = only single sensitivity + // 0 = only single optimization StorageHelper.populateStorageParams(0, getRegion().getStorage(), optimization, propertiesParameters, "optimization"); } catch (IsisFishException eee) { @@ -915,7 +916,7 @@ try { ObjectiveStorage objectiveStorage = ObjectiveStorage.getObjective(objectiveName); objective = objectiveStorage.getNewInstance(); - // 0 = only single sensitivity + // 0 = only single objective StorageHelper.populateStorageParams(0, getRegion().getStorage(), objective, propertiesParameters, "objective"); } catch (IsisFishException eee) { @@ -940,8 +941,54 @@ if (optimizationExportsObservations == null) { // must be sorted for ui (LinkedHashMap) optimizationExportsObservations = new LinkedHashMap<>(); - - // FIXME echatellier 20140404 finish restore parameters + + if (propertiesParameters != null) { + try { + // On verifie tout d'abord que l'on ai pas dans une simulation + // si on y es, on utilise le context static non null du thread local + // Resoud les lazy exceptions des parametres des regles + boolean mustClose = false; + TopiaContext tx = SimulationContext.get().getDB(); + + if (tx == null) { + // not in simulation, create transaction + tx = getRegion().getStorage().beginTransaction(); + mustClose = true; + } + + // rules + String[] optimizationExportList = propertiesParameters.getProperty("optimizationexports", "").split(","); + int optimizationExportIndex = 0; + for (String name : optimizationExportList) { + if (name != null && !"".equals(name)) { + try { + Export export = ExportStorage.getExport(name).getNewInstance(); + Observation observation = null; + String observationId = propertiesParameters.getProperty("optimizationobservation." + optimizationExportIndex); + if (StringUtils.isNotBlank(observationId)) { + observation = (Observation)tx.findByTopiaId(observationId); + } + optimizationExportsObservations.put(export, observation); + } catch (IsisFishException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't find rule: " + name, eee); + } + } + } + optimizationExportIndex++; + } + + // si la transaction a été ouverte (pas dans une simulation) + // on la referme + if (mustClose) { + tx.closeContext(); + } + } catch (TopiaException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't get TopiaContext", eee); + } + } + } } return optimizationExportsObservations; @@ -1478,6 +1525,9 @@ if (optimization != null) { result.optimization = optimization; } + if (optimizationExportsObservations != null) { + result.optimizationExportsObservations = new LinkedHashMap<Export, Observation>(optimizationExportsObservations); + } if (resultEnabled != null) { result.resultEnabled = new LinkedList<String>(resultEnabled); } @@ -1629,7 +1679,20 @@ 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"); @@ -1791,6 +1854,35 @@ } } + // optimization export and observations + if (optimizationExportsObservations != null) { + String optimizationExportsList = ""; + int optimizationExportIndex = 0; + for (Map.Entry<Export, Observation> exportObservationEntry : optimizationExportsObservations.entrySet()) { + Export export = exportObservationEntry.getKey(); + optimizationExportsList += ExportStorage.getName(export) + ","; + + // add in props observation id export index + Observation observation = exportObservationEntry.getValue(); + if (observation != null) { + result.setProperty("optimizationobservation." + optimizationExportIndex, observation.getTopiaId()); + } + optimizationExportIndex++; + } + result.setProperty("optimizationexports", optimizationExportsList); + } else { + if (propertiesParameters != null) { + if (propertiesParameters.containsKey("optimizationexports")) { + result.setProperty("optimizationexports", propertiesParameters.getProperty("optimizationexports")); + } + for (String key : propertiesParameters.stringPropertyNames()) { + if (key.startsWith("optimizationobservation.")) { + result.setProperty(key, propertiesParameters.getProperty(key)); + } + } + } + } + // export names String exportList = ""; for (String export : getExportNames()) { @@ -1854,8 +1946,6 @@ // sensitivity params result.setProperty("sensitivityAnalysisOnlyKeepFirst", String.valueOf(isSensitivityAnalysisOnlyKeepFirst())); - // FIXME echatellier 20140404 store optimization params - result.setProperty("generatedPreScript", getGeneratedPreScript()); result.setProperty("usePreScript", String.valueOf(getUsePreScript())); result.setProperty("preScript", getPreScript()); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-04-06 16:08:21 UTC (rev 3936) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-04-06 16:10:33 UTC (rev 3937) @@ -25,7 +25,6 @@ package fr.ifremer.isisfish.simulator.launcher; -import fr.ifremer.isisfish.simulator.sensitivity.FactorHelper; import static org.nuiton.i18n.I18n.t; import java.beans.PropertyChangeListener; @@ -46,12 +45,8 @@ import java.util.TreeSet; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.beanutils.ConvertUtils; -import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; @@ -59,7 +54,6 @@ import org.apache.commons.lang3.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.math.matrix.MatrixND; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; @@ -79,10 +73,10 @@ import fr.ifremer.isisfish.datastore.SimulationPlanStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.SimulatorStorage; +import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.mexico.MexicoHelper; import fr.ifremer.isisfish.rule.Rule; -import fr.ifremer.isisfish.rule.RuleHelper; import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.SimulationException; import fr.ifremer.isisfish.simulator.SimulationParameter; @@ -90,16 +84,13 @@ import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; import fr.ifremer.isisfish.simulator.sensitivity.Domain; import fr.ifremer.isisfish.simulator.sensitivity.Factor; -import fr.ifremer.isisfish.simulator.sensitivity.FactorGroup; +import fr.ifremer.isisfish.simulator.sensitivity.FactorHelper; import fr.ifremer.isisfish.simulator.sensitivity.Scenario; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityAnalysis; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityScenarios; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityUtils; -import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.util.CompileHelper; -import fr.ifremer.isisfish.util.ConverterUtil; -import java.util.concurrent.atomic.AtomicInteger; /** * Cette classe est responsable de conservation de toutes les simulations faites @@ -809,6 +800,22 @@ + File.separator + name)); } + // copie des export d'optimisation + for (Export export : param.getOptimizationExportsObservations().keySet()) { + String name = ExportStorage.getName(export); + if (!param.getExportNames().contains(name)) { + // duplicated code + name = name.endsWith(".java") ? name : name + ".java"; + File exportFile = new File(ExportStorage.getExportDirectory(), name); + if (!exportFile.isFile()) { + exportFile = new File(ExportStorage.getCommunityExportDirectory(), name); + } + FileUtils.copyFile(exportFile, + new File(tmpDirectory, ExportStorage.EXPORT_PATH + + File.separator + name)); + } + } + // copie de tous les scripts a utiliser // les script officiel prevalent sur les scripts communautés FileUtil.copyRecursively(ScriptStorage.getCommunityScriptDirectory(), Modified: branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2014-04-06 16:08:21 UTC (rev 3936) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2014-04-06 16:10:33 UTC (rev 3937) @@ -685,6 +685,8 @@ isisfish.params.toString.number.years=Number of years\: %1$s\n\n isisfish.params.toString.objective= isisfish.params.toString.optimization= +isisfish.params.toString.optimizationExport= +isisfish.params.toString.optimizationObservation= isisfish.params.toString.plan=Plan\: %1$s isisfish.params.toString.plan.number=Simulation plan sequence number\: %1$s\n\n isisfish.params.toString.populations=Populations \: Modified: branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-04-06 16:08:21 UTC (rev 3936) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-04-06 16:10:33 UTC (rev 3937) @@ -679,15 +679,17 @@ isisfish.params.simulationName=Nom de la simulation isisfish.params.stategiesAndPopulations=Stratégies et populations isisfish.params.title=Paramètres -isisfish.params.toString.fishery=Pêcherie\: %1$s\n\n -isisfish.params.toString.lib.logger.level=niveau du logger de librairies \: %1$s -isisfish.params.toString.number.years=Nombre d'années \: %1$s\n\n -isisfish.params.toString.objective= -isisfish.params.toString.optimization= -isisfish.params.toString.plan=Plan\: %1$s -isisfish.params.toString.plan.number=Numéro de séquence dans le plan \: %1$s\n\n +isisfish.params.toString.fishery=Pêcherie\: %s\n\n +isisfish.params.toString.lib.logger.level=niveau du logger de librairies \: %s +isisfish.params.toString.number.years=Nombre d'années \: %s\n\n +isisfish.params.toString.objective=Fonction d'objectif \: %s +isisfish.params.toString.optimization=Méthode d'optimisation \: %s +isisfish.params.toString.optimizationExport=Export d'optimisation \: %s +isisfish.params.toString.optimizationObservation=Observation d'optimisation \: %s +isisfish.params.toString.plan=Plan\: %s +isisfish.params.toString.plan.number=Numéro de séquence dans le plan \: %s\n\n isisfish.params.toString.populations=Populations \: -isisfish.params.toString.rule=Règle\: %1$s +isisfish.params.toString.rule=Règle\: %s isisfish.params.toString.script.generatedpresimulation= isisfish.params.toString.script.logger.level=niveau du logger de scripts \: %1$s isisfish.params.toString.script.presimulation=Script de presimulation

1 0

r3936 - branches/4.0.1
by echatellier＠users.forge.codelutin.com April 6, 2014

April 6, 2014

Author: echatellier Date: 2014-04-06 18:08:21 +0200 (Sun, 06 Apr 2014) New Revision: 3936 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3936 Log: Update libs Modified: branches/4.0.1/pom.xml Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2014-04-06 09:34:58 UTC (rev 3935) +++ branches/4.0.1/pom.xml 2014-04-06 16:08:21 UTC (rev 3936) @@ -220,14 +220,14 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.6</version> + <version>1.7.7</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.7.6</version> + <version>1.7.7</version> <scope>runtime</scope> </dependency> @@ -276,7 +276,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.175</version> + <version>1.3.176</version> <scope>compile</scope> </dependency>

1 0

r3935 - in branches/4.0.1/src/main/java/fr/ifremer/isisfish: datastore ui
by echatellier＠users.forge.codelutin.com April 6, 2014

April 6, 2014

Author: echatellier Date: 2014-04-06 11:34:58 +0200 (Sun, 06 Apr 2014) New Revision: 3935 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3935 Log: Fix build Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2014-04-04 16:47:29 UTC (rev 3934) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2014-04-06 09:34:58 UTC (rev 3935) @@ -35,24 +35,19 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.SessionFactory; +import org.hibernate.internal.SessionFactoryImpl; +import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; +import org.hibernate.service.spi.Stoppable; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.framework.TopiaContextImpl; import org.nuiton.util.ZipUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishRuntimeException; -import org.hibernate.SessionFactory; -import org.hibernate.internal.SessionFactoryImpl; -import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; -import org.hibernate.service.spi.Stoppable; -import org.nuiton.topia.framework.TopiaContextImpl; -//import org.hibernate.SessionFactory; -//import org.hibernate.internal.SessionFactoryImpl; -//import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; -//import org.hibernate.service.spi.Stoppable; -//import org.nuiton.topia.framework.TopiaContextImpl; /** * Class abstraite dont herite tous les storages qui on besoin d'un TopiaContext @@ -246,6 +241,7 @@ } } + @Deprecated protected Stoppable getHibernatePool() throws TopiaException { Stoppable result = null; if (storage instanceof TopiaContextImpl) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2014-04-04 16:47:29 UTC (rev 3934) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2014-04-06 09:34:58 UTC (rev 3935) @@ -108,7 +108,7 @@ */ public void refreshFactorTree() { - }*/ + } ]]></script> <JMenuBar constraints='BorderLayout.NORTH'> <JMenu text="isisfish.simulation.menu.simulation">

1 0

r3934 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com April 4, 2014

April 4, 2014

Author: echatellier Date: 2014-04-04 18:47:29 +0200 (Fri, 04 Apr 2014) New Revision: 3934 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3934 Log: refs #4803: Relecture des exports pour appel de la fonction d'evaluation de l'objectif Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java 2014-04-04 16:09:12 UTC (rev 3933) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/OptimizationPrepareJob.java 2014-04-04 16:47:29 UTC (rev 3934) @@ -1,27 +1,26 @@ package fr.ifremer.isisfish.simulator.launcher; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18n; +import org.nuiton.math.matrix.MatrixND; + import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.entities.Observation; +import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.simulator.Objective; import fr.ifremer.isisfish.simulator.Optimization; import fr.ifremer.isisfish.simulator.OptimizationContext; import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.SimulationParameter; -import fr.ifremer.isisfish.simulator.launcher.SimulationItem; -import fr.ifremer.isisfish.simulator.launcher.SimulationJob; -import fr.ifremer.isisfish.simulator.launcher.SimulationService; -import java.io.File; -import java.io.IOException; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.io.FileUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.i18n.I18n; -import org.nuiton.util.FileUtil; /** * Permet de generer l'enchainement des simulations d'optimisation. @@ -126,14 +125,45 @@ } throw new IsisFishRuntimeException(I18n._("isisfish.error.evaluate.optimization.script"), eee); } - } @Override public void finished(SimulationJob job, SimulationStorage sim) { if (objective != null) { + + // appel de la methode d'objectif try { - double obj = objective.eval(optimizationContext, null, null); // FIXME mettre les bons arguments + List<MatrixND> exports = new ArrayList<>(); + List<MatrixND> observations = new ArrayList<>(); + + // recuperation des exports et observations + Map<Export, Observation> exportsObservations = sim.getParameter().getOptimizationExportsObservations(); + for (Map.Entry<Export, Observation> exportObservation : exportsObservations.entrySet()) { + Export export = exportObservation.getKey(); + Observation observation = exportObservation.getValue(); + + File rootDirectory = sim.getDirectory(); + File resultExportDirectory = SimulationStorage.getResultExportDirectory(rootDirectory); + String fullFilename = export.getExportFilename() + export.getExtensionFilename(); + File exportFile = new File(resultExportDirectory, fullFilename); + + // read matrix file + MatrixND exportMatrix = null; + if (observation.getValue() != null) { + + // on fait ici un clone, car on ne connait pas les dimensions de la + // matrix à importer; cela n'a peut être aucun sens. + exportMatrix = observation.getValue().clone(); + + // import + exportMatrix.importCSV(exportFile, new int[] {0, 0}); + } + + exports.add(exportMatrix); + observations.add(observation.getValue()); + } + + double obj = objective.eval(optimizationContext, exports, observations); sim.setObjective(obj); } catch (IOException eee) { throw new IsisFishRuntimeException("Can't evaluate objective", eee);

1 0