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

r3390 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 09 Jun '11

09 Jun '11

Author: chatellier Date: 2011-06-09 16:42:29 +0000 (Thu, 09 Jun 2011) New Revision: 3390 Log: Add unaccent on factor name Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-09 16:38:12 UTC (rev 3389) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-09 16:42:29 UTC (rev 3390) @@ -62,6 +62,7 @@ import org.nuiton.util.FileUtil; import org.nuiton.util.ListenerSet; import org.nuiton.util.ObjectUtil; +import org.nuiton.util.StringUtil; import org.nuiton.util.ZipUtil; import fr.ifremer.isisfish.IsisFish; @@ -550,6 +551,7 @@ // also fix factor name for sensitivity calculator String name = factor.getName(); + name = StringUtil.unaccent(name); name = name.replaceAll("\\W", "_"); factor.setName(name); }

1 0

r3389 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 09 Jun '11

09 Jun '11

Author: chatellier Date: 2011-06-09 16:38:12 +0000 (Thu, 09 Jun 2011) New Revision: 3389 Log: Fix factor name for R Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2011-06-09 15:45:19 UTC (rev 3388) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2011-06-09 16:38:12 UTC (rev 3389) @@ -46,7 +46,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; import org.nuiton.util.MD5InputStream; -import org.nuiton.util.MD5OutputStream; import org.nuiton.util.StringUtil; import org.nuiton.util.ZipUtil; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-09 15:45:19 UTC (rev 3388) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-09 16:38:12 UTC (rev 3389) @@ -522,6 +522,8 @@ * Explore design plan factor tree, and set factor nominal value * for each factor. * + * Also fix factor name for R (without special chars in name) + * * @param context opened database context * @param designPlan design plan */ @@ -545,6 +547,11 @@ } else { factor.setNominalValue("NaN"); } + + // also fix factor name for sensitivity calculator + String name = factor.getName(); + name = name.replaceAll("\\W", "_"); + factor.setName(name); } }

1 0

r3388 - isis-fish/branches/3.3.1/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 09 Jun '11

09 Jun '11

Author: chatellier Date: 2011-06-09 15:45:19 +0000 (Thu, 09 Jun 2011) New Revision: 3388 Log: r n'aime pas les : Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-06-09 15:28:56 UTC (rev 3387) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-06-09 15:45:19 UTC (rev 3388) @@ -869,7 +869,7 @@ isisfish.sensitivity.newfactorname=Factor group name isisfish.sensitivity.populationfactorname=Population %s isisfish.sensitivity.referencevalue=Reference value -isisfish.sensitivity.ruleparameterfactorname=Param rule \: %s.%s +isisfish.sensitivity.ruleparameterfactorname=Param rule %s.%s isisfish.sensitivity.rulesfactorname=Rule set isisfish.sensitivity.secondpass=Analyze results isisfish.sensitivity.secondpass.title=Analyze results Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-06-09 15:28:56 UTC (rev 3387) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-06-09 15:45:19 UTC (rev 3388) @@ -869,7 +869,7 @@ isisfish.sensitivity.newfactorname=Nom du groupe de facteurs isisfish.sensitivity.populationfactorname=Population %s isisfish.sensitivity.referencevalue=Valeur de référence -isisfish.sensitivity.ruleparameterfactorname=Param règle \: %s.%s +isisfish.sensitivity.ruleparameterfactorname=Param règle %s.%s isisfish.sensitivity.rulesfactorname=Ensemble de règles isisfish.sensitivity.secondpass=Analyse des résultats isisfish.sensitivity.secondpass.title=Analyse des résultats

1 0

r3387 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org 09 Jun '11

09 Jun '11

Author: chatellier Date: 2011-06-09 15:28:56 +0000 (Thu, 09 Jun 2011) New Revision: 3387 Log: Du not change factor name (only factor path is changed) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-06-09 15:22:49 UTC (rev 3386) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-06-09 15:28:56 UTC (rev 3387) @@ -364,7 +364,6 @@ log.debug("Renammed factor for index " + ruleIndex + " : " + factor.getPath()); } factor.setPath(factorPath); - factor.setName(factorPath); // also factor name } } }

1 0

r3386 - isis-fish/branches/3.3.1/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 09 Jun '11

09 Jun '11

Author: chatellier Date: 2011-06-09 15:22:49 +0000 (Thu, 09 Jun 2011) New Revision: 3386 Log: Fix arg types Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-06-09 15:17:51 UTC (rev 3385) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-06-09 15:22:49 UTC (rev 3386) @@ -869,7 +869,7 @@ isisfish.sensitivity.newfactorname=Nom du groupe de facteurs isisfish.sensitivity.populationfactorname=Population %s isisfish.sensitivity.referencevalue=Valeur de référence -isisfish.sensitivity.ruleparameterfactorname=Param règle \: %d.%d +isisfish.sensitivity.ruleparameterfactorname=Param règle \: %s.%s isisfish.sensitivity.rulesfactorname=Ensemble de règles isisfish.sensitivity.secondpass=Analyse des résultats isisfish.sensitivity.secondpass.title=Analyse des résultats

1 0

r3385 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 09 Jun '11

09 Jun '11

