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

r3456 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 20 Jul '11

20 Jul '11

Author: chatellier Date: 2011-07-20 14:44:55 +0000 (Wed, 20 Jul 2011) New Revision: 3456 Log: Defaut factor validity (true if discrete) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-07-20 14:33:09 UTC (rev 3455) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-07-20 14:44:55 UTC (rev 3456) @@ -949,8 +949,8 @@ */ public void save(FactorWizardUI factorWizardUI) { - // first check is faactor is valid - boolean factorValid = false; + // first check is factor is valid + boolean factorValid = true; ContinuousPanelContainerUI continuousPanel = factorWizardUI.continuousPanel; if (continuousPanel != null) { factorValid = continuousPanel.isFactorValid();

1 0

r3455 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity
by jcouteau＠users.labs.libre-entreprise.org 20 Jul '11

20 Jul '11

Author: jcouteau Date: 2011-07-20 14:33:09 +0000 (Wed, 20 Jul 2011) New Revision: 3455 Log: debug group screening Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2011-07-20 13:29:28 UTC (rev 3454) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2011-07-20 14:33:09 UTC (rev 3455) @@ -277,4 +277,27 @@ public String toString() { return "FactorGroup(" + name + ")"; } + + /** + * Set value for label. + * + * @param valueIdentifier new value identifier to get + */ + @Override + public void setValueForIdentifier(Object valueIdentifier) { + identifier = valueIdentifier; + for (Factor factor : factors) { + factor.setValueForIdentifier(valueIdentifier); + } + } + + /** + * Get the factor value for displaying (for example in R). + * + * @return the value + */ + @Override + public Object getDisplayedValue() { + return identifier; + } }

1 0

r3454 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 20 Jul '11

20 Jul '11

Author: chatellier Date: 2011-07-20 13:29:28 +0000 (Wed, 20 Jul 2011) New Revision: 3454 Log: Refactoring analysis > calculator Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2011-07-20 13:22:28 UTC (rev 3453) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2011-07-20 13:29:28 UTC (rev 3454) @@ -1577,14 +1577,14 @@ .getName(getSensitivityAnalysis()); result.setProperty("sensitivityanalysis", analysisName); - // calculator parameter - Properties calculatorParams = StorageHelper.getParamsAsProperties(0, + // analysis parameter + Properties analysisParams = StorageHelper.getParamsAsProperties(0, getRegion().getStorage(), getSensitivityAnalysis(), "sensitivity"); - result.putAll(calculatorParams); + result.putAll(analysisParams); } else { if (propertiesParameters != null && propertiesParameters.containsKey("sensitivityanalysis")) { - result.setProperty("sensitivitycalculator", + result.setProperty("sensitivityanalysis", propertiesParameters.getProperty("sensitivityanalysis")); for (String key : propertiesParameters.stringPropertyNames()) { if (key.startsWith("sensitivity.")) {

1 0

r3453 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 20 Jul '11

20 Jul '11

Author: chatellier Date: 2011-07-20 13:22:28 +0000 (Wed, 20 Jul 2011) New Revision: 3453 Log: Update h2 Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2011-07-18 16:26:01 UTC (rev 3452) +++ isis-fish/trunk/pom.xml 2011-07-20 13:22:28 UTC (rev 3453) @@ -274,7 +274,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.157</version> + <version>1.3.158</version> <scope>compile</scope> </dependency>

1 0

r3452 - isis-fish/branches/isis-fish-3.3.0.x
by chatellier＠users.labs.libre-entreprise.org 18 Jul '11

18 Jul '11

Author: chatellier Date: 2011-07-18 16:26:01 +0000 (Mon, 18 Jul 2011) New Revision: 3452 Log: Prepare next version Modified: isis-fish/branches/isis-fish-3.3.0.x/pom.xml Modified: isis-fish/branches/isis-fish-3.3.0.x/pom.xml =================================================================== --- isis-fish/branches/isis-fish-3.3.0.x/pom.xml 2011-07-18 16:15:00 UTC (rev 3451) +++ isis-fish/branches/isis-fish-3.3.0.x/pom.xml 2011-07-18 16:26:01 UTC (rev 3452) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.9</version> + <version>3.3.0.9-SNAPSHOT</version>  <dependencies>

1 0

r3451 - in isis-fish/branches/isis-fish-3.3.0.x: . src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 18 Jul '11

18 Jul '11

