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

r1959 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/simulator/launcher main/resources/templates/ssh test/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org March 13, 2009

March 13, 2009

Author: chatellier Date: 2009-03-13 11:16:31 +0000 (Fri, 13 Mar 2009) New Revision: 1959 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java isis-fish/trunk/src/main/resources/templates/ssh/launch-isis-cron.seq isis-fish/trunk/src/main/resources/templates/ssh/launch-isis-qsub.seq isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java Log: Gere les prescript pour les simulations SSH Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-03-13 09:58:41 UTC (rev 1958) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-03-13 11:16:31 UTC (rev 1959) @@ -30,6 +30,7 @@ import java.util.Map; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.util.FileUtil; @@ -76,8 +77,9 @@ protected Configuration freemarkerConfiguration; /** Freemarker qsub template. */ - protected static final String SQUB_SCRIPT_TEMPLATE = "templates/ssh/launch-isis-qsub.seq"; - + protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/launch-isis-qsub.seq"; + //protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/launch-isis-cron.seq"; + /** * Opened session. * Stored in static context to not reask passphrase @@ -194,10 +196,13 @@ // build du contenu du script message(control, _("isisfish.simulation.remote.message.waitingstart")); + String simulationPreScriptPath = uploadPreScriptIfNecessary(sshSession, + control.getId(), simulationPrescript); File simulationScript = getSimulationScriptFile(control.getId(), - simulationRemotePath); + simulationRemotePath, simulationPreScriptPath); String scriptRemotePath = uploadSimulationScript(sshSession, simulationScript); + addScriptToQsubQueue(sshSession, scriptRemotePath); } catch (Exception e) { @@ -561,7 +566,7 @@ String remotePath = IsisFish.config.getSimulatorSshTmpPath(); // remote temp directory should have been created - // by #downloadResults(Session, String) + // by #uploadSimulation(Session, String) // upload directory in that dir if (!remotePath.endsWith("/")) { @@ -580,7 +585,52 @@ return remotePath; } + + /** + * Upload pre script on remote server. + * + * Return path if uploaded or null if no upload needed. + * + * @param session valid opened ssh session + * @param simulationPreScript script content + * + * @throws SSHException if upload fail + * @throws IOException if upload fail + */ + protected String uploadPreScriptIfNecessary(Session session, + String simulationId, String simulationPreScript) throws SSHException, IOException { + // if there is no pre script, do nothings + if (StringUtils.isEmpty(simulationPreScript)) { + return null; + } + + File tempPreScriptFile = File.createTempFile("isis-" + simulationId + "-", ".prescript"); + FileUtil.writeString(tempPreScriptFile, simulationPreScript); + String localPath = tempPreScriptFile.getAbsolutePath(); + + String remotePath = IsisFish.config.getSimulatorSshTmpPath(); + // remote temp directory should have been created + // by #uploadSimulation(Session, String) + + // upload directory in that dir + if (!remotePath.endsWith("/")) { + remotePath += "/"; + } + + if (localPath.lastIndexOf("/") > 0) { + remotePath += localPath.substring(localPath.lastIndexOf("/") + 1); + } else if (localPath.lastIndexOf("\\") > 0) { // windows + remotePath += localPath.substring(localPath.lastIndexOf("\\") + 1); + } else { + remotePath += localPath; + } + + SSHUtils.scpTo(session, tempPreScriptFile, remotePath); + + return remotePath; + } + /** * Retourne un fichier temporaire contenant le script de lancement * de simulation. @@ -589,23 +639,20 @@ * * @param simuationId id de la simulation * @param simulationZip zip de la simulation + * @param preScriptPath simulation pre script path (can be null) * * @return un Fichier temporaire ou <tt>null</tt> en cas d'exception * * @throws IOException if can't build script */ protected File getSimulationScriptFile(String simuationId, - String simulationZip) throws IOException { + String simulationZip, String preScriptPath) throws IOException { File tempScript = File.createTempFile("launch-isis", ".seq"); tempScript.deleteOnExit(); // auto delete - // uncomment this to test on a cron server - //String scriptName = "ssh/launch-isis-cron.seq"; - // uncomment this to test on a qsub server - String fileContent = getSimulationScriptLaunchContent( - SQUB_SCRIPT_TEMPLATE, simuationId, simulationZip); + QSUB_SCRIPT_TEMPLATE, simuationId, simulationZip, preScriptPath); FileUtil.writeString(tempScript, fileContent); return tempScript; @@ -620,14 +667,21 @@ * @param templateName url du template * @param simuationId id de la simulation * @param simulationZip zip de la simulation + * @param preScriptPath simulation pre script path (can be null) * * @throws IOException if can't get script content */ protected String getSimulationScriptLaunchContent(String templateName, - String simuationId, String simulationZip) throws IOException { + String simuationId, String simulationZip, String preScriptPath) throws IOException { String scriptContent = null; + // test null values for prescript + String localPreScript = preScriptPath; + if (localPreScript == null) { + localPreScript = ""; + } + try { // get template Template template = freemarkerConfiguration @@ -638,6 +692,7 @@ root.put("isishome", IsisFish.config.getSimulatorSshIsisHome()); root.put("simulationid", simuationId); root.put("simulationzip", simulationZip); + root.put("simulationprescript", localPreScript); // process template Writer out = new StringWriter(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-03-13 09:58:41 UTC (rev 1958) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-03-13 11:16:31 UTC (rev 1959) @@ -50,7 +50,6 @@ import fr.ifremer.isisfish.simulator.launcher.SimulationJob.PostAction; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityException; -import fr.ifremer.isisfish.simulator.sensitivity.SensitivityScenarios; /** * Moniteur singleton pour pouvoir sauvegarder Modified: isis-fish/trunk/src/main/resources/templates/ssh/launch-isis-cron.seq =================================================================== --- isis-fish/trunk/src/main/resources/templates/ssh/launch-isis-cron.seq 2009-03-13 09:58:41 UTC (rev 1958) +++ isis-fish/trunk/src/main/resources/templates/ssh/launch-isis-cron.seq 2009-03-13 11:16:31 UTC (rev 1959) @@ -1,7 +1,9 @@ #!/bin/bash cd "${isishome}" -#source /usr/share/modules/init/csh -#module load java/1.6.0 +<#if simulationprescript?length > 0> +java -jar isis-fish*.jar --option launch.ui false --simulateWithSimulationAndScript "${simulationid}" "${simulationzip}" "${simulationprescript}" +<#else> java -jar isis-fish*.jar --option launch.ui false --simulateWithSimulation "${simulationid}" "${simulationzip}" +</#if> \ No newline at end of file Modified: isis-fish/trunk/src/main/resources/templates/ssh/launch-isis-qsub.seq =================================================================== --- isis-fish/trunk/src/main/resources/templates/ssh/launch-isis-qsub.seq 2009-03-13 09:58:41 UTC (rev 1958) +++ isis-fish/trunk/src/main/resources/templates/ssh/launch-isis-qsub.seq 2009-03-13 11:16:31 UTC (rev 1959) @@ -6,4 +6,8 @@ source /usr/share/modules/init/csh module load java/1.6.0 +<#if simulationprescript?length > 0> +java -jar isis-fish*.jar --option launch.ui false --simulateWithSimulationAndScript "${simulationid}" "${simulationzip}" "${simulationprescript}" +<#else> java -jar isis-fish*.jar --option launch.ui false --simulateWithSimulation "${simulationid}" "${simulationzip}" +</#if> \ No newline at end of file Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2009-03-13 09:58:41 UTC (rev 1958) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2009-03-13 11:16:31 UTC (rev 1959) @@ -22,8 +22,10 @@ import junit.framework.Assert; +import org.junit.BeforeClass; import org.junit.Test; +import fr.ifremer.TestUtils; import fr.ifremer.isisfish.IsisFish; import freemarker.template.TemplateException; @@ -39,6 +41,11 @@ */ public class SshSimulatorLauncherTest { + @BeforeClass + public static void init() throws Exception { + TestUtils.init(); + } + /** * Test l'instantiation du script qsub (caparmor). * @@ -49,16 +56,18 @@ * @throws TemplateException when freemarker throws it */ @Test - public void testFreemarkerTemplate() throws IOException, TemplateException { + public void testFreemarkerTemplateWithScript() throws IOException, + TemplateException { final String SIMULATIONID = "testid"; final String SIMULATIONZIP = "test.zip"; + final String SIMULATIONPRESCRIPT = "prescript-1234567890.txt"; final String ISISHOME = IsisFish.config.getSimulatorSshIsisHome(); SSHSimulatorLauncher launcher = new SSHSimulatorLauncher(); String content = launcher.getSimulationScriptLaunchContent( - SSHSimulatorLauncher.SQUB_SCRIPT_TEMPLATE, SIMULATIONID, - SIMULATIONZIP); + SSHSimulatorLauncher.QSUB_SCRIPT_TEMPLATE, SIMULATIONID, + SIMULATIONZIP, SIMULATIONPRESCRIPT); // simulation parameters Assert.assertTrue("String \"" + SIMULATIONID @@ -67,9 +76,74 @@ Assert.assertTrue("String \"" + SIMULATIONZIP + "\" not found in template", content.indexOf(SIMULATIONZIP) > 0); + Assert.assertTrue("String \"" + SIMULATIONPRESCRIPT + + "\" not found in template", content + .indexOf(SIMULATIONPRESCRIPT) > 0); + Assert.assertTrue( + "Action --simulateWithSimulationAndScript not on script", + content.indexOf(" --simulateWithSimulationAndScript ") > 0); // isis location Assert.assertTrue("String \"" + ISISHOME + "\" not found in template", content.indexOf(ISISHOME) > 0); } + + /** + * Test l'instantiation du script qsub (caparmor). + * + * Test sans script de pre simu. + * + * Le script contient une variable $simulation qui + * doit être remplacée. + * + * @throws IOException when freemarker throws it + * @throws TemplateException when freemarker throws it + */ + @Test + public void testFreemarkerTemplateWithoutScript() throws IOException, + TemplateException { + + final String SIMULATIONID = "testid"; + final String SIMULATIONZIP = "test.zip"; + final String SIMULATIONPRESCRIPT = null; + final String ISISHOME = IsisFish.config.getSimulatorSshIsisHome(); + + SSHSimulatorLauncher launcher = new SSHSimulatorLauncher(); + String content = launcher.getSimulationScriptLaunchContent( + SSHSimulatorLauncher.QSUB_SCRIPT_TEMPLATE, SIMULATIONID, + SIMULATIONZIP, SIMULATIONPRESCRIPT); + + // simulation parameters + Assert.assertTrue("String \"" + SIMULATIONID + + "\" not found in template", content + .indexOf(SIMULATIONID) > 0); + Assert.assertTrue("String \"" + SIMULATIONZIP + + "\" not found in template", + content.indexOf(SIMULATIONZIP) > 0); + Assert.assertTrue("Action --simulateWithSimulation not on script", + content.indexOf(" --simulateWithSimulation ") > 0); + + // isis location + Assert.assertTrue("String \"" + ISISHOME + "\" not found in template", + content.indexOf(ISISHOME) > 0); + } + + /** + * Pour tester, un autre script est present, mais + * celui ci ne doit jamais être utilisé hors des tests. + * + * Test que le script contient "!/bin/csh". + * @throws IOException + */ + @Test + public void testValidQsubScript() throws IOException { + SSHSimulatorLauncher launcher = new SSHSimulatorLauncher(); + String content = launcher.getSimulationScriptLaunchContent( + SSHSimulatorLauncher.QSUB_SCRIPT_TEMPLATE, "", + "", ""); + + // simulation parameters + Assert.assertTrue("Invalid qsub script is used", content + .indexOf("!/bin/csh") > 0); + } } \ No newline at end of file

1 0

r1958 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: . actions simulator/launcher
by chatellier＠users.labs.libre-entreprise.org March 13, 2009

March 13, 2009

Author: chatellier Date: 2009-03-13 09:58:41 +0000 (Fri, 13 Mar 2009) New Revision: 1958 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java Log: Add simulationWithSimulationAndScript action. Fix subprocess launcher. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-03-13 09:02:57 UTC (rev 1957) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-03-13 09:58:41 UTC (rev 1958) @@ -782,6 +782,7 @@ SIMULATE_WITH_REGION(_(""), SimulationAction.class.getName() + "#simulateWithRegion", "--simulateWithRegion"), SIMULATE_WITH_SIMULATION(_(""), SimulationAction.class.getName() + "#simulateWithSimulation", "--simulateWithSimulation"), + SIMULATE_WITH_SIMULATION_AND_SCRIPT(_(""), SimulationAction.class.getName() + "#simulateWithSimulationAndScript", "--simulateWithSimulationAndScript"), ; public String description; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-03-13 09:02:57 UTC (rev 1957) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-03-13 09:58:41 UTC (rev 1958) @@ -27,6 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codelutin.util.FileUtil; import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFish; @@ -103,7 +104,7 @@ public static void simulateWithSimulation(String simulationId, File simulationZip) throws Exception { // just call with null pre script - simulateWithSimulation(simulationId, simulationZip, null); + simulateWithSimulationAndScript(simulationId, simulationZip, null); } /** @@ -115,7 +116,7 @@ * @param simulationPrescript simulation prescript * @throws Exception */ - public static void simulateWithSimulation(String simulationId, File simulationZip, String simulationPrescript) + public static void simulateWithSimulationAndScript(String simulationId, File simulationZip, File simulationPrescript) throws Exception { if (log.isInfoEnabled()) { @@ -135,8 +136,11 @@ //SimulationStorage simulation = launcher.simulate(null, control, simulationZip); //simulation.getStorage().closeContext(); - // FIXME simulation prescript to get from parameters !!! - launcher.simulate(null, control, simulationZip, null); + String simulationPrescriptContent = null; + if (simulationPrescript != null && simulationPrescript.canRead()) { + simulationPrescriptContent = FileUtil.readAsString(simulationPrescript); + } + launcher.simulate(null, control, simulationZip, simulationPrescriptContent); SimulationStorage simulation = launcher.getSimulationStorage(SimulationService.getService(), control); simulation.getStorage().closeContext(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2009-03-13 09:02:57 UTC (rev 1957) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2009-03-13 09:58:41 UTC (rev 1958) @@ -30,8 +30,10 @@ import java.net.URLClassLoader; import java.net.URL; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codelutin.util.FileUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.datastore.SimulationStorage; @@ -71,7 +73,7 @@ try { // simulation = SimulationStorage.importAndRenameZip( // simulationZip, simulationId); - simulation = subProcessSimulate(control, simulationZip); + simulation = subProcessSimulate(control, simulationZip, simulationPrescript); } catch (Exception eee) { if (log.isErrorEnabled()) { log.error(_("Can't do simulation %s", simulationId), eee); @@ -123,7 +125,7 @@ } public SimulationStorage subProcessSimulate(SimulationControl control, - File simulationZip) throws Exception { + File simulationZip, String simulationPrescript) throws Exception { message(control, _("isisfish.message.simulation.prepare")); @@ -131,6 +133,14 @@ // on ferme le SimulationStorage pour ne pas interferer avec le process //simulation.closeStorage(); + // write prescript in a temporary file + File tempPrescriptFile = null; + if (!StringUtils.isEmpty(simulationPrescript)) { + tempPrescriptFile = File.createTempFile("isis", ".prescript"); + tempPrescriptFile.deleteOnExit(); + FileUtil.writeString(tempPrescriptFile, simulationPrescript); + } + String java = System.getProperty("java.home") + File.separator + "bin" + File.separator + "java"; String classpath = System.getProperty("java.class.path"); @@ -155,10 +165,19 @@ log.debug("classpath to use : " + classpath); } // prepare le process - ProcessBuilder processBuilder = new ProcessBuilder(java, "-classpath", + ProcessBuilder processBuilder = null; + if (tempPrescriptFile != null) { + processBuilder = new ProcessBuilder(java, "-classpath", classpath, IsisFish.class.getName(), "--option", "launch.ui", + "false", "--simulateWithSimulationAndScript", simulationId, + simulationZip.getAbsolutePath(), tempPrescriptFile.getAbsolutePath()); + } + else { + processBuilder = new ProcessBuilder(java, "-classpath", + classpath, IsisFish.class.getName(), "--option", "launch.ui", "false", "--simulateWithSimulation", simulationId, simulationZip.getAbsolutePath()); + } processBuilder.redirectErrorStream(true); // demarrage du process

1 0

r1957 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator: . launcher
by chatellier＠users.labs.libre-entreprise.org March 13, 2009

March 13, 2009

Author: chatellier Date: 2009-03-13 09:02:57 +0000 (Fri, 13 Mar 2009) New Revision: 1957 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Temp fix for sensitivity export names Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-03-13 08:56:41 UTC (rev 1956) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-03-13 09:02:57 UTC (rev 1957) @@ -290,7 +290,7 @@ } // number of sensitivity simulation String sensitivityExportList = ""; - for (String export : getExportNames()) { + for (String export : getSensitivityExportNames()) { sensitivityExportList += export + ","; } result.setProperty("sensitivityexports", sensitivityExportList); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-03-13 08:56:41 UTC (rev 1956) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-03-13 09:02:57 UTC (rev 1957) @@ -63,6 +63,8 @@ import fr.ifremer.isisfish.datastore.ScriptStorage; 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.rule.Rule; import fr.ifremer.isisfish.simulator.AnalysePlan; import fr.ifremer.isisfish.simulator.AnalysePlanContext; @@ -405,6 +407,17 @@ param.setSensitivityCalculator(sensitivitycalculator); param.setNumberOfSensitivitySimulation(sensitivityScenarios.getScenarios().size()); + // FIXME to remove when available in UI + List<String> names = ExportStorage.getExportNames(); + List<String> ASName = new ArrayList<String>(); + for (String name : names) { + Export export = ExportStorage.getExport(name).getNewExportInstance(); + if (export instanceof SensitivityExport) { + ASName.add(name); + } + } + param.setSensitivityExportNames(ASName); + // on l'ajoute tout de suite a la liste des simulations demandee // init with default "id" must been changed for designPlan // simulation

1 0

r1956 - isis-fish/trunk/src/main/resources
by bpoussin＠users.labs.libre-entreprise.org March 13, 2009

March 13, 2009

Author: bpoussin Date: 2009-03-13 08:56:41 +0000 (Fri, 13 Mar 2009) New Revision: 1956 Modified: isis-fish/trunk/src/main/resources/sensitivity.properties Log: modification sur StrategyMonthInfo des facteurs possibles Modified: isis-fish/trunk/src/main/resources/sensitivity.properties =================================================================== --- isis-fish/trunk/src/main/resources/sensitivity.properties 2009-03-13 08:39:04 UTC (rev 1955) +++ isis-fish/trunk/src/main/resources/sensitivity.properties 2009-03-13 08:56:41 UTC (rev 1956) @@ -64,7 +64,7 @@ Species.AgeGroupType Species.AgeGroupType Species.Comment -StrategyMonthInfo.NumberOfTrips +StrategyMonthInfo.MinInactivityDays StrategyMonthInfo.ProportionMetier Strategy.Name Strategy.ProportionSetOfVessels

1 0

r1955 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities
by bpoussin＠users.labs.libre-entreprise.org March 13, 2009

March 13, 2009

Author: bpoussin Date: 2009-03-13 08:39:04 +0000 (Fri, 13 Mar 2009) New Revision: 1955 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java Log: modification de la valeur par default (1 au lieu de 0) pour TechnicalEfficiency Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2009-03-13 08:33:52 UTC (rev 1954) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2009-03-13 08:39:04 UTC (rev 1955) @@ -57,7 +57,7 @@ */ @Override public double getTechnicalEfficiency(Date date, Metier metier) { - double result = 0; + double result = 1; try { Gear gear = metier.getGear();

1 0

r1954 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org March 13, 2009

March 13, 2009

Author: chatellier Date: 2009-03-13 08:33:52 +0000 (Fri, 13 Mar 2009) New Revision: 1954 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx Log: Fix strange url here :) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-03-12 21:03:05 UTC (rev 1953) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-03-13 08:33:52 UTC (rev 1954) @@ -184,7 +184,7 @@ protected void remove(){ getSimulAction().removeFactor(path); getContextValue(InputSaveVerifier.class).getSensPanel().setFactorModel(); - this.dispose();www.google.fr/ + this.dispose(); } ]]> </script>

