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

r2849 - in isis-fish/trunk/src/test: java/fr/ifremer/isisfish/mexico resources/mexico
by chatellier＠users.labs.libre-entreprise.org 17 Dec '09

17 Dec '09

Author: chatellier Date: 2009-12-17 14:35:23 +0000 (Thu, 17 Dec 2009) New Revision: 2849 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java isis-fish/trunk/src/test/resources/mexico/mexicohelper_designplan.xml Log: Update mexico design test and test data. Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-12-16 15:21:02 UTC (rev 2848) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-12-17 14:35:23 UTC (rev 2849) @@ -95,8 +95,8 @@ "factor 3 (integer discrete)"); DiscreteDomain<Integer, Double> domain3 = new DiscreteDomain<Integer, Double>(); domain3.getValues().put(0.0, 13); - domain3.getValues().put(0.0, 14); - domain3.getValues().put(0.0, 15); + domain3.getValues().put(1.0, 14); + domain3.getValues().put(2.0, 45); factorContinuous2.setDomain(domain3); factorContinuous2 .setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength"); Modified: isis-fish/trunk/src/test/resources/mexico/mexicohelper_designplan.xml =================================================================== --- isis-fish/trunk/src/test/resources/mexico/mexicohelper_designplan.xml 2009-12-16 15:21:02 UTC (rev 2848) +++ isis-fish/trunk/src/test/resources/mexico/mexicohelper_designplan.xml 2009-12-17 14:35:23 UTC (rev 2849) @@ -1,74 +1,74 @@ <experimentalDesign> - <factors> - <factor name="factor 1 (double continuous)" property="continuous" type="real"> - <target> - fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength - </target> - <domain> - <fixed cardinality="0"> - <range min="0.0" max="50.0" /> - </fixed> - </domain> - </factor> - <factor name="factor 2 (double discrete)" property="discrete" type="real"> - <target> - fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength - </target> - <value> - 3.0</value> - <domain> - <fixed cardinality="5"> - <enumeration> - <value> - 12.3</value> - <value> - 70.9</value> - <value> - 21.0</value> - <value> - -12.1</value> - <value> - -8.45</value> - </enumeration> - </fixed> - </domain> - </factor> - <factor name="factor 3 (integer discrete)" property="discrete" type="integer"> - <target> - fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength - </target> - <domain> - <fixed cardinality="1"> - <enumeration> - <value> - 15</value> - </enumeration> - </fixed> - </domain> - </factor> - <factor name="factor 4 (MatrixContinuous)" property="matrixcontinuous" type="real"> - <target> - fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength - </target> - <domain> - <fixed cardinality="0"> - <range min="0.0" max="1.0" /> - <matrix coefficient="0.1" operator="-"> - [test1,[3, 2],[\"col1\", \"col2\"],[[null(), null(), null()], [null(), null()]],[[13.0, -14.0], [21.0, - 2.0], [12.0, -1.0]]]</matrix> - </fixed> - </domain> - </factor> - <factor name="factor 5 (EquationContinuous)" property="equationcontinuous" type="real"> - <target> - fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#maxLength - </target> - <domain> - <fixed cardinality="0"> - <range min="0.0" max="1.0" /> - <equation variable="L1" operator="-" coefficient="0.1" reference="45.0" /> - </fixed> - </domain> - </factor> - </factors> + <factors> + <factor name="factor 1 (double continuous)" property="continuous" + type="real"> + <target> + fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength + </target> + <domain> + <fixed cardinality="0"> + <range min="0.0" max="50.0" /> + </fixed> + </domain> + </factor> + <factor name="factor 2 (double discrete)" property="discrete" + type="real"> + <target> + fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength + </target> + <domain> + <fixed cardinality="5"> + <enumeration> + <value>12.3</value> + <value>70.9</value> + <value>21.0</value> + <value>-12.1</value> + <value>-8.45</value> + </enumeration> + </fixed> + </domain> + </factor> + <factor name="factor 3 (integer discrete)" property="discrete" + type="integer"> + <target> + fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength + </target> + <domain> + <fixed cardinality="3"> + <enumeration> + <value>13</value> + <value>14</value> + <value>45</value> + </enumeration> + </fixed> + </domain> + </factor> + <factor name="factor 4 (MatrixContinuous)" property="matrixcontinuous" + type="real"> + <target> + fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength + </target> + <domain> + <fixed cardinality="0"> + <range min="0.0" max="1.0" /> + <matrix coefficient="0.1" operator="-"> + [test1,[3, 2],[\"col1\", \"col2\"],[[null(), + null(), null()], [null(), null()]],[[13.0, + -14.0], [21.0, 2.0], [12.0, -1.0]]]</matrix> + </fixed> + </domain> + </factor> + <factor name="factor 5 (EquationContinuous)" property="equationcontinuous" + type="real"> + <target> + fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#maxLength + </target> + <domain> + <fixed cardinality="0"> + <range min="0.0" max="1.0" /> + <equation variable="L1" operator="-" coefficient="0.1" reference="45.0" /> + </fixed> + </domain> + </factor> + </factors> </experimentalDesign> \ No newline at end of file

1 0

r2848 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 16 Dec '09

16 Dec '09

Author: chatellier Date: 2009-12-16 15:21:02 +0000 (Wed, 16 Dec 2009) New Revision: 2848 Modified: isis-fish/trunk/changelog.txt Log: Fix mistake Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-12-16 14:19:25 UTC (rev 2847) +++ isis-fish/trunk/changelog.txt 2009-12-16 15:21:02 UTC (rev 2848) @@ -1,7 +1,7 @@ isis-fish (3.3.0.0) stable; urgency=low * Improve simulation stopping algorithm (now faster) - * Locally save simulation zip to allow simulation restart even afer isis shutdown + * Locally save simulation zip to allow simulation restart even after isis shutdown * In sensitivity analysis, upload only one zip to caparmor for all simulations * Add option to control number of SSH thread to use * Add split pane between queued and done simulations tables

1 0

r2847 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 16 Dec '09

16 Dec '09

