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

r2039 - in isis-fish/trunk/src/test/java/fr/ifremer/isisfish: mexico simulator/sensitivity
by jcouteau＠users.labs.libre-entreprise.org 26 Mar '09

26 Mar '09

Author: jcouteau Date: 2009-03-26 17:24:00 +0000 (Thu, 26 Mar 2009) New Revision: 2039 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java Log: Fixed failing tests Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-03-25 14:32:30 UTC (rev 2038) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-03-26 17:24:00 UTC (rev 2039) @@ -116,8 +116,8 @@ Factor<Double> factorEquationContinuous = new Factor<Double>( "factor 5 (EquationContinuous)"); EquationContinuousDomain<Double> domain5 = new EquationContinuousDomain<Double>(); - domain5.setMinBound(1.0); - domain5.setMaxBound(2.0); + domain5.setCoefficient(0.1); + domain5.setReferenceValue(45.0); domain5.setVariableName("L1"); domain5.setOperator("-"); factorEquationContinuous.setDomain(domain5); Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2009-03-25 14:32:30 UTC (rev 2038) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2009-03-26 17:24:00 UTC (rev 2039) @@ -30,6 +30,7 @@ import fr.ifremer.isisfish.simulator.launcher.SimulationServiceTest; 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; /** @@ -107,10 +108,19 @@ scenario.addFactor(factor); factor.setValueForIdentifier(maxValue.toString()); scenario.addFactor(factor); + } else if (domain instanceof EquationContinuousDomain) { + EquationContinuousDomain<Double> cDomain = (EquationContinuousDomain<Double>) domain; + Double minValue = cDomain.getMinBound(); + Double maxValue = cDomain.getMaxBound(); + + factor.setValueForIdentifier(minValue.toString()); + scenario.addFactor(factor); + factor.setValueForIdentifier(maxValue.toString()); + scenario.addFactor(factor); } else if (domain instanceof ContinuousDomain) { ContinuousDomain<? extends Serializable> cDomain = (ContinuousDomain<? extends Serializable>) domain; - Double minValue = (Double) cDomain.getMinBound(); - Double maxValue = (Double) cDomain.getMaxBound(); + Double minValue = cDomain.getMinBound(); + Double maxValue = cDomain.getMaxBound(); factor.setValueForIdentifier(minValue); scenario.addFactor(factor);

1 0

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

25 Mar '09

Author: chatellier Date: 2009-03-25 14:32:30 +0000 (Wed, 25 Mar 2009) New Revision: 2038 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java Log: Affichage de la trace dans le fenetre d'evaluation Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2009-03-25 12:23:33 UTC (rev 2037) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2009-03-25 14:32:30 UTC (rev 2038) @@ -601,9 +601,13 @@ System.setErr(oldErr); msg = result.toString(); } catch (Exception ex) { - if (log.isErrorEnabled()) { - log.error("Error on script evaluation", ex); + if (log.isDebugEnabled()) { + log.debug("Error on script evaluation", ex); } + ByteArrayOutputStream result = new ByteArrayOutputStream(); + PrintStream out = new PrintStream(result); + ex.printStackTrace(out); + msg = result.toString(); } return msg; }

1 0

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

25 Mar '09

Author: sletellier Date: 2009-03-25 12:23:33 +0000 (Wed, 25 Mar 2009) New Revision: 2037 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Log: Region loading in factor tab when an old simulation load 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-25 12:15:23 UTC (rev 2036) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-03-25 12:23:33 UTC (rev 2037) @@ -122,20 +122,23 @@ public void run() { getContextValue(SimulAction.class).regionChange(selected); refresh(); - if (isSensitivity()){ - try { - getParentContainer(SensitivityUI.class).getSensitivityTabUI().setRegion((FisheryRegionImpl) getContextValue(SimulAction.class).getSimulationParameter().getRegion().getFisheryRegion()); - getParentContainer(SensitivityUI.class).getSensitivityTabUI().setTreeModel(); - } catch (StorageException ex) { - log.debug(ex.getMessage(), ex); - }; - } + setFactorRegion(); getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.region.loaded")); } }); } } } +protected void setFactorRegion(){ + if (isSensitivity()){ + try { + getParentContainer(SensitivityUI.class).getSensitivityTabUI().setRegion((FisheryRegionImpl) getContextValue(SimulAction.class).getSimulationParameter().getRegion().getFisheryRegion()); + getParentContainer(SensitivityUI.class).getSensitivityTabUI().setTreeModel(); + } catch (StorageException ex) { + log.debug(ex.getMessage(), ex); + }; + } +} public void setSimulationParameter(SimulAction simulAction){ getContextValue(SimulAction.class).setSimulationParameter(simulAction.getSimulationParameter()); } @@ -149,6 +152,7 @@ public void run() { getContextValue(SimulAction.class).loadOldSimulation(selected); refresh(); + setFactorRegion(); getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.old.simulation.loaded")); } });

1 0

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

25 Mar '09

Author: jcouteau Date: 2009-03-25 12:15:23 +0000 (Wed, 25 Mar 2009) New Revision: 2036 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java Log: Fully functional EquationContinuousDomain with unit tests. Adaptation of SimulationPreScriptTest to this new Domain. 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-25 11:33:30 UTC (rev 2035) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2009-03-25 12:15:23 UTC (rev 2036) @@ -20,28 +20,31 @@ import java.io.Serializable; +import org.codelutin.math.matrix.MapFunction; + /** - * Domaine continu portant sur variable pouvant prendre diférente - * valeur par rapport à une valeur initiale. + * Domaine continu portant sur variable pouvant prendre diférente valeur par + * rapport à une valeur initiale. * * Composé d'un borne min et max et d'un opération. - * - * @param <E> type des valeurs gérées par le domaine * + * @param <E> + * type des valeurs gérées par le domaine + * * @author chatellier * @version $Revision: 1.0 $ * - * Last update : $Date: 24 févr. 2009 $ - * By : $Author: chatellier $ + * Last update : $Date: 24 févr. 2009 $ By : $Author: chatellier $ */ -public class EquationContinuousDomain<E extends Serializable> extends ContinuousDomain<E> { +public class EquationContinuousDomain<E extends Serializable> extends + ContinuousDomain<E> { /** serialVersionUID. */ private static final long serialVersionUID = -2037768174807839046L; /** Variable name (must be java valid identifier) */ protected String variableName; - + /** Operation. (=,+,-,/) */ protected String operator; @@ -70,7 +73,8 @@ /** * Set variable name. * - * @param variableName the variableName to set + * @param variableName + * the variableName to set */ public void setVariableName(String variableName) { this.variableName = variableName; @@ -88,7 +92,8 @@ /** * Set operator. * - * @param operator the operator to set + * @param operator + * the operator to set */ public void setOperator(String operator) { this.operator = operator; @@ -96,7 +101,7 @@ /** * Get coefficient. - * + * * @return the coefficient */ public Double getCoefficient() { @@ -105,8 +110,9 @@ /** * Set coefficient. - * - * @param the coefficient to set + * + * @param the + * coefficient to set */ public void setCoefficient(Double coefficient) { this.coefficient = coefficient; @@ -114,7 +120,7 @@ /** * Get reference value. - * + * * @return the reference value */ public Double getReferenceValue() { @@ -123,8 +129,9 @@ /** * Set reference value. - * - * @param the reference value.to set + * + * @param the + * reference value.to set */ public void setReferenceValue(Double referenceValue) { this.referenceValue = referenceValue; @@ -133,11 +140,43 @@ /** * {@inheritDoc}. * - * In equation continuous domain, value appear in - * continuous domain values only. - * Here : return identifier. + * In equation continuous domain, always return 0 */ + @Override + public double getMinBound() { + return 0; + } + + /** + * {@inheritDoc}. + * + * In equation continuous domain, always return 1 + */ + @Override + public double getMaxBound() { + return 1; + } + + /** + * {@inheritDoc}. + * + * In equation continuous domain, value appear in continuous domain values + * only. Here : return identifier. + */ public E getValueForIdentifier(Serializable identifier) { - return (E)identifier; + if (operator.equals("+")) { + return (E) ((Double) (referenceValue + ((referenceValue + coefficient) * ((2 * Double + .valueOf((String) identifier)) - 1)))); + } else if (operator.equals("-")) { + return (E) ((Double) (referenceValue + ((referenceValue - coefficient) * ((2 * Double + .valueOf((String) identifier)) - 1)))); + } else if (operator.equals("*")) { + return (E) ((Double) (referenceValue + ((referenceValue * coefficient) * ((2 * Double + .valueOf((String) identifier)) - 1)))); + } else if (operator.equals("/")) { + return (E) ((Double) (referenceValue + ((referenceValue / coefficient) * ((2 * Double + .valueOf((String) identifier)) - 1)))); + } + return (E) identifier; } } Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2009-03-25 11:33:30 UTC (rev 2035) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2009-03-25 12:15:23 UTC (rev 2036) @@ -292,13 +292,13 @@ // factor Factor<Double> factorEquation = new Factor<Double>("test equation"); EquationContinuousDomain<Double> domain1 = new EquationContinuousDomain<Double>(); - domain1.setMinBound(0.0); - domain1.setMaxBound(3.0); + domain1.setReferenceValue(3.0); domain1.setOperator("-"); + domain1.setCoefficient(0.1); domain1.setVariableName("PopulationEquation.K1"); factorEquation.setDomain(domain1); factorEquation.setPath("org.codelutin.equation1#testFactorPreScriptEquation"); - factorEquation.setValueForIdentifier(2.0); + factorEquation.setValueForIdentifier("0.1"); log.info("Script = " + domain1.getClass().getSimpleName()); @@ -320,6 +320,6 @@ out.flush(); String scriptContent = out.toString(); //log.info("Script = " + scriptContent); - Assert.assertTrue(scriptContent.indexOf("\"PopulationEquation.K1\", 2, \"-\"") != -1); + Assert.assertTrue(scriptContent.indexOf("\"PopulationEquation.K1\", 0,68, \"-\"") != -1); } } 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-25 11:33:30 UTC (rev 2035) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2009-03-25 12:15:23 UTC (rev 2036) @@ -25,8 +25,10 @@ import org.junit.Assert; import org.junit.Test; +import fr.ifremer.isisfish.entities.Equation; 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; /** @@ -246,4 +248,92 @@ log.info("factor#toString() = " + factor); } } + + /** + * Test factor with matrix. + * + * @see MatrixND + */ + @Test + public void testEquationContinuousFactor() { + + // factor + Factor<Double> factor = new Factor<Double>("testequation"); + EquationContinuousDomain<Double> domain = new EquationContinuousDomain<Double>(); + domain.setCoefficient(0.1); + domain.setOperator("*"); + domain.setVariableName("Linf"); + domain.setReferenceValue(3.0); + factor.setDomain(domain); + factor + .setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + factor.setValueForIdentifier("0.1"); + + Assert.assertEquals(2.76, factor.getValue(),0.0000001); + Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0); + Assert.assertEquals(1,((ContinuousDomain)factor.getDomain()).getMaxBound(),0); + + + + // factor 2 + Factor<Double> factor2 = new Factor<Double>("testequation"); + EquationContinuousDomain<Double> domain2 = new EquationContinuousDomain<Double>(); + domain2.setCoefficient(0.1); + domain2.setOperator("/"); + domain2.setVariableName("Linf"); + domain2.setReferenceValue(3.0); + factor2.setDomain(domain2); + factor2 + .setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + factor2.setValueForIdentifier("0.1"); + + Assert.assertEquals(-21, Double.valueOf(factor2.getValue()),0.0000001); + Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0); + Assert.assertEquals(1,((ContinuousDomain)factor.getDomain()).getMaxBound(),0); + + // factor 3 + Factor<Double> factor3 = new Factor<Double>("testequation"); + EquationContinuousDomain<Double> domain3 = new EquationContinuousDomain<Double>(); + domain3.setCoefficient(0.1); + domain3.setOperator("+"); + domain3.setVariableName("Linf"); + domain3.setReferenceValue(3.0); + factor3.setDomain(domain3); + factor3 + .setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + factor3.setValueForIdentifier("0.1"); + + Assert.assertEquals(0.52, Double.valueOf(factor3.getValue()),0.0000001); + Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0); + Assert.assertEquals(1,((ContinuousDomain)factor.getDomain()).getMaxBound(),0); + + // factor 4 + Factor<Double> factor4 = new Factor<Double>("testequation"); + EquationContinuousDomain<Double> domain4 = new EquationContinuousDomain<Double>(); + domain4.setCoefficient(0.1); + domain4.setOperator("-"); + domain4.setVariableName("Linf"); + domain4.setReferenceValue(3.0); + factor4.setDomain(domain4); + factor4 + .setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + factor4.setValueForIdentifier("0.1"); + + Assert.assertEquals(0.68, Double.valueOf(factor4.getValue()),0.0000001); + Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0); + Assert.assertEquals(1,((ContinuousDomain)factor.getDomain()).getMaxBound(),0); + + try { + factor.setValueForIdentifier("blah blah"); + Assert.fail("Can't set identifier not present in domain"); + } catch (IllegalArgumentException e) { + if (log.isInfoEnabled()) { + log.info("Exception normally thrown"); + } + } + + if (log.isInfoEnabled()) { + log.info("factor#toString() = " + factor); + } + } }

1 0

r2035 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 25 Mar '09

25 Mar '09

Author: chatellier Date: 2009-03-25 11:33:30 +0000 (Wed, 25 Mar 2009) New Revision: 2035 Modified: isis-fish/trunk/pom.xml Log: La derniere version de h2 bug (Hexadecimal string contains non-hex character) Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-03-25 10:29:19 UTC (rev 2034) +++ isis-fish/trunk/pom.xml 2009-03-25 11:33:30 UTC (rev 2035) @@ -217,10 +217,11 @@ </dependency>  +  <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.1.109</version> + <version>1.1.108</version> <scope>compile</scope> </dependency>

1 0

r2034 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 25 Mar '09

25 Mar '09

Author: chatellier Date: 2009-03-25 10:29:19 +0000 (Wed, 25 Mar 2009) New Revision: 2034 Modified: isis-fish/trunk/pom.xml Log: Use correct xsd url. Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-03-25 08:41:19 UTC (rev 2033) +++ isis-fish/trunk/pom.xml 2009-03-25 10:29:19 UTC (rev 2034) @@ -1,4 +1,4 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>

1 0

r2033 - in isis-fish/trunk/src/test/java/fr/ifremer/isisfish: mexico simulator/sensitivity
by jcouteau＠users.labs.libre-entreprise.org 25 Mar '09

25 Mar '09

Author: jcouteau Date: 2009-03-25 08:41:19 +0000 (Wed, 25 Mar 2009) New Revision: 2033 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java Log: Changes on test and random mock to adapt to new MatrixContinuousDomain Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-03-24 18:09:10 UTC (rev 2032) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-03-25 08:41:19 UTC (rev 2033) @@ -102,11 +102,10 @@ .setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength"); // factor 4 - Factor<Double> factorMatrixContinuous = new Factor<Double>( + Factor<MatrixND> factorMatrixContinuous = new Factor<MatrixND>( "factor 4 (MatrixContinuous)"); - MatrixContinuousDomain<Double> domain4 = new MatrixContinuousDomain<Double>(); - domain4.setMinBound(1.0); - domain4.setMaxBound(2.0); + MatrixContinuousDomain<MatrixND> domain4 = new MatrixContinuousDomain<MatrixND>(); + domain4.setCoefficient(0.1); domain4.setMatrix(matrix1); domain4.setOperator("-"); factorMatrixContinuous.setDomain(domain4); Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2009-03-24 18:09:10 UTC (rev 2032) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2009-03-25 08:41:19 UTC (rev 2033) @@ -24,11 +24,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codelutin.math.matrix.MatrixND; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.launcher.SimulationServiceTest; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; /** * Implementation of SensitivityCalculator that take random value in available @@ -49,26 +51,29 @@ } /** - * Retourne vrai si le calculateur sait gerer la cardinalité - * des facteurs continue. + * Retourne vrai si le calculateur sait gerer la cardinalité des facteurs + * continue. * * @return <tt>true</tt> s'il sait la gerer */ public boolean canManageCardinality() { return false; } - + /** * Envoi un plan a faire analyser par l'outils d'analyse de sensibilité. * * Retourne un {@link SensitivityScenarios} qui représente l'ensemble des * scenarios à prendre en compte pour les simulations. * - * @param plan plan a analyser - * @param outputdirectory master sensitivity export directory + * @param plan + * plan a analyser + * @param outputdirectory + * master sensitivity export directory * * @return un {@link SensitivityScenarios} - * @throws SensitivityException if calculator impl fail to execute + * @throws SensitivityException + * if calculator impl fail to execute * * @see DesignPlan * @see Scenario @@ -93,7 +98,16 @@ Factor<? extends Serializable> factor = factors.get(pickedFactor); Domain<? extends Serializable> domain = factor.getDomain(); - if (domain instanceof ContinuousDomain) { + if (domain instanceof MatrixContinuousDomain) { + MatrixContinuousDomain<MatrixND> cDomain = (MatrixContinuousDomain<MatrixND>) domain; + Double minValue = cDomain.getMinBound(); + Double maxValue = cDomain.getMaxBound(); + + factor.setValueForIdentifier(minValue.toString()); + scenario.addFactor(factor); + factor.setValueForIdentifier(maxValue.toString()); + scenario.addFactor(factor); + } else if (domain instanceof ContinuousDomain) { ContinuousDomain<? extends Serializable> cDomain = (ContinuousDomain<? extends Serializable>) domain; Double minValue = (Double) cDomain.getMinBound(); Double maxValue = (Double) cDomain.getMaxBound(); @@ -124,7 +138,8 @@ * @param simulationStorages * ensemble des {@link SimulationStorage} qui ont résultés des * simulations - * @param outputdirectory master sensitivity export directory + * @param outputdirectory + * master sensitivity export directory * @throws SensitivityException * if calculator impl fail to execute *

1 0

r2032 - 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 24 Mar '09

24 Mar '09

Author: jcouteau Date: 2009-03-24 18:09:10 +0000 (Tue, 24 Mar 2009) New Revision: 2032 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: Fully working MatrixContinuousDomain : - New implementation of getValueForIdentifier. - Unit 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-24 17:05:50 UTC (rev 2031) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2009-03-24 18:09:10 UTC (rev 2032) @@ -20,22 +20,23 @@ import java.io.Serializable; +import org.codelutin.math.matrix.MapFunction; import org.codelutin.math.matrix.MatrixND; /** * Domaine continu portant sur une matrice. * * Composé d'un borne min et max et d'une matrice. - * - * @param <E> type des valeurs gérées par le domaine * + * @param <E> + * type des valeurs gérées par le domaine + * * @author chatellier * @version $Revision: 1.0 $ * - * Last update : $Date: 24 févr. 2009 $ - * By : $Author: chatellier $ + * Last update : $Date: 24 févr. 2009 $ By : $Author: chatellier $ */ -public class MatrixContinuousDomain<E extends Serializable> extends +public class MatrixContinuousDomain <E extends Serializable> extends ContinuousDomain<E> { /** serialVersionUID. */ @@ -69,7 +70,8 @@ /** * Set matrix. * - * @param matrix the matrix to set + * @param matrix + * the matrix to set */ public void setMatrix(MatrixND matrix) { this.matrix = matrix; @@ -83,7 +85,8 @@ } /** - * @param coefficient the coefficient to set + * @param coefficient + * the coefficient to set */ public void setCoefficient(double coefficient) { this.coefficient = coefficient; @@ -101,7 +104,8 @@ /** * Set operator. * - * @param operator the operator to set + * @param operator + * the operator to set */ public void setOperator(String operator) { this.operator = operator; @@ -110,18 +114,58 @@ /** * {@inheritDoc}. * + * In matrix continuous domain, always return 0 + */ + @Override + public double getMinBound() { + return 0; + } + + /** + * {@inheritDoc}. + * + * In matrix continuous domain, always return 1 + */ + @Override + public double getMaxBound() { + return 1; + } + + /** + * {@inheritDoc}. + * * In continuous domain, just return identifier */ - public E getValueForIdentifier(Serializable identifier) { + public E getValueForIdentifier(final Serializable identifier) { if (operator.equals("+")) { - this.matrix.adds((Double) identifier); + this.matrix.map(new MapFunction() { + public double apply(double val) { + return (val + ((val + coefficient) * ((2 * Double + .valueOf((String) identifier)) - 1))); + } + }); } else if (operator.equals("-")) { - this.matrix.minuss((Double) identifier); + this.matrix.map(new MapFunction() { + public double apply(double val) { + return (val + ((val - coefficient) * ((2 * Double + .valueOf((String) identifier)) - 1))); + } + }); } else if (operator.equals("*")) { - this.matrix.mults((Double) identifier); + this.matrix.map(new MapFunction() { + public double apply(double val) { + return (val + ((val * coefficient) * ((2 * Double + .valueOf((String) identifier)) - 1))); + } + }); } else if (operator.equals("/")) { - this.matrix.divs((Double) identifier); + this.matrix.map(new MapFunction() { + public double apply(double val) { + return (val + ((val / coefficient) * ((2 * Double + .valueOf((String) identifier)) - 1))); + } + }); } - return (E) identifier; + return (E) this.matrix; } } 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-24 17:05:50 UTC (rev 2031) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2009-03-24 18:09:10 UTC (rev 2032) @@ -25,18 +25,17 @@ import org.junit.Assert; import org.junit.Test; -import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; /** * Factors test. - * + * * @author chatellier * @version $Revision: 1.0 $ * - * Last update : $Date: 23 févr. 2009 $ - * By : $Author: chatellier $ + * Last update : $Date: 23 févr. 2009 $ By : $Author: chatellier $ */ public class FactorTest { @@ -98,7 +97,8 @@ domain.getValues().put("m1", matrix1); domain.getValues().put("m2", matrix2); factor.setDomain(domain); - factor.setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + factor + .setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor.setValueForIdentifier("m2"); Assert.assertEquals(matrix2, factor.getValue()); @@ -116,4 +116,134 @@ log.info("factor#toString() = " + factor); } } + + /** + * Test factor with matrix. + * + * @see MatrixND + */ + @Test + public void testMatrixContinuousFactor() { + + // matrix 1 + MatrixND matrix1 = MatrixFactory.getInstance().create("test1", + new int[] { 3, 2 }, new String[] { "col1", "col2" }); + matrix1.setValue(new int[] { 0, 0 }, 1); + matrix1.setValue(new int[] { 0, 1 }, -14); + matrix1.setValue(new int[] { 1, 0 }, 21); + matrix1.setValue(new int[] { 1, 1 }, 2); + matrix1.setValue(new int[] { 2, 0 }, 3); + matrix1.setValue(new int[] { 2, 1 }, -1); + + // factor + Factor<MatrixND> factor = new Factor<MatrixND>("testmatrix"); + MatrixContinuousDomain<MatrixND> domain = new MatrixContinuousDomain<MatrixND>(); + domain.setMatrix(matrix1); + domain.setCoefficient(0.1); + domain.setOperator("*"); + factor.setDomain(domain); + factor + .setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + factor.setValueForIdentifier("0.1"); + + Assert.assertEquals(0.92, factor.getValue().getValue(new int[] { 0, 0 }),0.0000001); + 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); + + // matrix 2 + MatrixND matrix2 = MatrixFactory.getInstance().create("test1", + new int[] { 3, 2 }, new String[] { "col1", "col2" }); + matrix2.setValue(new int[] { 0, 0 }, 1); + matrix2.setValue(new int[] { 0, 1 }, -14); + matrix2.setValue(new int[] { 1, 0 }, 21); + matrix2.setValue(new int[] { 1, 1 }, 2); + matrix2.setValue(new int[] { 2, 0 }, 3); + matrix2.setValue(new int[] { 2, 1 }, -1); + + + // factor 2 + Factor<MatrixND> factor2 = new Factor<MatrixND>("testmatrix"); + MatrixContinuousDomain<MatrixND> domain2 = new MatrixContinuousDomain<MatrixND>(); + domain2.setMatrix(matrix2); + domain2.setCoefficient(0.1); + domain2.setOperator("/"); + factor2.setDomain(domain2); + factor2 + .setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + factor2.setValueForIdentifier("0.1"); + + // val + ((val / coefficient) * ((2 * Double + // .valueOf((String) identifier)) - 1)) + + Assert.assertEquals(-7, factor2.getValue().getValue(new int[] { 0, 0 }),0.0000001); + Assert.assertEquals(-21, factor2.getValue().getValue(new int[] { 2, 0 }),0.0000001); + Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0); + Assert.assertEquals(1,((ContinuousDomain)factor.getDomain()).getMaxBound(),0); + + // matrix 3 + MatrixND matrix3 = MatrixFactory.getInstance().create("test1", + new int[] { 3, 2 }, new String[] { "col1", "col2" }); + matrix3.setValue(new int[] { 0, 0 }, 1); + matrix3.setValue(new int[] { 0, 1 }, -14); + matrix3.setValue(new int[] { 1, 0 }, 21); + matrix3.setValue(new int[] { 1, 1 }, 2); + matrix3.setValue(new int[] { 2, 0 }, 3); + matrix3.setValue(new int[] { 2, 1 }, -1); + + // factor 3 + Factor<MatrixND> factor3 = new Factor<MatrixND>("testmatrix"); + MatrixContinuousDomain<MatrixND> domain3 = new MatrixContinuousDomain<MatrixND>(); + domain3.setMatrix(matrix3); + domain3.setCoefficient(0.1); + domain3.setOperator("-"); + factor3.setDomain(domain3); + factor3 + .setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + factor3.setValueForIdentifier("0.1"); + + Assert.assertEquals(0.28, factor3.getValue().getValue(new int[] { 0, 0 }),0.0000001); + Assert.assertEquals(0.68, factor3.getValue().getValue(new int[] { 2, 0 }),0.0000001); + Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0); + Assert.assertEquals(1,((ContinuousDomain)factor.getDomain()).getMaxBound(),0); + + // matrix 3 + MatrixND matrix4 = MatrixFactory.getInstance().create("test1", + new int[] { 3, 2 }, new String[] { "col1", "col2" }); + matrix4.setValue(new int[] { 0, 0 }, 1); + matrix4.setValue(new int[] { 0, 1 }, -14); + matrix4.setValue(new int[] { 1, 0 }, 21); + matrix4.setValue(new int[] { 1, 1 }, 2); + matrix4.setValue(new int[] { 2, 0 }, 3); + matrix4.setValue(new int[] { 2, 1 }, -1); + + // factor 3 + Factor<MatrixND> factor4 = new Factor<MatrixND>("testmatrix"); + MatrixContinuousDomain<MatrixND> domain4 = new MatrixContinuousDomain<MatrixND>(); + domain4.setMatrix(matrix4); + domain4.setCoefficient(0.1); + domain4.setOperator("+"); + factor4.setDomain(domain4); + factor4 + .setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + factor4.setValueForIdentifier("0.1"); + + Assert.assertEquals(0.12, factor4.getValue().getValue(new int[] { 0, 0 }),0.0000001); + Assert.assertEquals(0.52, factor4.getValue().getValue(new int[] { 2, 0 }),0.0000001); + Assert.assertEquals(0,((ContinuousDomain)factor.getDomain()).getMinBound(),0); + Assert.assertEquals(1,((ContinuousDomain)factor.getDomain()).getMaxBound(),0); + + try { + factor.setValueForIdentifier("blah blah"); + Assert.fail("Can't set identifier not present in domain"); + } catch (IllegalArgumentException e) { + if (log.isInfoEnabled()) { + log.info("Exception normally thrown"); + } + } + + if (log.isInfoEnabled()) { + log.info("factor#toString() = " + factor); + } + } }

1 0

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

24 Mar '09

Author: sletellier Date: 2009-03-24 17:05:50 +0000 (Tue, 24 Mar 2009) New Revision: 2031 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java isis-fish/trunk/src/main/resources/sensitivity.properties Log: Verifing component can be factored Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-03-24 15:46:42 UTC (rev 2030) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-03-24 17:05:50 UTC (rev 2031) @@ -91,7 +91,7 @@ <JLabel text="isisfish.gear.effortUnit" enabled='{isActif()}'/> </cell> <cell columns="2" fill='horizontal' weightx='1.0'> - <JTextField id="fieldGearEffortUnit" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getEffortUnit())}' onKeyReleased='getBean().setEffortUnit(fieldGearEffortUnit.getText())' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"EffortUnit"'/> + <JTextField id="fieldGearEffortUnit" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getEffortUnit())}' onKeyReleased='getBean().setEffortUnit(fieldGearEffortUnit.getText())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -107,7 +107,7 @@ <JLabel text="isisfish.gear.technicalParameter" enabled='{isActif()}'/> </cell> <cell columns="2" fill='horizontal' weightx='1.0'> - <JTextField id="fieldGearParamName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getParameterName())}' onKeyReleased='getBean().setParameterName(fieldGearParamName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"ParameterName"'/> + <JTextField id="fieldGearParamName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getParameterName())}' onKeyReleased='getBean().setParameterName(fieldGearParamName.getText())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-03-24 15:46:42 UTC (rev 2030) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-03-24 17:05:50 UTC (rev 2031) @@ -206,7 +206,7 @@ <JLabel text="isisfish.metierSeasonInfoZone.season" enabled='{isMetierSeasonInfoNotNull()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <IntervalPanel id='ip' enabled='{isMetierSeasonInfoNotNull()}' decorator='boxed' _bean='{MetierImpl.class}' _method='"Interval"'/> + <IntervalPanel id='ip' enabled='{isMetierSeasonInfoNotNull()}' decorator='boxed'/> </cell> </row> <row> @@ -215,7 +215,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.7'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="metierZones" onValueChanged='metierZonesChanged()' enabled='{isMetierSeasonInfoNotNull()}' decorator='boxed' _bean='{MetierImpl.class}' _method='"Zone"'/> + <JList id="metierZones" onValueChanged='metierZonesChanged()' enabled='{isMetierSeasonInfoNotNull()}' decorator='boxed'/> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-03-24 15:46:42 UTC (rev 2030) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-03-24 17:05:50 UTC (rev 2031) @@ -75,7 +75,7 @@ <JLabel text="isisfish.metier.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldMetierName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldMetierName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{MetierImpl.class}' _method='"Name"'/> + <JTextField id="fieldMetierName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldMetierName.getText())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -83,7 +83,7 @@ <JLabel text="isisfish.common.gear" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldMetierGear" onActionPerformed='gearChanged()' enabled='{isActif()}'/> + <JComboBox id="fieldMetierGear" onActionPerformed='gearChanged()' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -91,7 +91,7 @@ <JLabel text="isisfish.metier.rangeValues" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldMetierParam" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGearParameterValue())}' onKeyReleased='getBean().setGearParameterValue(fieldMetierParam.getText())' enabled='{isActif()}' decorator='boxed' editable='{false}'/> + <JTextField id="fieldMetierParam" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGearParameterValue())}' onKeyReleased='getBean().setGearParameterValue(fieldMetierParam.getText())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-03-24 15:46:42 UTC (rev 2030) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-03-24 17:05:50 UTC (rev 2031) @@ -176,7 +176,7 @@ <JLabel text="isisfish.populationBasics.maturityGroup" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JComboBox id="fieldPopulationBasicsMatureClass" onActionPerformed='matureClassChanged()' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MaturityGroup"'/> + <JComboBox id="fieldPopulationBasicsMatureClass" onActionPerformed='matureClassChanged()' enabled='{isActif()}' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> <JCheckBox id="fieldPopulationBasicsPlusGroup" text="isisfish.populationBasics.plusGroup" selected='{getBean().getPlusGroup()}' onActionPerformed='getBean().setPlusGroup(fieldPopulationBasicsPlusGroup.isSelected())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"PlusGroup"'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-03-24 15:46:42 UTC (rev 2030) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-03-24 17:05:50 UTC (rev 2031) @@ -217,7 +217,7 @@ <JLabel text="isisfish.common.season" enabled='{isPopSeasonInfoNotNull()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <IntervalPanel id='ip' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"Interval"'/> + <IntervalPanel id='ip' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-03-24 15:46:42 UTC (rev 2030) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-03-24 17:05:50 UTC (rev 2031) @@ -156,7 +156,7 @@ <row> <cell columns='2' fill='both' weighty='0.7' weightx='1.0'> <JScrollPane> - <JList id="portCell" selectedValue='{getBean().getCell()}' selectionMode="0" onMouseClicked='portChanged()' enabled='{isActif()}' decorator='boxed' _bean='{PortImpl.class}' _method='"Cell"'/> + <JList id="portCell" selectedValue='{getBean().getCell()}' selectionMode="0" onMouseClicked='portChanged()' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-03-24 15:46:42 UTC (rev 2030) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-03-24 17:05:50 UTC (rev 2031) @@ -181,8 +181,7 @@ <InputOneEquationUI id='selectivityEquation' constructorParams='this' lblText='{_("isisfish.selectivity.equation")}' bean='{getBean()}' nameEquation='Selectivity' actif='{isActif()}' - clazz='{fr.ifremer.isisfish.equation.SelectivityEquation.class}' - decorator='boxed' _bean='{GearImpl.class}' _method='""'/> + clazz='{fr.ifremer.isisfish.equation.SelectivityEquation.class}'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-03-24 15:46:42 UTC (rev 2030) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-03-24 17:05:50 UTC (rev 2031) @@ -104,7 +104,7 @@ <JLabel text="isisfish.common.port" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldSetOfVesselsPort" onActionPerformed='portChanged()' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"Port"'/> + <JComboBox id="fieldSetOfVesselsPort" onActionPerformed='portChanged()' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -112,7 +112,7 @@ <JLabel text="isisfish.setOfVessels.vesselType" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldSetOfVesselsVesselType" onActionPerformed='vesselTypeChanged()' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"VesselType"'/> + <JComboBox id="fieldSetOfVesselsVesselType" onActionPerformed='vesselTypeChanged()' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx 2009-03-24 17:05:50 UTC (rev 2031) @@ -0,0 +1,20 @@ +<Table> + <fr.ifremer.isisfish.entities.SpeciesImpl id='bean' javaBean='null'/> + <Boolean id='actif' javaBean='false'/> + <script><![CDATA[ + protected void dynamicChanged(){ + if (getBean() != null){ + getBean().setAgeGroupType(fieldSpeciesDynamicAge.isSelected()); + } + } + ]]> + </script> + <row> + <cell fill='horizontal' weightx='0.5'> + <JRadioButton id="fieldSpeciesDynamicAge" text="isisfish.species.age" selected='{getBean() == null ? true : getBean().getAgeGroupType()}' buttonGroup="structuredGroup" onItemStateChanged='dynamicChanged()' enabled='{isActif()}'/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JRadioButton id="fieldSpeciesDynamicLength" text="isisfish.species.length" selected='{getBean() == null ? false : !getBean().getAgeGroupType()}' buttonGroup="structuredGroup" enabled='{isActif()}'/> + </cell> + </row> +</Table> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-03-24 15:46:42 UTC (rev 2030) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-03-24 17:05:50 UTC (rev 2031) @@ -115,12 +115,9 @@ <cell> <JLabel text="isisfish.species.structured" enabled='{isActif()}'/> </cell> - <cell fill='horizontal' weightx='0.5'> - <JRadioButton id="fieldSpeciesDynamicAge" text="isisfish.species.age" selected='{getBean().getAgeGroupType()}' buttonGroup="structuredGroup" onItemStateChanged='getBean().setAgeGroupType(fieldSpeciesDynamicAge.isSelected())' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"AgeGroupType"'/> + <cell fill='horizontal' weightx='1' columns='2'> + <SpeciesStructuredUI bean='{getBean()}' actif='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"AgeGroupType"'/> </cell> - <cell fill='horizontal' weightx='0.5'> - <JRadioButton id="fieldSpeciesDynamicLength" text="isisfish.species.length" selected='{!getBean().getAgeGroupType()}' buttonGroup="structuredGroup" enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"AgeGroupType"'/> - </cell> </row> <row> <cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-03-24 15:46:42 UTC (rev 2030) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-03-24 17:05:50 UTC (rev 2031) @@ -104,7 +104,7 @@ <JLabel text="isisfish.common.setOfVessels" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldStrategySetOfVessels" onActionPerformed='getBean().setSetOfVessels((SetOfVessels)fieldStrategySetOfVessels.getSelectedItem())' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"SetOfVessels"'/> + <JComboBox id="fieldStrategySetOfVessels" onActionPerformed='getBean().setSetOfVessels((SetOfVessels)fieldStrategySetOfVessels.getSelectedItem())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -122,7 +122,7 @@ <JPanel/> </cell> <cell fill='horizontal' weightx='1.0'> - <JCheckBox id="fieldUseEquationInactivity" selected='{getBean().getInactivityEquationUsed()}' text="isisfish.strategy.inactivityEquationUsed" onActionPerformed='getBean().setInactivityEquationUsed(fieldUseEquationInactivity.isSelected());strategyInactivity.setActif(fieldUseEquationInactivity.isSelected())' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"InactivityEquationUsed"'/> + <JCheckBox id="fieldUseEquationInactivity" selected='{getBean().getInactivityEquationUsed()}' text="isisfish.strategy.inactivityEquationUsed" onActionPerformed='getBean().setInactivityEquationUsed(fieldUseEquationInactivity.isSelected());strategyInactivity.setActif(fieldUseEquationInactivity.isSelected())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-03-24 15:46:42 UTC (rev 2030) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-03-24 17:05:50 UTC (rev 2031) @@ -150,7 +150,7 @@ <JScrollPane> <JList id="zoneCells" enabled='{isActif()}' selectedValues='{getBean().getCell().toArray()}' onMouseClicked='if ( isActif() ) { zoneCellsChange(); }' - decorator='boxed' _bean='{ZoneImpl.class}' _method='"Cell"'/> + decorator='boxed'/> </JScrollPane> </cell> </row> 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-24 15:46:42 UTC (rev 2030) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-24 17:05:50 UTC (rev 2031) @@ -34,6 +34,7 @@ import fr.ifremer.isisfish.ui.input.PopulationMigrationImmigrationUI; import fr.ifremer.isisfish.ui.input.PopulationMigrationMigrationUI; import fr.ifremer.isisfish.ui.input.PopulationZonesEditorUI; +import fr.ifremer.isisfish.ui.input.SpeciesStructuredUI; import fr.ifremer.isisfish.ui.widget.IntervalPanel; import java.lang.reflect.Method; import java.util.logging.Level; @@ -114,7 +115,12 @@ } else if (result instanceof JRadioButton){ ((JRadioButton) result).setSelected((Boolean)callMethod(e, fieldName)); - } else if (result instanceof InputOneEquationUI){ + } else if (result instanceof SpeciesStructuredUI){ + SpeciesStructuredUI origine = (SpeciesStructuredUI)c; + SpeciesStructuredUI ui = new SpeciesStructuredUI(); + ui.setActif(true); + result = ui; + }else if (result instanceof InputOneEquationUI){ InputOneEquationUI origine = (InputOneEquationUI) c; InputOneEquationUI ui = new InputOneEquationUI(new JAXXInitialContext().add(new InputAction())); ui.setSelectedEquation(origine.getSelectedEquation()); @@ -318,6 +324,12 @@ } else if (result instanceof JRadioButton){ ((JRadioButton) result).setSelected((Boolean)value); + } else if (result instanceof SpeciesStructuredUI){ + SpeciesStructuredUI origine = (SpeciesStructuredUI)c; + SpeciesStructuredUI ui = new SpeciesStructuredUI(); + ui.getFieldSpeciesDynamicAge().setSelected((Boolean)value); + ui.setActif(true); + result = ui; } else if (result instanceof InputOneEquationUI){ InputOneEquationUI origine = (InputOneEquationUI) c; InputOneEquationUI ui = new InputOneEquationUI(new JAXXInitialContext().add(new InputAction())); @@ -431,6 +443,9 @@ } else if (c instanceof IntervalPanel){ // ((IntervalPanel) result).setModel((BeanUtils.getProperty(e, fieldName))); + } else if (c instanceof SpeciesStructuredUI){ + result = ((SpeciesStructuredUI)c).getFieldSpeciesDynamicAge().isSelected(); + } else if (c instanceof SelectivityEditorUI){ result = ((SelectivityEditorUI)c).getBean().getPopulationSelectivity(); Modified: isis-fish/trunk/src/main/resources/sensitivity.properties =================================================================== --- isis-fish/trunk/src/main/resources/sensitivity.properties 2009-03-24 15:46:42 UTC (rev 2030) +++ isis-fish/trunk/src/main/resources/sensitivity.properties 2009-03-24 17:05:50 UTC (rev 2031) @@ -1,6 +1,3 @@ -Cell.Latitude -Cell.Longitude -Cell.Land EffortDescription.FishingOperation EffortDescription.FishingOperationDuration EffortDescription.GearsNumberPerOperation @@ -12,10 +9,9 @@ EffortDescription.RepairAndMaintenanceGearCost EffortDescription.LandingCosts EffortDescription.OtherRunningCost -Gear.EffortUnit Gear.StandardisationFactor -Gear.ParameterName Gear.PossibleValue +Gear.PopulationSelectivity Metier.GearParameterValue Metier.Zone MetierSeasonInfo.SpeciesTargetSpecies @@ -47,7 +43,6 @@ Population.MonthGapBetweenReproRecrutement Population.RecruitmentDistribution StrategyMonthInfo.LengthChangeMatrix -Port.Cell SetOfVessels.NumberOfVessels SetOfVessels.FixedCosts Species.ScientificName @@ -55,15 +50,12 @@ Species.CodeCEE Species.AgeGroupType Species.AgeGroupType -SetOfVessels.Port -SetOfVessels.VesselType SetOfVessels.NumberOfVessels SetOfVessels.FixedCosts SetOfVessels.TechnicalEfficiencyEquation StrategyMonthInfo.MinInactivityDays StrategyMonthInfo.ProportionMetier Strategy.ProportionSetOfVessels -Strategy.InactivityEquationUsed Strategy.SetOfVessels Strategy.Inactivity TripType.TripDuration @@ -74,5 +66,4 @@ VesselType.ActivityRange VesselType.MinCrewSize VesselType.UnitFuelCostOfTravel -VesselType.TripType -Zone.Cell \ No newline at end of file +VesselType.TripType \ No newline at end of file

1 0

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

24 Mar '09

Author: sletellier Date: 2009-03-24 15:46:42 +0000 (Tue, 24 Mar 2009) New Revision: 2030 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/domain/EquationContinuousDomain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeCellRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.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 isis-fish/trunk/src/main/resources/sensitivity.properties Log: Equation and matrix continuous factor with coeficient are enabled 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-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2009-03-24 15:46:42 UTC (rev 2030) @@ -47,6 +47,11 @@ * Nom du facteur. */ protected String name; + + /** + * Commentaire du facteur. + */ + protected String comment; /** * Domaine du facteur. @@ -118,6 +123,24 @@ } /** + * Get comment. + * + * @return the comment + */ + public String getComment() { + return comment; + } + + /** + * Set comment. + * + * @param the comment to set + */ + public void setComment(String comment) { + this.comment = comment; + } + + /** * Get domain. * * @return the domain 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-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2009-03-24 15:46:42 UTC (rev 2030) @@ -45,6 +45,12 @@ /** Operation. (=,+,-,/) */ protected String operator; + /** Coefficient in percent */ + protected Double coefficient; + + /** Valeur de reference in percent */ + protected Double referenceValue; + /** * Empty constructor. */ @@ -89,6 +95,42 @@ } /** + * Get coefficient. + * + * @return the coefficient + */ + public Double getCoefficient() { + return coefficient; + } + + /** + * Set coefficient. + * + * @param the coefficient to set + */ + public void setCoefficient(Double coefficient) { + this.coefficient = coefficient; + } + + /** + * Get reference value. + * + * @return the reference value + */ + public Double getReferenceValue() { + return referenceValue; + } + + /** + * Set reference value. + * + * @param the reference value.to set + */ + public void setReferenceValue(Double referenceValue) { + this.referenceValue = referenceValue; + } + + /** * {@inheritDoc}. * * In equation continuous domain, value appear in Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-03-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-03-24 15:46:42 UTC (rev 2030) @@ -91,10 +91,11 @@ </cell> </row> <row> - <cell columns='2' fill='both' weightx='1.0'> + <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> <JScrollPane> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationCapturability' constructorParams='null, false' - matrix='{getBean().getCapturability() == null ? null : getBean().getCapturability().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Capturability"'/> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationCapturability' + matrix='{getBean().getCapturability() == null ? null : getBean().getCapturability().copy()}' + enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Capturability"'/> </JScrollPane> </cell> </row> @@ -104,7 +105,7 @@ </cell> </row> <row> - <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> <JScrollPane> <JTextArea id="fieldPopulationCapturabilityComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getCapturabilityComment())}' onKeyReleased='getBean().setCapturabilityComment(fieldPopulationCapturabilityComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-03-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-03-24 15:46:42 UTC (rev 2030) @@ -134,7 +134,7 @@ </cell> <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> <JScrollPane> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationGroupNaturalDeathRate' constructorParams='null, false' + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationGroupNaturalDeathRate' matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"NaturalDeathRateMatrix"'/> </JScrollPane> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-03-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-03-24 15:46:42 UTC (rev 2030) @@ -205,7 +205,7 @@ <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationEmigrationTable' constructorParams='null, false' linearModel="true" enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationEmigrationTable' linearModel="true" enabled='{isActif()}'/> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-03-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-03-24 15:46:42 UTC (rev 2030) @@ -201,7 +201,7 @@ <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationImmigrationTable' constructorParams='null, false' linearModel="true" enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationImmigrationTable' linearModel="true" enabled='{isActif()}'/> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-03-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-03-24 15:46:42 UTC (rev 2030) @@ -216,7 +216,7 @@ <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationMigrationTable' constructorParams='null, false' linearModel='{true}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationMigrationTable' linearModel='{true}' enabled='{isActif()}'/> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-03-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-03-24 15:46:42 UTC (rev 2030) @@ -114,8 +114,9 @@ </cell> <cell fill='both' weightx='1.0'> <JScrollPane> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationRecruitmentDistribution' constructorParams='null, false' - matrix='{getBean().getRecruitmentDistribution() == null ? null : getBean().getRecruitmentDistribution().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"RecruitmentDistribution"'/> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationRecruitmentDistribution' + matrix='{getBean().getRecruitmentDistribution() == null ? null : getBean().getRecruitmentDistribution().copy()}' + enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"RecruitmentDistribution"'/> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-03-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-03-24 15:46:42 UTC (rev 2030) @@ -236,7 +236,7 @@ </cell> <cell fill='both' weightx='1.0'> <JScrollPane> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationSeasonReproductionDistribution' constructorParams='null, false' + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationSeasonReproductionDistribution' matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"'/> </JScrollPane> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-03-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-03-24 15:46:42 UTC (rev 2030) @@ -150,7 +150,7 @@ <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id="fieldStrategyMonthInfoProportion" constructorParams='null, false' linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/> </JScrollPane> </cell> </row> 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-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-24 15:46:42 UTC (rev 2030) @@ -21,6 +21,7 @@ import fr.ifremer.isisfish.entities.Formule; import fr.ifremer.isisfish.entities.Selectivity; import fr.ifremer.isisfish.entities.TargetSpecies; +import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; @@ -116,6 +117,7 @@ } else if (result instanceof InputOneEquationUI){ InputOneEquationUI origine = (InputOneEquationUI) c; InputOneEquationUI ui = new InputOneEquationUI(new JAXXInitialContext().add(new InputAction())); + ui.setSelectedEquation(origine.getSelectedEquation()); ui.setLblText(origine.getLblText()); ui.setNameEquation(origine.getNameEquation()); ui.setClazz(origine.getClazz()); @@ -197,6 +199,7 @@ if (c instanceof InputOneEquationUI){ InputOneEquationUI origine = (InputOneEquationUI) c; EquationContinuousPanel ui = new EquationContinuousPanel(new JAXXInitialContext().add(new InputAction())); + ui.setSelectedEquation(origine.getSelectedEquation()); ui.setLblText(origine.getLblText()); ui.setNameEquation(origine.getNameEquation()); ui.setClazz(origine.getClazz()); @@ -210,7 +213,6 @@ if (m != null){ matrixPanel.setMatrix(m.clone()); } - continuousPanel = matrixPanel.getDefaultContinuousPanel(); result = matrixPanel; } else { continuousPanel = new DefaultContinuousPanel(); @@ -232,7 +234,7 @@ } return new JTextField(); } - public static ContinuousPanelContainer getContinuousPanelWithValue(JComponent c, ContinuousDomain domain) { + public static ContinuousPanelContainer getContinuousPanelWithValue(JComponent c, ContinuousDomain domain, Factor f) { ContinuousPanelContainer result = null; try { DefaultContinuousPanel continuousPanel = null; @@ -241,6 +243,7 @@ EquationContinuousPanel ui = new EquationContinuousPanel(new JAXXInitialContext().add(new InputAction())); ui.setLblText(origine.getLblText()); ui.setNameEquation(origine.getNameEquation()); + ui.getEditor().getEditor().setText((String)f.getValue()); ui.setClazz(origine.getClazz()); ui.setMethodGet(origine.getMethodGet()); ui.setMethodSet(origine.getMethodSet()); @@ -258,8 +261,8 @@ if (m != null){ panel.setMatrix(m.clone()); } - continuousPanel = panel.getDefaultContinuousPanel(); panel.getOperator().setSelectedItem(matrixDomain.getOperator()); + panel.getCoef().setText("" + matrixDomain.getCoefficient()); result = panel; } else { continuousPanel = new DefaultContinuousPanel(); @@ -318,6 +321,7 @@ } else if (result instanceof InputOneEquationUI){ InputOneEquationUI origine = (InputOneEquationUI) c; InputOneEquationUI ui = new InputOneEquationUI(new JAXXInitialContext().add(new InputAction())); + ui.getEditor().setText((String)value); ui.setLblText(origine.getLblText()); ui.setNameEquation(origine.getNameEquation()); ui.setClazz(origine.getClazz()); 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-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx 2009-03-24 15:46:42 UTC (rev 2030) @@ -48,6 +48,9 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import javax.swing.table.TableCellEditor; import javax.swing.table.TableModel; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.apache.commons.lang.StringUtils; protected String[] columnNames = {"Name", "Value", "Coef", "Operator", "Action"}; protected java.util.List<EquationContinuousDomain> datas = new ArrayList<EquationContinuousDomain>(); @@ -85,9 +88,9 @@ if (columnIndex == 0){ return datas.get(rowIndex).getVariableName(); } else if (columnIndex == 1){ - return datas.get(rowIndex).getMinBound(); + return datas.get(rowIndex).getReferenceValue(); } else if (columnIndex == 2){ - return datas.get(rowIndex).getMaxBound(); + return datas.get(rowIndex).getCoefficient(); } else if (columnIndex == 3){ return datas.get(rowIndex).getOperator(); } else if (columnIndex == 4){ @@ -103,9 +106,9 @@ if (columnIndex == 0){ datas.get(rowIndex).setVariableName((String)aValue); } else if (columnIndex == 1){ - datas.get(rowIndex).setMinBound(Long.parseLong((String)aValue)); + datas.get(rowIndex).setReferenceValue(Double.parseDouble((String)aValue)); } else if (columnIndex == 2){ - datas.get(rowIndex).setMaxBound(Long.parseLong((String)aValue)); + datas.get(rowIndex).setCoefficient(Double.parseDouble((String)aValue)); } else if (columnIndex == 3){ datas.get(rowIndex).setOperator((String)aValue); } @@ -134,7 +137,9 @@ public void actionPerformed(ActionEvent e) { JComboBox source = (JComboBox)e.getSource(); int i = operateurs.indexOf(source); - datas.get(i).setOperator((String)source.getSelectedItem()); + if (datas.size() <= i){ + datas.get(i).setOperator((String)source.getSelectedItem()); + } } }); return result; @@ -158,8 +163,17 @@ } protected void valid(int i){ String variableName = datas.get(i).getVariableName(); - String text = editor.getEditor().getText().replaceAll(variableName, "getValue('" + variableName + "'}"); - editor.getEditor().setText(text); + String[] lines = editor.getEditor().getText().split("\n"); + String result = ""; + for (String line : lines){ + Pattern p = Pattern.compile("(^.*\\ *" + variableName + "\\ *\\=\\ *).*\\;$"); + Matcher matcher = p.matcher(line); + if (matcher.find()) { + line = matcher.group(1) + "getValueAndCompute('" + bean.toString() + "." + StringUtils.uncapitalize(methodGet) + "." + variableName + "');"; + } + result += line + "\n"; + } + editor.getEditor().setText(result); } protected void setTable(){ params.setModel(getTableModel()); @@ -203,34 +217,6 @@ public void removeCellEditorListener(CellEditorListener l) { } }); - params.addMouseListener(new MouseListener() { - - @Override - public void mouseClicked(MouseEvent e) { - if (params.getSelectedRow() != -1){ - remove.setEnabled(true); - } - else { - remove.setEnabled(false); - } - } - - @Override - public void mousePressed(MouseEvent e) { - } - - @Override - public void mouseReleased(MouseEvent e) { - } - - @Override - public void mouseEntered(MouseEvent e) { - } - - @Override - public void mouseExited(MouseEvent e) { - } - }); } protected void add(){ datas.add(new EquationContinuousDomain()); @@ -239,10 +225,12 @@ } protected void remove(){ int i = params.getSelectedRow(); - datas.remove(i); - operateurs.remove(i); - actions.remove(i); - setTable(); + if (i != -1){ + datas.remove(i); + operateurs.remove(i); + actions.remove(i); + setTable(); + } } ]]> </script> 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-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-03-24 15:46:42 UTC (rev 2030) @@ -31,24 +31,24 @@ * @author letellier */ public class FactorAction { - public static void saveContinue(JComponent cOrigine, String name, String path, ContinuousPanelContainer panel, SimulAction action, boolean exist){ + public static void saveContinue(JComponent cOrigine, String name, String comment, String path, ContinuousPanelContainer panel, SimulAction action, boolean exist){ DefaultContinuousPanel defaultPanel = null; if (MatrixContinuousPanel.class.isInstance(panel)){ MatrixContinuousPanel matrixPanel = (MatrixContinuousPanel)panel; - defaultPanel = matrixPanel.getDefaultContinuousPanel(); + Double coef = Double.valueOf(matrixPanel.getCoef().getText()); MatrixND matrix = matrixPanel.getMatrix(); String operateur = (String)matrixPanel.getOperator().getSelectedItem(); - action.addContinuousMatrixFactor(name, path, getMin(defaultPanel), getMax(defaultPanel), matrix, operateur, cOrigine, exist); + action.addContinuousMatrixFactor(name, comment, path, coef, matrix, operateur, cOrigine, exist); } else if (EquationContinuousPanel.class.isInstance(panel)){ EquationContinuousPanel equationPanel = (EquationContinuousPanel)panel; List<EquationContinuousDomain> domains = equationPanel.getDomains(); for (EquationContinuousDomain domain : domains){ - action.addContinuousEquationFactor(name, path, domain, equationPanel.getEditor().getEditor().getText(), cOrigine, exist); + action.addContinuousEquationFactor(name, comment, path, domain, equationPanel.getEditor().getEditor().getText(), cOrigine, exist); } } else if (DefaultContinuousPanel.class.isInstance(panel)){ defaultPanel = (DefaultContinuousPanel)panel; - action.addContinuousFactor(name, path, getMin(defaultPanel), getMax(defaultPanel), cOrigine, exist); + action.addContinuousFactor(name, comment, path, getMin(defaultPanel), getMax(defaultPanel), cOrigine, exist); } } protected static Double getMin(DefaultContinuousPanel defaultPanel){ @@ -57,12 +57,12 @@ protected static Double getMax(DefaultContinuousPanel defaultPanel){ return Double.parseDouble(defaultPanel.getMax()); } - public static void saveDiscret(JComponent cOrigine, String name, String path, List<JComponent> components, SimulAction action, boolean exist){ + public static void saveDiscret(JComponent cOrigine, String name, String comment, String path, List<JComponent> components, SimulAction action, boolean exist){ List<Serializable> values = new ArrayList<Serializable>(); for(JComponent c: components){ values.add((Serializable)EditorHelper.getValue(c)); } - action.addDiscreteFactor(name, path, values, cOrigine, exist); + action.addDiscreteFactor(name, comment, path, values, cOrigine, exist); } } ; \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeCellRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeCellRenderer.java 2009-03-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeCellRenderer.java 2009-03-24 15:46:42 UTC (rev 2030) @@ -27,6 +27,7 @@ import javax.swing.tree.DefaultTreeCellRenderer; import fr.ifremer.isisfish.simulator.sensitivity.Factor; +import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; /** * Factor tree cell renderer. @@ -62,7 +63,13 @@ else if (userObject instanceof Factor) { Factor<?> factor = (Factor)userObject; //c = new JLabel(factor.getName()); - c.setText(factor.getName()); + if (factor.getDomain() instanceof EquationContinuousDomain){ + EquationContinuousDomain domain = (EquationContinuousDomain)factor.getDomain(); + c.setText(factor.getName() + "." + domain.getVariableName()); + } + else { + c.setText(factor.getName()); + } } } 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-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-03-24 15:46:42 UTC (rev 2030) @@ -124,13 +124,14 @@ this.cOrigine = cOrigine; this.path = f.getPath(); factorName.setText(f.getName()); + comment.setText(f.getComment()); Domain domain = f.getDomain(); this.factor = f; if (ContinuousDomain.class.isInstance(domain)){ ContinuousDomain cDomain = (ContinuousDomain) domain; - continuousPanel = EditorHelper.getContinuousPanelWithValue(cOrigine, cDomain); + continuousPanel = EditorHelper.getContinuousPanelWithValue(cOrigine, cDomain, f); init(); continueRadion.setSelected(true); @@ -189,16 +190,19 @@ } protected void save(){ if (continueRadion.isSelected()){ - getFactorAction().saveContinue(cOrigine, factorName.getText(), path, continuousPanel, getSimulAction(), isExistingValue()); + getFactorAction().saveContinue(cOrigine, factorName.getText(), comment.getText(), path, continuousPanel, getSimulAction(), isExistingValue()); } else { - getFactorAction().saveDiscret(cOrigine, factorName.getText(), path, discretComponents, getSimulAction(), isExistingValue()); + getFactorAction().saveDiscret(cOrigine, factorName.getText(), comment.getText(), path, discretComponents, getSimulAction(), isExistingValue()); } getContextValue(InputSaveVerifier.class).getSensPanel().setFactorModel(); - this.dispose(); + exit(); } protected void remove(){ getSimulAction().removeFactor(factor); getContextValue(InputSaveVerifier.class).getSensPanel().setFactorModel(); + exit(); +} +protected void exit(){ this.dispose(); } ]]> @@ -257,7 +261,7 @@ </row> <row> <cell fill='horizontal' weightx='0.25'> - <JButton id='cancel' text='isisfish.common.cancel' onActionPerformed='this.dispose()'/> + <JButton id='cancel' text='isisfish.common.cancel' onActionPerformed='exit()'/> </cell> <cell fill='horizontal' weightx='0.25'> <JButton id='remove' text='isisfish.common.remove' visible='{isExistingValue()}' onActionPerformed='remove()'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx 2009-03-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx 2009-03-24 15:46:42 UTC (rev 2030) @@ -41,22 +41,25 @@ </script> <Table id='content' constraints='BorderLayout.CENTER'> <row> - <cell fill='both' columns='2' weightx='1' weighty='1'> - <DefaultContinuousPanel id='defaultContinuousPanel' continuePossible='{isContinuePossible()}' continueSelected='{isContinueSelected()}'/> - </cell> - </row> - <row> <cell fill='horizontal'> <JLabel text='isisfish.factor.value' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> </cell> <cell fill='both' weightx='1' weighty='1'> <JScrollPane> - <JAXXMatrixEditor id='componentPanel' constructorParams='false' matrix='{getMatrix() == null ? null : getMatrix().clone()}' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + <JAXXMatrixEditor id='componentPanel' dimensionEdit='{false}' matrix='{getMatrix() == null ? null : getMatrix().clone()}' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> </JScrollPane> </cell> </row> <row> <cell fill='horizontal'> + <JLabel text='isisfish.factor.coefficient' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='both' columns='2' weightx='1' weighty='1'> + <JTextField id='coef' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + </row> + <row> + <cell fill='horizontal'> <JLabel text='isisfish.factor.operateur' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> </cell> <cell fill='horizontal' weightx='1' columns='3'> 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-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-03-24 15:46:42 UTC (rev 2030) @@ -564,7 +564,7 @@ <cell columns="4" fill="both" weightx="1.0" weighty="0.6"> <JTabbedPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> <tab title='{_("isisfish.params.populationNumbers")}'> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id="simulParamsNumbers" constructorParams='null, false' name="isisfish.params.populationNumbers"/> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id="simulParamsNumbers" name="isisfish.params.populationNumbers"/> </tab> <tab title='{_("isisfish.params.ruleParameters")}'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> 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-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-03-24 15:46:42 UTC (rev 2030) @@ -826,9 +826,9 @@ return result; } - public void addFactor(String path, Factor f, JComponent c) { - factors.put(path + f.getName(), f); - factorComponent.put(path + f.getName(), c); + public void addFactor(Factor f, JComponent c) { + factors.put(f.getPath() + f.getName(), f); + factorComponent.put(f.getPath() + f.getName(), c); designPlan.setFactors(getFactors()); } @@ -836,20 +836,21 @@ return factors.get(name); } - public void addContinuousFactor(String name, String path, Double min, + public void addContinuousFactor(String name, String comment, String path, Double min, Double max, JComponent c, boolean exist) { Factor f = new Factor(name); ContinuousDomain<Serializable> domain = new ContinuousDomain<Serializable>(); domain.setMinBound(min); domain.setMaxBound(max); f.setDomain(domain); + f.setComment(comment); f.setPath(path); if (exist) removeFactor(f); - addFactor(path, f, c); + addFactor(f, c); } - public void addDiscreteFactor(String name, String path, + public void addDiscreteFactor(String name, String comment, String path, List<Serializable> values, JComponent c, boolean exist) { Factor f = new Factor(name); DiscreteDomain<Serializable> domain = new DiscreteDomain<Serializable>(); @@ -862,39 +863,40 @@ i++; } f.setDomain(domain); + f.setComment(comment); f.setPath(path); if (exist) removeFactor(f); - addFactor(path, f, c); + addFactor(f, c); } - public void addContinuousEquationFactor(String name, String path, + public void addContinuousEquationFactor(String name, String comment, String path, EquationContinuousDomain domain, String equation, JComponent c, boolean exist) { Factor f = new Factor(name); f.setValue(equation); f.setDomain(domain); + f.setComment(comment); f.setPath(path + domain.getVariableName()); if (exist) removeFactor(f); - addFactor(path, f, c); + addFactor(f, c); } - public void addContinuousMatrixFactor(String name, String path, - Double min, Double max, MatrixND matrix, + public void addContinuousMatrixFactor(String name, String comment, String path, + Double coef, MatrixND matrix, String operateur, JComponent c, boolean exist) { Factor f = new Factor(name); MatrixContinuousDomain<Serializable> domain = new MatrixContinuousDomain<Serializable>(); domain.setMatrix(matrix); domain.setOperator(operateur); - domain.setMaxBound(max); - domain.setMinBound(min); + domain.setCoefficient(coef); + f.setComment(comment); f.setDomain(domain); f.setPath(path); - f.setValue(matrix); if (exist) removeFactor(f); - addFactor(path, f, c); + addFactor(f, c); } public JComponent getFactorComponent(Factor f) { 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-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-03-24 15:46:42 UTC (rev 2030) @@ -352,6 +352,7 @@ isisfish.export.directory=Export directory isisfish.export.saved=Export saved isisfish.export.title=Results export +isisfish.factor.coefficient=Coefficient (in %) isisfish.factor.comment=Comment isisfish.factor.continue=Continue factor isisfish.factor.discret=Discret factor 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-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-03-24 15:46:42 UTC (rev 2030) @@ -352,6 +352,7 @@ isisfish.export.directory=Dossier d'export isisfish.export.saved=Exports des r\u00E9sultats sauvegard\u00E9s isisfish.export.title=Export des r\u00E9sultats +isisfish.factor.coefficient=Co\u00E9fficient (en %) isisfish.factor.comment=Commentaires isisfish.factor.continue=Facteur continu isisfish.factor.discret=Facteur discret Modified: isis-fish/trunk/src/main/resources/sensitivity.properties =================================================================== --- isis-fish/trunk/src/main/resources/sensitivity.properties 2009-03-23 17:45:43 UTC (rev 2029) +++ isis-fish/trunk/src/main/resources/sensitivity.properties 2009-03-24 15:46:42 UTC (rev 2030) @@ -17,7 +17,6 @@ Gear.ParameterName Gear.PossibleValue Metier.GearParameterValue -Metier.Interval Metier.Zone MetierSeasonInfo.SpeciesTargetSpecies Population.GeographicId @@ -29,10 +28,11 @@ Population.MeanWeight Population.Price Population.ReproductionEquation -PopulationGroup.MeanWeight -PopulationGroup.Price Population.NaturalDeathRateMatrix Population.NaturalDeathRate +Population.Capturability +PopulationGroup.MeanWeight +PopulationGroup.Price PopulationGroup.ReproductionRate PopulationGroup.Age PopulationGroup.MinLength @@ -42,7 +42,6 @@ PopulationSeasonInfo.ImmigrationMatrix PopulationSeasonInfo.MigrationMatrix PopulationSeasonInfo.UseEquationMigration -PopulationSeasonInfo.Interval PopulationSeasonInfo.LengthChangeMatrix PopulationSeasonInfo.GroupChange Population.MonthGapBetweenReproRecrutement

1 0