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

r4089 - trunk
by echatellier＠users.forge.codelutin.com July 30, 2014

July 30, 2014

Author: echatellier Date: 2014-07-30 11:19:33 +0200 (Wed, 30 Jul 2014) New Revision: 4089 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4089 Log: Revert release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-30 09:10:08 UTC (rev 4088) +++ trunk/pom.xml 2014-07-30 09:19:33 UTC (rev 4089) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.1.0</version> + <version>4.3.1.0-SNAPSHOT</version>  <dependencies> @@ -688,9 +688,9 @@   <scm> - <connection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.0</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.0</developerConnection> - <url>https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.0</url> + <connection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</developerConnection> + <url>https://svn.codelutin.com/isis-fish/trunk</url> </scm> <repositories>

1 0

r4088 - trunk
by maven-release＠users.forge.codelutin.com July 30, 2014

July 30, 2014

Author: maven-release Date: 2014-07-30 11:10:08 +0200 (Wed, 30 Jul 2014) New Revision: 4088 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4088 Log: [maven-release-plugin] prepare release isis-fish-4.3.1.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-30 09:05:46 UTC (rev 4087) +++ trunk/pom.xml 2014-07-30 09:10:08 UTC (rev 4088) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.3.1.0-SNAPSHOT</version> + <version>4.3.1.0</version>  <dependencies> @@ -480,7 +480,7 @@ <projectId>isis-fish</projectId> <platform>codelutin.com</platform> <siteLocales>fr,en</siteLocales> - <siteDeployClassifier/> + <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> @@ -688,9 +688,9 @@   <scm> - <connection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</developerConnection> - <url>https://svn.codelutin.com/isis-fish/trunk</url> + <connection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.0</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.0</developerConnection> + <url>https://svn.codelutin.com/isis-fish/tags/isis-fish-4.3.1.0</url> </scm> <repositories>

1 0

r4087 - trunk/src/test/java/fr/ifremer/isisfish/mexico
by echatellier＠users.forge.codelutin.com July 30, 2014

July 30, 2014