Author: chatellier Date: 2009-12-16 14:19:25 +0000 (Wed, 16 Dec 2009) New Revision: 2847 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: Improve translation 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-12-16 11:51:57 UTC (rev 2846) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-12-16 14:19:25 UTC (rev 2847) @@ -40,7 +40,6 @@ Process\ template\ error= Region\ %s\ allready\ exist\ in\ repository.\ Can't\ import= 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= @@ -118,7 +117,7 @@ isisfish.common.population=Population isisfish.common.populationGroup=Population group isisfish.common.populations=Populations -isisfish.common.port=port +isisfish.common.port=Port isisfish.common.prev=Previous isisfish.common.region=Region isisfish.common.remove=Remove @@ -145,28 +144,23 @@ isisfish.config.category.misc.description=Miscealenous isisfish.config.category.versioning=VCS isisfish.config.category.versioning.description=Versioning system -isisfish.config.database.lockmode.description= -isisfish.config.main.compileDirectory.description= -isisfish.config.main.configFileName.description= -isisfish.config.main.defaultBackupDirectory.description= -isisfish.config.main.defaultExportDirectory.description= -isisfish.config.main.defaultExportNames.description= -isisfish.config.main.defaultMapFile.description= -isisfish.config.main.defaultResultNames.description= -isisfish.config.main.defaultSimulator.description= +isisfish.config.database.lockmode.description=Database lock mode +isisfish.config.main.compileDirectory.description=Script compilation directory +isisfish.config.main.configFileName.description=Configuration filename +isisfish.config.main.defaultBackupDirectory.description=Backup directory +isisfish.config.main.defaultExportNames.description=Exports to do after simulation +isisfish.config.main.defaultMapFile.description=Default map file to use for map without custom maps +isisfish.config.main.defaultResultNames.description=Result names to manage during a simulation +isisfish.config.main.defaultSimulator.description=Default simulator to use to simulate isisfish.config.main.defaultTagValue.description= isisfish.config.main.encoding.description=encoding used on system -isisfish.config.main.javadocDirectory.description= -isisfish.config.main.javadocURL.description= -isisfish.config.main.launchUI.description= -isisfish.config.main.localSimulator.description= +isisfish.config.main.javadocDirectory.description=Javadoc generation directory +isisfish.config.main.javadocURL.description=Javadoc url +isisfish.config.main.launchUI.description=Display user interface +isisfish.config.main.localSimulator.description=Local simulator launcher name (same process) isisfish.config.main.locale.description=user locale -isisfish.config.main.login.description= isisfish.config.main.monitoringDirectory.description=Folder containing all necessary information needed to restart simulation -isisfish.config.main.password.description= -isisfish.config.main.regionMap.description= -isisfish.config.main.remoteCaparmor.description= -isisfish.config.main.resultExport.description= +isisfish.config.main.remoteCaparmor.description=Remote simulator launcher name isisfish.config.main.simulation.ssh.control.check.interval=Control check interval (seconds) isisfish.config.main.simulation.ssh.control.check.interval.description=Control check interval (seconds) isisfish.config.main.simulation.ssh.datapath=Isis-Fish database @@ -186,17 +180,14 @@ isisfish.config.main.simulation.ssh.userhome.description=User home directory isisfish.config.main.simulation.ssh.username=SSH identifier isisfish.config.main.simulation.ssh.username.description=SSH identifier -isisfish.config.main.simulationServer.description= isisfish.config.main.simulationShowOnlyError.description= -isisfish.config.main.simulationShowOnlyQueue.description= -isisfish.config.main.smtpServer.description= -isisfish.config.main.subSimulator.description= -isisfish.config.main.userMail.description= -isisfish.config.main.userName.description= +isisfish.config.main.smtpServer.description=Smtp server address +isisfish.config.main.subSimulator.description=Sub process simulator launcher name +isisfish.config.main.userMail.description=User email address +isisfish.config.main.userName.description=User name isisfish.config.ssh.key.file=SSH key isisfish.config.ssh.key.file.description=Private SSH key path isisfish.config.vcs.hostName.description= -isisfish.config.vcs.keyFile.description= isisfish.config.vcs.localDatabasePath.description= isisfish.config.vcs.noPassPhrase.description= isisfish.config.vcs.passphrase.description= @@ -259,7 +250,7 @@ isisfish.error.empty.species.name=specie's name is empty isisfish.error.empty.unit=measure unit is empty isisfish.error.equation.openeditor=Can't open equation editor -isisfish.error.equation.return.number=EquationImpl must retun a number\: %1$s +isisfish.error.equation.return.number=EquationImpl must return a number\: %1$s isisfish.error.equation.savemodel=Can't save equation as model isisfish.error.errorpane.htmlmessage=<html><b>IsisFish has handled \:</b><br />%s</b></html> isisfish.error.errorpane.title=Error @@ -392,7 +383,7 @@ isisfish.error.undefined.zone.population=No population's zone defined isisfish.error.undefined.zone.recruitment=No recrutment's zone defined isisfish.error.undefined.zone.reproduction=No reprodution's zone defined -isisfish.error.unsupported.equation.langage=unsupported langage '%1$s' for equation\: %2$s +isisfish.error.unsupported.equation.langage=Unsupported language '%1$s' for equation\: %2$s isisfish.error.wait.simThread=Can't wait SimThread isisfish.error.warning.title=Warning isisfish.error.write.simulation=Can't write information %1$s @@ -417,35 +408,35 @@ isisfish.filter.reset=Reset isisfish.filter.result=Results isisfish.filter.result.found=Results (%d/%d) -isisfish.filter.select=filter.select -isisfish.filter.select.simulation=select.simulation -isisfish.filter.simulation=filter.simulation -isisfish.filter.simulation.analysePlanNumber=analysePlanNumber -isisfish.filter.simulation.description=description -isisfish.filter.simulation.local=local -isisfish.filter.simulation.numberOfYear=numberOfYear -isisfish.filter.simulation.regionName=regionName -isisfish.filter.simulation.simulationEnd=simulationEnd -isisfish.filter.simulation.simulationName=simulationName -isisfish.filter.simulation.simulationStart=simulationStart -isisfish.filter.simulation.simulatorName=simulatorName -isisfish.filter.simulation.tooltip.analysePlanNumber=filter.simulation.tooltip.analysePlanNumber -isisfish.filter.simulation.tooltip.description=filter.simulation.tooltip.description -isisfish.filter.simulation.tooltip.local=filter.simulation.tooltip.local -isisfish.filter.simulation.tooltip.numberOfYear=filter.simulation.tooltip.numberOfYear -isisfish.filter.simulation.tooltip.regionName=filter.simulation.tooltip.regionName -isisfish.filter.simulation.tooltip.simulationEnd=filter.simulation.tooltip.simulationEnd -isisfish.filter.simulation.tooltip.simulationName=filter.simulation.tooltip.simulationName -isisfish.filter.simulation.tooltip.simulationStart=filter.simulation.tooltip.simulationStart -isisfish.filter.simulation.tooltip.simulatorName=filter.simulation.tooltip.simulatorName -isisfish.filter.simulation.tooltip.useAnalysePlan=filter.simulation.tooltip.useAnalysePlan -isisfish.filter.simulation.tooltip.useOptimization=filter.simulation.tooltip.useOptimization -isisfish.filter.simulation.tooltip.usePreScript=filter.simulation.tooltip.usePreScript -isisfish.filter.simulation.tooltip.useStatistic=filter.simulation.tooltip.useStatistic -isisfish.filter.simulation.useAnalysePlan=filter.simulation.useAnalysePlan -isisfish.filter.simulation.useOptimization=filter.simulation.useOptimization -isisfish.filter.simulation.usePreScript=filter.simulation.usePreScript -isisfish.filter.simulation.useStatistic=filter.simulation.useStatistic +isisfish.filter.select=Select +isisfish.filter.select.simulation=Select a simulation +isisfish.filter.simulation=Filter simulations +isisfish.filter.simulation.analysePlanNumber=Analyse plan number +isisfish.filter.simulation.description=Description +isisfish.filter.simulation.local=Local +isisfish.filter.simulation.numberOfYear=Number of year +isisfish.filter.simulation.regionName=Region name +isisfish.filter.simulation.simulationEnd=Simulation end date (dd/MM/yyyy) +isisfish.filter.simulation.simulationName=Simulation name +isisfish.filter.simulation.simulationStart=Simulation start date (dd/MM/yyyy) +isisfish.filter.simulation.simulatorName=Simulator name +isisfish.filter.simulation.tooltip.analysePlanNumber=Filter on analyse number +isisfish.filter.simulation.tooltip.description=Filter on description (regex) +isisfish.filter.simulation.tooltip.local=Filter only local simulations +isisfish.filter.simulation.tooltip.numberOfYear=Filter on number of year (exact sequence) +isisfish.filter.simulation.tooltip.regionName=Filter on region name (regex) +isisfish.filter.simulation.tooltip.simulationEnd=Filter on region end date (format dd/MM/yyyy) +isisfish.filter.simulation.tooltip.simulationName=Filter on simulation name +isisfish.filter.simulation.tooltip.simulationStart=Filter on simulation start date (format dd/MM/yyyy) +isisfish.filter.simulation.tooltip.simulatorName=Filter on simulator name +isisfish.filter.simulation.tooltip.useAnalysePlan=Filter on simulations with analyse plan +isisfish.filter.simulation.tooltip.useOptimization=Filter on simulations with optimization +isisfish.filter.simulation.tooltip.usePreScript=Filter on simulations with pre-script +isisfish.filter.simulation.tooltip.useStatistic=Filter on simulations with statistic +isisfish.filter.simulation.useAnalysePlan=analyse plan +isisfish.filter.simulation.useOptimization=optimization +isisfish.filter.simulation.usePreScript=pre-script +isisfish.filter.simulation.useStatistic=statistic isisfish.fisheryRegion.addMap=Add map isisfish.fisheryRegion.area=Fishery area boundaries isisfish.fisheryRegion.comments=Comments @@ -579,7 +570,7 @@ isisfish.message.evaluation.finished=evaluation finished isisfish.message.export.done=export done isisfish.message.export.zip=Export to zip file %1$s -isisfish.message.file.already.exists= +isisfish.message.file.already.exists=File %s already exists, do you want overwrite it ? isisfish.message.file.overwrite=File exists, do you want overwrite it ? isisfish.message.import=Import %1$s isisfish.message.import.equation.convert=Manual equation convertion @@ -593,11 +584,11 @@ isisfish.message.import.scripts.zipped=Zipped script (*.zip) isisfish.message.import.xml.v2.file=Import xml v2 file isisfish.message.import.zip=Import zip file -isisfish.message.launchui.notlaunch= -isisfish.message.load.finished=load finished +isisfish.message.launchui.notlaunch=User interface not started +isisfish.message.load.finished=Load finished isisfish.message.load.map=Try to load map file\: %1$s -isisfish.message.loading.old.simulation=Loading old simulation ... -isisfish.message.loading.region=Loading region ... +isisfish.message.loading.old.simulation=Loading old simulation... +isisfish.message.loading.region=Loading region... isisfish.message.name.imported.region=Enter name for imported region isisfish.message.new.filename=Enter the name of the new file. (use only chars and _ and start with uppercase) isisfish.message.new.formule.category=Select the equation model's category @@ -787,9 +778,9 @@ isisfish.queue.title=Queue isisfish.result.abundance=Abondance isisfish.result.add=Add a result -isisfish.result.begin.simulation=En debut de Simulation\: +isisfish.result.begin.simulation=Simulation start \: isisfish.result.capture=Capture -isisfish.result.capture.metier=Capture par metier +isisfish.result.capture.metier=Capture by metier isisfish.result.choose.simulation=Choose a Simulation isisfish.result.datas=Datas isisfish.result.dimension=Dimension @@ -872,7 +863,7 @@ isisfish.script.paste=Paste isisfish.script.paste.tooltip=Paste current selection (Ctrl-v) isisfish.script.save=Save -isisfish.script.save.tooltip=Sauve le script +isisfish.script.save.tooltip=Save script isisfish.script.title=Script Editor isisfish.season.toString=season %1$s-%2$s isisfish.selectivity.equation=Equation @@ -914,10 +905,10 @@ isisfish.setOfVessels.technicalEfficiency=Technical efficiency isisfish.setOfVessels.title=Caracteristics isisfish.setOfVessels.vesselType=Vessel type -isisfish.simpleResult.more.information=Clic a cell for more information... +isisfish.simpleResult.more.information=Click a cell for more information... isisfish.simulation.log.console.title=Log console for simulation '%1$s' -isisfish.simulation.log.showConsole=display log console for simulation %1$s -isisfish.simulation.menu.import=Restor simulation parameter +isisfish.simulation.log.showConsole=Display log console for simulation %1$s +isisfish.simulation.menu.import=Restore simulation parameter isisfish.simulation.menu.save=Save simulation parameter isisfish.simulation.menu.simulation=Simulation isisfish.simulation.name=Simulation name 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-12-16 11:51:57 UTC (rev 2846) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-12-16 14:19:25 UTC (rev 2847) @@ -40,7 +40,6 @@ Process\ template\ error= Region\ %s\ allready\ exist\ in\ repository.\ Can't\ import= 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= @@ -145,28 +144,23 @@ isisfish.config.category.misc.description=Divers isisfish.config.category.versioning=VCS isisfish.config.category.versioning.description=Gestionnaire de version -isisfish.config.database.lockmode.description= +isisfish.config.database.lockmode.description=M\u00E9thode de v\u00E9rouillage \u00E0 utiliser pour la base de donn\u00E9es isisfish.config.main.compileDirectory.description=le r\u00E9pertoire o\u00F9 sont compil\u00E9s les scripts isisfish.config.main.configFileName.description=le fichier de configuration \u00E0 utiliser isisfish.config.main.defaultBackupDirectory.description=le r\u00E9pertoire o\u00F9 stocker les backups des donn\u00E9es -isisfish.config.main.defaultExportDirectory.description=le r\u00E9pertoire o\u00F9 exporter les r\u00E9sultats des simulations isisfish.config.main.defaultExportNames.description=les noms des exports \u00E0 effectuer apr\u00E8s une simulation isisfish.config.main.defaultMapFile.description=noms de la carte par d\u00E9faut pour une base sans cartes -isisfish.config.main.defaultResultNames.description=les noms des r\u00E9sultats \u00E0 traiter apr\u00E8s une simulation +isisfish.config.main.defaultResultNames.description=les noms des r\u00E9sultats \u00E0 traiter durant une simulation isisfish.config.main.defaultSimulator.description=le nom du simulateur par d\u00E9faut \u00E0 utiliser lors d'une simulation isisfish.config.main.defaultTagValue.description= isisfish.config.main.encoding.description=l'encoding du syst\u00E8me isisfish.config.main.javadocDirectory.description=dossier de g\u00E9n\u00E9ration de la javadoc des scripts isisfish.config.main.javadocURL.description=l'url de la javadoc des scripts -isisfish.config.main.launchUI.description= -isisfish.config.main.localSimulator.description=pour indiquer si les simulations sont \u00E0 effectuer localement +isisfish.config.main.launchUI.description=Affiche l'interface utilisateur +isisfish.config.main.localSimulator.description=Nom du simulateur local (processus courant) isisfish.config.main.locale.description=la locale utilisateur -isisfish.config.main.login.description=le login pour se connecter au serveur de simulations distant isisfish.config.main.monitoringDirectory.description=Dossier contenant les informations permettant de relancer les simulations -isisfish.config.main.password.description=le mot de passe pour se connecter au serveur de simulations distant -isisfish.config.main.regionMap.description=le nom du r\u00E9pertoire contenant les maps d'une r\u00E9gion -isisfish.config.main.remoteCaparmor.description=lance les simulations sur un serveur distant -isisfish.config.main.resultExport.description=TODO +isisfish.config.main.remoteCaparmor.description=Nom du lanceur de simulation distante isisfish.config.main.simulation.ssh.control.check.interval=V\u00E9rification de la progression (secondes) isisfish.config.main.simulation.ssh.control.check.interval.description=Temps d'attente en secondes entre deux v\u00E9rifications de progression isisfish.config.main.simulation.ssh.datapath=Base de donn\u00E9es @@ -186,17 +180,14 @@ isisfish.config.main.simulation.ssh.userhome.description=R\u00E9pertoire d'accueil de l'utilisateur isisfish.config.main.simulation.ssh.username=Identifiant isisfish.config.main.simulation.ssh.username.description=Identifiant SSH pour se connecter au serveur -isisfish.config.main.simulationServer.description=l'url du serveur de simulations distant isisfish.config.main.simulationShowOnlyError.description=pour indiquer si l'on doit conserver dans l'UI des simulations termin\u00E9es uniquement celles avec erreur -isisfish.config.main.simulationShowOnlyQueue.description=pour indiquer si l'on doit conserver dans l'UI des simulations termin\u00E9es uniquement celles effectu\u00E9es localement isisfish.config.main.smtpServer.description=le nom du serveur smtp \u00E0 utiliser pour envoyer les courriels -isisfish.config.main.subSimulator.description=pour indiquer si les simulations sont \u00E0 effectuer localement dans un sous process +isisfish.config.main.subSimulator.description=Nom du simulateur en sous processus isisfish.config.main.userMail.description=le courriel de l'utilisateur isisfish.config.main.userName.description=le nom - pr\u00E9nom de l'utilisateur isisfish.config.ssh.key.file=Cl\u00E9 SSH isisfish.config.ssh.key.file.description=Emplacement de la cl\u00E9 priv\u00E9e SSH isisfish.config.vcs.hostName.description=le nom du serveur vcs \u00E0 utiliser -isisfish.config.vcs.keyFile.description=le chemin complet du fichier de clef priv\u00E9e ssh2 \u00E0 utiliser lors d'une connexion s\u00E9curis\u00E9e isisfish.config.vcs.localDatabasePath.description= isisfish.config.vcs.noPassPhrase.description=pour indiquer si la clef priv\u00E9e ssh2 utilis\u00E9e pour communiquer avec le serveur vcs est prot\u00E9g\u00E9 par une passe-phrase isisfish.config.vcs.passphrase.description=la passe-phrase utilis\u00E9e pour prot\u00E9ger la clef priv\u00E9e ssh @@ -432,7 +423,7 @@ isisfish.filter.simulation.tooltip.analysePlanNumber=filter sur le num\u00E9ro d'analyse (uniquement pour les simulations avec plan d'analyse) isisfish.filter.simulation.tooltip.description=filtrer sur la description (format regex) isisfish.filter.simulation.tooltip.local=filter uniquement les simulations locales -isisfish.filter.simulation.tooltip.numberOfYear=filter sur le nombre d'ann\u00E9e(s) (recherche extacte) +isisfish.filter.simulation.tooltip.numberOfYear=filter sur le nombre d'ann\u00E9e(s) (recherche exacte) isisfish.filter.simulation.tooltip.regionName=filtrer sur le nom de la r\u00E9gion (format regex) isisfish.filter.simulation.tooltip.simulationEnd=filtrer sur la date de fin de simulation (format dd/MM/yyyy) isisfish.filter.simulation.tooltip.simulationName=filtrer sur le nom de simulation (format regex) @@ -596,7 +587,7 @@ isisfish.message.launchui.notlaunch=Interface utilisateur non lanc\u00E9e isisfish.message.load.finished=Chargement termin\u00E9 isisfish.message.load.map=Chargement de la carte \: %1$s -isisfish.message.loading.old.simulation=Chargement d'une ancienne simulation ... +isisfish.message.loading.old.simulation=Chargement d'une ancienne simulation... isisfish.message.loading.region=Chargement de la r\u00E9gion isisfish.message.name.imported.region=Entrez le nom de la r\u00E9gion \u00E0 importer isisfish.message.new.filename=Entrez le nom du nouveau du fichier.\n\t (utiliser uniquemment des caract\u00E8res et _ en commencant avec une majuscule) @@ -613,7 +604,7 @@ isisfish.message.region.removed=R\u00E9gion supprim\u00E9e isisfish.message.remove.canceled=Suppression annul\u00E9e isisfish.message.remove.finished=Suppresison termin\u00E9 -isisfish.message.removing.region=Suppression de la r\u00E9gion %1$s ... +isisfish.message.removing.region=Suppression de la r\u00E9gion %1$s... isisfish.message.result.verif.region=R\u00E9sultat de la v\u00E9rification de la r\u00E9gion isisfish.message.save.finished=Sauvegarde termin\u00E9e isisfish.message.saveModel.dialog=Entrez le nom du mod\u00E8le d'equation @@ -787,7 +778,7 @@ isisfish.queue.title=Queue isisfish.result.abundance=Abondance isisfish.result.add=Ajouter un r\u00E9sultat -isisfish.result.begin.simulation=En d\u00E9but de simulation\: +isisfish.result.begin.simulation=En d\u00E9but de simulation \: isisfish.result.capture=Capturer isisfish.result.capture.metier=Capturer par m\u00E9tier isisfish.result.choose.simulation=Choisir une simulation @@ -979,7 +970,7 @@ isisfish.tripType.duration=Dur\u00E9e isisfish.tripType.minTime=Temps minimal entre deux voyages isisfish.tripType.name=Nom -isisfish.vcs.ask.passphrase=Entrez votre passe phrase (si votre clef ssh en contient une). +isisfish.vcs.ask.passphrase=Entrez votre passphrase (si votre clef ssh en contient une). isisfish.vcs.ask.passphrase.title=Demande de passe phrase isisfish.vcs.commit=Message de sauvegarde isisfish.vcs.commit.cancel=annuler

1 0

r2846 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: . ui
by chatellier＠users.labs.libre-entreprise.org 16 Dec '09

16 Dec '09

Author: chatellier Date: 2009-12-16 11:51:57 +0000 (Wed, 16 Dec 2009) New Revision: 2846 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx Log: Clean config class (remove unused option, and commented options) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-12-15 15:36:25 UTC (rev 2845) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-12-16 11:51:57 UTC (rev 2846) @@ -327,33 +327,6 @@ return result; } - /** - * Retourne l'url du serveur de simulation - * @return simulator server - */ - public String getSimulatorServer() { - String result = getOption(Option.SIMULATOR_SERVER.key); - return result; - } - - /** - * Retourne le login pour acceder au serveur de simulation - * @return simulator username - */ - public String getSimulatorUsername() { - String result = getOption(Option.SIMULATOR_USER_NAME.key); - return result; - } - - /** - * Retourne le mot de passe pour acceder au serveur de simulation - * @return simulator password - */ - public String getSimulatorPassword() { - String result = getOption(Option.SIMULATOR_PASSWORD.key); - return result; - } - public String getSimulatorClassfile() { String result = getOption(Option.SIMULATOR_CLASSFILE.key); return result; @@ -576,18 +549,6 @@ setOption(Option.SSH_KEY_FILE.key, sshFile.getAbsolutePath()); } - /* - * Le type de simulation par defaut a utiliser (local, remote, ...) - * @return - *) - public boolean isSimulatorLocal() { - // FIXME never called - String value = getOption(Option.SIMULATOR_LAUNCHER.key); - // and following code always return false : - boolean result = "local".equalsIgnoreCase(value); - return result; - }*/ - /*public boolean isUseVCS() { String value = getOption(Option.VCS_TYPE.key); boolean result = !VCSNone.TYPE_NONE.equals(value); @@ -597,17 +558,12 @@ public boolean isLaunchUI() { boolean result = getOptionAsBoolean(Option.LAUNCH_UI.key); return result; - } + } public void setSimulatorLauncher(String value) { setOption(Option.SIMULATOR_LAUNCHER.key, value); - } + } -// public boolean isSimulationShowOnlyQueue() { -// Boolean result = getOptionAsBoolean(Option.SIMULATION_SHOW_ONLY_QUEUE.key); -// return result; -// } - public boolean isSimulationShowOnlyError() { Boolean result = getOptionAsBoolean(Option.SIMULATION_SHOW_ONLY_ERROR.key); return result; @@ -826,7 +782,6 @@ String[] keys = new String[]{ "compileDirectory", Option.COMPILATION_DIRECTORY.key, "defaultBackupDirectory", Option.BACKUP_DIRECTORY.key, - "defaultExportDirectory", Option.DEFAULT_EXPORT_DIRECTORY.key, "defaultExportNames", Option.DEFAULT_EXPORT_NAMES.key, "defaultMapFile", Option.DEFAULT_MAP_FILENAME.key, "defaultResultNames", Option.DEFAULT_RESULT_NAMES.key, @@ -834,9 +789,6 @@ "defaultTagValue", Option.DEFAULT_TAG_VALUE.key, "javadocURL", Option.JAVADOC_URL.key, "locale", Option.LOCALE.key, - "login", Option.SIMULATOR_USER_NAME.key, - "password", Option.SIMULATOR_PASSWORD.key, - "simulationServer", Option.SIMULATOR_SERVER.key, "simulationShowOnlyError", Option.SIMULATION_SHOW_ONLY_ERROR.key, "simulationShowOnlyQueue", null, // Option.SIMULATION_SHOW_ONLY_QUEUE.key, "smtpServer", Option.SMTP_SERVER.key, @@ -910,7 +862,6 @@ CONFIG_FILE(CONFIG_FILE_NAME, _("isisfish.config.main.configFileName.description"), CONFIG_FILENAME), BACKUP_DIRECTORY("backup.directory", _("isisfish.config.main.defaultBackupDirectory.description"), getUserHome() + File.separator + "isis-backup"), - DEFAULT_EXPORT_DIRECTORY("default.export.directory", _("isisfish.config.main.defaultExportDirectory.description"), getUserHome() + File.separator + "isis-export"), DEFAULT_EXPORT_NAMES("default.export.names", _("isisfish.config.main.defaultExportNames.description"), ""), DEFAULT_RESULT_NAMES("default.result.names", _("isisfish.config.main.defaultResultNames.description"), ""), DEFAULT_MAP_FILENAME("default.map.filename", _("isisfish.config.main.defaultMapFile.description"), "maps/vmap_area_thin.shp"), @@ -924,11 +875,6 @@ SIMULATOR_LAUNCHER2(SimulationService.SIMULATION_LAUNCHER + ".1", _("isisfish.config.main.subSimulator.description"), SubProcessSimulationLauncher.class.getName()), SIMULATOR_LAUNCHER_REMOTE(SimulationService.SIMULATION_LAUNCHER + ".2", _("isisfish.config.main.remoteCaparmor.description"), SSHSimulatorLauncher.class.getName()), - SIMULATOR_SERVER("simulation.server", _("isisfish.config.main.simulationServer.description"), "http://simulateur.ifremer.fr:9090"), - /** le login a utiliser pour les launcher distant, le type du launcher est ajouter a la cle (car 1 login par launcher) */ - SIMULATOR_USER_NAME("simulator.username", _("isisfish.config.main.login.description"), "anonymous"), - SIMULATOR_PASSWORD("simulator.password", _("isisfish.config.main.password.description"), "guest"), - /** Serveur accessible par ssh : address */ SIMULATOR_SSH_SERVER("simulation.ssh.server", _("isisfish.config.main.simulation.ssh.server.description"), "caparmor"), /** Serveur accessible par ssh : nom du service de transfert de fichier */ @@ -951,10 +897,7 @@ SIMULATOR_SSH_MAXTHREADS("simulation.ssh.max.threads", _("isisfish.config.main.simulation.ssh.max.threads.description"), "1"), LOCALE("locale", _("isisfish.config.main.locale.description"), "fr_FR"), - // REGION_MAP("regionMap", _("isisfish.config.main.regionMap.description"), "maps"), - // RESULT_EXPORT("resultExport", String.class, 15, n_("isisfish.config.main.resultExport.description"), "resultExports"), SIMULATION_SHOW_ONLY_ERROR("simulationShowOnlyError", _("isisfish.config.main.simulationShowOnlyError.description"), "false"), - // SIMULATION_SHOW_ONLY_QUEUE("simulationShowOnlyQueue", _("isisfish.config.main.simulationShowOnlyQueue.description"), "true"), // if false no graphical interface LAUNCH_UI("launch.ui", _("isisfish.config.main.launchUI.description"), "true"), @@ -972,7 +915,7 @@ VCS_TYPE(VCS.VCS_TYPE, _("isisfish.config.vcs.type.description"), VCS.TYPE_SVN), // depend of VCS_TYPE, for SVN can be svn, svn+ssh, http or file VCS_PROTOCOL(VCS.VCS_PROTOCOL, _("isisfish.config.vcs.useSshConnexion.description"), "svn"), - //VCS_SSH_KEY_FILE(VCS.VCS_SSH_KEY_FILE, _("isisfish.config.vcs.keyFile.description"), getUserHome() + File.separator + ".ssh" + File.separator + "isis_rsa"), + // user login to access vcs VCS_USER_NAME(VCS.VCS_USER_NAME, _("isisfish.config.vcs.userName.description"), ""), VCS_USER_PASSWORD(VCS.VCS_USER_PASSWORD, _("isisfish.config.vcs.userPassword.description"), ""), Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-12-15 15:36:25 UTC (rev 2845) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-12-16 11:51:57 UTC (rev 2846) @@ -100,7 +100,7 @@ } /** - * Show congig frame (Jaxx based). + * Show config frame (Jaxx based). */ protected void config() { ConfigUIModel model = new ConfigUIModel(IsisFish.config); @@ -115,7 +115,6 @@ IsisConfig.Option.MONITORING_DIRECTORY, IsisConfig.Option.JAVADOC_DIRECTORY, IsisConfig.Option.BACKUP_DIRECTORY, - IsisConfig.Option.DEFAULT_EXPORT_DIRECTORY, IsisConfig.Option.LOCALE, IsisConfig.Option.SIMULATION_SHOW_ONLY_ERROR );

