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

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

03 May '09

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 03 May '09

03 May '09

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 03 May '09

03 May '09

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 03 May '09

03 May '09

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