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

r4084 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com 29 Jul '14

29 Jul '14

Author: echatellier Date: 2014-07-29 17:39:48 +0200 (Tue, 29 Jul 2014) New Revision: 4084 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4084 Log: Check simulation information file existence Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2014-07-29 14:59:25 UTC (rev 4083) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2014-07-29 15:39:48 UTC (rev 4084) @@ -536,21 +536,20 @@ // fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher#localSimulateSameThread(SimulationControl, SimulationStorage) File simulationRoot = SimulationStorage.getSimulationDirectory(control.getId()); - File localParameterFile = SimulationStorage.getSimulationParametersFile(simulationRoot); + File localInformationFile = SimulationStorage.getSimulationInformationFile(simulationRoot); // si la simulation n'est pas localement presente, c'est pas fini // la simulation peut être finie, mais non téléchargées - // en testant le fichier de parametres, on s'assure que la simulation est physiquement + // en testant le fichier d'information, on s'assure que la simulation est physiquement // présente en local - if (localParameterFile.isFile()) { + if (localInformationFile.isFile()) { // cas d'une simulation terminée if (control.getProgress() > 0 && control.getProgress() >= control.getProgressMax()) { simulationEnded = true; } else { // cas d'une simulation arretee par exception - File informationFile = SimulationStorage.getSimulationInformationFile(simulationRoot); - SimulationInformation information = new SimulationInformation(informationFile); + SimulationInformation information = new SimulationInformation(localInformationFile); if (StringUtils.isNotEmpty(information.getException())) { if (log.isWarnEnabled()) { log.warn("Simulation exception : " + information.getException());

1 0

r4083 - trunk/src/main/java/fr/ifremer/isisfish/datastore
by echatellier＠users.forge.codelutin.com 29 Jul '14

29 Jul '14

Author: echatellier Date: 2014-07-29 16:59:25 +0200 (Tue, 29 Jul 2014) New Revision: 4083 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4083 Log: Use commons-lang3 Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2014-07-29 14:55:39 UTC (rev 4082) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2014-07-29 14:59:25 UTC (rev 4083) @@ -43,7 +43,7 @@ import java.util.Set; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;

1 0

r4082 - trunk
by echatellier＠users.forge.codelutin.com 29 Jul '14

29 Jul '14

Author: echatellier Date: 2014-07-29 16:55:39 +0200 (Tue, 29 Jul 2014) New Revision: 4082 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4082 Log: Fix site classifier Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-29 14:48:57 UTC (rev 4081) +++ trunk/pom.xml 2014-07-29 14:55:39 UTC (rev 4082) @@ -473,6 +473,7 @@ <projectId>isis-fish</projectId> <platform>codelutin.com</platform> <siteLocales>fr,en</siteLocales> + <siteDeployClassifier/> <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>Ifremer, Codelutin</license.organizationName>

1 0

r4081 - in trunk/src/main/java/fr/ifremer/isisfish: simulator ui/sensitivity/wizard
by echatellier＠users.forge.codelutin.com 29 Jul '14

29 Jul '14

Author: echatellier Date: 2014-07-29 16:48:57 +0200 (Tue, 29 Jul 2014) New Revision: 4081 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4081 Log: Fix licence headers Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterPropertiesHelper.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousDistributionPanel.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterPropertiesHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterPropertiesHelper.java 2014-07-29 14:48:44 UTC (rev 4080) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterPropertiesHelper.java 2014-07-29 14:48:57 UTC (rev 4081) @@ -1,6 +1,28 @@ package fr.ifremer.isisfish.simulator; +/* + * #%L + * IsisFish + * %% + * Copyright (C) 2014 Ifremer, Codelutin, Benjamin Poussin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousDistributionPanel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousDistributionPanel.java 2014-07-29 14:48:44 UTC (rev 4080) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousDistributionPanel.java 2014-07-29 14:48:57 UTC (rev 4081) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2012 - 2014 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */

1 0

r4080 - in trunk/src/main/java/fr/ifremer/isisfish/ui: sensitivity simulator
by echatellier＠users.forge.codelutin.com 29 Jul '14

29 Jul '14