1 0

r2845 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 15 Dec '09

15 Dec '09

Author: chatellier Date: 2009-12-15 15:36:25 +0000 (Tue, 15 Dec 2009) New Revision: 2845 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Remove useless comments 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-12-15 15:36:10 UTC (rev 2844) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-12-15 15:36:25 UTC (rev 2845) @@ -845,11 +845,6 @@ SimulationItem item = new SimulationItem(childControl, childParam); item.setSimulationZip(zip); - // add extra information for specific launchers - //item.setStandaloneSimulation(standaloneSimulation); - //item.setSimulationNumber(simulationNumber); - //item.setSimulationsCount(simulationsCount); - nextJob = new SimulationJob(simulationService, job, item, job.getPriority()); nextJob.setLauncher(job.getLauncher()); nextJob.addPostAction(this); // pour l'appel des after des plans @@ -1055,11 +1050,6 @@ FileUtil.writeString(simulationDesignPlanFile, xmlDesignPlan, "utf-8"); } - FileUtil.copy(new File(SimulatorStorage.getSimulatorDirectory(), - param.getSimulatorName()), new File(tmpDirectory, - SimulatorStorage.SIMULATOR_PATH + File.separator - + param.getSimulatorName())); - // creation du zip File result = new File(tmpDirectory.getPath() + ".zip"); result.deleteOnExit();

