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

r2169 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org May 4, 2009

May 4, 2009

Author: chatellier Date: 2009-05-04 08:26:48 +0000 (Mon, 04 May 2009) New Revision: 2169 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Log: Disable setTopiaId(null) for test 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-05-03 18:31:42 UTC (rev 2168) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-05-04 08:26:48 UTC (rev 2169) @@ -316,6 +316,7 @@ // forceReload, save all modification in parameter and reread it parameters = simulation.getForceReloadParameter(); + /* Temp disabled // Rule modification List<Rule> rules = parameters.getRules(); for (Rule rule : rules) { @@ -335,7 +336,7 @@ } } } - } + }*/ // // Activation de l'OAP demandée

1 0

r2168 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org May 3, 2009

May 3, 2009

Author: chatellier Date: 2009-05-03 18:31:42 +0000 (Sun, 03 May 2009) New Revision: 2168 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Update i18n Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-05-03 18:22:03 UTC (rev 2167) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-05-03 18:31:42 UTC (rev 2168) @@ -7,6 +7,7 @@ Can't\ delete\ simulation\ %s\ = Can't\ do\ post\ action\ %s= Can't\ do\ simulation\ %s= +Can't\ download\ archive\ \:\ %s= Can't\ download\ file= Can't\ evaluate\ simulation\ prescript= Can't\ export\ simulation\ %s= @@ -28,6 +29,7 @@ Create\ a\ new\ script= Cut\ current\ selection\ (Ctrl-x)= Error\ during\ vcs\ initialisation= +Error\ while\ downloading\ file\ \:\ %s= Error\ while\ uploading\ public\ key\ to\ remote\ serveur\ authorized_keys= Export\ selected\ script(s)\ to\ zip\ archive= Generate\ next\ simulation= @@ -49,6 +51,7 @@ Region\ %s\ already\ inited= Remote\ IsisFish\ server= Remote\ control\ file\ doesn't\ exists\ %s= +Remote\ information\ file\ doesn't\ exists\ %s= Rename\ data\ directory\ to\ %s= Save\ current\ script= Show\ help= @@ -901,6 +904,7 @@ isisfish.simulation.remote.message.connection=Connecting to Caparmor isisfish.simulation.remote.message.downloadresults=Downloading results isisfish.simulation.remote.message.upload=Uploading simulation +isisfish.simulation.remote.message.waitingavailable=Waiting for available resource. isisfish.simulation.remote.message.waitingstart=Waiting for simulation start isisfish.simulation.title=Simulation launcher isisfish.simulator.launcher.inprocess=in current process Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-05-03 18:22:03 UTC (rev 2167) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-05-03 18:31:42 UTC (rev 2168) @@ -7,6 +7,7 @@ Can't\ delete\ simulation\ %s\ = Can't\ do\ post\ action\ %s= Can't\ do\ simulation\ %s= +Can't\ download\ archive\ \:\ %s= Can't\ download\ file= Can't\ evaluate\ simulation\ prescript= Can't\ export\ simulation\ %s= @@ -28,6 +29,7 @@ Create\ a\ new\ script= Cut\ current\ selection\ (Ctrl-x)= Error\ during\ vcs\ initialisation= +Error\ while\ downloading\ file\ \:\ %s= Error\ while\ uploading\ public\ key\ to\ remote\ serveur\ authorized_keys= Export\ selected\ script(s)\ to\ zip\ archive= Generate\ next\ simulation= @@ -49,6 +51,7 @@ Region\ %s\ already\ inited=La r\u00E9gion %s a d\u00E9j\u00E0 \u00E9t\u00E9 initialis\u00E9e Remote\ IsisFish\ server= Remote\ control\ file\ doesn't\ exists\ %s= +Remote\ information\ file\ doesn't\ exists\ %s= Rename\ data\ directory\ to\ %s= Save\ current\ script= Show\ help= @@ -901,6 +904,7 @@ isisfish.simulation.remote.message.connection=Connexion \u00E0 Caparmor isisfish.simulation.remote.message.downloadresults=T\u00E9l\u00E9chargement des r\u00E9sultats isisfish.simulation.remote.message.upload=Upload de la simulation +isisfish.simulation.remote.message.waitingavailable=Attente d'une place de simulation isisfish.simulation.remote.message.waitingstart=Attente du d\u00E9marrage de la simulation isisfish.simulation.title=Lanceur de simulation isisfish.simulator.launcher.inprocess=dans le m\u00EAme processus @@ -1064,4 +1068,4 @@ minimum\ length= not\ started= region\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite= -simulate\ %s\ with\ file\ %s= \ No newline at end of file +simulate\ %s\ with\ file\ %s=

1 0

r2167 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org May 3, 2009

May 3, 2009