Author: chatellier Date: 2011-07-18 16:15:00 +0000 (Mon, 18 Jul 2011) New Revision: 3451 Log: Prepare next version Modified: isis-fish/branches/isis-fish-3.3.0.x/pom.xml isis-fish/branches/isis-fish-3.3.0.x/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: isis-fish/branches/isis-fish-3.3.0.x/pom.xml =================================================================== --- isis-fish/branches/isis-fish-3.3.0.x/pom.xml 2011-07-18 16:13:13 UTC (rev 3450) +++ isis-fish/branches/isis-fish-3.3.0.x/pom.xml 2011-07-18 16:15:00 UTC (rev 3451) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.8</version> + <version>3.3.0.9</version>  <dependencies> Modified: isis-fish/branches/isis-fish-3.3.0.x/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/branches/isis-fish-3.3.0.x/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-07-18 16:13:13 UTC (rev 3450) +++ isis-fish/branches/isis-fish-3.3.0.x/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-07-18 16:15:00 UTC (rev 3451) @@ -119,7 +119,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(3, 3, 0, 7); + protected final static Version version = new Version(3, 3, 0, 9); protected final static Version databaseVersion = new Version( version.getNumber(0), version.getNumber(1)); protected final static Version apiVersion = new Version(

1 0

r3450 - in isis-fish/branches/isis-fish-3.3.0.x: . src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 18 Jul '11

18 Jul '11

Author: chatellier Date: 2011-07-18 16:13:13 +0000 (Mon, 18 Jul 2011) New Revision: 3450 Log: Fix R parameters initialisation for sub process launch Modified: isis-fish/branches/isis-fish-3.3.0.x/changelog.txt isis-fish/branches/isis-fish-3.3.0.x/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java Modified: isis-fish/branches/isis-fish-3.3.0.x/changelog.txt =================================================================== --- isis-fish/branches/isis-fish-3.3.0.x/changelog.txt 2011-07-18 15:48:03 UTC (rev 3449) +++ isis-fish/branches/isis-fish-3.3.0.x/changelog.txt 2011-07-18 16:13:13 UTC (rev 3450) @@ -1,3 +1,9 @@ +isis-fish (3.3.0.9) stable; urgency=low + + * Fix R parameters initialisation for sub process launch + + -- lun. juil. 18 18:12:49 CEST 2011 + isis-fish (3.3.0.8) stable; urgency=low * Fix NullPointerException with length change matrix Modified: isis-fish/branches/isis-fish-3.3.0.x/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java =================================================================== --- isis-fish/branches/isis-fish-3.3.0.x/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2011-07-18 15:48:03 UTC (rev 3449) +++ isis-fish/branches/isis-fish-3.3.0.x/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2011-07-18 16:13:13 UTC (rev 3450) @@ -36,6 +36,7 @@ import java.net.URLClassLoader; import java.rmi.RemoteException; import java.util.ArrayList; +import java.util.List; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -185,21 +186,44 @@ log.debug("classpath to use : " + classpath); } + // common args + List<String> command = new ArrayList<String>(); + command.add(java); + command.add("-Xmx1024M"); + + // jri args + String libraryPath = System.getProperty("java.library.path"); + if (StringUtils.isNotBlank(libraryPath)) { + command.add("-Djava.library.path=\"" + libraryPath + "\""); + } + String rType = System.getProperty("R.type"); + if (StringUtils.isNotBlank(rType)) { + command.add("-DR.type=\"" + rType + "\""); + } + + // common args + command.add("-classpath"); + command.add(classpath); + command.add(IsisFish.class.getName()); + command.add("--option"); + command.add("launch.ui"); + command.add("false"); + // prepare le process ProcessBuilder processBuilder = null; if (tempPrescriptFile != null) { - processBuilder = new ProcessBuilder(java, "-Xmx1024M", "-classpath", - classpath, IsisFish.class.getName(), "--option", "launch.ui", - "false", "--simulateWithSimulationAndScript", simulationId, - simulationZip.getAbsolutePath(), tempPrescriptFile.getAbsolutePath()); + command.add("--simulateWithSimulationAndScript"); + command.add(simulationId); + command.add(simulationZip.getAbsolutePath()); + command.add(tempPrescriptFile.getAbsolutePath()); } else { - processBuilder = new ProcessBuilder(java, "-Xmx1024M", "-classpath", - classpath, IsisFish.class.getName(), "--option", "launch.ui", - "false", "--simulateWithSimulation", simulationId, - simulationZip.getAbsolutePath()); + command.add("--simulateWithSimulation"); + command.add(simulationId); + command.add(simulationZip.getAbsolutePath()); } + processBuilder = new ProcessBuilder(command); processBuilder.redirectErrorStream(true); // demarrage du process

1 0

r3449 - isis-fish/branches
by chatellier＠users.labs.libre-entreprise.org 18 Jul '11

18 Jul '11

Author: chatellier Date: 2011-07-18 15:48:03 +0000 (Mon, 18 Jul 2011) New Revision: 3449 Log: 3.3.0.x maintenance branche Added: isis-fish/branches/isis-fish-3.3.0.x/

1 0

r3448 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 18 Jul '11

18 Jul '11

Author: chatellier Date: 2011-07-18 15:42:02 +0000 (Mon, 18 Jul 2011) New Revision: 3448 Log: Fix simulation monitoring (step) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2011-07-18 15:39:28 UTC (rev 3447) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2011-07-18 15:42:02 UTC (rev 3448) @@ -296,7 +296,7 @@ oldValue = this.step.getStep(); } this.step = t; - listeners.firePropertyChange("date", oldValue, this.step.getStep()); + listeners.firePropertyChange("step", oldValue, this.step.getStep()); } /**

1 0

r3447 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 18 Jul '11

18 Jul '11

Author: chatellier Date: 2011-07-18 15:39:28 +0000 (Mon, 18 Jul 2011) New Revision: 3447 Log: Fix simulation monitoring (step) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2011-07-18 15:38:28 UTC (rev 3446) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2011-07-18 15:39:28 UTC (rev 3447) @@ -310,7 +310,7 @@ result.setProperty("running", String.valueOf(running)); result.setProperty("stop", String.valueOf(stop)); if (step != null) { - result.setProperty("date", String.valueOf(step.getStep())); + result.setProperty("step", String.valueOf(step.getStep())); } result.setProperty("progressMax", String.valueOf(progressMax)); result.setProperty("progress", String.valueOf(progress));

1 0