1 0

r2844 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 15 Dec '09

15 Dec '09

Author: chatellier Date: 2009-12-15 15:36:10 +0000 (Tue, 15 Dec 2009) New Revision: 2844 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java Log: wrong variable used 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-12-15 14:49:15 UTC (rev 2843) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2009-12-15 15:36:10 UTC (rev 2844) @@ -227,7 +227,7 @@ Thread.sleep(2000); } while (!subControl.isStopSimulationRequest() && (subControl.getProgress() == 0 || subControl.getProgress() < subControl.getProgressMax()) - && !SimulationStorage.exists(control.getId())); + && !SimulationStorage.exists(subControl.getId())); } } else {

1 0

r2843 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 15 Dec '09

15 Dec '09

Author: chatellier Date: 2009-12-15 14:49:15 +0000 (Tue, 15 Dec 2009) New Revision: 2843 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Fix second pass sensitivity directory. 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-12-15 14:30:56 UTC (rev 2842) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-12-15 14:49:15 UTC (rev 2843) @@ -636,7 +636,7 @@ simulationCommonPrefix, numberOfSimulation); // build master sensitivity export directory File masterExportDirectory = new File(SimulationStorage - .getSimulationDirectory(), + .getSensitivityResultsDirectory(), simulationCommonPrefix); // directory must already exists !!! sensitivityCalculator.analyzeResult(