Author: echatellier Date: 2014-07-30 11:05:46 +0200 (Wed, 30 Jul 2014) New Revision: 4087 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4087 Log: Fix date in test to not fail because of date difference Modified: trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java Modified: trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2014-07-30 08:47:48 UTC (rev 4086) +++ trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2014-07-30 09:05:46 UTC (rev 4087) @@ -319,9 +319,11 @@ @Test public void testExportImport() throws IOException, IsisFishException, TopiaException { + Date date = new Date(); + // first export DesignPlan testDesignPlan = getTestDesignPlan(false, false); - String xml1 = MexicoHelper.getDesignPlanAsXML(testDesignPlan); + String xml1 = MexicoHelper.getDesignPlanAsXML(testDesignPlan, "date", date.toString()); if (log.isDebugEnabled()) { log.debug("xml 1 = " + xml1); } @@ -332,7 +334,7 @@ // topia context can be null in tests DesignPlan plan = MexicoHelper.getDesignPlanFromXML(testFile, regionContext); - String xml2 = MexicoHelper.getDesignPlanAsXML(plan); + String xml2 = MexicoHelper.getDesignPlanAsXML(plan, "date", date.toString()); if (log.isDebugEnabled()) { log.debug("xml 2 = " + xml2); }

1 0

r4086 - in trunk: . src/main/java/fr/ifremer/isisfish
by echatellier＠users.forge.codelutin.com July 30, 2014

July 30, 2014

Author: echatellier Date: 2014-07-30 10:47:48 +0200 (Wed, 30 Jul 2014) New Revision: 4086 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4086 Log: Fix Locale converter error Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-29 20:51:13 UTC (rev 4085) +++ trunk/pom.xml 2014-07-30 08:47:48 UTC (rev 4086) @@ -26,8 +26,15 @@ <dependency> <groupId>org.nuiton</groupId> + <artifactId>nuiton-converter</artifactId> + <version>1.0</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-3</version> <scope>compile</scope> </dependency> @@ -81,21 +88,21 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-profiling</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> <scope>compile</scope> </dependency> Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-07-29 20:51:13 UTC (rev 4085) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2014-07-30 08:47:48 UTC (rev 4086) @@ -25,8 +25,8 @@ package fr.ifremer.isisfish; +import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; -import static org.nuiton.i18n.I18n.n; import java.io.File; import java.net.MalformedURLException; @@ -40,12 +40,15 @@ import java.util.Locale; import java.util.Map; -import fr.ifremer.isisfish.actions.ValidateSimulationAction; import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.lang3.time.DurationFormatUtils; -import org.nuiton.math.matrix.DoubleBigVector; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ConfigOptionDef; +import org.nuiton.converter.ConverterUtil; +import org.nuiton.math.matrix.DoubleBigVector; +import org.nuiton.math.matrix.DoubleSparseHashVector; import org.nuiton.util.StringUtil; import org.nuiton.util.Version; @@ -54,6 +57,7 @@ import fr.ifremer.isisfish.actions.OtherAction; import fr.ifremer.isisfish.actions.SimulationAction; import fr.ifremer.isisfish.actions.VCSAction; +import fr.ifremer.isisfish.actions.ValidateSimulationAction; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher; @@ -63,7 +67,6 @@ import fr.ifremer.isisfish.util.IsisCacheBackend; import fr.ifremer.isisfish.util.IsisCacheBackendOnGuava; import fr.ifremer.isisfish.vcs.VCS; -import org.nuiton.math.matrix.DoubleSparseHashVector; /** * Isis fish configuration. @@ -75,7 +78,10 @@ * by : $Author: bpoussin $ */ public class IsisConfig extends ApplicationConfig { - + + /** Class logger. */ + static private Log log = LogFactory.getLog(IsisConfig.class); + /** * Config step after init. * @@ -181,7 +187,16 @@ protected long startingTime = System.currentTimeMillis(); public IsisConfig() { - + + // fix missing converter for locale + try { + ConverterUtil.registerConverter(Locale.class); + } catch (Exception ex) { + if (log.isWarnEnabled()) { + log.warn("Can't register locale converter", ex); + } + } + for (Option o : Option.values()) { if (o.defaultValue != null) { setDefaultOption(o.key, o.defaultValue);

1 0

r4085 - trunk/src/main/resources/i18n
by bpoussin＠users.forge.codelutin.com July 29, 2014

July 29, 2014

Author: bpoussin Date: 2014-07-29 22:51:13 +0200 (Tue, 29 Jul 2014) New Revision: 4085 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4085 Log: ajout de la documentation des nouveaux parametres Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-07-29 15:39:48 UTC (rev 4084) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-07-29 20:51:13 UTC (rev 4085) @@ -230,13 +230,13 @@ isisfish.config.main.subSimulator.description=Nom du simulateur en sous processus isisfish.config.main.userMail.description=le courriel de l'utilisateur isisfish.config.main.userName.description=le nom - prénom de l'utilisateur -isisfish.config.mapped.result.matrix.vector.class.description= -isisfish.config.simulation.matrix.threshold.use.sparse.class.description= -isisfish.config.simulation.matrix.use.lazy.vector.description= -isisfish.config.simulation.matrix.vector.class.description= -isisfish.config.simulation.matrix.vector.sparse.class.description= -isisfish.config.simulation.store.result.cachestep.description= -isisfish.config.simulation.store.result.ondisk.description= +isisfish.config.mapped.result.matrix.vector.class.description=(OBSOLETE) Type de matrice à utiliser pour la lecture des résultats du fichier results.mapped +isisfish.config.simulation.matrix.threshold.use.sparse.class.description=seuil d'utilisation des matrices dense/creuse. Sous ce seuil, des matrices denses sont utilisé (matrix.vector.class), au dessu de ce seuil des matrices creusent sont utilisées (matrice.vector.sparse.class) +isisfish.config.simulation.matrix.use.lazy.vector.description=indique si l'on utilise ou non le copy-on-write. La copie de matrice est alors à coût nul tant qu'on ecrit pas sur une des deux matrices. Il est recommandé de laissé à la valeur par défaut. +isisfish.config.simulation.matrix.vector.class.description=Type de matrice à utiliser pour les matrices denses. +isisfish.config.simulation.matrix.vector.sparse.class.description=Type de matrice à utiliser pour les matrices creuses. +isisfish.config.simulation.store.result.cachestep.description=Nombre de pas de temps gardé en mémoire durant la simulation. Si le résultat n'est plus en mémoire, il est alors relu sur le disque s'il existe, ce qui est un peu plus coûteux. +isisfish.config.simulation.store.result.ondisk.description=Nombre de résultat à conserver sur disque. Lorsque vous faites des simulations distantes pour un plan d'analyse et que vous souhaitez travailler sur les résultats des simulations après la simulation, il faut que les résultats soient stockés sur disque. isisfish.config.ssh.key.file=Clé SSH isisfish.config.ssh.key.file.description=Emplacement de la clé privée SSH isisfish.config.title=Préférences

1 0

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

July 29, 2014

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 July 29, 2014

July 29, 2014

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 July 29, 2014

July 29, 2014

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 July 29, 2014

July 29, 2014

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 July 29, 2014

July 29, 2014

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