Author: echatellier Date: 2014-07-29 16:48:44 +0200 (Tue, 29 Jul 2014) New Revision: 4080 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4080 Log: Fix ui refresh Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2014-07-29 14:48:26 UTC (rev 4079) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2014-07-29 14:48:44 UTC (rev 4080) @@ -48,6 +48,7 @@ @Override public void refresh() { paramsUI.refresh(); + advancedParamsUI.refresh(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2014-07-29 14:48:26 UTC (rev 4079) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2014-07-29 14:48:44 UTC (rev 4080) @@ -120,7 +120,12 @@ @Override public void run() { simulAction.regionChange(ParamsUI.this, selected); - getParentContainer(SimulUI.class).refresh(); + // FIXME fix this + if (!isSensitivity()) { + getParentContainer(SimulUI.class).refresh(); + } else { + getParentContainer(SensitivityUI.class).refresh(); + } setSensitivityTabRegion(); getParentContainer(WelcomePanelUI.class).setStatusMessage(t("isisfish.message.region.loaded")); } @@ -190,7 +195,12 @@ simulAction.loadOldSimulation(selected); fieldSimulParamsRegion.setSelectedItem(getContextValue(SimulAction.class).getSimulationParameter().getRegionName()); - getParentContainer(SimulUI.class).refresh(); + // FIXME fix this + if (!isSensitivity()) { + getParentContainer(SimulUI.class).refresh(); + } else { + getParentContainer(SensitivityUI.class).refresh(); + } // mise a jour des années fieldSimulParamsNbAnnees.setText(String.valueOf(simulAction.getNumberOfYear()));

1 0

r4079 - in trunk/src/test/java/fr/ifremer/isisfish: mexico simulator/launcher
by echatellier＠users.forge.codelutin.com 29 Jul '14

29 Jul '14

Author: echatellier Date: 2014-07-29 16:48:26 +0200 (Tue, 29 Jul 2014) New Revision: 4079 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4079 Log: Fix tests Modified: trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java Modified: trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2014-07-29 14:48:10 UTC (rev 4078) +++ trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2014-07-29 14:48:26 UTC (rev 4079) @@ -364,12 +364,12 @@ Assert.assertTrue(xml.indexOf("<feature name=\"grouptype\">continuous") != -1); Assert.assertTrue(xml.indexOf("<feature name=\"group\">discretegrp") != -1); Assert.assertTrue(xml.indexOf("<feature name=\"group\">discrete") != -1); - + // factor 6 Assert.assertTrue(xml.indexOf("<rule name=\"TACpoids\">") != -1); Assert.assertTrue(xml.indexOf("<rule name=\"TailleMin\">") != -1); Assert.assertTrue(xml.indexOf("<param key=\"rule.0.parameter.propSurvie\">42.0</param>") != -1); - Assert.assertTrue(xml.indexOf("<param key=\"rule.0.parameter.species\">fr.ifremer.isisfish.entities.Species#1169028645830#0.022262364425031378</param>") != -1); + Assert.assertTrue(xml.indexOf("<param key=\"rule.0.parameter.species\">fr.ifremer.isisfish.entities.Species#1169028645830#0.022262364425031378:EngEnc</param>") != -1); } /** Modified: trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2014-07-29 14:48:10 UTC (rev 4078) +++ trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2014-07-29 14:48:26 UTC (rev 4079) @@ -402,10 +402,10 @@ // generate prescript for that wonderfull scenario String preScriptContent = FactorHelper.generatePreScript(scenario1); - //log.info("Script = " + preScriptContent); + log.info("Script = " + preScriptContent); Assert.assertTrue(preScriptContent.contains("params.setProperty(\"population.xxx.number\"")); - Assert.assertTrue(preScriptContent.contains("params.setProperty(\"rule.0.parameter.species\",\"fr.ifremer.isisfish.entities.Species#1169028645830#0.022262364425031378\");")); + Assert.assertTrue(preScriptContent.contains("params.setProperty(\"rule.0.parameter.species\",\"fr.ifremer.isisfish.entities.Species#1169028645830#0.022262364425031378:EngEnc\");")); Assert.assertTrue(preScriptContent.contains("params.setProperty(\"rule.1.parameter.propSurvie\",\"42.0\");")); Assert.assertTrue(preScriptContent.contains("rules\",\"TACpoids,TailleMin\")")); }

1 0

r4078 - trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by echatellier＠users.forge.codelutin.com 29 Jul '14

29 Jul '14

Author: echatellier Date: 2014-07-29 16:48:10 +0200 (Tue, 29 Jul 2014) New Revision: 4078 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4078 Log: Fix rules factors Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2014-07-29 14:47:37 UTC (rev 4077) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2014-07-29 14:48:10 UTC (rev 4078) @@ -107,6 +107,7 @@ import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.PARAMETER_KEY; import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.PARAMETERS_KEY; import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.POPULATION_KEY; +import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.RULES_KEY; import static fr.ifremer.isisfish.simulator.SimulationParameterPropertiesHelper.RULE_KEY; /** @@ -1255,7 +1256,7 @@ // new factor with rule domain if (source instanceof RuleChooser) { - String factorPath = PARAMETERS_KEY + DOT + RULE_KEY; + String factorPath = PARAMETERS_KEY + DOT + RULES_KEY; selectedFactor = getFactor(factorPath); if (selectedFactor == null) { selectedFactor = new Factor(t("isisfish.sensitivity.rulesfactorname"));

1 0

r4077 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com 29 Jul '14

29 Jul '14

Author: echatellier Date: 2014-07-29 16:47:37 +0200 (Tue, 29 Jul 2014) New Revision: 4077 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4077 Log: Test parameter file instead of control file (not always exists) Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2014-07-29 14:47:07 UTC (rev 4076) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2014-07-29 14:47:37 UTC (rev 4077) @@ -535,20 +535,20 @@ // and set by end of // fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher#localSimulateSameThread(SimulationControl, SimulationStorage) - File localControlFile = SimulationStorage.getSimulationControlFile(control.getId()); + File simulationRoot = SimulationStorage.getSimulationDirectory(control.getId()); + File localParameterFile = SimulationStorage.getSimulationParametersFile(simulationRoot); // si la simulation n'est pas localement presente, c'est pas fini // la simulation peut être finie, mais non téléchargées - // en testant le fichier de controle, on s'assure que la simulation est physiquement + // en testant le fichier de parametres, on s'assure que la simulation est physiquement // présente en local - if (localControlFile.isFile()) { + if (localParameterFile.isFile()) { // cas d'une simulation terminée if (control.getProgress() > 0 && control.getProgress() >= control.getProgressMax()) { simulationEnded = true; } else { // cas d'une simulation arretee par exception - File simulationRoot = SimulationStorage.getSimulationDirectory(control.getId()); File informationFile = SimulationStorage.getSimulationInformationFile(simulationRoot); SimulationInformation information = new SimulationInformation(informationFile); if (StringUtils.isNotEmpty(information.getException())) {

1 0

r4076 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com 29 Jul '14

29 Jul '14

Author: echatellier Date: 2014-07-29 16:47:07 +0200 (Tue, 29 Jul 2014) New Revision: 4076 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4076 Log: Add try/catch to prevent exception in finally Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-07-29 14:46:24 UTC (rev 4075) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2014-07-29 14:47:07 UTC (rev 4076) @@ -243,8 +243,15 @@ } } } finally { - // remove simulation logger (no more need since thread is dead) - simulation.removeSimulationLogger(); + try { + // remove simulation logger (no more need since thread is dead) + simulation.removeSimulationLogger(); + } catch (Exception ex) { + if (log.isDebugEnabled()) { + log.debug("Can't restore logger configuration", ex); + } + // FIXME echatellier 20140729 remove this with log4j 2 + } } return simulation; }

1 0

r4075 - trunk/src/main/java/fr/ifremer/isisfish/entities
by echatellier＠users.forge.codelutin.com 29 Jul '14

29 Jul '14

Author: echatellier Date: 2014-07-29 16:46:24 +0200 (Tue, 29 Jul 2014) New Revision: 4075 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4075 Log: Fix NPE Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2014-07-29 14:44:48 UTC (rev 4074) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2014-07-29 14:46:24 UTC (rev 4075) @@ -209,7 +209,7 @@ // return t("isisfish.populationGroup.toString", this.getPopulation(), // this.getId()); if (toStringCache == null) { - toStringCache = this.getPopulation().toString() + " Group " + this.getId(); + toStringCache = this.getPopulation() + " Group " + this.getId(); } return toStringCache; }

1 0