1 0

r2842 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 15 Dec '09

15 Dec '09

Author: chatellier Date: 2009-12-15 14:30:56 +0000 (Tue, 15 Dec 2009) New Revision: 2842 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: Fix parameter help. 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-12-15 14:14:37 UTC (rev 2841) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-12-15 14:30:56 UTC (rev 2842) @@ -174,7 +174,7 @@ isisfish.config.main.simulation.ssh.isis.home=Isis-Fish home isisfish.config.main.simulation.ssh.isis.home.description=Isis-Fish installation directory isisfish.config.main.simulation.ssh.max.threads=SSH threads count -isisfish.config.main.simulation.ssh.max.threads.description=Number of simultaneous simulations to do throw SSH. Might only be usefull for analysis plans. Otherwise keep value at '1'. +isisfish.config.main.simulation.ssh.max.threads.description=Number of simultaneous simulations to do through SSH. Might only be usefull for dependent analysis plans. Otherwise keep value at '1'. isisfish.config.main.simulation.ssh.pbsbinpath=PBS executables directory isisfish.config.main.simulation.ssh.pbsbinpath.description=PBS executables (qsub, qdel...) directory isisfish.config.main.simulation.ssh.server=Simulation server 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-12-15 14:14:37 UTC (rev 2841) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-12-15 14:30:56 UTC (rev 2842) @@ -174,7 +174,7 @@ isisfish.config.main.simulation.ssh.isis.home=Installation d'Isis-Fish isisfish.config.main.simulation.ssh.isis.home.description=Emplacement d'installation d'Isis-Fish sur le serveur isisfish.config.main.simulation.ssh.max.threads=Nombre de thread SSH -isisfish.config.main.simulation.ssh.max.threads.description=Nombre de simulation simultan\u00E9e \u00E0 faire en SSH. Attention, ne doit \u00EAtre utilis\u00E9 que pour faire plusieurs plans d'analyse en m\u00EAme temps, sinon, laisser '1'. +isisfish.config.main.simulation.ssh.max.threads.description=Nombre de simulation simultan\u00E9e \u00E0 faire en SSH. Attention, ne doit \u00EAtre utilis\u00E9 que pour faire plusieurs plans d'analyse d\u00E9pendants en m\u00EAme temps, sinon laisser '1'. isisfish.config.main.simulation.ssh.pbsbinpath=Emplacement des executables PBS isisfish.config.main.simulation.ssh.pbsbinpath.description=Emplacement des commandes PBS (qsub, qdel...) sur le serveur isisfish.config.main.simulation.ssh.server=Serveur de simulation

