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

r2196 - isis-fish/trunk/src/main/resources/templates/ssh
by jcouteau＠users.labs.libre-entreprise.org May 7, 2009

May 7, 2009

Author: jcouteau Date: 2009-05-07 15:45:26 +0000 (Thu, 07 May 2009) New Revision: 2196 Modified: isis-fish/trunk/src/main/resources/templates/ssh/isis-launch-with-qsub.seq Log: QSub script for fast jobs on Caparmor (3Gb RAM, Xmx=2500M, jdk6u13) Modified: isis-fish/trunk/src/main/resources/templates/ssh/isis-launch-with-qsub.seq =================================================================== --- isis-fish/trunk/src/main/resources/templates/ssh/isis-launch-with-qsub.seq 2009-05-07 15:39:34 UTC (rev 2195) +++ isis-fish/trunk/src/main/resources/templates/ssh/isis-launch-with-qsub.seq 2009-05-07 15:45:26 UTC (rev 2196) @@ -1,13 +1,12 @@ #!/bin/csh -#PBS -l mem=1000mb cd "${isishome}" source /usr/share/modules/init/csh module load java/1.6.0 <#if simulationprescript?length > 0> -java -jar isis-fish*.jar --option launch.ui false --simulateRemotellyWithPreScript "${simulationid}" "${simulationzip}" "${simulationresultzip}" "${simulationprescript}" +/home3/caparmor/poussin/jdk1.6.0_13/bin/java -Xmx2500M -jar isis-fish*.jar --option launch.ui false --simulateRemotellyWithPreScript "${simulationid}" "${simulationzip}" "${simulationresultzip}" "${simulationprescript}" <#else> -java -jar isis-fish*.jar --option launch.ui false --simulateRemotelly "${simulationid}" "${simulationzip}" "${simulationresultzip}" +/home3/caparmor/poussin/jdk1.6.0_13/bin/java -jar isis-fish*.jar --option launch.ui false --simulateRemotelly "${simulationid}" "${simulationzip}" "${simulationresultzip}" </#if> \ No newline at end of file

1 0

r2195 - isis-fish/trunk/src/main/resources/templates/prescript
by chatellier＠users.labs.libre-entreprise.org May 7, 2009

May 7, 2009

