Author: chatellier Date: 2009-03-19 15:09:32 +0000 (Thu, 19 Mar 2009) New Revision: 2007 Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Export parameters now works Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-03-19 12:55:51 UTC (rev 2006) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-03-19 15:09:32 UTC (rev 2007) @@ -298,7 +298,7 @@ String sensitivityExportList = ""; // WARN only SENSITIVITY are parametrable for now for (SensitivityExport export : getSensitivityExport()) { - sensitivityExportList += export + ","; + sensitivityExportList += ExportStorage.getName(export) + ","; Properties exportProp = exportParametertoProperties(exportIndex++, export); result.putAll(exportProp); } @@ -1104,10 +1104,10 @@ result.numbers.putAll(numbers) ; result.tagValue.putAll(tagValue) ; result.simulLogLevel = simulLogLevel; - result.scriptLogLevel= scriptLogLevel; - result.libLogLevel= libLogLevel; + result.scriptLogLevel = scriptLogLevel; + result.libLogLevel = libLogLevel; result.numberOfSensitivitySimulation = numberOfSensitivitySimulation; - result.sensitivityExport= sensitivityExport; + result.sensitivityExport.addAll(sensitivityExport); result.sensitivityCalculator = sensitivityCalculator; return result; 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-19 12:55:51 UTC (rev 2006) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-03-19 15:09:32 UTC (rev 2007) @@ -63,8 +63,6 @@ import fr.ifremer.isisfish.datastore.ScriptStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.SimulatorStorage; -import fr.ifremer.isisfish.export.Export; -import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.simulator.AnalysePlan; import fr.ifremer.isisfish.simulator.AnalysePlanContext; @@ -414,17 +412,6 @@ param.setSensitivityCalculator(sensitivitycalculator); param.setNumberOfSensitivitySimulation(sensitivityScenarios.getScenarios().size()); - // FIXME to remove when available in UI - /*List<String> names = ExportStorage.getExportNames(); - List<String> ASName = new ArrayList<String>(); - for (String name : names) { - Export export = ExportStorage.getExport(name).getNewExportInstance(); - if (export instanceof SensitivityExport) { - ASName.add(name); - } - } - param.setSensitivityExportNames(ASName);*/ - // on l'ajoute tout de suite a la liste des simulations demandee // init with default "id" must been changed for designPlan // simulation Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-03-19 12:55:51 UTC (rev 2006) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-03-19 15:09:32 UTC (rev 2007) @@ -65,7 +65,8 @@ // enable/disable table try { SensitivityCalculator sens = SensitivityStorage.getSensitivity(sensitivityName).getNewSensitivityInstance(); - factorCardinality.setVisible(!sens.canManageCardinality()); + factorCardinalityScrollPane.setVisible(!sens.canManageCardinality()); + validate(); } catch(IsisFishException e) { if (log.isErrorEnabled()) { @@ -161,7 +162,7 @@ } protected DefaultComboBoxModel getExportTableModel() { - java.util.List<String> exportNames = getSimulAction().getSensibilityExportNames(); + java.util.List<String> exportNames = getSimulAction().getSensitivityExportNames(); DefaultComboBoxModel model = new DefaultComboBoxModel(exportNames.toArray()); return model; } @@ -254,7 +255,7 @@ protected void setExportListModel() { DefaultListModel model = new DefaultListModel(); - for (SensitivityExport s : getSimulAction().getSensibilityExports()){ + for (SensitivityExport s : getSimulAction().getSensitivityExports()){ model.addElement(new GenericCell(s.getExportFilename(), s, s.getClass())); } exportList.setModel(model); @@ -270,24 +271,24 @@ </cell> </row> <row> - <cell columns="2" fill="both" weightx="1.0" weighty="0.1"> + <cell columns="2" fill="both" weightx="1.0" weighty="1.0"> <JScrollPane> <JTable id="simulSensitivityCalculatorParam" rowHeight='24'/> </JScrollPane> </cell> </row> <row> - <cell columns="2" fill="both" weightx="1.0" weighty="0.1"> - <JScrollPane> - <JTable id="factorCardinality" rowHeight='24' visible="false" /> + <cell columns="2" fill="both" weightx="1.0" weighty="1.0"> + <JScrollPane id="factorCardinalityScrollPane" visible="false"> + <JTable id="factorCardinality" rowHeight='24' /> </JScrollPane> </cell> </row> <row> - <cell fill="both" columns='2' weightx="1" weighty="0.5"> + <cell fill="both" columns='2' weightx="1.0" weighty="1.0"> <Table> <row> - <cell fill="both" weightx="1" weighty="1"> + <cell fill="both" weightx="1.0" weighty="1"> <Table> <row> <cell fill="horizontal"> @@ -308,7 +309,7 @@ </row> </Table> </cell> - <cell fill="both" weighty="1"> + <cell fill="both" weighty="1.0"> <Table> <row> <cell fill="horizontal"> @@ -342,8 +343,8 @@ </cell> </row> <row> - <cell fill="both" columns='2' weightx="1" weighty="0.3"> - <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <cell fill="both" columns='2' weightx="1.0" weighty="1.0"> + <JScrollPane minimumSize='{new Dimension(0,50)}' preferredSize='{new Dimension(0,50)}'> <JTable id="exportParamsTable" rowHeight='24'/> </JScrollPane> </cell> 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-03-19 12:55:51 UTC (rev 2006) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-03-19 15:09:32 UTC (rev 2007) @@ -107,7 +107,7 @@ protected RuleStorage ruleStorage = null; protected List<String> analysePlan = null; protected Map<Rule, String> rules = new HashMap<Rule, String>(); - protected Map<SensitivityExport, String> sensibilityExports = new HashMap<SensitivityExport, String>(); + protected Map<SensitivityExport, String> sensitivityExports = new HashMap<SensitivityExport, String>(); protected List<String> oldSimulNames = null; protected String simulName = null; @@ -669,7 +669,7 @@ * Sensitivity */ - public List<String> getSensibilityExportNames() { + public List<String> getSensitivityExportNames() { List<String> result = new ArrayList<String>(); List<String> exportNames = ExportStorage.getExportNames(); for (String export : exportNames) { @@ -687,13 +687,13 @@ return result; } - public Collection<SensitivityExport> getSensibilityExports() { - return sensibilityExports.keySet(); + public Collection<SensitivityExport> getSensitivityExports() { + return sensitivityExports.keySet(); } public List<SensitivityExport> getSensitivityExportList() { List<SensitivityExport> result = new ArrayList<SensitivityExport>(); - for (Map.Entry<SensitivityExport, String> entry : sensibilityExports + for (Map.Entry<SensitivityExport, String> entry : sensitivityExports .entrySet()) { result.add(entry.getKey()); } @@ -705,7 +705,7 @@ ExportStorage storage = ExportStorage.getExport(name); SensitivityExport exInstance = (SensitivityExport) storage .getNewExportInstance(); - sensibilityExports.put(exInstance, name); + sensitivityExports.put(exInstance, name); param.setSensitivityExport(getSensitivityExportList()); } catch (IsisFishException ex) { Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, @@ -713,20 +713,18 @@ } } + /** + * Remove an export. + * + * @param export export to remove + */ public void removeSensitivityExport(SensitivityExport export) { - Map<SensitivityExport, String> se = new HashMap<SensitivityExport, String>(); - for (Map.Entry<SensitivityExport, String> entry : sensibilityExports - .entrySet()) { - if (!entry.getValue().equals(export)) { - se.put(entry.getKey(), entry.getValue()); - } - } - sensibilityExports = se; + sensitivityExports.remove(export); param.setSensitivityExport(getSensitivityExportList()); } public void clearSensitivityExport() { - sensibilityExports.clear(); + sensitivityExports.clear(); param.setSensitivityExport(getSensitivityExportList()); } Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java (rev 0) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java 2009-03-19 15:09:32 UTC (rev 2007) @@ -0,0 +1,69 @@ +/* *##% + * Copyright (C) 2009 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; + +import java.util.Properties; + +import junit.framework.Assert; + +import org.junit.BeforeClass; +import org.junit.Test; + +import fr.ifremer.TestUtils; + +/** + * TODO COMMENT ME. + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 19 mars 2009 $ + * By : $Author: chatellier $ + */ +public class SimulationParameterTest { + + @BeforeClass + public static void init() throws Exception { + TestUtils.init(); + } + + /** + * Test to build one simulation parameters. + * + * Write it on disk, read it from disk. + * And test it.s + */ + @Test + public void testToPropertiesFromPropertties() { + + SimulationParameter params = new SimulationParameter(); + params.setIsisFishVersion("3.2.0.4"); + params.setDescription("desc"); + + // make transform + Properties props = params.toProperties(); + SimulationParameter params2 = new SimulationParameter(); + params2.fromProperties(null, props); + + Assert.assertEquals("3.2.0.4", params2.getIsisFishVersion()); + Assert.assertEquals("desc", params2.getDescription()); + } + + +}