1 0

r1953 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator: . launcher
by chatellier＠users.labs.libre-entreprise.org March 12, 2009

March 12, 2009

Author: chatellier Date: 2009-03-12 21:03:05 +0000 (Thu, 12 Mar 2009) New Revision: 1953 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Fix end AS detection ans analyseResult call Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-03-12 21:02:35 UTC (rev 1952) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-03-12 21:03:05 UTC (rev 1953) @@ -1055,6 +1055,9 @@ result.simulLogLevel = simulLogLevel; result.scriptLogLevel= scriptLogLevel; result.libLogLevel= libLogLevel; + result.numberOfSensitivitySimulation = numberOfSensitivitySimulation; + result.sensitivityExportNames = sensitivityExportNames; + result.sensitivityCalculator = sensitivityCalculator; return result; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-03-12 21:02:35 UTC (rev 1952) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-03-12 21:03:05 UTC (rev 1953) @@ -100,6 +100,10 @@ control.setProgress(0); control.setStarted(true); + // FIXME temp auto save + // force saving of control file + control.setAutoSaveState(true); + // replace prescript if specified on method if (simulationPrescript != null && !simulationPrescript.trim().isEmpty()) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-03-12 21:02:35 UTC (rev 1952) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-03-12 21:03:05 UTC (rev 1953) @@ -596,13 +596,23 @@ && currentSimulationControl.getProgress() >= currentSimulationControl.getProgressMax()) { SimulationStorage storage = SimulationStorage.getSimulation(currentId); simulationStorageForAnalyze.add(storage); + if (log.isDebugEnabled()) { + log.debug("Found simulation number = " + simulationIndex); + } } else { + if (log.isDebugEnabled()) { + log.debug("Miss simulation number = " + simulationIndex); + } + // no need to continue // if only miss one, break break; } } + else { + break; + } } // si on a toutes les simulation est qu'elles sont finie @@ -614,8 +624,7 @@ } try { // FIXME sensitivityScenarios are not available here :( - SensitivityScenarios sensitivityScenarios = new SensitivityScenarios(); - sensitivityCalculator.analyzeResult(sensitivityScenarios, simulationStorageForAnalyze); + sensitivityCalculator.analyzeResult(null, simulationStorageForAnalyze); } catch(SensitivityException e) { if (log.isErrorEnabled()) {