Author: chatellier Date: 2011-06-09 15:17:51 +0000 (Thu, 09 Jun 2011) New Revision: 3385 Log: Fix coefficient for edtion Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-06-09 13:35:47 UTC (rev 3384) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-06-09 15:17:51 UTC (rev 3385) @@ -750,7 +750,7 @@ String.valueOf(domain.getReferenceValue()), String.valueOf(domain.getReferenceValue()), String.valueOf(domain.getReferenceValue()), - String.valueOf(domain.getCoefficient())); + String.valueOf(domain.getCoefficient() * 100.0 )); } else { // factor numerique continue (min/max)

1 0

r3384 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 09 Jun '11

09 Jun '11

Author: chatellier Date: 2011-06-09 13:35:47 +0000 (Thu, 09 Jun 2011) New Revision: 3384 Log: Remove deprecated unused method Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-06-09 13:35:29 UTC (rev 3383) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-06-09 13:35:47 UTC (rev 3384) @@ -212,9 +212,6 @@ log.info("PATH: " + System.getenv("PATH")); } - // first load converter and matrixFactory - //initConvertersAndMatrixFactory(); - // parsing des options à partir des arguments passés config = new IsisConfig(); config.parse(args);

1 0

r3383 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 09 Jun '11

09 Jun '11

Author: chatellier Date: 2011-06-09 13:35:29 +0000 (Thu, 09 Jun 2011) New Revision: 3383 Log: Fix logging again Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-06-09 13:32:24 UTC (rev 3382) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-06-09 13:35:29 UTC (rev 3383) @@ -204,14 +204,11 @@ // i18n is not inited here if (log.isInfoEnabled()) { - log.info("Starting Isis-Fish " + IsisConfig.getVersion() + " with args : " - + java.util.Arrays.toString(args)); + log.info("Starting Isis-Fish " + IsisConfig.getVersion() + " with args : " + java.util.Arrays.toString(args)); log.info("Date: " + SimpleDateFormat.getInstance().format(new java.util.Date())); - log.info("Java version: " + System.getProperty("java.runtime.version") - + "(" + System.getProperty("os.arch") + ")"); - log.info("Java VM: " + System.getProperty("java.vm.name")); - log.info("R_HOME: " + System.getenv("R_HOME") + - ", R.type: " + System.getProperty("R.type")); + log.info("Java version: " + System.getProperty("java.runtime.version") + ", " + System.getProperty("java.vm.name")); + log.info("System arch: " + System.getProperty("os.arch")); + log.info("R_HOME: " + System.getenv("R_HOME") + ", R.type: " + System.getProperty("R.type")); log.info("PATH: " + System.getenv("PATH")); }

1 0

r3382 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 09 Jun '11

09 Jun '11

Author: chatellier Date: 2011-06-09 13:32:24 +0000 (Thu, 09 Jun 2011) New Revision: 3382 Log: Remove deprecated unused method Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-06-09 13:31:52 UTC (rev 3381) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-06-09 13:32:24 UTC (rev 3382) @@ -37,7 +37,6 @@ import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.List; -import java.util.Locale; import javax.imageio.ImageIO; import javax.swing.JLabel; @@ -47,17 +46,13 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; -import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.ClassPathI18nInitializer; -import org.nuiton.math.matrix.DoubleBigVector; -import org.nuiton.math.matrix.MatrixFactory; import org.nuiton.topia.TopiaException; import org.nuiton.util.FileUtil; import org.nuiton.util.Version; -import org.nuiton.util.converter.LocaleConverter; import org.nuiton.widget.SwingSession; import fr.ifremer.isisfish.cron.CronService; @@ -72,18 +67,8 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.SimulatorStorage; import fr.ifremer.isisfish.simulator.launcher.SimulationService; -import fr.ifremer.isisfish.types.Date; -import fr.ifremer.isisfish.types.Month; -import fr.ifremer.isisfish.types.RangeOfValues; -import fr.ifremer.isisfish.types.TimeUnit; import fr.ifremer.isisfish.ui.WelcomeUI; import fr.ifremer.isisfish.ui.util.ErrorHelper; -import fr.ifremer.isisfish.util.ConverterUtil; -import fr.ifremer.isisfish.util.DateConverter; -import fr.ifremer.isisfish.util.MonthConverter; -import fr.ifremer.isisfish.util.RangeOfValuesConverter; -import fr.ifremer.isisfish.util.StringConverter; -import fr.ifremer.isisfish.util.TimeUnitConverter; import fr.ifremer.isisfish.vcs.VCS; import fr.ifremer.isisfish.vcs.VCSActionEvent; import fr.ifremer.isisfish.vcs.VCSException;

1 0

r3381 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 09 Jun '11

09 Jun '11

Author: chatellier Date: 2011-06-09 13:31:52 +0000 (Thu, 09 Jun 2011) New Revision: 3381 Log: Remove deprecated unused method Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-06-09 13:30:55 UTC (rev 3380) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-06-09 13:31:52 UTC (rev 3381) @@ -671,26 +671,5 @@ } } } - - /** - * Initialise les convertiseurs utilisé par commons-beansutils. - * - * @deprecated since 3.2.0.5 duplicated with {@link ConverterUtil#getConverter(org.nuiton.topia.TopiaContext)} - */ - protected static void initConvertersAndMatrixFactory() { - - ConvertUtils.register(new LocaleConverter(), Locale.class); - - // init converters - ConvertUtils.register(new DateConverter(), Date.class); - ConvertUtils.register(new MonthConverter(), Month.class); - ConvertUtils.register(new TimeUnitConverter(), TimeUnit.class); - ConvertUtils.register(new RangeOfValuesConverter(), RangeOfValues.class); - // ... et inversement - ConvertUtils.register(new StringConverter(), String.class); - - // par defaut on utilise des doubles pour les matrices - MatrixFactory.setDefaultVectorClass(DoubleBigVector.class); - } } // IsisFish

1 0