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