Author: chatellier Date: 2009-05-07 15:39:34 +0000 (Thu, 07 May 2009) New Revision: 2195 Modified: isis-fish/trunk/src/main/resources/templates/prescript/factorprescript.ftl Log: For matrix CD, take factor value (not domain default value :() Modified: isis-fish/trunk/src/main/resources/templates/prescript/factorprescript.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/prescript/factorprescript.ftl 2009-05-07 12:47:26 UTC (rev 2194) +++ isis-fish/trunk/src/main/resources/templates/prescript/factorprescript.ftl 2009-05-07 15:39:34 UTC (rev 2195) @@ -42,11 +42,7 @@ <#if factor.domain.class.simpleName.equals("EquationContinuousDomain")> context.setValue("${factor.name}.${factor.domain.variableName}", ${factor.value}, "${factor.domain.operator}"); <#else> - <#if factor.domain.class.simpleName.equals("MatrixContinuousDomain")> - <#assign value=factor.domain.matrix /> - <#else> - <#assign value=factor.value /> - </#if> + <#assign value=factor.value /> <#assign serializedValue=beanUtils.convert(value)/> <#assign path=factor.path /> <#assign topiaId=path?substring(0, path?last_index_of("#"))/>

1 0

r2194 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org May 7, 2009

May 7, 2009

Author: sletellier Date: 2009-05-07 12:47:26 +0000 (Thu, 07 May 2009) New Revision: 2194 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx Log: UI optimisation Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-05-07 11:03:30 UTC (rev 2193) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-05-07 12:47:26 UTC (rev 2194) @@ -71,17 +71,15 @@ protected NavigationTreeNode currentNode = null; protected InputContentUI currentUI = null; - public InputNavigationTreeSelectionAdapter(InputUI context, boolean register) { + public InputNavigationTreeSelectionAdapter(InputUI context) { super(InputUI.class, null, context, Strategy.PER_UI_TYPE); if (context.getNavigation() == null) { throw new IllegalArgumentException("could not have a null 'navigation' in ui " + context); } - if (register) { - // register in tree this listener - context.getNavigation().addTreeSelectionListener(this); - } + // register in tree this listener + context.getNavigation().addTreeSelectionListener(this); } @Override Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-05-07 11:03:30 UTC (rev 2193) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-05-07 12:47:26 UTC (rev 2194) @@ -34,6 +34,8 @@ <javax.swing.tree.DefaultTreeSelectionModel id='navigationSelectionModel' selectionMode='{javax.swing.tree.TreeSelectionModel.SINGLE_TREE_SELECTION}'/> + <jaxx.runtime.swing.navigation.NavigationTreeCellRenderer id='navigationTreeCellRenderer' constructorParams='this'/> + <jaxx.runtime.swing.CardLayout2 id='cardlayout'/> <java.awt.CardLayout id='cardlayoutPrincipal'/> @@ -47,8 +49,6 @@ import fr.ifremer.isisfish.ui.WelcomePanelUI; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import fr.ifremer.isisfish.entities.Cell; @@ -81,6 +81,7 @@ import fr.ifremer.isisfish.datastore.RegionStorage; getContextValue(WelcomeSaveVerifier.class).addSaveVerifier(getVerifier()); +new fr.ifremer.isisfish.ui.input.InputNavigationTreeSelectionAdapter(this); protected InputAction getAction(){ return getContextValue(InputAction.class); @@ -133,12 +134,9 @@ String regionName = getRegion().getName(); setContextValue(getRegion()); NavigationTreeModel model = InputNavigationTreeSelectionAdapter.getTreeModel(regionName, getRegion()); - navigation.setSelectionModel(navigationSelectionModel); - navigation.setCellRenderer(new NavigationTreeCellRenderer(this)); setContextValue(model); navigation.setModel(model); - new InputNavigationTreeSelectionAdapter(this, true); setTreeSelection("$root"); } } @@ -258,7 +256,7 @@ </Table> <JPanel id="treePanel" name="treePanel" layout='{new BorderLayout()}'> <JScrollPane constraints='BorderLayout.CENTER'> - <JTree id="navigation" rootVisible="true" selectionRow='0' model='{new DefaultTreeModel(null)}'/> + <JTree id="navigation" selectionModel='{getNavigationSelectionModel()}' cellRenderer='{getNavigationTreeCellRenderer()}' rootVisible="true" selectionRow='0' model='{new DefaultTreeModel(null)}'/> </JScrollPane> </JPanel> </JPanel>

1 0

r2193 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain
by jcouteau＠users.labs.libre-entreprise.org May 7, 2009

May 7, 2009

Author: jcouteau Date: 2009-05-07 11:03:30 +0000 (Thu, 07 May 2009) New Revision: 2193 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java Log: replace clone by copy in MatrixContinuousDomain 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 2009-05-07 10:45:27 UTC (rev 2192) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2009-05-07 11:03:30 UTC (rev 2193) @@ -149,7 +149,7 @@ */ public MatrixND getValueForIdentifier(final Double identifier) { this.value = identifier; - MatrixND temp = this.matrix.clone(); + MatrixND temp = this.matrix.copy(); if (operator.equals("+")) { temp.map(new MapFunction() { public double apply(double val) {

1 0

r2192 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain
by jcouteau＠users.labs.libre-entreprise.org May 7, 2009

May 7, 2009

Author: jcouteau Date: 2009-05-07 10:45:27 +0000 (Thu, 07 May 2009) New Revision: 2192 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java Log: Fix matrix bug 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 2009-05-06 16:56:49 UTC (rev 2191) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2009-05-07 10:45:27 UTC (rev 2192) @@ -149,32 +149,33 @@ */ public MatrixND getValueForIdentifier(final Double identifier) { this.value = identifier; + MatrixND temp = this.matrix.clone(); if (operator.equals("+")) { - this.matrix.map(new MapFunction() { + temp.map(new MapFunction() { public double apply(double val) { return (val + ((val + coefficient) * ((2 * value - 1)))); } }); } else if (operator.equals("-")) { - this.matrix.map(new MapFunction() { + temp.map(new MapFunction() { public double apply(double val) { return (val + ((val - coefficient) * ((2 * value - 1)))); } }); } else if (operator.equals("*")) { - this.matrix.map(new MapFunction() { + temp.map(new MapFunction() { public double apply(double val) { return (val + ((val * coefficient) * ((2 * value - 1)))); } }); } else if (operator.equals("/")) { - this.matrix.map(new MapFunction() { + temp.map(new MapFunction() { public double apply(double val) { return (val + ((val / coefficient) * ((2 * value - 1)))); } }); } - return this.matrix; + return temp; } /**

1 0

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

May 6, 2009

Author: chatellier Date: 2009-05-06 16:56:49 +0000 (Wed, 06 May 2009) New Revision: 2191 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java Log: Re add previous simulae action (no deletion at end) for sub process launcher Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-05-06 10:55:55 UTC (rev 2190) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-05-06 16:56:49 UTC (rev 2191) @@ -874,6 +874,8 @@ VCS_COMMIT(_(""), VCSAction.class.getName() + "#vcsCommit", "--vcsCommit"), SIMULATE_WITH_REGION(_(""), SimulationAction.class.getName() + "#simulateWithRegion", "--simulateWithRegion"), + SIMULATE_WITH_SIMULATION(_(""), SimulationAction.class.getName() + "#simulateWithSimulation", "--simulateWithSimulation"), + SIMULATE_WITH_SIMULATION_AND_SCRIPT(_(""), SimulationAction.class.getName() + "#simulateWithSimulationAndScript", "--simulateWithSimulationAndScript"), SIMULATE_REMOTELLY(_(""), SimulationAction.class.getName() + "#simulateRemotelly", "--simulateRemotelly"), SIMULATE_REMOTELLY_WITH_PRESCRIPT(_(""), SimulationAction.class.getName() + "#simulateRemotellyWithPreScript", "--simulateRemotellyWithPreScript"); 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-06 10:55:55 UTC (rev 2190) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-05-06 16:56:49 UTC (rev 2191) @@ -28,7 +28,6 @@ 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; @@ -102,6 +101,62 @@ } /** + * Launch a simulation with specified simulationId and simulation zip. + * + * @param simulationId id de simulation + * @param simulationZip Zip de la simulation + * @throws Exception + */ + @Step(IsisConfig.STEP_AFTER_INIT_VCS) + public static void simulateWithSimulation(String simulationId, File simulationZip) + throws Exception { + // just call with null pre script + simulateWithSimulationAndScript(simulationId, simulationZip, null); + } + + /** + * Launch a simulation with specified simulationId, simulationZip + * and simulationPrescript. + * + * @param simulationId id de simulation + * @param simulationZip Zip de la simulation + * @param simulationPrescript simulation prescript + * @throws Exception + */ + @Step(IsisConfig.STEP_AFTER_INIT_VCS) + public static void simulateWithSimulationAndScript(String simulationId, File simulationZip, File simulationPrescript) + throws Exception { + + if (log.isInfoEnabled()) { + log.info("Command line action : simulateWithSimulation (" + simulationId + ", " + simulationZip.getAbsolutePath() + ", " + 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()); + + SimulationControl control = new SimulationControl(name); + + // pour forcer le fichier de control a être sauver + // pour ensuite être lu par le processus parent + control.setAutoSaveState(true); + + // lancement de la simulation + SimulatorLauncher launcher = new InProcessSimulatorLauncher(); + + //SimulationStorage simulation = launcher.simulate(null, control, simulationZip); + //simulation.getStorage().closeContext(); + String simulationPrescriptContent = null; + if (simulationPrescript != null && simulationPrescript.canRead()) { + simulationPrescriptContent = FileUtil.readAsString(simulationPrescript); + } + launcher.simulate(null, control, simulationZip, simulationPrescriptContent); + SimulationStorage simulation = launcher.getSimulationStorage(SimulationService.getService(), control); + simulation.getStorage().closeContext(); + + // FIXME integrer ca dans le process normal d'init + IsisFish.quit(); + } + + /** * Launch a simulation specialized for remote launch (caparmor). * * Done operations :

1 0

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

May 6, 2009

Author: chatellier Date: 2009-05-06 10:55:55 +0000 (Wed, 06 May 2009) New Revision: 2190 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Log: Wrong commit Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-05-06 10:55:31 UTC (rev 2189) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-05-06 10:55:55 UTC (rev 2190) @@ -84,8 +84,8 @@ protected Configuration freemarkerConfiguration; /** Freemarker qsub template. */ - //protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/isis-launch-with-qsub.seq"; - protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/isis-launch-with-cron.seq"; + protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/isis-launch-with-qsub.seq"; + //protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/isis-launch-with-cron.seq"; /** * Opened session. Stored in static context to not reask passphrase at each

1 0

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

May 6, 2009

Author: chatellier Date: 2009-05-06 10:55:31 +0000 (Wed, 06 May 2009) New Revision: 2189 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Log: Reachivage des resultats de simulation en zip 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-06 09:48:22 UTC (rev 2188) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-05-06 10:55:31 UTC (rev 2189) @@ -180,19 +180,10 @@ //ZipUtil.compressFiles(simulationResultZip, simulationStorage.getFile(), // Collections.singletonList(new File(simulationStorage.getFile(), simulationStorage.getName())), 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); + if (log.isInfoEnabled()) { + log.info("Compressing simulation as zip : " + simulationResultArchive); } - else { - if (log.isInfoEnabled()) { - log.info("Compressing simulation as zip : " + simulationResultArchive); - } - ZipUtil.compress(simulationResultArchive, simulationStorage.getFile(), null, true); - } + ZipUtil.compress(simulationResultArchive, simulationStorage.getFile(), null, true); simulationStorage.getStorage().closeContext(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-05-06 09:48:22 UTC (rev 2188) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-05-06 10:55:31 UTC (rev 2189) @@ -41,6 +41,7 @@ import org.codelutin.util.MD5; import org.codelutin.util.MD5InputStream; import org.codelutin.util.Tbz2Util; +import org.codelutin.util.ZipUtil; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; @@ -83,8 +84,8 @@ protected Configuration freemarkerConfiguration; /** Freemarker qsub template. */ - protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/isis-launch-with-qsub.seq"; - //protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/isis-launch-with-cron.seq"; + //protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/isis-launch-with-qsub.seq"; + protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/isis-launch-with-cron.seq"; /** * Opened session. Stored in static context to not reask passphrase at each @@ -365,7 +366,8 @@ // FIXME too slow methods //SimulationStorage.importZip(resultZipFile); - Tbz2Util.uncompress(resultArchiveFile, SimulationStorage.getSimulationDirectory()); + //Tbz2Util.uncompress(resultArchiveFile, SimulationStorage.getSimulationDirectory()); + ZipUtil.uncompress(resultArchiveFile, SimulationStorage.getSimulationDirectory()); if (log.isDebugEnabled()) { log.debug("Simulation imported : " + resultArchiveFile.getAbsolutePath()); @@ -665,7 +667,7 @@ protected File downloadResultsArchive(Session session, String simulationId, String md5sum) throws SSHException, IOException { - File localFile = File.createTempFile("simulation-results", ".tbz2"); + File localFile = File.createTempFile("simulation-results", ".zip"); if (log.isDebugEnabled()) { log.debug("Downloading results in " + localFile.getAbsolutePath()); @@ -822,7 +824,7 @@ remotePath += "/"; } - remotePath += "simulation-" + simulationId + "-result.tbz2"; + remotePath += "simulation-" + simulationId + "-result.zip"; return remotePath; }

1 0

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

May 6, 2009

Author: chatellier Date: 2009-05-06 09:48:22 +0000 (Wed, 06 May 2009) New Revision: 2188 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx Log: Add comment Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx 2009-05-06 09:15:17 UTC (rev 2187) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx 2009-05-06 09:48:22 UTC (rev 2188) @@ -74,6 +74,7 @@ protected void updateActions() { setCanStop(!selectionModelQueueTab.isSelectionEmpty()); setCanShowLog(!selectionModelQueueTabDone.isSelectionEmpty()); + // TODO value have to change on non valueChanged event setCanClear(queueTableDone.getModel().getRowCount()>0); } ]]>

1 0

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

May 6, 2009

Author: chatellier Date: 2009-05-06 09:15:17 +0000 (Wed, 06 May 2009) New Revision: 2187 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Ajout d'un fixme Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-05-06 09:10:04 UTC (rev 2186) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-05-06 09:15:17 UTC (rev 2187) @@ -392,6 +392,10 @@ return result; } + /** + * + * FIXME on ne peut pas retirer une regles par son nom (le nom n'est pas la clé) + */ public void removeRules(String name) { if (name != null) { /*for (Map.Entry<Rule, String> entry : rules.entrySet()) {

1 0