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 *