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

r2869 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain
by chatellier＠users.labs.libre-entreprise.org 04 Jan '10

04 Jan '10

Author: chatellier Date: 2010-01-04 15:56:16 +0000 (Mon, 04 Jan 2010) New Revision: 2869 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java Log: Fail to compile now ??? Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2010-01-04 15:49:25 UTC (rev 2868) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2010-01-04 15:56:16 UTC (rev 2869) @@ -131,13 +131,6 @@ } /** - * In continuous domain, just return identifier. - */ - public MatrixND getValueForIdentifier(final Serializable identifier) { - return getValueForIdentifier((Double) identifier); - } - - /** * {@inheritDoc}. * * In continuous domain, just return identifier

1 0

r2868 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: . cron
by chatellier＠users.labs.libre-entreprise.org 04 Jan '10

04 Jan '10

Author: chatellier Date: 2010-01-04 15:49:25 +0000 (Mon, 04 Jan 2010) New Revision: 2868 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/CronService.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/package-info.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Log: Define a cron service. One task implemented : remove old files. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-04 14:22:06 UTC (rev 2867) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-04 15:49:25 UTC (rev 2868) @@ -51,6 +51,7 @@ import org.nuiton.util.Version; import org.nuiton.widget.SwingUtil; +import fr.ifremer.isisfish.cron.CronService; import fr.ifremer.isisfish.datastore.AnalysePlanStorage; import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.FormuleStorage; @@ -149,6 +150,10 @@ // action after ui launched config.doAction(IsisConfig.STEP_AFTER_UI); + + // start cron service + CronService cronService = new CronService(); + cronService.start(); } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Global IsisFish exception", e); Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/CronService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/CronService.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/CronService.java 2010-01-04 15:49:25 UTC (rev 2868) @@ -0,0 +1,99 @@ +/* *##% + * Copyright (C) 2010 Code Lutin, Chatellier Eric + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.cron; + +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedList; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Main cron service job. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class CronService extends Thread { + + /** Class logger. */ + private static Log log = LogFactory.getLog(CronService.class); + + /** Registered services. */ + protected Collection<Runnable> services; + + /** + * Init cron service with default available services. + */ + public CronService() { + services = new LinkedList<Runnable>(); + registerDefaultServices(); + } + + /** + * Register default services (always executed if service is launched). + */ + private void registerDefaultServices() { + addService(new RemoveOldFileTask()); + } + + /** + * Add a new task for execution. + * + * @param task task to add + */ + protected void addService(Runnable task) { + services.add(task); + } + + /** + * Run all registered services once and stop. + * + * This behavior may change later to run as a real cron service. + */ + public void run() { + + if (log.isInfoEnabled()) { + log.info("Starting " + services.size() + " registered services"); + } + + Iterator<Runnable> itOnTasks = services.iterator(); + + while (itOnTasks.hasNext()) { + Runnable task = itOnTasks.next(); + Thread taskThread = new Thread(task); + try { + taskThread.start(); + taskThread.join(); // run sequential + } + catch (Exception ex) { + if (log.isDebugEnabled()) { + log.debug("Task " + task.getClass().getSimpleName() + " failed to run", ex); + } + } + } + + // free memory + services.clear(); + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/CronService.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java 2010-01-04 15:49:25 UTC (rev 2868) @@ -0,0 +1,83 @@ +/* *##% + * Copyright (C) 2010 Code Lutin, Chatellier Eric + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.cron; + +import java.io.File; + +import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import fr.ifremer.isisfish.IsisFish; + +/** + * This cron task is used to remove old isis files. + * + * Currently remove : + * <ul> + * <li>monitored simulations files older than 1 year</li> + * </ul> + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class RemoveOldFileTask implements Runnable { + + /** Class logger. */ + private static Log log = LogFactory.getLog(RemoveOldFileTask.class); + + /* + * @see java.lang.Runnable#run() + */ + @Override + public void run() { + if (log.isDebugEnabled()) { + log.debug("Remove old simulation files task called"); + } + removeMonitoredSimulations(); + } + + /** + * Remove old *.zip files located in monitoring directory. + */ + protected void removeMonitoredSimulations() { + if (log.isDebugEnabled()) { + log.debug("Removing old monitored simulations files"); + } + + File directory = IsisFish.config.getMonitoringDirectory(); + File[] files = directory.listFiles(); + + // supprime les fichier au premier niveau (pour le moment) + // qui sont plus vieux qu'un an + for (File file : files) { + if (file.isFile()) { + if (file.lastModified() + DateUtils.MILLIS_PER_DAY * 365 < System.currentTimeMillis()) { + if (log.isDebugEnabled()) { + log.debug("Removing file " + file); + } + file.delete(); + } + } + } + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/package-info.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/package-info.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/package-info.java 2010-01-04 15:49:25 UTC (rev 2868) @@ -0,0 +1,5 @@ +/** + * Cron service and scripts. + */ +package fr.ifremer.isisfish.cron; + Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/cron/package-info.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"

1 0

r2867 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 04 Jan '10

04 Jan '10

Author: chatellier Date: 2010-01-04 14:22:06 +0000 (Mon, 04 Jan 2010) New Revision: 2867 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Store only one zip for simulation with common zip file. 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 2010-01-04 14:01:31 UTC (rev 2866) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2010-01-04 14:22:06 UTC (rev 2867) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -285,6 +285,9 @@ String simulationId = job.getId(); SimulationItem simulationItem = job.getItem(); File simulationMonitoringFolder = new File(monitorFolder, simulationId); + if (!simulationMonitoringFolder.exists()) { + simulationMonitoringFolder.mkdirs(); + } File simulationPropertiesFile = new File(simulationMonitoringFolder, PROPERTIES_FILE); if (!simulationPropertiesFile.exists()) { @@ -301,17 +304,34 @@ // zip File zipFile = simulationItem.getSimulationZip(); + try { // original zip must be keeped outside monitoring folder - FileUtils.copyFileToDirectory(zipFile, simulationMonitoringFolder); - simulationProperties.setProperty(PROPERTY_ZIP, zipFile.getName()); + + // for standalone, set it in parent directory + if (simulationItem.isStandaloneSimulationZip()) { + FileUtils.copyFileToDirectory(zipFile, simulationMonitoringFolder); + simulationProperties.setProperty(PROPERTY_ZIP, zipFile.getName()); + } + else { + String shortSimulationId = simulationId.substring(0, simulationId.lastIndexOf('_')); + // zip common to multiples simulations + // saved in monitoring folder at root + File savedZipFile = new File(simulationMonitoringFolder.getParent(), shortSimulationId + ".zip"); + // the first simulation is in charge to save the common zip file + if (simulationItem.getSimulationNumber() == 0) { + FileUtils.copyFile(zipFile, savedZipFile); + } + simulationProperties.setProperty(PROPERTY_ZIP, ".." + File.separator + savedZipFile.getName()); + } + } catch (IOException e) { if (log.isErrorEnabled()) { log.error("Can't copy simulation zip", e); } } - // addtionnal infos + // additionnal infos simulationProperties.setProperty(PROPERTY_STANDALONE, String.valueOf(simulationItem.isStandaloneSimulation())); simulationProperties.setProperty(PROPERTY_LASTSIMULATION, String.valueOf(simulationItem.isLastSimulation()));

1 0

r2866 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 04 Jan '10

04 Jan '10

Author: chatellier Date: 2010-01-04 14:01:31 +0000 (Mon, 04 Jan 2010) New Revision: 2866 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Log: vcs must be done is ui is enabled too Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-04 11:28:22 UTC (rev 2865) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-04 14:01:31 UTC (rev 2866) @@ -400,7 +400,8 @@ */ static public void initVCS() throws VCSException { - if (config.isPerformVcsUpdate()) { + // vcs must be done is ui is enabled too + if (config.isLaunchUI() && config.isPerformVcsUpdate()) { // init vcs // in graphical mode, real VCS

1 0

r2865 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 04 Jan '10

04 Jan '10

Author: chatellier Date: 2010-01-04 11:28:22 +0000 (Mon, 04 Jan 2010) New Revision: 2865 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: Add option to disable automatic data migration and vcs update 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 2010-01-04 11:12:21 UTC (rev 2864) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2010-01-04 11:28:22 UTC (rev 2865) @@ -46,6 +46,7 @@ Show\ help= Show\ version= SimulationExecutor\ started\ with\ %s\ thread\ for\ %s= +Skip\ data\ migration\ (disabled)= Ssh\ key\ found\ '%s'\ will\ be\ used\ to\ connect\ to= Stop\ simulation\ plan,\ because\ can't\ call\ afterSimulation\ correctly\ on\ plan\ %s= SubProcess\ start\:\ %s\ %s= @@ -161,6 +162,8 @@ isisfish.config.main.localSimulator.description=Local simulator launcher name (same process) isisfish.config.main.locale.description=user locale isisfish.config.main.monitoringDirectory.description=Folder containing all necessary information needed to restart simulation +isisfish.config.main.performmigration.description=Perform data migration +isisfish.config.main.performvcsupdate.description=Perform vcs update 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) 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 2010-01-04 11:12:21 UTC (rev 2864) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-01-04 11:28:22 UTC (rev 2865) @@ -46,6 +46,7 @@ Show\ help= Show\ version= SimulationExecutor\ started\ with\ %s\ thread\ for\ %s= +Skip\ data\ migration\ (disabled)= Ssh\ key\ found\ '%s'\ will\ be\ used\ to\ connect\ to= Stop\ simulation\ plan,\ because\ can't\ call\ afterSimulation\ correctly\ on\ plan\ %s= SubProcess\ start\:\ %s\ %s= @@ -161,6 +162,8 @@ isisfish.config.main.localSimulator.description=Nom du simulateur local (processus courant) isisfish.config.main.locale.description=la locale utilisateur isisfish.config.main.monitoringDirectory.description=Dossier contenant les informations permettant de relancer les simulations +isisfish.config.main.performmigration.description=Migre les donn\u00E9es +isisfish.config.main.performvcsupdate.description=Met \u00E0 jour le d\u00E9p\u00F4t VCS 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

1 0

r2864 - isis-fish/trunk/src/main/xmi
by chatellier＠users.labs.libre-entreprise.org 04 Jan '10

04 Jan '10

Author: chatellier Date: 2010-01-04 11:12:21 +0000 (Mon, 04 Jan 2010) New Revision: 2864 Modified: isis-fish/trunk/src/main/xmi/isis-fish.properties Log: Update date. Modified: isis-fish/trunk/src/main/xmi/isis-fish.properties =================================================================== --- isis-fish/trunk/src/main/xmi/isis-fish.properties 2010-01-04 11:12:04 UTC (rev 2863) +++ isis-fish/trunk/src/main/xmi/isis-fish.properties 2010-01-04 11:12:21 UTC (rev 2864) @@ -1,4 +1,4 @@ -model.tagvalue.copyright=/* Copyright (C) 1999 - 2009 Ifremer - Code Lutin */ +model.tagvalue.copyright=/* Copyright (C) 1999 - 2010 Ifremer - Code Lutin */ model.tagvalue.org.nuiton.math.matrix.MatrixND=fr.ifremer.isisfish.types.hibernate.MatrixType(name,dim,dimNames,semantics,data) model.tagvalue.fr.ifremer.isisfish.types.Month=fr.ifremer.isisfish.types.hibernate.MonthType model.tagvalue.fr.ifremer.isisfish.types.Date=fr.ifremer.isisfish.types.hibernate.DateType

1 0

r2863 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish resources/templates/ssh
by chatellier＠users.labs.libre-entreprise.org 04 Jan '10

04 Jan '10

Author: chatellier Date: 2010-01-04 11:12:04 +0000 (Mon, 04 Jan 2010) New Revision: 2863 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl Log: Add option to disable automatic data migration and vcs update Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-01-04 08:53:44 UTC (rev 2862) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-01-04 11:12:04 UTC (rev 2863) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2002-2010 Ifremer, Code Lutin, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -151,7 +151,7 @@ return apiVersion; } - static final public String COPYRIGHT_TEXT = "Version " + getVersion() + " IFREMER-MAERHA © 2000-2009"; + static final public String COPYRIGHT_TEXT = "Version " + getVersion() + " IFREMER-MAERHA © 2000-2010"; static final public String CONFIG_FILENAME = "isis-config-" + version.getNumber(0); /** separateur de liste */ @@ -555,10 +555,35 @@ return result; }*/ + /** + * Get launch.ui option value. + * + * @return launch ui option value + */ public boolean isLaunchUI() { boolean result = getOptionAsBoolean(Option.LAUNCH_UI.key); return result; } + + /** + * Get perform migration option value. + * + * @return perform migration option value + */ + public boolean isPerformMigration() { + boolean result = getOptionAsBoolean(Option.PERFORM_MIGRATION.key); + return result; + } + + /** + * Get perform vcs update option value. + * + * @return perform vcs update option value + */ + public boolean isPerformVcsUpdate() { + boolean result = getOptionAsBoolean(Option.PERFORM_VCS_UPDATE.key); + return result; + } public void setSimulatorLauncher(String value) { setOption(Option.SIMULATOR_LAUNCHER.key, value); @@ -896,14 +921,20 @@ /** Serveur accessible par SSH : nombre de thread au maximum a utilise simultanement */ SIMULATOR_SSH_MAXTHREADS("simulation.ssh.max.threads", _("isisfish.config.main.simulation.ssh.max.threads.description"), "1"), + /** Application locale (for i18n init). */ LOCALE("locale", _("isisfish.config.main.locale.description"), "fr_FR"), SIMULATION_SHOW_ONLY_ERROR("simulationShowOnlyError", _("isisfish.config.main.simulationShowOnlyError.description"), "false"), - // if false no graphical interface + /** Perform ui launch option. */ LAUNCH_UI("launch.ui", _("isisfish.config.main.launchUI.description"), "true"), + /** Perform data migration option. */ + PERFORM_MIGRATION("perform.migration", _("isisfish.config.main.performmigration.description"), "true"), + /** Perform vcs update option. */ + PERFORM_VCS_UPDATE("perform.vcsupdate", _("isisfish.config.main.performvcsupdate.description"), "true"), + /** Database directory. */ DATABASE_DIRECTORY("database.directory", _("isisfish.config.vcs.localDatabasePath.description"), getUserHome() + File.separator + "isis-database-3"), - + /** Database lock mode (h2).*/ DATABASE_LOCK_MODE("database.lockmode", _("isisfish.config.database.lockmode.description"), "file"), // SSH (global, for both VCS and caparmor) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-04 08:53:44 UTC (rev 2862) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2010-01-04 11:12:04 UTC (rev 2863) @@ -139,9 +139,11 @@ if (log.isInfoEnabled()) { log.info(_("isisfish.launching", config.getElapsedTimeAsString())); } - + // after init vcs and local data config.doAction(IsisConfig.STEP_AFTER_INIT_VCS); + + doNuitonMigration(); launchUI(); @@ -177,65 +179,71 @@ * Find all files containing "org.codelutin." into "org.nuiton." */ protected static void doNuitonMigration() { - - // Search in a set of directories - // Searching throw simulations/* can take a huge time... - File[] folders = new File[]{ - AnalysePlanStorage.getAnalysePlanDirectory(), - ExportStorage.getExportDirectory(), - RuleStorage.getRuleDirectory(), - ScriptStorage.getScriptDirectory(), - SensitivityStorage.getSensitivityDirectory(), - SensitivityExportStorage.getSensitivityExportDirectory(), - SimulatorStorage.getSimulatorDirectory() - }; - - try { - Map<File, List<CharSequence>> filesToMigrate = new HashMap<File, List<CharSequence>>(); - for (File folder : folders) { - filesToMigrate.putAll(FileUtil.grep("org\\.codelutin\\.", folder, ".*\\.java", "ISO-8859-1")); - } - - if (filesToMigrate != null && !filesToMigrate.isEmpty()) { - - // yes by defaut (for tests) - // but ask user if UI launch - boolean migrationOption = true; - if (IsisFish.config.isLaunchUI()) { - // display a user frame - String migratedFiles = ""; - String separator = ""; - for (File fileToMigrate : filesToMigrate.keySet()) { - migratedFiles += separator + fileToMigrate.toString(); - separator = "\n"; - } - JLabel labelModifiedFiles = new JLabel(_("isisfish.misc.nuitonmigration")); - JTextArea areaModifiedFiles = new JTextArea(migratedFiles); - areaModifiedFiles.setEditable(false); - areaModifiedFiles.setAutoscrolls(true); - JScrollPane sp = new JScrollPane(areaModifiedFiles); - sp.setPreferredSize(new Dimension(500, 100)); // don't remove popup is huge - migrationOption = ask(new Component[] { labelModifiedFiles, sp} ); + if (config.isPerformMigration()) { + // Search in a set of directories + // Searching throw simulations/* can take a huge time... + File[] folders = new File[]{ + AnalysePlanStorage.getAnalysePlanDirectory(), + ExportStorage.getExportDirectory(), + RuleStorage.getRuleDirectory(), + ScriptStorage.getScriptDirectory(), + SensitivityStorage.getSensitivityDirectory(), + SensitivityExportStorage.getSensitivityExportDirectory(), + SimulatorStorage.getSimulatorDirectory() + }; + + try { + Map<File, List<CharSequence>> filesToMigrate = new HashMap<File, List<CharSequence>>(); + for (File folder : folders) { + filesToMigrate.putAll(FileUtil.grep("org\\.codelutin\\.", folder, ".*\\.java", "ISO-8859-1")); } - - // if migration has to be done - if (migrationOption) { - if (log.isInfoEnabled()) { - log.info("Starting nuiton.org migration for user scripts :"); + + if (filesToMigrate != null && !filesToMigrate.isEmpty()) { + + // yes by defaut (for tests) + // but ask user if UI launch + boolean migrationOption = true; + if (IsisFish.config.isLaunchUI()) { + // display a user frame + String migratedFiles = ""; + String separator = ""; + for (File fileToMigrate : filesToMigrate.keySet()) { + migratedFiles += separator + fileToMigrate.toString(); + separator = "\n"; + } + JLabel labelModifiedFiles = new JLabel(_("isisfish.misc.nuitonmigration")); + JTextArea areaModifiedFiles = new JTextArea(migratedFiles); + areaModifiedFiles.setEditable(false); + areaModifiedFiles.setAutoscrolls(true); + JScrollPane sp = new JScrollPane(areaModifiedFiles); + sp.setPreferredSize(new Dimension(500, 100)); // don't remove popup is huge + migrationOption = ask(new Component[] { labelModifiedFiles, sp} ); } - for (File fileToMigrate : filesToMigrate.keySet()) { + // if migration has to be done + if (migrationOption) { if (log.isInfoEnabled()) { - log.info(" migrate file : " + fileToMigrate.getAbsolutePath()); + log.info("Starting nuiton.org migration for user scripts :"); } - FileUtil.sed("org\\.codelutin\\.", "org.nuiton.", fileToMigrate, "ISO-8859-1"); + + for (File fileToMigrate : filesToMigrate.keySet()) { + if (log.isInfoEnabled()) { + log.info(" migrate file : " + fileToMigrate.getAbsolutePath()); + } + FileUtil.sed("org\\.codelutin\\.", "org.nuiton.", fileToMigrate, "ISO-8859-1"); + } } } } + catch(IOException eee) { + if (log.isErrorEnabled()) { + log.error("Can't to nuiton migration", eee); + } + } } - catch(IOException eee) { - if (log.isErrorEnabled()) { - log.error("Can't to nuiton migration", eee); + else { + if (log.isInfoEnabled()) { + log.info(_("Skip data migration (disabled)")); } } } @@ -392,7 +400,7 @@ */ static public void initVCS() throws VCSException { - if (config.isLaunchUI()) { + if (config.isPerformVcsUpdate()) { // init vcs // in graphical mode, real VCS @@ -564,16 +572,10 @@ } /** - * initialise et lance l'interface graphique si elle est demandee + * Initialise et lance l'interface graphique si elle a demandé a être lancée. */ public static void launchUI() { if (config.isLaunchUI()) { - - // migration must be done in UI envirronement and - // must nerver be done in caparmor - // TODO set it here for now, ui is not displayed on caparmor - doNuitonMigration(); - // init simulater manager SimulationService.getService(); Modified: isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl 2010-01-04 08:53:44 UTC (rev 2862) +++ isis-fish/trunk/src/main/resources/templates/ssh/qsub-script.ftl 2010-01-04 11:12:04 UTC (rev 2863) @@ -5,7 +5,7 @@ #source /usr/share/modules/init/csh #module load java/1.6.0 -<#assign commonCommand="/home3/caparmor/poussin/jdk/bin/java -Xmx2500M -jar isis-fish*.jar --option launch.ui false" /> +<#assign commonCommand="/home3/caparmor/poussin/jdk/bin/java -Xmx2500M -jar isis-fish*.jar --option launch.ui false --option perform.vcsupdate false --option perform.migration false" /> <#if qsubmutiplejob> <#-- localsimulationid is short simulation id version --> <#assign localsimulationid='${simulationid}_$PBS_ARRAY_INDEX' />

1 0

r2862 - in isis-fish/trunk: . src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 04 Jan '10

04 Jan '10

Author: chatellier Date: 2010-01-04 08:53:44 +0000 (Mon, 04 Jan 2010) New Revision: 2862 Modified: isis-fish/trunk/pom.xml 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 version, dates. Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-12-22 17:17:18 UTC (rev 2861) +++ isis-fish/trunk/pom.xml 2010-01-04 08:53:44 UTC (rev 2862) @@ -422,7 +422,7 @@ <jaxx.version>1.7.1</jaxx.version> <eugene.version>2.0.0-beta-1</eugene.version> <topia.version>2.3.0-beta-1</topia.version> - <nuiton-utils.version>1.1.2-SNAPSHOT</nuiton-utils.version> + <nuiton-utils.version>1.1.2</nuiton-utils.version> <nuiton-i18n.version>1.0.1</nuiton-i18n.version> <nuiton-widgets.version>1.0.1-SNAPSHOT</nuiton-widgets.version> <jrst.version>1.0.0</jrst.version> @@ -447,7 +447,7 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <version>2.1</version> <configuration> <source>1.6</source> <target>1.6</target> 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-22 17:17:18 UTC (rev 2861) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2010-01-04 08:53:44 UTC (rev 2862) @@ -66,7 +66,7 @@ destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= directory\ %s\ must\ be\ a\ directory= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html>Isis-Fish (%s) Copyright IFREMER-MAERHA 2000-2009. <a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a> Please, report any bug you can found.<html> +isisfish.about.abouthtmltext=<html>Isis-Fish (%s) Copyright IFREMER-MAERHA 2000-2010. <a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a> Please, report any bug you can found.<html> isisfish.about.licensetext=You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with Isis-Fish. All rights reserved. No guarantees are provided for use of this program. isisfish.about.title=About Isis-Fish... isisfish.advancedParameters.title=Advanced parameters 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-22 17:17:18 UTC (rev 2861) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2010-01-04 08:53:44 UTC (rev 2862) @@ -66,7 +66,7 @@ destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= directory\ %s\ must\ be\ a\ directory= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html>Isis-Fish (%s) Copyright IFREMER-MAERHA 2000-2009. <a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a> Merci de rapporter les bugs.<html> +isisfish.about.abouthtmltext=<html>Isis-Fish (%s) Copyright IFREMER-MAERHA 2000-2010. <a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a> Merci de rapporter les bugs.<html> isisfish.about.licensetext=Vous pouvez modifier et redistribuer ce programme sous les conditions \u00E9nonc\u00E9es par la licence GNU GPL (version 2 ou ult\u00E9rieure). Une copie de la licence GPL est dans le fichier \u00AB\u00A0LICENSE.txt\u00A0\u00BB fourni avec Isis-Fish. Tous droits r\u00E9serv\u00E9s. Aucune garantie n'est fournie pour l'utilisation de ce programme. isisfish.about.title=\u00C0 propos de Isis-Fish... isisfish.advancedParameters.title=Param\u00E8tres avanc\u00E9s

1 0

r2861 - in isis-fish/trunk: . src/test/java/fr/ifremer/isisfish/simulator src/test/java/fr/ifremer/isisfish/simulator/launcher src/test/resources/fr/ifremer/isisfish/simulator src/test/resources/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 22 Dec '09

22 Dec '09

Author: chatellier Date: 2009-12-22 17:17:18 +0000 (Tue, 22 Dec 2009) New Revision: 2861 Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/simulator/launcher/ isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/simulator/launcher/sim_test-gdg-3.2-3.3.zip isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/simulator/launcher/sim_test-ica-3.2-3.3.zip Removed: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/pom.xml isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java Log: Add simulations tests : ica, gdg (quite long, done in integration-test phase) Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-12-22 14:58:49 UTC (rev 2860) +++ isis-fish/trunk/changelog.txt 2009-12-22 17:17:18 UTC (rev 2861) @@ -1,5 +1,6 @@ isis-fish (3.3.0.0) stable; urgency=low + * Restore simulation tests at integration-test phase * Add region factorisable value export (mexico) * Improve simulation stopping algorithm (now faster) * Locally save simulation zip to allow simulation restart even after isis shutdown Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-12-22 14:58:49 UTC (rev 2860) +++ isis-fish/trunk/pom.xml 2009-12-22 17:17:18 UTC (rev 2861) @@ -480,6 +480,20 @@ </property> </systemProperties> </configuration> + <executions> + <execution> + <id>surefire-it</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <includes> + <include>**/*IT.java</include> + </includes> + </configuration> + </execution> + </executions> </plugin> <plugin> <artifactId>maven-site-plugin</artifactId> Deleted: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java 2009-12-22 14:58:49 UTC (rev 2860) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java 2009-12-22 17:17:18 UTC (rev 2861) @@ -1,185 +0,0 @@ -/* *##% - * Copyright (C) 2007, 2009 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -package fr.ifremer.isisfish.simulator; - -import java.io.File; -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.math.matrix.DoubleBigVector; -import org.nuiton.math.matrix.MatrixFactory; -import org.nuiton.topia.TopiaContext; -import org.junit.Assert; -import org.junit.Test; - -import fr.ifremer.isisfish.AbstractIsisFishTest; -import fr.ifremer.isisfish.datastore.ResultStorage; -import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.entities.Result; -import fr.ifremer.isisfish.types.Date; - - -/** - * SimulationHelperTest. - * - * Created: 4 janv. 07 12:06:18 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -public class SimulationHelperTest extends AbstractIsisFishTest { - - /** Commons logging log. */ - private static Log log = LogFactory.getLog(SimulationHelperTest.class); - - final static private String[] SIMULATION_ZIP_FILE = new String[]{ - "src" + File.separator + "test" + File.separator + "resources" + File.separator + "simulations" + File.separator + "test-nonregression-20090203.zip", - // put here other zip simulation test - }; - -// public void testVerifResult() throws Exception { -// try { -// IsisConfig.load(); -// -// for (String zipName : SIMULATION_ZIP_FILE) { -// // recuperation du fichier zip de la simulation de test -// File zip = new File(zipName); -// -// // import de cette simulation -// String name = "simulation-test-" + System.currentTimeMillis(); -// SimulationStorage simRef = SimulationStorage.importAndRenameZip(zip, name + "-ref"); -// -// // import de la simulation avec un autre nom -// SimulationStorage sim = SimulationStorage.importAndRenameZip(zip, name); -// -// try { -// // verification qu'on retrouve les memes resulats pour les deux simulations -// ResultStorage resultRef = simRef.getResultStorage(); -// ResultStorage result = sim.getResultStorage(); -// -// List<String> resultNames = resultRef.getResultName(); -// assertEquals(resultNames, result.getResultName()); -// -// Date lastDate = resultRef.getLastDate(); -// for (Date date=new Date(0); date.before(lastDate); date=date.next()) { -// for (String resultName : resultNames) { -// assertEquals("Date " + date.getDate() + " result " + resultName, -// resultRef.getMatrix(date, resultName), -// result.getMatrix(date, resultName)); -// } -// } -// -// } finally { -// // fermeture des bases -// simRef.getStorage().closeContext(); -// sim.getStorage().closeContext(); -// // suppresion des deux simulations -// simRef.delete(false); -// sim.delete(false); -// } -// } -// } catch (Exception eee) { -// System.err.println(eee); -// eee.printStackTrace(); -// throw eee; -// } -// } - - /* - 10;20;30;40;50;60;70;80;90; - 100;200;300;400;500;600;700;800;900; - 1000;2000;3000;4000;5000;6000;7000;8000;9000; - 10000;20000;30000;40000;50000;60000;70000;80000;90000; - 100000;200000;300000;400000;500000;600000;700000;800000;900000; - 1000000;2000000;3000000;4000000;5000000;6000000;7000000;8000000;9000000; - 10000000;20000000;30000000;40000000;50000000;60000000;70000000;80000000;90000000; - 100000000;200000000;300000000;400000000;500000000;600000000;700000000;800000000;900000000; - 1000000000;2000000000;3000000000;4000000000;5000000000;6000000000;7000000000;8000000000;9000000000; - 10000000000;20000000000;30000000000;40000000000;50000000000;60000000000;70000000000;80000000000;90000000000; - */ - - @Test - public void testSimulate() throws Exception { - - try { - // par defaut on utilise des doubles pour les matrices - MatrixFactory.setDefaultVectorClass(DoubleBigVector.class); - - for (String zipName : SIMULATION_ZIP_FILE) { - // recuperation du fichier zip de la simulation de test - File zip = new File(zipName); - - // import de cette simulation - String name = "simulation-test-" + System.currentTimeMillis(); - SimulationStorage simRef = SimulationStorage.importAndRenameZip(zip, name + "-ref"); - - // import de la simulation avec un autre nom - SimulationStorage sim = SimulationStorage.importAndRenameZip(zip, name); - - try { - // suppression des resultats de cette simulation - TopiaContext tx = sim.getStorage().beginTransaction(); - tx.execute("DELETE from " + Result.class.getName()); - tx.commitTransaction(); - tx.closeContext(); - - // lancement de la simulation - // FIXME a remplacer avec SimulationService -// SimulationHelper.simulate(null, sim); - - // verification qu'on retrouve les memes resulats pour les deux simulations - ResultStorage resultRef = simRef.getResultStorage(); - ResultStorage result = sim.getResultStorage(); - - List<String> resultNames = resultRef.getResultName(); - Assert.assertEquals(resultNames, result.getResultName()); - - Date lastDate = resultRef.getLastDate(); - - log.info("Check result ..."); - for (Date date = new Date(0); date.before(lastDate); date = date.next()) { - for (String resultName : resultNames) { - log.debug("Check result " + date + " " + resultName); - Assert.assertEquals("Date " + date.getDate() + " result " + resultName, - resultRef.getMatrix(date, resultName), - result.getMatrix(date, resultName)); - } - } - - } finally { - // fermeture des bases - simRef.getStorage().closeContext(); - sim.getStorage().closeContext(); - // suppresion des deux simulations - simRef.delete(false); - sim.delete(false); - } - } - } catch (Exception eee) { - System.err.println(eee); - eee.printStackTrace(); - throw eee; - } - } -} Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java (rev 0) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java 2009-12-22 17:17:18 UTC (rev 2861) @@ -0,0 +1,171 @@ +/* *##% + * Copyright (C) 2009 Ifremer - Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.simulator.launcher; + +import java.io.File; +import java.net.URL; +import java.util.List; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.topia.TopiaContext; + +import fr.ifremer.isisfish.AbstractIsisFishTest; +import fr.ifremer.isisfish.datastore.ResultStorage; +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.entities.Result; +import fr.ifremer.isisfish.simulator.SimulationControl; +import fr.ifremer.isisfish.types.Date; + +/** + * Integration tests for {@link SimulationService}. + * + * Dans ces deux tests, les simulations ont été effectuées sur isis-fish-3.2.0.9. + * Les resultats ont été exporté dans le fichier data-backup.sql.gz. Le zip + * contient cet export et le fichier de parametres. + * + * Il ne contient pas les scripts pour utiliser ceux de la base de test. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ By : $Author: chatellier $ + */ +public class SimulationServiceIT extends AbstractIsisFishTest { + + /** Class logger. */ + private static Log log = LogFactory.getLog(SimulationServiceIT.class); + + /** + * Read a zipped simulation file. + * Redo simulation with same parameters, and check that result are all equals. + * + * @param zipName + * @throws Exception + */ + protected void testSimulate(String zipName) throws Exception { + + int resultChecked = 0; + + // recuperation du fichier zip de la simulation de test + File zip = new File(zipName); + + // import de cette simulation + String name = "simulation-test-" + System.currentTimeMillis(); + SimulationStorage simRef = SimulationStorage.importAndRenameZip(zip, name + "-ref"); + + // la simulation testée ici + SimulationStorage sim = SimulationStorage.importAndRenameZip(zip, name + "-temp"); + + try { + // suppression des resultats de cette simulation + TopiaContext tx = sim.getStorage().beginTransaction(); + tx.execute("DELETE from " + Result.class.getName()); + tx.commitTransaction(); + tx.closeContext(); + + // lancement de la simulation + SimulationControl control = new SimulationControl(sim.getName()); + control.setDate(new Date()); + InProcessSimulatorLauncher launcher = new InProcessSimulatorLauncher(); + sim = launcher.localSimulate(control, sim); + + // if simulation ends with exception, no need to continue + if (!StringUtils.isEmpty(sim.getInformation().getException())) { + Assert.fail(sim.getInformation().getException()); + } + + // verification qu'on retrouve les memes resulats pour les deux simulations + ResultStorage resultRef = simRef.getResultStorage(); + ResultStorage result = sim.getResultStorage(); + + List<String> resultNames = resultRef.getResultName(); + Assert.assertEquals(resultNames, result.getResultName()); + + Date lastDate = resultRef.getLastDate(); + + + if (log.isInfoEnabled()) { + log.info("Check result ..."); + } + + for (Date date = new Date(0); date.beforeOrEquals(lastDate); date = date.next()) { + for (String resultName : resultNames) { + if (log.isDebugEnabled()) { + log.debug("Check result " + date + " " + resultName); + } + Assert.assertEquals("Date " + date.getDate() + " result " + resultName, + resultRef.getMatrix(date, resultName), + result.getMatrix(date, resultName)); + + resultChecked++; + } + } + + // nombre de résultat sur 12 mois, sur 5 ans + Assert.assertEquals("All expected results have not been checked !", resultNames.size() * 12 * 5, resultChecked); + + } finally { + // fermeture des bases + simRef.getStorage().closeContext(); + sim.getStorage().closeContext(); + // suppresion des deux simulations + simRef.delete(false); + sim.delete(false); + } + + // Test qu'au moins quelques resultats ont été verifié + Assert.assertTrue("At least some result must be done", resultChecked > 100); + } + + /** + * Do simulation test on gdg database. + * + * Simulation properties : + * - 10 years + * - all strategies + * - one population + * + * @throws Exception + */ + @Test + public void testSimlateGdG() throws Exception { + URL zipURL = this.getClass().getResource("sim_test-gdg-3.2-3.3.zip"); + testSimulate(zipURL.getFile()); + } + + /** + * Do simulation test on ICA database. + * + * Simulation properties : + * - 10 years + * - all strategies + * - one population + * + * @throws Exception + */ + @Test + public void testSimlateICA() throws Exception { + URL zipURL = this.getClass().getResource("sim_test-ica-3.2-3.3.zip"); + testSimulate(zipURL.getFile()); + } +} Property changes on: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2009-12-22 14:58:49 UTC (rev 2860) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2009-12-22 17:17:18 UTC (rev 2861) @@ -198,57 +198,4 @@ } } } - - /** - * Lance une simulation avec des facteurs de sensibilité. - * - * This test use factors with matrix. - * - * Fail after 2 min. - */ - @Test(timeout=120 * 1000) - public void testRunSensivitySimulationWithMatrix() { - - SimulationParameter params = new SimulationParameter(); - // set params region - params.setRegionName("DemoRegion"); - // set population - List<Population> pops = new ArrayList<Population>(); - Population pop = new PopulationImpl(); - pop.setName("test population"); - pop.setPopulationGroup(new ArrayList<PopulationGroup>()); - pop.setPopulationZone(new ArrayList<Zone>()); - pops.add(pop); - params.setPopulations(pops); - // strat - List<Strategy> strats = new ArrayList<Strategy>(); - Strategy strategy = new StrategyImpl(); - strategy.setName("stratest"); - strats.add(strategy); - params.setStrategies(strats); - // number of year - params.setNumberOfYear(1); - - SimulationService service = SimulationService.getService(); - SimulatorLauncher launcher = new InProcessSimulatorLauncher(); - service.addSimulationLauncher(launcher); - - SensitivityCalculator sensitivityCalculator = new SensitivityCalculatorRandomMock(); - - DesignPlan designPlan = getTestMatrixDesignPlan(); - - service.submit("sensitivity test matrix 1", params, launcher, 0, - sensitivityCalculator, designPlan); - - // temporise la fin de test , sinon junit tue tous les process - try { - do { - Thread.sleep(2000); - } while (!service.jobs.isEmpty()); - } catch (InterruptedException e) { - if (log.isErrorEnabled()) { - log.error("Can't wait wimulation to end", e); - } - } - } } Added: isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/simulator/launcher/sim_test-gdg-3.2-3.3.zip =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/simulator/launcher/sim_test-gdg-3.2-3.3.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/simulator/launcher/sim_test-ica-3.2-3.3.zip =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/simulator/launcher/sim_test-ica-3.2-3.3.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

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

22 Dec '09

Author: chatellier Date: 2009-12-22 14:58:49 +0000 (Tue, 22 Dec 2009) New Revision: 2860 Modified: isis-fish/trunk/changelog.txt Log: Update changelog (export factors) Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-12-22 14:19:05 UTC (rev 2859) +++ isis-fish/trunk/changelog.txt 2009-12-22 14:58:49 UTC (rev 2860) @@ -1,5 +1,6 @@ isis-fish (3.3.0.0) stable; urgency=low + * Add region factorisable value export (mexico) * Improve simulation stopping algorithm (now faster) * Locally save simulation zip to allow simulation restart even after isis shutdown * In sensitivity analysis, upload only one zip to caparmor for all simulations

1 0