1 0

r1952 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org March 12, 2009

March 12, 2009

Author: chatellier Date: 2009-03-12 21:02:35 +0000 (Thu, 12 Mar 2009) New Revision: 1952 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx Log: Fix path case (for commons beanutils) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-03-12 21:02:05 UTC (rev 1951) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-03-12 21:02:35 UTC (rev 1952) @@ -43,6 +43,7 @@ <Boolean id='existingValue' javaBean='false'/> <script><![CDATA[ +import org.apache.commons.lang.StringUtils; import org.codelutin.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.ui.simulator.SimulAction; import fr.ifremer.isisfish.ui.input.InputSaveVerifier; @@ -87,7 +88,10 @@ // path is topiaId#property // ex : fwn#fsd#0.3425345#name - this.path = bean.getTopiaId() + "#" + EditorHelper.getMethod(cOrigine); + // for JAXX : cOrigine start with upper case + // for commons beanutils : must be lower case + String methodName = StringUtils.uncapitalize(EditorHelper.getMethod(cOrigine)); + this.path = bean.getTopiaId() + "#" + methodName; factorName.setText(bean.toString() + "." + EditorHelper.getMethod(cOrigine)); setContinuePossible(b); @@ -180,7 +184,7 @@ protected void remove(){ getSimulAction().removeFactor(path); getContextValue(InputSaveVerifier.class).getSensPanel().setFactorModel(); - this.dispose(); + this.dispose();www.google.fr/ } ]]> </script>

1 0

r1951 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org March 12, 2009

March 12, 2009

Author: chatellier Date: 2009-03-12 21:02:05 +0000 (Thu, 12 Mar 2009) New Revision: 1951 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Change label type (integer) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-03-12 13:59:01 UTC (rev 1950) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-03-12 21:02:05 UTC (rev 1951) @@ -690,8 +690,11 @@ DiscreteDomain<Serializable> domain = new DiscreteDomain<Serializable>(); int i = 0; for (Serializable value : values){ + // FIXME test when integer + // Don't work with String ;( + domain.getValues().put(i, value); + // and start at 0 i++; - domain.getValues().put(name + i, value); } f.setDomain(domain); f.setPath(path);

1 0

r1950 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui
by sletellier＠users.labs.libre-entreprise.org March 12, 2009

March 12, 2009

Author: sletellier Date: 2009-03-12 13:59:01 +0000 (Thu, 12 Mar 2009) New Revision: 1950 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx Log: Put SimulAction in context Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2009-03-12 11:44:11 UTC (rev 1949) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2009-03-12 13:59:01 UTC (rev 1950) @@ -39,7 +39,7 @@ import fr.ifremer.isisfish.ui.input.InputSaveVerifier; simulUI.getContextValue(SimulAction.class).init(); - + queueUI.setContextValue(simulUI.getContextValue(SimulAction.class)); public void selTab(int i){ simulTabs.setSelectedIndex(i); } @@ -62,7 +62,7 @@ <fr.ifremer.isisfish.ui.script.ScriptUI/> </tab> <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/Queue.gif"))}'> - <fr.ifremer.isisfish.ui.simulator.QueueUI/> + <fr.ifremer.isisfish.ui.simulator.QueueUI id="queueUI"/> </tab> </JTabbedPane> </JPanel>

1 0