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

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

31 Mar '09

Author: chatellier Date: 2009-03-31 13:33:51 +0000 (Tue, 31 Mar 2009) New Revision: 2054 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/SimulationMonitor.java Log: Dans le cas de SSH, si une eception a ?\195?\169t?\195?\169 lanc?\195?\169, lance une demande d'arret de simulation et telecharge le debut de simulation 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-03-31 12:58:07 UTC (rev 2053) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-03-31 13:33:51 UTC (rev 2054) @@ -21,6 +21,7 @@ import static org.codelutin.i18n.I18n._; import java.io.File; +import java.io.FileInputStream; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; @@ -28,6 +29,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Properties; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; @@ -246,7 +248,7 @@ /** * {@inheritDoc} * - * Se connecte au serveur distance et tétécharge le + * Se connecte au serveur distance et télécharge le * fichier de control. * Injecte ensuite ce fichier dans le {@link SimulationControl}. */ @@ -255,35 +257,69 @@ SimulationControl control) throws RemoteException { try { - // download control file - File controlFile = downloadControlFile(control.getId()); - - if (log.isDebugEnabled()) { - log.debug("Control have been downloaded : " - + controlFile.getAbsolutePath()); + try { + // download control file + File controlFile = downloadSimulationFile(control.getId(), SimulationStorage.CONTROL_FILENAME); + if (log.isDebugEnabled()) { + log.debug("Control have been downloaded : " + + controlFile.getAbsolutePath()); + } + + synchronized (control) { + // le thread principal a pu le modifier pendant le sleep + //if (control.isRunning()) { + // on ne lit pas le stop, car le stop ne peut-etre appeler + // que par l'utilisateur qui est de ce cote de la machine + SimulationStorage.readControl(controlFile, control, "stop"); + //} + } + + // deleteTempFile + controlFile.delete(); + } catch (SSHException e) { + // file doesn't exist + if (log.isDebugEnabled()) { + // not add ,e plz :) + log.debug(_("Remote control file doesn't exists %s", e + .getMessage())); + } } + + try { + // download information file + File infoFile = downloadSimulationFile(control.getId(), SimulationStorage.INFORMATION_FILENAME); + if (log.isDebugEnabled()) { + log.debug("Information have been downloaded : " + + infoFile.getAbsolutePath()); + } - synchronized (control) { - // le thread principal a pu le modifier pendant le sleep - //if (control.isRunning()) { - // on ne lit pas le stop, car le stop ne peut-etre appeler - // que par l'utilisateur qui est de ce cote de la machine - SimulationStorage.readControl(controlFile, control, "stop"); - //} + // s'il y a une exception, + // on dit juste que la simulation a eu une demande + // d'arret pour qu'elle s'arrete dans l'UI + Properties infoProperties = new Properties(); + infoProperties.load(new FileInputStream(infoFile)); + if (!StringUtils.isEmpty(infoProperties.getProperty("exception"))) { + synchronized (control) { + control.setStopSimulationRequest(true); + } + } + + + // deleteTempFile + infoFile.delete(); + } catch (SSHException e) { + // file doesn't exist + if (log.isDebugEnabled()) { + // not add ,e plz :) + log.debug(_("Remote control file doesn't exists %s", e + .getMessage())); + } } - - // deleteTempFile - controlFile.delete(); - } catch (SSHException e) { - // file doesn't exist - if (log.isDebugEnabled()) { + } catch (IOException e) { + if (log.isErrorEnabled()) { // not add ,e plz :) - log.debug(_("Remote control file doesn't exists %s", e - .getMessage())); + log.error(_("Can't download file"), e); } - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); } } @@ -522,11 +558,13 @@ * Download remote simulation control file and store * its content into temp file. * + * @param simulationId id de la simulation + * @param fileName nom du fichier a telecharger * @return downloaded temp file (file have to be manually deleted) * @throws IOException * @throws SSHException if remote file doesn't exists */ - protected File downloadControlFile(String simulationId) throws IOException, + protected File downloadSimulationFile(String simulationId, String fileName) throws IOException, SSHException { File localFile = null; @@ -537,10 +575,10 @@ String remoteFile = IsisFish.config.getSimulatorSshDataPath(); remoteFile += "/" + SimulationStorage.SIMULATION_PATH; remoteFile += "/" + simulationId; - remoteFile += "/control"; + remoteFile += "/" + fileName; // local tmp file - localFile = File.createTempFile(simulationId, "control"); + localFile = File.createTempFile(simulationId, fileName); try { SSHUtils.scpFrom(getSSHSession(), remoteFile, localFile); 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-03-31 12:58:07 UTC (rev 2053) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-03-31 13:33:51 UTC (rev 2054) @@ -453,13 +453,15 @@ try { + // get storage + // meme si StopSimulationRequest + // force le download dans le cas de ssh + SimulationStorage simulation = launcher.getSimulationStorage( + service, control); + // on ne fait de post traitement que si // la simulation n'a pas été arretée if (!control.isStopSimulationRequest()) { - // get storage - SimulationStorage simulation = launcher.getSimulationStorage( - service, control); - // post manage this storage boolean simulationAvailble = exportResult(job, simulation);