Author: chatellier Date: 2009-05-03 18:22:03 +0000 (Sun, 03 May 2009) New Revision: 2167 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Log: Get simulation result tbz2 compressed. Global improvement. 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-05-03 18:21:25 UTC (rev 2166) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-05-03 18:22:03 UTC (rev 2167) @@ -40,7 +40,7 @@ import org.codelutin.util.FileUtil; import org.codelutin.util.MD5; import org.codelutin.util.MD5InputStream; -import org.codelutin.util.ZipUtil; +import org.codelutin.util.Tbz2Util; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; @@ -228,6 +228,7 @@ // ask for available resources on caparmor // blocking until available + message(control, _("isisfish.simulation.remote.message.waitingavailable")); simulationStarted(); // start ssh session @@ -241,7 +242,7 @@ String simulationRemotePath = uploadSimulation(sshSession, simulationZip); - String remoteResultZip = getRemoteResultZipPath(control.getId()); + String remoteResultZip = getRemoteResultArchivePath(control.getId()); // build du contenu du script message(control,_("isisfish.simulation.remote.message.waitingstart")); @@ -251,6 +252,8 @@ simulationRemotePath, remoteResultZip, simulationPreScriptPath); String scriptRemotePath = uploadSimulationScript(sshSession, simulationScript); + // prescrit uploaded, delete + simulationScript.delete(); addScriptToQsubQueue(sshSession, scriptRemotePath); @@ -276,8 +279,7 @@ // TODO change, now getSimulationStorage() // is common to all launchers - SimulationStorage simulationStorage = null; - simulationStorage = SimulationStorage + SimulationStorage simulationStorage = SimulationStorage .getSimulation(control.getId()); return simulationStorage; @@ -292,13 +294,21 @@ @Override public void updateControl(SimulationService simulationService, SimulationControl control) throws RemoteException { + + // make sure user is connected + try { + getSSHSession(); + } + catch(JSchException e) { + throw new RemoteException("Can't connect", e); + } try { // CONTROL file try { // download control file - File controlFile = downloadSimulationFile(control.getId(), + File controlFile = downloadControlFile(sshSession, control.getId(), SimulationStorage.CONTROL_FILENAME); if (log.isDebugEnabled()) { log.debug("Control have been downloaded : " @@ -332,7 +342,7 @@ // MD5 + SIMULATION zip file try { - File md5ControlFile = downloadMD5ControlFile(control.getId()); + File md5ControlFile = downloadResultsMD5File(sshSession, control.getId()); if (md5ControlFile != null) { control.setText(_("isisfish.simulation.remote.message.downloadresults")); @@ -343,9 +353,9 @@ log.debug("MD5 Control file have been downloaded : " + md5ControlFile.getAbsolutePath()); } - File resultZipFile = downloadZIPResults(sshSession, control.getId(), md5sum); + File resultArchiveFile = downloadResultsArchive(sshSession, control.getId(), md5sum); - if (resultZipFile != null) { + if (resultArchiveFile != null) { // FIXME done here to not break upload during import // FIXME je pense que les resources ne sont @@ -355,10 +365,10 @@ // FIXME too slow methods //SimulationStorage.importZip(resultZipFile); - ZipUtil.uncompress(resultZipFile, SimulationStorage.getSimulationDirectory()); + Tbz2Util.uncompress(resultArchiveFile, SimulationStorage.getSimulationDirectory()); if (log.isDebugEnabled()) { - log.debug("Simulation imported : " + resultZipFile.getAbsolutePath()); + log.debug("Simulation imported : " + resultArchiveFile.getAbsolutePath()); } // read control from downloaded simulation @@ -366,7 +376,9 @@ SimulationStorage.readControl(control.getId(), control, "stop"); } - resultZipFile.delete(); + resultArchiveFile.delete(); + + // TODO remove remote md5 and zip } else { if (log.isWarnEnabled()) { @@ -380,7 +392,7 @@ } catch(SSHException e) { if (log.isDebugEnabled()) { - log.debug(_("Error while downloading file : %s", e.getMessage())); + log.debug(_("Can't download archive : %s", e.getMessage())); } } /*catch (TopiaException e) { if (log.isErrorEnabled()) { @@ -390,7 +402,7 @@ // INFORMATION file try { - File infoFile = downloadSimulationFile(control.getId(), + File infoFile = downloadControlFile(sshSession, control.getId(), SimulationStorage.INFORMATION_FILENAME); if (log.isDebugEnabled()) { log.debug("Information have been downloaded : " @@ -421,7 +433,7 @@ // file doesn't exist if (log.isDebugEnabled()) { // not add ,e plz :) - log.debug(_("Remote control file doesn't exists %s", e + log.debug(_("Remote information file doesn't exists %s", e .getMessage())); } } @@ -650,10 +662,10 @@ * @throws SSHException if download fail (can happen if remote file doesn't exist * @throws IOException if download fail (can happen if remote file doesn't exist */ - protected File downloadZIPResults(Session session, String simulationId, String md5sum) + protected File downloadResultsArchive(Session session, String simulationId, String md5sum) throws SSHException, IOException { - File localFile = File.createTempFile("simulation-results", ".zip"); + File localFile = File.createTempFile("simulation-results", ".tbz2"); if (log.isDebugEnabled()) { log.debug("Downloading results in " + localFile.getAbsolutePath()); @@ -661,13 +673,20 @@ // build remote file path // FIXME this path should be given by remote IsisFish app - String remoteFile = getRemoteResultZipPath(simulationId); + String remoteFile = getRemoteResultArchivePath(simulationId); - SSHUtils.scpFrom(session, remoteFile, localFile); + try { + SSHUtils.scpFrom(session, remoteFile, localFile); + } + catch(SSHException e) { + localFile.delete(); + throw e; + } if (!StringUtils.isEmpty(md5sum)) { MD5InputStream in = new MD5InputStream(new FileInputStream(localFile)); - while(in.read() != -1) {} + while(in.read() != -1) { + } in.close(); String localMd5 = MD5.asHex(in.hash()); if (!localMd5.equals(md5sum)) { @@ -686,13 +705,14 @@ * Download remote simulation control file and store its content into temp * file. * + * @param sshSession valid opened ssh session * @param simulationId id de la simulation * @param fileName nom du fichier a telecharger * @return downloaded temp file (file have to be manually deleted) * @throws IOException * @throws SSHException if remote file doesn't exists */ - protected File downloadSimulationFile(String simulationId, String fileName) + protected File downloadControlFile(Session sshSession, String simulationId, String fileName) throws IOException, SSHException { File localFile = null; @@ -709,9 +729,10 @@ localFile = File.createTempFile(simulationId, fileName); try { - SSHUtils.scpFrom(getSSHSession(), remoteFile, localFile); - } catch (JSchException e) { - throw new SSHException("Can't connect", e); + SSHUtils.scpFrom(sshSession, remoteFile, localFile); + } catch (SSHException e) { + localFile.delete(); + throw e; } return localFile; @@ -721,26 +742,26 @@ * Download remote simulation md5 control file and store its content into temp * file. * + * @param sshSession valid opened ssh session * @param simulationId id de la simulation * @return downloaded temp file (file have to be manually deleted) * @throws IOException * @throws SSHException if remote file doesn't exists */ - protected File downloadMD5ControlFile(String simulationId) + protected File downloadResultsMD5File(Session sshSession, String simulationId) throws IOException, SSHException { - File localFile = null; - // build remote file path - String remoteFile = getRemoteResultZipPath(simulationId) + ".md5"; + String remoteFile = getRemoteResultArchivePath(simulationId) + ".md5"; // local tmp file - localFile = File.createTempFile(simulationId, ".md5"); + File localFile = File.createTempFile(simulationId, ".md5"); try { - SSHUtils.scpFrom(getSSHSession(), remoteFile, localFile); - } catch (JSchException e) { - throw new SSHException("Can't download file", e); + SSHUtils.scpFrom(sshSession, remoteFile, localFile); + } catch (SSHException e) { + localFile.delete(); + throw e; } return localFile; @@ -791,7 +812,7 @@ * @throws SSHException if upload fail * @throws IOException if upload fail */ - protected String getRemoteResultZipPath(String simulationId) + protected String getRemoteResultArchivePath(String simulationId) throws SSHException, IOException { String remotePath = IsisFish.config.getSimulatorSshTmpPath(); @@ -801,7 +822,7 @@ remotePath += "/"; } - remotePath += "simulation-" + simulationId + "-result.zip"; + remotePath += "simulation-" + simulationId + "-result.tbz2"; return remotePath; } @@ -871,7 +892,7 @@ protected File getLaunchSimulationScriptFile(String simuationId, String simulationZip, String simulationResultZip, String preScriptPath) throws IOException { - File tempScript = File.createTempFile("isis-launch-", ".seq"); + File tempScript = File.createTempFile("isis-launch-" + simuationId + "-", ".seq"); tempScript.deleteOnExit(); // auto delete String fileContent = getSimulationScriptLaunchContent(

