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);