1 0

r2841 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 15 Dec '09

15 Dec '09

Author: chatellier Date: 2009-12-15 14:14:37 +0000 (Tue, 15 Dec 2009) New Revision: 2841 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Move log to trace 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-12-15 14:07:34 UTC (rev 2840) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-12-15 14:14:37 UTC (rev 2841) @@ -462,8 +462,8 @@ } else { //checkScheduler.schedule(this, date); - if (log.isDebugEnabled()) { - log.debug("Time to check not reached, skip check, " + date + if (log.isTraceEnabled()) { + log.trace("Time to check not reached, skip check, " + date + " < " + now); } }

1 0

r2840 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 15 Dec '09

15 Dec '09

Author: chatellier Date: 2009-12-15 14:07:34 +0000 (Tue, 15 Dec 2009) New Revision: 2840 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Improve suppression deletion algorithm (deletion > check) Reduce monitoring delay. Simulation can be deleted from caparmor even after isis restart. Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-12-15 13:19:01 UTC (rev 2839) +++ isis-fish/trunk/changelog.txt 2009-12-15 14:07:34 UTC (rev 2840) @@ -1,5 +1,6 @@ isis-fish (3.3.0.0) stable; urgency=low + * Improve simulation stopping algorithm (now faster) * Locally save simulation zip to allow simulation restart even afer isis shutdown * In sensitivity analysis, upload only one zip to caparmor for all simulations * Add option to control number of SSH thread to use 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-12-15 13:19:01 UTC (rev 2839) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-12-15 14:07:34 UTC (rev 2840) @@ -29,10 +29,10 @@ import java.io.InputStream; import java.io.OutputStream; import java.rmi.RemoteException; -import java.util.Collection; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.Comparator; import java.util.Date; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Properties; @@ -83,10 +83,15 @@ /** Class logger. */ private static Log log = LogFactory.getLog(SimulationMonitor.class); + /** Simulation start date format. */ + private static final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + protected static final String PROPERTIES_FILE = "monitoring.properties"; protected static final String PROPERTY_LAUNCHER = "simulation.launcher"; protected static final String PROPERTY_DATE = "simulation.date"; protected static final String PROPERTY_ZIP = "simulation.zip"; + protected static final String PROPERTY_STANDALONE = "simulation.standalone"; + protected static final String PROPERTY_LASTSIMULATION = "simulation.last"; /** Instance. */ protected static SimulationMonitor instance = new SimulationMonitor(); @@ -224,17 +229,13 @@ try { // launcher - String simulationLauncher = propertiesFile - .getProperty(PROPERTY_LAUNCHER); - SimulatorLauncher launcher = (SimulatorLauncher) Class.forName( - simulationLauncher).newInstance(); + String simulationLauncher = propertiesFile.getProperty(PROPERTY_LAUNCHER); + SimulatorLauncher launcher = (SimulatorLauncher) Class.forName(simulationLauncher).newInstance(); // zip (copy to temp in mandatory) String zipFileName = propertiesFile.getProperty(PROPERTY_ZIP); File zipFile = new File(simulationFolder, zipFileName); - // - File tempZipFile = File.createTempFile( - "simulation-" + simulationId, ".zip"); + File tempZipFile = File.createTempFile("simulation-" + simulationId, ".zip"); FileUtils.copyFile(zipFile, tempZipFile); tempZipFile.deleteOnExit(); @@ -246,11 +247,18 @@ // Et il est relance avec un parametre "checkonly" SimulationParameter params = new SimulationParameter(); SimulationControl control = new SimulationControl(simulationId); + SimulationItem item = new SimulationItem(control, params); item.setSimulationZip(tempZipFile); // tempZipFile, important ! + + // set additionnal parameters (null safe, defaut parameter safe) + String standalone = propertiesFile.getProperty(PROPERTY_STANDALONE); + item.setStandaloneSimulation(!"false".equalsIgnoreCase(standalone)); + String lastSimulation = propertiesFile.getProperty(PROPERTY_LASTSIMULATION); + item.setLastSimulation("true".equalsIgnoreCase(lastSimulation)); + SimulationJob job = new SimulationJob(service, item, 0); job.setLauncher(launcher); - service.submitForCheckOnly(job); } catch (ClassNotFoundException e) { if (log.isErrorEnabled()) { @@ -275,6 +283,7 @@ public synchronized void simulationStart(SimulationJob job) { String simulationId = job.getId(); + SimulationItem simulationItem = job.getItem(); File simulationMonitoringFolder = new File(monitorFolder, simulationId); File simulationPropertiesFile = new File(simulationMonitoringFolder, PROPERTIES_FILE); @@ -287,10 +296,11 @@ simulationProperties.setProperty(PROPERTY_LAUNCHER, launcherName); // date - simulationProperties.setProperty(PROPERTY_DATE, launcherName); + String simulationDate = dateFormat.format(new Date()); + simulationProperties.setProperty(PROPERTY_DATE, simulationDate); // zip - File zipFile = job.getItem().getSimulationZip(); + File zipFile = simulationItem.getSimulationZip(); try { // original zip must be keeped outside monitoring folder FileUtils.copyFileToDirectory(zipFile, simulationMonitoringFolder); @@ -301,6 +311,10 @@ } } + // addtionnal infos + simulationProperties.setProperty(PROPERTY_STANDALONE, String.valueOf(simulationItem.isStandaloneSimulation())); + simulationProperties.setProperty(PROPERTY_LASTSIMULATION, String.valueOf(simulationItem.isLastSimulation())); + // save property file OutputStream out = null; try { @@ -385,25 +399,22 @@ } /** - * Wait one second, and check for first + * Wait a little time, and check for first * simulation progression, if first simulation time * is reached. */ protected void waitAndCheckProgression() { + // wait a minimum time + // 1s is to long to stop 1000 simulations try { - Thread.sleep(1000); + Thread.sleep(10); } catch (InterruptedException e) { if (log.isErrorEnabled()) { log.error("Monitor thread has been interrupted", e); } } - // log - if (log.isDebugEnabled()) { - log.debug("Simulation monitor wake up"); - } - // take first job in map if (!checkSet.isEmpty()) { SimpleEntry<Date, SimulationJob> firstEntry = checkSet.first(); @@ -482,24 +493,25 @@ // update try { - launcher.updateControl(service, control); - - // by default, Progress = ProgressMax = 0 - // WARNING this condition is VERY important - // and set by end of - // fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher#localSimulateSameThread(SimulationControl, SimulationStorage) - - // FIXME check SimulationStorage.exists(control.getId()) condition - if ((control.getProgress() > 0 - && control.getProgress() >= control.getProgressMax() && SimulationStorage - .exists(control.getId()))) { - simulationEnded = true; - } - if (control.isStopSimulationRequest()) { - launcher.simulationStopRequest(job); // to release one resource + launcher.simulationStopRequest(job); simulationEnded = true; } + else { + launcher.updateControl(service, control); + + // by default, Progress = ProgressMax = 0 + // WARNING this condition is VERY important + // and set by end of + // fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher#localSimulateSameThread(SimulationControl, SimulationStorage) + + // FIXME check SimulationStorage.exists(control.getId()) condition + if ((control.getProgress() > 0 + && control.getProgress() >= control.getProgressMax() && SimulationStorage + .exists(control.getId()))) { + simulationEnded = true; + } + } } catch (RemoteException e) { if (log.isErrorEnabled()) { log.error("Progression thread update error", e); @@ -710,25 +722,4 @@ return simulationStorageForAnalyze; } - - /** - * Convertit une collection de string, en une chaine - * séparée par des ",". - * - * @param collection collection to convert - * @return string - */ - protected static String collectionToString(Collection<String> collection) { - String str = ""; - - Iterator<String> it = collection.iterator(); - while (it.hasNext()) { - str += it.next(); - if (it.hasNext()) { - str += ","; - } - } - - return str; - } } // SimulationMonitor

1 0