1 0

r2053 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org 31 Mar '09

31 Mar '09

Author: sletellier Date: 2009-03-31 12:58:07 +0000 (Tue, 31 Mar 2009) New Revision: 2053 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Log: Bug npe when loading old simulation in sensitivity is fixed Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-03-31 12:21:43 UTC (rev 2052) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-03-31 12:58:07 UTC (rev 2053) @@ -183,14 +183,18 @@ protected void enablePreSimul(){ if (fieldUseSimulPreScripts.isSelected()){ SimulUI simul = getParentContainer(SimulUI.class); - simul.enablePreSimul(); + if (simul != null){ + simul.enablePreSimul(); + } } } protected void enableAnalysePlan(){ if (fieldSimulUseAnalysePlan.isSelected()){ getContextValue(SimulAction.class).getSimulationParameter().setUseAnalysePlan(true); SimulUI simul = getParentContainer(SimulUI.class); - simul.enableAnalysePlan(); + if (simul != null){ + simul.enableAnalysePlan(); + } } else{ getContextValue(SimulAction.class).getSimulationParameter().setUseAnalysePlan(false);

1 0

r2052 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/sensitivity resources/i18n
by sletellier＠users.labs.libre-entreprise.org 31 Mar '09

31 Mar '09

Author: sletellier Date: 2009-03-31 12:21:43 +0000 (Tue, 31 Mar 2009) New Revision: 2052 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 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: Adding message box Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-03-31 10:06:24 UTC (rev 2051) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-03-31 12:21:43 UTC (rev 2052) @@ -18,13 +18,18 @@ package fr.ifremer.isisfish.ui.sensitivity; +import static org.codelutin.i18n.I18n._; + import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.ui.simulator.SimulAction; +import fr.ifremer.isisfish.ui.widget.ErrorDialogUI; import java.io.Serializable; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; import javax.swing.JComponent; +import javax.swing.JDialog; +import javax.swing.JOptionPane; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.math.matrix.MatrixND; @@ -63,7 +68,15 @@ List<EquationContinuousDomain> domains = equationPanel.getDomains(); for (EquationContinuousDomain domain : domains) { - action.addContinuousEquationFactor(name, comment, path, domain, cOrigine, exist); + if (domain.getCoefficient() != null && domain.getCoefficient() == 1){ + JOptionPane.showMessageDialog(equationPanel, _("isisfish.error.factor.coefValueIsOne")); + } + else if (domain.getReferenceValue() != null && domain.getCoefficient() != null && domain.getCoefficient() > 1 && domain.getOperator() != null && domain.getVariableName() != null ){ + action.addContinuousEquationFactor(name, comment, path, domain, cOrigine, exist); + } + else { + JOptionPane.showMessageDialog(equationPanel, _("isisfish.error.factor.invalid")); + } } } catch (Exception ex) { if (log.isErrorEnabled()) { 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-03-31 10:06:24 UTC (rev 2051) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-03-31 12:21:43 UTC (rev 2052) @@ -243,6 +243,8 @@ isisfish.error.equation.retun.number=EquationImpl must retun a number\: %1$s isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s isisfish.error.evalute.plan.script=Can't evaluate plan script +isisfish.error.factor.coefValueIsOne=Coefficient can't be equal to 1 +isisfish.error.factor.invalid=Factor is not valid isisfish.error.file.already.exists=The file %1$s already exist isisfish.error.get.fisheryRegion=Can't get FisheryRegion isisfish.error.growth.equation.before.create.group.population=Error, You must input growth equation before create the group population @@ -318,6 +320,7 @@ isisfish.error.save.simulation.parameters=Can't save simulation parameters in file %1$s isisfish.error.script.create=isisfish.error.script.create isisfish.error.script.delete=Can't delete file %1$s for reason %2$s +isisfish.error.script.evaluate= isisfish.error.script.import=Can't import file for reason %1$s isisfish.error.script.load=Can't load file %1$s for reason %2$s isisfish.error.script.save=Can't save file %1$s for reason %2$s 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-03-31 10:06:24 UTC (rev 2051) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-03-31 12:21:43 UTC (rev 2052) @@ -243,6 +243,8 @@ isisfish.error.equation.retun.number=EquationImpl must retun a number\: %1$s isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s isisfish.error.evalute.plan.script=Can't evaluate plan script +isisfish.error.factor.coefValueIsOne=Un co\u00E9fficient ne peux pas \u00EAtre \u00E9gual \u00E0 1 +isisfish.error.factor.invalid=Le facteur n'est pas valide isisfish.error.file.already.exists=The file %1$s already exist isisfish.error.get.fisheryRegion=Can't get FisheryRegion isisfish.error.growth.equation.before.create.group.population=Error, You must input growth equation before create the group population @@ -318,6 +320,7 @@ isisfish.error.save.simulation.parameters=Can't save simulation parameters in file %1$s isisfish.error.script.create=isisfish.error.script.create isisfish.error.script.delete=N'a pas pu supprimer le fichier %1$s pour la raison suivante %2$s +isisfish.error.script.evaluate= isisfish.error.script.import=N'a pas pu importer pour la raison suivante %1$s isisfish.error.script.load=N'a pas pu charger le fichier %1$s pour la raison suivante %2$s isisfish.error.script.save=N'a pas pu sauver le fichier %1$s pour la raison suivante %2$s

1 0

r2051 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by sletellier＠users.labs.libre-entreprise.org 31 Mar '09

31 Mar '09

Author: sletellier Date: 2009-03-31 10:06:24 +0000 (Tue, 31 Mar 2009) New Revision: 2051 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx Log: Editing continuous equation factor debug Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx 2009-03-31 10:04:30 UTC (rev 2050) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx 2009-03-31 10:06:24 UTC (rev 2051) @@ -61,9 +61,13 @@ return datas; } public void setDomains(java.util.List<EquationContinuousDomain> domains){ - datas = domains; + datas.clear(); + for (EquationContinuousDomain d : domains){ + addDomain(d); + } } public void addDomain(EquationContinuousDomain domain){ + newButton(); datas.add(domain); } protected AbstractTableModel getTableModel(){

1 0

r2050 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by sletellier＠users.labs.libre-entreprise.org 31 Mar '09

31 Mar '09

Author: sletellier Date: 2009-03-31 10:04:30 +0000 (Tue, 31 Mar 2009) New Revision: 2050 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx Log: Set value when continue factor become discret Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-31 09:23:19 UTC (rev 2049) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-31 10:04:30 UTC (rev 2050) @@ -282,6 +282,11 @@ } return result; } + + public static JComponent getEditorWithValue(JComponent c) { + return getEditorWithValue(c, getValue(c)); + } + public static JComponent getEditorWithValue(JComponent c, Object value) { JComponent result = null; try { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-03-31 09:23:19 UTC (rev 2049) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-03-31 10:04:30 UTC (rev 2050) @@ -152,7 +152,13 @@ for (Object o : values.values()) { i++; cache = o; - JComponent c = EditorHelper.getEditorWithValue(cOrigine, o); + JComponent c = null; + if (o != null){ + c = EditorHelper.getEditorWithValue(cOrigine, o); + } + else { + c = EditorHelper.getEditorWithValue(cOrigine); + } discretComponents.add(c); JScrollPane js = new JScrollPane(c); tabPane.addTab("Factor " + i, js);

1 0

r2049 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: datastore simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 31 Mar '09

31 Mar '09

Author: chatellier Date: 2009-03-31 09:23:19 +0000 (Tue, 31 Mar 2009) New Revision: 2049 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Store design plan as xml in simulation 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-03-31 09:17:55 UTC (rev 2048) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2009-03-31 09:23:19 UTC (rev 2049) @@ -67,6 +67,7 @@ public static final String PARAMETERS_FILENAME = "parameters.properties"; public static final String RESULT_XML_FILENAME = "isis-mexico-output.xml"; public static final String RESULT_EXPORT_DIRECTORY = "resultExports"; + public static final String DESIGN_PLAN_FILENAME = "isis-mexico-designplan.xml"; /** to use log facility, just put in your code: log.info(\"...\"); */ private static Log log = LogFactory.getLog(SimulationStorage.class); @@ -162,7 +163,8 @@ /** * Retourne le fichier de stockage des resultats sous format XML mexico - * de la simulation + * de la simulation. + * * @param root le repertoire de stockage de la simulation * @return */ @@ -172,7 +174,8 @@ } /** - * Retourne le fichier de stockage des parametres de la simulation courante + * Retourne le fichier de stockage des parametres de la simulation courante. + * * @return */ protected File getSimulationParametersFile() { @@ -181,6 +184,17 @@ } /** + * Get Mexico XML design plan file. + * + * @param root le repertoire de stockage de la simulation + * @return a {@link File} even if file doesn't exist + */ + public static File getMexicoDesignPlan(File root) { + File result = new File(root, DESIGN_PLAN_FILENAME); + return result; + } + + /** * Retourne le fichier de stockage du fichier de control de la simulation. * Ce fichier conserve l'etat de la simulation, cela permet a un processus * externe de connaitre l'etat d'une simulation distante 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-03-31 09:17:55 UTC (rev 2048) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-03-31 09:23:19 UTC (rev 2049) @@ -43,6 +43,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.mutable.MutableInt; import org.apache.commons.lang.time.DurationFormatUtils; import org.apache.commons.logging.Log; @@ -63,6 +64,7 @@ import fr.ifremer.isisfish.datastore.ScriptStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.SimulatorStorage; +import fr.ifremer.isisfish.mexico.MexicoHelper; import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.simulator.AnalysePlan; import fr.ifremer.isisfish.simulator.AnalysePlanContext; @@ -367,7 +369,7 @@ fireStartEvent(job); // on construit le zip de la simulation - File zip = prepareSimulationZipFile(control, param, true); + File zip = prepareSimulationZipFile(control, param, null, true); item.setSimulationZip(zip); if (param.getUseAnalysePlan() && param.isIndependentPlan()) { @@ -412,6 +414,9 @@ param.setSensitivityCalculator(sensitivitycalculator); param.setNumberOfSensitivitySimulation(sensitivityScenarios.getScenarios().size()); + // export designplan as XML + String xmlDesignPlan = MexicoHelper.getDesignPlanAsXML(designPlan); + // on l'ajoute tout de suite a la liste des simulations demandee // init with default "id" must been changed for designPlan // simulation @@ -419,7 +424,7 @@ // on construit le zip de la simulation // in zip, there will be param "without" prescript - File zip = prepareSimulationZipFile(controlJustForZip, param, true); + File zip = prepareSimulationZipFile(controlJustForZip, param, xmlDesignPlan, true); // for each simulation, we neeed to launch a specific simulation // new simulation ids will be id + "_" + x @@ -819,15 +824,17 @@ * <li> exports * <li> simulators * <li> export de la database de la region + * <li> analyseplan * <p> * Le tout est zippé et le zip est retourné, il peut-être directement - * importé dans le SimulationStorage (en le renomant comme il faut - * importAndRenameZip). + * importé dans le {@link SimulationStorage} (en le renommant comme + * il faut {@link SimulationStorage#importAndRenameZip(File, String)}. * <p> * Ce zip est automatiquement supprimé à la fin de l'application. * * @param control le controleur * @param param les parametre de la simulation + * @param xmlDesignPlan contenu xml des design plan * @param compile si vrai la version compile des fichiers Java est aussi * mise dans le fichier zip. Cela peut servir pour les simulations locales * pour ne pas recompiler pour chaque simulation avec plan d'analyse @@ -835,7 +842,7 @@ * @throws SimulationException pour tout problème rencontré (IO,Topia...) */ protected File prepareSimulationZipFile(SimulationControl control, - SimulationParameter param, boolean compile) + SimulationParameter param, String xmlDesignPlan, boolean compile) throws SimulationException { try { File tmpDirectory = FileUtil.createTempDirectory( @@ -914,6 +921,17 @@ compileAllFile(control, tmpDirectory); } + // Sauvegarde du design plan en XML + if (!StringUtils.isEmpty(xmlDesignPlan)) { + File simulationDesignPlanFile = SimulationStorage.getMexicoDesignPlan(tmpDirectory); + FileUtil.writeString(simulationDesignPlanFile, xmlDesignPlan); + } + + 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

r2048 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 31 Mar '09

31 Mar '09

Author: chatellier Date: 2009-03-31 09:17:55 +0000 (Tue, 31 Mar 2009) New Revision: 2048 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx Log: Modify regex, tab char... Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx 2009-03-31 09:15:24 UTC (rev 2047) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx 2009-03-31 09:17:55 UTC (rev 2048) @@ -166,7 +166,7 @@ String[] lines = editor.getEditor().getText().split("\n"); String result = ""; for (String line : lines){ - Pattern p = Pattern.compile("(^.*\\ *" + variableName + "\\ *\\=\\ *).*\\;$"); + Pattern p = Pattern.compile("(^.*\\s+" + variableName + "\\s*\\=\\s*).*\\;$"); Matcher matcher = p.matcher(line); if (matcher.find()) { line = matcher.group(1) + "context.getValueAndCompute(\"" + bean.toString() + "." + StringUtils.uncapitalize(methodGet) + "." + variableName + "\");";

1 0

r2047 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 31 Mar '09

31 Mar '09

Author: chatellier Date: 2009-03-31 09:15:24 +0000 (Tue, 31 Mar 2009) New Revision: 2047 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx Log: Remplace simple quote by double quotes Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx 2009-03-31 08:38:50 UTC (rev 2046) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx 2009-03-31 09:15:24 UTC (rev 2047) @@ -169,7 +169,7 @@ Pattern p = Pattern.compile("(^.*\\ *" + variableName + "\\ *\\=\\ *).*\\;$"); Matcher matcher = p.matcher(line); if (matcher.find()) { - line = matcher.group(1) + "context.getValueAndCompute('" + bean.toString() + "." + StringUtils.uncapitalize(methodGet) + "." + variableName + "');"; + line = matcher.group(1) + "context.getValueAndCompute(\"" + bean.toString() + "." + StringUtils.uncapitalize(methodGet) + "." + variableName + "\");"; } result += line + "\n"; }

1 0

r2046 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/simulator/sensitivity/domain test/java/fr/ifremer/isisfish/simulator/sensitivity
by jcouteau＠users.labs.libre-entreprise.org 31 Mar '09

31 Mar '09

Author: jcouteau Date: 2009-03-31 08:38:50 +0000 (Tue, 31 Mar 2009) New Revision: 2046 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java Log: Remove a sys.out and adding tests 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-03-31 08:33:52 UTC (rev 2045) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2009-03-31 08:38:50 UTC (rev 2046) @@ -141,7 +141,6 @@ */ public E getValueForIdentifier(final Serializable identifier) { this.value = Double.valueOf((String)identifier); - System.out.println("Value : "+this.value); if (operator.equals("+")) { this.matrix.map(new MapFunction() { public double apply(double val) { Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2009-03-31 08:33:52 UTC (rev 2045) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2009-03-31 08:38:50 UTC (rev 2046) @@ -152,6 +152,7 @@ Assert.assertEquals(2.76, factor.getValue().getValue(new int[] { 2, 0 }),0.0000001); Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0); Assert.assertEquals(1,((ContinuousDomain)factor.getDomain()).getMaxBound(),0); + Assert.assertEquals(0.1, ((MatrixContinuousDomain)factor.getDomain()).getValue(),0); // matrix 2 MatrixND matrix2 = MatrixFactory.getInstance().create("test1", @@ -272,6 +273,7 @@ Assert.assertEquals(2.76, factor.getValue(),0.0000001); Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0); Assert.assertEquals(1,((ContinuousDomain)factor.getDomain()).getMaxBound(),0); + Assert.assertEquals(0.1, ((EquationContinuousDomain)factor.getDomain()).getValue(),0);

1 0

r2045 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity: . domain
by jcouteau＠users.labs.libre-entreprise.org 31 Mar '09

31 Mar '09

Author: jcouteau Date: 2009-03-31 08:33:52 +0000 (Tue, 31 Mar 2009) New Revision: 2045 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java Log: real clone() method for domains Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2009-03-30 14:18:23 UTC (rev 2044) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2009-03-31 08:33:52 UTC (rev 2045) @@ -61,4 +61,12 @@ * @param visitor */ public void accept(DomainVisitor visitor); + + /** + * Clone the domain + * + * @return the domain cloned + */ + + public Domain<E> clone(); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2009-03-30 14:18:23 UTC (rev 2044) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2009-03-31 08:33:52 UTC (rev 2045) @@ -22,27 +22,29 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorVisitor; /** * Facteur de variation des parametres de simulation. - * - * @param <E> type des valeurs gérées par le facteur * - * La classe doit être {@link Serializable} avec ses valeurs - * pour permettre l'export XML. + * @param <E> + * type des valeurs gérées par le facteur * + * La classe doit être {@link Serializable} avec ses valeurs pour permettre + * l'export XML. + * * @author chatellier * @version $Revision: 1.0 $ * - * Last update : $Date: 19 févr. 2009 $ - * By : $Author: chatellier $ + * Last update : $Date: 19 févr. 2009 $ By : $Author: chatellier $ */ public class Factor<E extends Serializable> implements Serializable, Cloneable { /** serialVersionUID. */ private static final long serialVersionUID = 1643804268013964453L; - + /** * Nom du facteur. */ @@ -52,35 +54,32 @@ * Commentaire du facteur. */ protected String comment; - + /** * Domaine du facteur. * - * Ensemble des valeurs possibles a prendre en compte. - * La clé est un label qui permet d'identifier la valeur. + * Ensemble des valeurs possibles a prendre en compte. La clé est un label + * qui permet d'identifier la valeur. * - * Le domain peut etre : - * - discret : i.e un ensemble de valeurs - * - continu : i.e, une borne min, max - * + * Le domain peut etre : - discret : i.e un ensemble de valeurs - continu : + * i.e, une borne min, max + * * @see ContinuousDomain * @see DiscreteDomain */ protected Domain<E> domain; - + /** * Factor value. */ protected E value; - + /** - * Path permettant d'identifier l'objet et - * la propriete de l'objet a mettre a jour. + * Path permettant d'identifier l'objet et la propriete de l'objet a mettre + * a jour. * - * Par exemple: - * topiaID#gear - * aura pour effet de recuperer l'objet correspondant - * au topiaID fournit et d'appeler le propriete + * Par exemple: topiaID#gear aura pour effet de recuperer l'objet + * correspondant au topiaID fournit et d'appeler le propriete * <tt>setGear(value)</tt> dessus. */ protected String path; @@ -93,17 +92,18 @@ protected Factor() { } - + /** * Constructor with name. * - * @param name factor name + * @param name + * factor name */ public Factor(String name) { this(); this.name = name; } - + /** * Get name. * @@ -116,7 +116,8 @@ /** * Set name. * - * @param name the name to set + * @param name + * the name to set */ public void setName(String name) { this.name = name; @@ -124,7 +125,7 @@ /** * Get comment. - * + * * @return the comment */ public String getComment() { @@ -133,8 +134,9 @@ /** * Set comment. - * - * @param the comment to set + * + * @param the + * comment to set */ public void setComment(String comment) { this.comment = comment; @@ -152,7 +154,8 @@ /** * Set domain. * - * @param domain the domain to set + * @param domain + * the domain to set */ public void setDomain(Domain<E> domain) { this.domain = domain; @@ -169,17 +172,19 @@ /** * Set value. - * - * @param value new value + * + * @param value + * new value */ public void setValue(E value) { this.value = value; } - + /** * Set value for label. - * - * @param valueIdentifier new value identifier to get + * + * @param valueIdentifier + * new value identifier to get */ public void setValueForIdentifier(Serializable valueIdentifier) { value = domain.getValueForIdentifier(valueIdentifier); @@ -197,7 +202,8 @@ /** * Set path. * - * @param path the path to set + * @param path + * the path to set */ public void setPath(String path) { this.path = path; @@ -213,7 +219,7 @@ visitor.visit(this, domain); visitor.end(this); } - + /** * {@inheritDoc} */ @@ -221,18 +227,18 @@ public Object clone() { Factor<E> f = new Factor<E>(); - // FIXME make real clone() for domain - f.domain = domain; + + f.domain = domain.clone(); f.name = name; f.path = path; // FIXME make real clone() for value f.value = value; - + return f; } @Override - public String toString(){ + public String toString() { return name; } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2009-03-30 14:18:23 UTC (rev 2044) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2009-03-31 08:33:52 UTC (rev 2045) @@ -134,4 +134,12 @@ public void setCardinality(int cardinality) { this.cardinality = cardinality; } + + public ContinuousDomain<E> clone(){ + ContinuousDomain<E> cloned = new ContinuousDomain<E>(); + cloned.setCardinality(this.cardinality); + cloned.setMaxBound(this.maxBound); + cloned.setMinBound(this.minBound); + return cloned; + } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2009-03-30 14:18:23 UTC (rev 2044) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2009-03-31 08:33:52 UTC (rev 2045) @@ -102,4 +102,11 @@ } visitor.end(this); } + + public DiscreteDomain<E> clone(){ + DiscreteDomain<E> cloned = new DiscreteDomain<E>(); + cloned.setValues(this.values); + return cloned; + + } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2009-03-30 14:18:23 UTC (rev 2044) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2009-03-31 08:33:52 UTC (rev 2045) @@ -53,6 +53,9 @@ /** Valeur de reference in percent */ protected Double referenceValue; + + /** Value used to create the equation */ + protected Double value; /** * Empty constructor. @@ -164,6 +167,9 @@ * only. Here : return identifier. */ public E getValueForIdentifier(Serializable identifier) { + + this.value = Double.valueOf((String)identifier); + if (operator.equals("+")) { return (E) ((Double) (referenceValue + ((referenceValue + coefficient) * ((2 * Double .valueOf((String) identifier)) - 1)))); @@ -179,4 +185,37 @@ } return (E) identifier; } + + /** + * Get value used to create the equation. + * + * @return the value + */ + public Double getValue() { + return this.value; + } + + /** + * Set value used to create the equation. + * + * @param value + * the value to set + */ + public void setValue(Double value) { + this.value = value; + } + + public EquationContinuousDomain<E> clone(){ + EquationContinuousDomain<E> cloned = new EquationContinuousDomain<E>(); + cloned.setCardinality(this.cardinality); + cloned.setMaxBound(this.maxBound); + cloned.setMinBound(this.minBound); + cloned.setCoefficient(this.coefficient); + cloned.setOperator(this.operator); + cloned.setValue(this.value); + cloned.setReferenceValue(this.referenceValue); + cloned.setVariableName(this.variableName); + return cloned; + } + } 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-03-30 14:18:23 UTC (rev 2044) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2009-03-31 08:33:52 UTC (rev 2045) @@ -50,6 +50,9 @@ /** Operation. (=,+,-,/) */ protected String operator; + + /** Value used to create the matrix */ + protected double value; /** * Empty constructor. @@ -137,6 +140,8 @@ * In continuous domain, just return identifier */ public E getValueForIdentifier(final Serializable identifier) { + this.value = Double.valueOf((String)identifier); + System.out.println("Value : "+this.value); if (operator.equals("+")) { this.matrix.map(new MapFunction() { public double apply(double val) { @@ -168,4 +173,35 @@ } return (E) this.matrix; } + + /** + * Get value used to create the matrix. + * + * @return the value + */ + public Double getValue() { + return this.value; + } + + /** + * Set value used to create the matrix. + * + * @param value + * the value to set + */ + public void setValue(Double value) { + this.value = value; + } + + public MatrixContinuousDomain<E> clone(){ + MatrixContinuousDomain<E> cloned = new MatrixContinuousDomain<E>(); + cloned.setCardinality(this.cardinality); + cloned.setMaxBound(this.maxBound); + cloned.setMinBound(this.minBound); + cloned.setCoefficient(this.coefficient); + cloned.setMatrix(this.matrix); + cloned.setOperator(this.operator); + cloned.setValue(this.value); + return cloned; + } }

1 0