Author: bpoussin Date: 2008-09-24 14:39:29 +0000 (Wed, 24 Sep 2008) New Revision: 1339 Modified: trunk/isis-fish/.cvsignore trunk/isis-fish/changelog trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java trunk/isis-fish/src/resources/i18n/isis-fish-en_GB.properties trunk/isis-fish/src/resources/i18n/isis-fish-fr_FR.properties Log: commit avant refactoring du repo (utf, mvn structure) Modified: trunk/isis-fish/.cvsignore =================================================================== --- trunk/isis-fish/.cvsignore 2008-09-12 15:37:10 UTC (rev 1338) +++ trunk/isis-fish/.cvsignore 2008-09-24 14:39:29 UTC (rev 1339) @@ -7,3 +7,4 @@ isis-fish.iws isis-fish.iml .settings +__poubelle__ Modified: trunk/isis-fish/changelog =================================================================== --- trunk/isis-fish/changelog 2008-09-12 15:37:10 UTC (rev 1338) +++ trunk/isis-fish/changelog 2008-09-24 14:39:29 UTC (rev 1339) @@ -3,6 +3,9 @@ * complete refactoring option, vcs * complete refactoring simulation engin * new launcher type (subprocess, caparmor ...) in progress + * modify script to use cell and not zone in some computation + * add TechnicalEfficiency equation + * add Inactivity equation support isis-fish (3.1.3) stable; urgency=high Modified: trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java =================================================================== --- trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2008-09-12 15:37:10 UTC (rev 1338) +++ trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2008-09-24 14:39:29 UTC (rev 1339) @@ -51,6 +51,7 @@ return "Sub process"; } + @Override public SimulationStorage simulate(SimulationService simulationService, SimulationControl control, File simulationZip) throws RemoteException { String simulationId = control.getId(); @@ -70,7 +71,9 @@ } + @Override public int maxSimulationThread() { + // TODO rendre configurable le nombre de processeurs a utiliser int result = Runtime.getRuntime().availableProcessors(); return result; } Modified: trunk/isis-fish/src/resources/i18n/isis-fish-en_GB.properties =================================================================== --- trunk/isis-fish/src/resources/i18n/isis-fish-en_GB.properties 2008-09-12 15:37:10 UTC (rev 1338) +++ trunk/isis-fish/src/resources/i18n/isis-fish-en_GB.properties 2008-09-24 14:39:29 UTC (rev 1339) @@ -1,7 +1,7 @@ Can't\ add\ result\ '%1$s'\ at\ date\ %2$s=Can't add result '%1$s' at date %2$s +Can't\ create\ simulation\ logger=Can't create simulation logger Can't\ evaluate\ simulation\ prescript=Can't evaluate simulation prescript Can't\ get\ result\:\ %1$s=Can't get result\: %1$s -Can't\ create\ simulation\ logger=Can't create simulation logger Can't\ instanciate\ export\ %1$s=Can't instanciate export %1$s Checkout\ pom.xml\ to\ %1$s= Info=Info @@ -230,7 +230,7 @@ isisfish.error.import.recent.files=Erreur lors de l'import, la version du fichier que vous souhaitez importer est plus r\u00E9cente que la version souhait\u00E9e. isisfish.error.import.scripts.force=Some files already exist, you MUST use option [force] pour force overwrite. isisfish.error.init.map=Can't init map. -isisfish.error.init.remove.button=could not init remove button (button or list is null) button : %1$s, list : %2$s +isisfish.error.init.remove.button=could not init remove button (button or list is null) button \: %1$s, list \: %2$s isisfish.error.instanciate=Can't instanciate %1$s isisfish.error.instanciate.export=Can't instanciate export %1$s isisfish.error.integer.positif=Your input must be a positif integer (>1) Modified: trunk/isis-fish/src/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- trunk/isis-fish/src/resources/i18n/isis-fish-fr_FR.properties 2008-09-12 15:37:10 UTC (rev 1338) +++ trunk/isis-fish/src/resources/i18n/isis-fish-fr_FR.properties 2008-09-24 14:39:29 UTC (rev 1339) @@ -1,7 +1,7 @@ Can't\ add\ result\ '%1$s'\ at\ date\ %2$s=Can't add result '%1$s' at date %2$s +Can't\ create\ simulation\ logger=Can't create simulation logger Can't\ evaluate\ simulation\ prescript=Can't evaluate simulation prescript Can't\ get\ result\:\ %1$s=Can't get result\: %1$s -Can't\ create\ simulation\ logger=Can't create simulation logger Can't\ instanciate\ export\ %1$s=Can't instanciate export %1$s Checkout\ pom.xml\ to\ %1$s= Info=Info @@ -230,7 +230,7 @@ isisfish.error.import.recent.files=Erreur lors de l'import, la version du fichier que vous souhaitez importer est plus r\u00E9cente que la version souhait\u00E9e. isisfish.error.import.scripts.force=Certains fichiers existent, vous devez utiliser l'option [force] pour forcer l'\u00E9crasement. isisfish.error.init.map=Can't init map. -isisfish.error.init.remove.button=could not init remove button (button or list is null) button : %1$s, list : %2$s +isisfish.error.init.remove.button=could not init remove button (button or list is null) button \: %1$s, list \: %2$s isisfish.error.instanciate=Can't instanciate %1$s isisfish.error.instanciate.export=Can't instanciate export %1$s isisfish.error.integer.positif=Your input must be a positif integer (>1)