1 0

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

May 3, 2009

Author: chatellier Date: 2009-05-03 18:21:25 +0000 (Sun, 03 May 2009) New Revision: 2166 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Refactor second pass: - check simulation existence in reverse order - get parameter without opening database 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 2009-05-03 18:20:06 UTC (rev 2165) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2009-05-03 18:21:25 UTC (rev 2166) @@ -74,6 +74,11 @@ addPropertyChangeListener(this); } + /** + * + * @deprecated todo remove, should be always auto saved + * @param autoSaveState + */ public void setAutoSaveState(boolean autoSaveState) { this.autoSaveState = autoSaveState; } @@ -171,7 +176,9 @@ * @param text The text to set. */ public void setText(String text) { - log.info(text); + if (log.isInfoEnabled()) { + log.info(text); + } String oldValue = this.text; this.text = text; listeners.firePropertyChange("text", oldValue, this.text); 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-05-03 18:20:06 UTC (rev 2165) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-05-03 18:21:25 UTC (rev 2166) @@ -79,6 +79,8 @@ /** Logger for this class. */ private static Log log = LogFactory.getLog(SimulationParameter.class); + public static String NUMBER_OF_SENSITIVITY_SIMULATION = "numberOfSensitivitySimulation"; + /** * Isis-fish version that permit to do the simulation, must be set just * before simulation by simulator. @@ -287,7 +289,7 @@ result.setProperty("exports", exportList); // number of sensitivity simulation - result.setProperty("numberOfSensitivitySimulation", String.valueOf(numberOfSensitivitySimulation)); + result.setProperty(NUMBER_OF_SENSITIVITY_SIMULATION, String.valueOf(numberOfSensitivitySimulation)); // calculator name if (getSensitivityCalculator() != null) { @@ -459,7 +461,7 @@ } // number of sensitivity simulation - numberOfSensitivitySimulation = Integer.parseInt(props.getProperty("numberOfSensitivitySimulation", "-1")); + numberOfSensitivitySimulation = Integer.parseInt(props.getProperty(NUMBER_OF_SENSITIVITY_SIMULATION, "-1")); // calculator name String sensitivityCalculator = props.getProperty("sensitivitycalculator", null); if (!StringUtils.isEmpty(sensitivityCalculator)) { 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-05-03 18:20:06 UTC (rev 2165) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-03 18:21:25 UTC (rev 2166) @@ -621,24 +621,25 @@ protected void analyzeSensitivityResult(SimulationJob job, SimulationStorage simulation) { - SimulationParameter params = simulation.getParameter(); + Properties props = simulation.getPropertiesParameter(); - int numberOfSimulation = params.getNumberOfSensitivitySimulation(); - SensitivityCalculator sensitivityCalculator = params.getSensitivityCalculator(); - if (numberOfSimulation > 0 && params.getSensitivityCalculator() != null) { + int numberOfSimulation = Integer.parseInt(props.getProperty(SimulationParameter.NUMBER_OF_SENSITIVITY_SIMULATION)); //getNumberOfSensitivitySimulation(); + + if (numberOfSimulation > 0) { // this is a sensitivity simulation String simulationId = job.getId(); String simulationCommonPrefix = simulationId.substring(0, simulationId.lastIndexOf("_")); // simulation start at 0 List<SimulationStorage> simulationStorageForAnalyze = new ArrayList<SimulationStorage>(); - for (int simulationIndex = 0; simulationIndex < numberOfSimulation ; ++simulationIndex) { + // en sens inverse, il le fera carrement moins souvent + for (int simulationIndex = numberOfSimulation -1; simulationIndex >= 0 ; --simulationIndex) { String currentId = simulationCommonPrefix + "_" + simulationIndex; if (SimulationStorage.localyExists(currentId)) { SimulationControl currentSimulationControl = new SimulationControl(currentId); SimulationStorage.readControl(currentId, currentSimulationControl); - // condiftion for simulation "end" + // condition for simulation "end" if (currentSimulationControl.getProgress() > 0 && currentSimulationControl.getProgress() >= currentSimulationControl.getProgressMax()) { SimulationStorage storage = SimulationStorage.getSimulation(currentId); @@ -666,6 +667,8 @@ // on construit la liste des simulation storage // et on l'envoie au script d'analyse de sensibilite if (simulationStorageForAnalyze.size() == numberOfSimulation) { + SimulationParameter params = simulation.getParameter(); + SensitivityCalculator sensitivityCalculator = params.getSensitivityCalculator(); if (log.isDebugEnabled()) { log.debug("Call analyzeResult on sensitivity script " + sensitivityCalculator.getClass().getSimpleName()); }

1 0

r2165 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org May 3, 2009

May 3, 2009

Author: chatellier Date: 2009-05-03 18:20:06 +0000 (Sun, 03 May 2009) New Revision: 2165 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java Log: Add getPropertiesParameter method with no database connection Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2009-05-03 18:18:42 UTC (rev 2164) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2009-05-03 18:20:06 UTC (rev 2165) @@ -309,6 +309,8 @@ /** * Get parameter property. * + * This method open database. + * * @return Parameter property. */ public SimulationParameter getParameter() { @@ -337,6 +339,30 @@ } /** + * Get parameter property. + * + * @return Parameter property. + */ + public Properties getPropertiesParameter() { + + Properties prop = new Properties(); + File file = getSimulationParametersFile(); + + + try { + FileInputStream in = new FileInputStream(file); + prop.load(in); + in.close(); + + } catch (IOException eee) { + throw new IsisFishRuntimeException(_( + "isisfish.error.read.simulation.parameters", file), eee); + } + + return prop; + } + + /** * Permet de force la relecture des parametres et donc que les scripts * soit charge dans le bon classloader *

1 0

r2164 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions
by chatellier＠users.labs.libre-entreprise.org May 3, 2009

May 3, 2009

Author: chatellier Date: 2009-05-03 18:18:42 +0000 (Sun, 03 May 2009) New Revision: 2164 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java Log: Add log. Compress simulation in tbz2. 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-05-03 08:58:08 UTC (rev 2163) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-05-03 18:18:42 UTC (rev 2164) @@ -23,12 +23,12 @@ import java.io.File; import java.io.FileInputStream; -import java.util.Collections; import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.util.FileUtil; +import org.codelutin.util.Tbz2Util; import org.codelutin.util.ZipUtil; import org.codelutin.util.ApplicationConfig.Action.Step; @@ -136,15 +136,19 @@ * @param simulationId id de simulation * @param simulationZip zip de la simulation * @param simulationPrescript simulation prescript (can be null, empty) - * @param simulationResultZip simulation result zip + * @param simulationResultArchive simulation result archive (tbz2 or zip) * @throws Exception */ @Step(IsisConfig.STEP_AFTER_INIT_VCS) - public static void simulateRemotellyWithPreScript(String simulationId, File simulationZip, File simulationResultZip, File simulationPrescript) + public static void simulateRemotellyWithPreScript(String simulationId, File simulationZip, File simulationResultArchive, File simulationPrescript) throws Exception { if (log.isInfoEnabled()) { - log.info("Command line action : simulateRemotelly (" + simulationId + ", " + simulationZip.getAbsolutePath() + ", " + simulationPrescript + ")"); + log.info("Command line action : simulateRemotelly"); + log.info(" simulation id : " + simulationId); + log.info(" simulation zip : " + simulationZip); + log.info(" result archive : " + simulationResultArchive); + log.info(" prescript file : " + simulationPrescript); } String name = simulationId; // ne pas mettre la date, car le sub process la met deja + " " + new SimpleDateFormat("yyyy-MM-dd-HH-mm").format(new Date()); @@ -175,11 +179,27 @@ // FIXME more performant than simulationStorage.createZip //ZipUtil.compressFiles(simulationResultZip, simulationStorage.getFile(), // Collections.singletonList(new File(simulationStorage.getFile(), simulationStorage.getName())), true); - ZipUtil.compress(simulationResultZip, simulationStorage.getFile(), null, true); + // if .tbz2 or .tar.bz2 + if (simulationResultArchive.getName().endsWith("bz2")) { + if (log.isInfoEnabled()) { + log.info("Compressing simulation as tar/bzip2 : " + simulationResultArchive); + } + Tbz2Util.compress(simulationResultArchive, simulationStorage.getFile(), null, true); + } + else { + if (log.isInfoEnabled()) { + log.info("Compressing simulation as zip : " + simulationResultArchive); + } + ZipUtil.compress(simulationResultArchive, simulationStorage.getFile(), null, true); + } + simulationStorage.getStorage().closeContext(); // remove simulation + if (log.isInfoEnabled()) { + log.info("Deleting simulation : " + simulationStorage.getRoot()); + } simulationStorage.delete(false); // FIXME integrer ca dans le process normal d'init

1 0

r2163 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org May 3, 2009

May 3, 2009

Author: chatellier Date: 2009-05-03 08:58:08 +0000 (Sun, 03 May 2009) New Revision: 2163 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java Log: Improve comparison for AS. (xxx_10 was before xxx_2) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2009-04-30 16:41:43 UTC (rev 2162) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2009-05-03 08:58:08 UTC (rev 2163) @@ -148,10 +148,31 @@ this.onlyCheckControl = onlyCheckControl; } + /** + * L'ordre depend : + * - de la priorite + * - si le nom fini par un chiffre : + * - du nom avant le chiffre (TODO :) ) + * - du chiffre + * - sinon du nom + */ + @Override public int compareTo(SimulationJob o) { int result = this.priority - o.priority; if (result == 0) { - result = this.getId().compareTo(o.getId()); + if (this.getId().matches(".*_\\d+") && o.getId().matches(".*_\\d+")) { + String firstString = this.getId().substring(0, this.getId().lastIndexOf("_")); + String secondString = o.getId().substring(0, o.getId().lastIndexOf("_")); + result = firstString.compareTo(secondString); + if (result == 0) { + int firstNumber = Integer.parseInt(this.getId().substring(this.getId().lastIndexOf("_") + 1)); + int secondNumber = Integer.parseInt(o.getId().substring(o.getId().lastIndexOf("_") + 1)); + result = firstNumber - secondNumber; + } + } + if (result == 0) { + result = this.getId().compareTo(o.getId()); + } } return result; }

1 0

r2162 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/input resources/i18n
by sletellier＠users.labs.libre-entreprise.org April 30, 2009

April 30, 2009

Author: sletellier Date: 2009-04-30 16:41:43 +0000 (Thu, 30 Apr 2009) New Revision: 2162 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Done : [#1817] manque de zones de saisie dans l'interface Population/Saison_ Bloquant EC Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-04-30 16:21:03 UTC (rev 2161) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-04-30 16:41:43 UTC (rev 2162) @@ -107,6 +107,7 @@ } // go back to previous node returnToPreviousNode(getNavigationTree(), event); + log.info("goBackToPreviousNode"); } @@ -121,7 +122,10 @@ try { currentUI = (InputContentUI) newUI; currentUI.setSens(false); - context.getContextValue(InputSaveVerifier.class).addCurrentPanel(currentUI); + InputSaveVerifier verifier = context.getContextValue(InputSaveVerifier.class); + verifier.removeAllPanels(); + verifier.addCurrentPanel(currentUI); + currentUI.refresh(); currentNode = node; } catch (Exception e) { if (log.isErrorEnabled()) { @@ -148,7 +152,7 @@ exit = false; } if (exit) { - verif.removeAllPanels(); + verif.reset(); } return exit; } @@ -164,9 +168,6 @@ if (TopiaEntity.class.isInstance(data)){ verif.addCurrentEntity((TopiaEntity) data); } - else{ - verif.addCurrentEntity(null); - } verif.refreshAll(); verif.setCurrentNode(node); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-04-30 16:21:03 UTC (rev 2161) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-04-30 16:41:43 UTC (rev 2162) @@ -373,6 +373,16 @@ addCurrentEntity(currentEntity, currentEntity.getTopiaId()); } } + public void reset(){ + removeAllEntity(); + removeAllPanels(); + this.currentCancelButton = null; + this.currentDeleteButton = null; + this.currentNewButton = null; + this.currentSaveButton = null; + this.currentOnglet = null; + this.currentNode = null; + } public void removeAllEntity(){ currentEntities.clear(); editable = false; Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-04-30 16:41:43 UTC (rev 2162) @@ -0,0 +1,124 @@ + +<fr.ifremer.isisfish.ui.input.InputContentUI> + +  + <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/> + + <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='populationSeasonInfo' javaBean='null'/> + + <Boolean id='popSeasonInfoNotNull' javaBean='false'/> + + <Boolean id='ageGroupType' javaBean='false'/> + + <script><![CDATA[ +import fr.ifremer.isisfish.entities.PopulationSeasonInfo; +import org.codelutin.math.matrix.gui.JAXXMatrixEditor; +import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl; +import org.codelutin.math.matrix.MatrixND; +import org.codelutin.math.matrix.gui.MatrixPanelEvent; +import org.codelutin.math.matrix.gui.MatrixPanelListener; +import fr.ifremer.isisfish.ui.widget.ErrorDialogUI; + +protected MatrixPanelListener listener = null; + +listener = new MatrixPanelListener() { + + @Override + public void matrixChanged(MatrixPanelEvent arg0) { + if (getPopulationSeasonInfo() != null && fieldPopulationSeasonReproductionDistribution.getMatrix() != null){ + getPopulationSeasonInfo().setLengthChangeMatrix(fieldPopulationSeasonReproductionDistribution.getMatrix().copy()); + } + } +}; +public void refresh(){ + fieldPopulationSeasonReproductionDistribution.addMatrixListener(listener); +} +public void spacialized(){ + getPopulationSeasonInfo().setSimpleLengthChangeMatrix(labelPopulationSeasonGroupChangeLengthNoSpacialized.isSelected()); + PopulationSeasonInfo popInfo = getPopulationSeasonInfo(); + try { + MatrixND mat = popInfo.getLengthChangeMatrix(); + if (mat != null){ + if (popInfo.getSimpleLengthChangeMatrix()) { + mat = popInfo.unspacializeLengthChangeMatrix(mat); + } else { + mat = popInfo.spacializeLengthChangeMatrix(mat); + popInfo.setLengthChangeMatrix(mat); + } + } + }catch(Exception eee){ + log.error("Can't (un)spacialize Matrix Change Of Group", eee); + ErrorDialogUI.showError(eee); + } +} + +public void computeMatrixChangeOfGroup(){ + PopulationSeasonInfo popInfo = getPopulationSeasonInfo(); + MatrixND mat = popInfo.computeLengthChangeMatrix(); + if(!popInfo.getSimpleLengthChangeMatrix()){ + mat = popInfo.spacializeLengthChangeMatrix(mat); + } + popInfo.setLengthChangeMatrix(mat); +} + +public void showSpacializedMatrixChangeOfGroup(){ + PopulationSeasonInfo popInfo = getPopulationSeasonInfo(); + MatrixND mat = popInfo.getLengthChangeMatrix(); + if(popInfo.getSimpleLengthChangeMatrix()){ + mat = popInfo.spacializeLengthChangeMatrix(mat); + } + JAXXMatrixEditor panel = new JAXXMatrixEditor(false, 800, 300); + panel.setMatrix(mat); + JOptionPane.showMessageDialog(null, panel, _("isisfish.message.spacialized.visualisation"), JOptionPane.INFORMATION_MESSAGE); +} + ]]></script> + + <Table> + <row> + <cell> + <Panel/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JRadioButton id="labelPopulationSeasonGroupChangeLengthNoSpacialized" + buttonGroup="labelPopulationSeasonGroupChangeLengthSpacializedGroup" + selected='{getPopulationSeasonInfo().getSimpleLengthChangeMatrix()}' + text="isisfish.populationSeasons.noSpacialized" decorator='boxed' + enabled='{isPopSeasonInfoNotNull()}' onItemStateChanged='spacialized()' + visible='{isAgeGroupType()}'/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JRadioButton id="labelPopulationSeasonGroupChangeLengthSpacialized" + buttonGroup="labelPopulationSeasonGroupChangeLengthSpacializedGroup" + selected='{!getPopulationSeasonInfo().getSimpleLengthChangeMatrix()}' + text="isisfish.populationSeasons.spacialized" enabled='{isPopSeasonInfoNotNull()}' + visible='{isAgeGroupType()}' decorator='boxed'/> + </cell> + </row> + <row> + <cell> + <JLabel text="isisfish.populationSeasons.changeGroup" visible='{isAgeGroupType()}'/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.populationSeasons.computeCoefficient" decorator='boxed' visible='{isAgeGroupType()}' + enabled='{isPopSeasonInfoNotNull()}' onActionPerformed='computeMatrixChangeOfGroup()'/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton id="labelPopulationSeasonGroupChangeLengthButtonShow" text="isisfish.populationSeasons.showSpacialized" + enabled='{labelPopulationSeasonGroupChangeLengthNoSpacialized.isSelected()}' decorator='boxed' + onActionPerformed='showSpacializedMatrixChangeOfGroup()' + visible='{isAgeGroupType()}'/> + </cell> + </row> + <row> + <cell> + <Panel/> + </cell> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationSeasonReproductionDistribution' + matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}' + decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"' + visible='{isAgeGroupType()}'/> + </cell> + </row> + </Table> +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-04-30 16:21:03 UTC (rev 2161) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-04-30 16:41:43 UTC (rev 2162) @@ -120,6 +120,15 @@ } }); +listener = new MatrixPanelListener() { + + @Override + public void matrixChanged(MatrixPanelEvent arg0) { + if (getPopulationSeasonInfo() != null && fieldPopulationSeasonReproductionDistribution.getMatrix() != null){ + getPopulationSeasonInfo().setLengthChangeMatrix(fieldPopulationSeasonReproductionDistribution.getMatrix().copy()); + } + } +}; public void refresh(){ if (!isActif()){ setPopSeasonInfoNotNull(false); @@ -144,16 +153,14 @@ ip.setLabelRenderer(Month.MONTH); ip.setModel(interval); - listener = new MatrixPanelListener() { - - @Override - public void matrixChanged(MatrixPanelEvent arg0) { - if (getPopulationSeasonInfo() != null && fieldPopulationSeasonReproductionDistribution.getMatrix() != null){ - getPopulationSeasonInfo().setLengthChangeMatrix(fieldPopulationSeasonReproductionDistribution.getMatrix().copy()); - } - } - }; + if(getPopulationSeasonInfo() != null) { + PopulationSeasonInfoImpl popInfo = getPopulationSeasonInfo(); + setPopulationSeasonInfo(null); + setPopulationSeasonInfo(popInfo); + getVerifier().addCurrentEntity(getPopulationSeasonInfo()); + } fieldPopulationSeasonReproductionDistribution.addMatrixListener(listener); + getVerifier().addCurrentPanel(populationSeasonSpecializedUI); } protected void setInterval() { if(getPopulationSeasonInfo() != null) { @@ -191,7 +198,7 @@ } protected void setCombo(){ if (getBean() != null){ - jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationSeasonInfoChooser,getBean().getPopulationSeasonInfo(), getBean().getPopulationSeasonInfo(), true); + jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationSeasonInfoChooser,getBean().getPopulationSeasonInfo(), getPopulationSeasonInfo(), true); } } protected void seasonGroupChanged(){ @@ -204,17 +211,17 @@ setPopulationSeasonInfo((PopulationSeasonInfoImpl)fieldPopulationSeasonInfoChooser.getSelectedItem()); getVerifier().addCurrentEntity(getPopulationSeasonInfo()); setPopSeasonInfoNotNull(getPopulationSeasonInfo() != null); - SwingUtilities.invokeLater(new Runnable() { - public void run() { - setInterval(); - setMatrix(); - init = false; - } - }); + setInterval(); + setMatrix(); + init = false; } protected void setMatrix(){ fieldPopulationSeasonReproductionDistribution.setMatrix(getPopulationSeasonInfo().getLengthChangeMatrix()); } +protected boolean isAgeGroupType(boolean result){ + populationSeasonSpecializedUI.setVisible(result); + return result; +} ]]> </script> <Table id='body'> @@ -240,32 +247,48 @@ </cell> </row> <row> - <cell> + <cell fill='both'> <JPanel/> </cell> - <cell fill='horizontal' weightx='1.0'> + <cell fill='both' weightx='1.0'> <JCheckBox id="fieldPopulationSeasonGroupChange" text="isisfish.populationSeasons.changeGroup" selected='{getPopulationSeasonInfo().getGroupChange()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"GroupChange"' - onActionPerformed='seasonGroupChanged()' enabled='{isPopSeasonInfoNotNull()}'/> + onActionPerformed='seasonGroupChanged()' enabled='{isPopSeasonInfoNotNull()}' visible='{isAgeGroupType(getPopulationSeasonInfo().getPopulation().getSpecies().getAgeGroupType())}'/> </cell> </row> <row> + <cell> + <JPanel/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JCheckBox id="fieldPopulationSeasonReproduction" selected='{getPopulationSeasonInfo().getReproduction()}' + onActionPerformed='getPopulationSeasonInfo().setReproduction(fieldPopulationSeasonReproduction.isSelected())' + text="isisfish.populationSeasons.Reproduction" enabled='{isPopSeasonInfoNotNull()}'/> + </cell> + </row> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='0.6'> + <PopulationSeasonSpacializedUI id='populationSeasonSpecializedUI' bean='{getBean()}' + populationSeasonInfo='{getPopulationSeasonInfo()}' popSeasonInfoNotNull='{isPopSeasonInfoNotNull()}' + ageGroupType='{isAgeGroupType(!getPopulationSeasonInfo().getPopulation().getSpecies().getAgeGroupType())}'/> + </cell> + </row> + <row> <cell anchor='east'> - <JLabel text="isisfish.populationSeasons.distributionSpawning" enabled='{isPopSeasonInfoNotNull()}'/> + <JLabel text="isisfish.populationSeasons.distributionSpawning" enabled='{isPopSeasonInfoNotNull()}' visible='{getPopulationSeasonInfo().getReproduction()}'/> </cell> - <cell fill='both' weightx='1.0'> - <JScrollPane> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationSeasonReproductionDistribution' - matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}' - decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"'/> - </JScrollPane> + <cell fill='both' weightx='1.0' weighty='0.2'> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationSeasonReproductionDistribution' + matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}' + visible='{getPopulationSeasonInfo().getReproduction()}' + decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"'/> </cell> </row> <row> <cell anchor='east'> <JLabel text="isisfish.populationSeasons.comments" enabled='{isPopSeasonInfoNotNull()}'/> </cell> - <cell fill='both' weightx='1.0' weighty='1.0'> + <cell fill='both' weightx='1.0' weighty='0.1'> <JScrollPane> <JTextArea id="fieldPopulationSeasonComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getSeasonsComment())}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed'/> </JScrollPane> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-04-30 16:21:03 UTC (rev 2161) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-04-30 16:41:43 UTC (rev 2162) @@ -32,8 +32,6 @@ import fr.ifremer.isisfish.entities.Formule; import fr.ifremer.isisfish.entities.SetOfVessels; import fr.ifremer.isisfish.entities.SetOfVesselsImpl; -import java.util.logging.Level; -import java.util.logging.Logger; boolean init = false; addPropertyChangeListener("bean", new PropertyChangeListener() { Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-04-30 16:21:03 UTC (rev 2161) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-04-30 16:41:43 UTC (rev 2162) @@ -608,6 +608,7 @@ isisfish.message.simulation.ended=Simulation ended isisfish.message.simulation.execution=Simulation execution isisfish.message.simulation.prepare=Preparing simulation +isisfish.message.spacialized.visualisation= isisfish.message.tray.disabled=SystemTray disabled isisfish.message.update.finished=update finished isisfish.metier.comments=Comments @@ -731,10 +732,15 @@ isisfish.populationSeasonInfo.migration=Migration isisfish.populationSeasonInfo.months=Months isisfish.populationSeasonInfo.toString=%1$s season %2$s-%3$s +isisfish.populationSeasons.Reproduction=Reproduction isisfish.populationSeasons.changeGroup=Change of group isisfish.populationSeasons.comments=Comments +isisfish.populationSeasons.computeCoefficient=Calculate coefficient isisfish.populationSeasons.distributionSpawning=Distribution of spawning +isisfish.populationSeasons.noSpacialized=Not spacialized isisfish.populationSeasons.selectSeason=Select a season +isisfish.populationSeasons.showSpacialized=Show the spacialized +isisfish.populationSeasons.spacialized=Spacialized isisfish.populationSeasons.title=Saisons isisfish.populationZones.betweenSpawningRecruitmentAreas=Match between spawning and recruitment areas isisfish.populationZones.selectPopulationAreas=Select the population areas Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-30 16:21:03 UTC (rev 2161) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-30 16:41:43 UTC (rev 2162) @@ -608,6 +608,7 @@ isisfish.message.simulation.ended=Simulation termin\u00E9e isisfish.message.simulation.execution=Simulation execution isisfish.message.simulation.prepare=Pr\u00E9paration de la simulation +isisfish.message.spacialized.visualisation= isisfish.message.tray.disabled=Icone de notification d\u00E9sactiv\u00E9e isisfish.message.update.finished=Mise \u00E0 jour termin\u00E9e isisfish.metier.comments=Commentaires @@ -731,10 +732,15 @@ isisfish.populationSeasonInfo.migration=Migration isisfish.populationSeasonInfo.months=Mois isisfish.populationSeasonInfo.toString=%1$s saison %2$s-%3$s +isisfish.populationSeasons.Reproduction=Reproduction isisfish.populationSeasons.changeGroup=Changement de groupe isisfish.populationSeasons.comments=Commentaires +isisfish.populationSeasons.computeCoefficient=Calculer le coefficient isisfish.populationSeasons.distributionSpawning=Distribution de la reproduction +isisfish.populationSeasons.noSpacialized=Non spacialized isisfish.populationSeasons.selectSeason=S\u00E9lectionnez une saison +isisfish.populationSeasons.showSpacialized=Voir les spacialized +isisfish.populationSeasons.spacialized=Spacialized isisfish.populationSeasons.title=Saisons isisfish.populationZones.betweenSpawningRecruitmentAreas=Correspondance entre les zones de reproduction et de recrutement isisfish.populationZones.selectPopulationAreas=S\u00E9lectionnez les zones des populations @@ -1058,4 +1064,4 @@ minimum\ length= not\ started= region\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite= -simulate\ %s\ with\ file\ %s= +simulate\ %s\ with\ file\ %s= \ No newline at end of file

1 0

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

April 30, 2009

Author: chatellier Date: 2009-04-30 16:21:03 +0000 (Thu, 30 Apr 2009) New Revision: 2161 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Rechargement des ann?\195?\169es lors du rechargement d'un simulation Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-04-30 15:35:37 UTC (rev 2160) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-04-30 16:21:03 UTC (rev 2161) @@ -154,6 +154,8 @@ public void run() { getContextValue(SimulAction.class).loadOldSimulation(selected); refresh(); + // mise a jour des années + fieldSimulParamsNbAnnees.setText(String.valueOf(getContextValue(SimulAction.class).getNumberOfYear())); setFactorRegion(); setExportSens(); setSensitivityCalculator(); @@ -207,7 +209,7 @@ } } protected void setNbAnnees(){ - getContextValue(SimulAction.class).setNbAnnees(fieldSimulParamsNbAnnees.getText()); + getContextValue(SimulAction.class).setNumberOfYear(fieldSimulParamsNbAnnees.getText()); } protected void setListSimulParamsStrategiesItems(){ DefaultListModel listSimulParamsStrategiesModel = new DefaultListModel(); 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-04-30 15:35:37 UTC (rev 2160) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-04-30 16:21:03 UTC (rev 2161) @@ -514,7 +514,11 @@ // Years - public void setNbAnnees(String years) { + public int getNumberOfYear() { + return param.getNumberOfYear(); + } + + public void setNumberOfYear(String years) { param.setNumberOfYear(Integer.parseInt(years)); }

1 0

r2160 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: datastore simulator
by chatellier＠users.labs.libre-entreprise.org April 30, 2009

April 30, 2009

Author: chatellier Date: 2009-04-30 15:35:37 +0000 (Thu, 30 Apr 2009) New Revision: 2160 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java Log: Fix hack cache problem (hack still not fixed) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2009-04-30 15:35:07 UTC (rev 2159) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2009-04-30 15:35:37 UTC (rev 2160) @@ -71,11 +71,20 @@ @SuppressWarnings("unchecked") static protected Map<String, RegionStorage> regions = (Map<String, RegionStorage>) new ReferenceMap(); - /** File to use to store next commit region comment */ protected File commentForNextCommitFile = null; - protected RegionStorage(File directory, String name) { + /** + * Constructor. + * + * @param directory region directory + * @param name region name + * + * FIXME constrcutor is publicc for hack in + * fr.ifremer.isisfish.simulator.SimulationParameter.fromProperties(File, Properties) + * set protected when fix hack + */ + public RegionStorage(File directory, String name) { super(directory, name); commentForNextCommitFile = new File(getDirectory(), "commentForNextCommit.txt"); } 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-04-30 15:35:07 UTC (rev 2159) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-04-30 15:35:37 UTC (rev 2160) @@ -349,7 +349,8 @@ // FIXME not good place and code if(this.region == null || !region.getName().equals(regionName)) { - this.region = RegionStorage.getRegion(directory, regionName); + // ATTENTION: directory pointe sur le repertoire de la simulation et non de la region + this.region = new RegionStorage(directory, regionName); // RegionStorage.getRegion(directory, regionName); } try {

1 0