Author: jcouteau Date: 2011-06-07 14:08:23 +0000 (Tue, 07 Jun 2011) New Revision: 3355 Log: Fix test compilation Modified: isis-fish/branches/3.3.1/src/main/resources/log4j.properties isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomainTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomainTest.java Modified: isis-fish/branches/3.3.1/src/main/resources/log4j.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/log4j.properties 2011-06-07 09:19:29 UTC (rev 3354) +++ isis-fish/branches/3.3.1/src/main/resources/log4j.properties 2011-06-07 14:08:23 UTC (rev 3355) @@ -31,6 +31,7 @@ # package level log4j.logger.fr.ifremer.isisfish=INFO +log4j.logger.org.nuiton.j2r=DEBUG log4j.logger.org.nuiton=WARN log4j.logger.analyseplans=INFO log4j.logger.exports=INFO Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-06-07 09:19:29 UTC (rev 3354) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-06-07 14:08:23 UTC (rev 3355) @@ -148,7 +148,7 @@ Factor factorMatrixContinuous = new Factor("factor 4 (MatrixContinuous)"); MatrixContinuousDomain domain4 = new MatrixContinuousDomain(); domain4.setCoefficient(0.799); - domain4.setMatrix(matrix1); + domain4.setReferenceValue(matrix1); factorMatrixContinuous.setDomain(domain4); factorMatrixContinuous.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength"); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2011-06-07 09:19:29 UTC (rev 3354) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2011-06-07 14:08:23 UTC (rev 3355) @@ -70,7 +70,7 @@ factor.setPath("org.nuiton.factor#1234567890#0.12242345354#name"); factor.setValueForIdentifier(49); - Assert.assertEquals((Integer) 49, factor.getValue()); + Assert.assertEquals(49, factor.getValue()); if (log.isInfoEnabled()) { log.info("factor#toString() = " + factor); @@ -151,7 +151,7 @@ // factor Factor factor = new Factor("testmatrix"); MatrixContinuousDomain domain = new MatrixContinuousDomain (); - domain.setMatrix(matrix1); + domain.setReferenceValue(matrix1); domain.setCoefficient(0.1); factor.setDomain(domain); factor.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); @@ -161,7 +161,7 @@ Assert.assertEquals(2.76, ((MatrixND)factor.getValue()).getValue(new int[] { 2, 0 }),0.0000001); Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0); Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0); - Assert.assertEquals(0.1, ((MatrixContinuousDomain)factor.getDomain()).getValue(),0); + Assert.assertEquals(0.1, (Double)factor.getDisplayedValue(),0); // matrix 2 MatrixND matrix2 = MatrixFactory.getInstance().create("test1", @@ -176,7 +176,7 @@ // factor 2 Factor factor2 = new Factor("testmatrix"); MatrixContinuousDomain domain2 = new MatrixContinuousDomain(); - domain2.setMatrix(matrix2); + domain2.setReferenceValue(matrix2); domain2.setCoefficient(0.1); factor2.setDomain(domain2); factor2.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); @@ -200,7 +200,7 @@ // factor 3 Factor factor3 = new Factor("testmatrix"); MatrixContinuousDomain domain3 = new MatrixContinuousDomain(); - domain3.setMatrix(matrix3); + domain3.setReferenceValue(matrix3); domain3.setCoefficient(0.2); factor3.setDomain(domain3); factor3.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); @@ -224,7 +224,7 @@ // factor 3 Factor factor4 = new Factor("testmatrix"); MatrixContinuousDomain domain4 = new MatrixContinuousDomain(); - domain4.setMatrix(matrix4); + domain4.setReferenceValue(matrix4); domain4.setCoefficient(0.3); factor4.setDomain(domain4); factor4.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); @@ -261,7 +261,7 @@ Assert.assertEquals(2.76, (Double)factor.getValue(),0.0000001); Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0); Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0); - Assert.assertEquals(0.1, ((EquationContinuousDomain)factor.getDomain()).getValue(),0); + Assert.assertEquals(0.1, (Double)factor.getValue(),0); // factor 2 Factor factor2 = new Factor("testequation"); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomainTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomainTest.java 2011-06-07 09:19:29 UTC (rev 3354) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomainTest.java 2011-06-07 14:08:23 UTC (rev 3355) @@ -54,7 +54,6 @@ domain.setVariableName("varname"); domain.setCoefficient(0.05); domain.setReferenceValue(90.0); - domain.setValue(89.5); // clone EquationContinuousDomain clone = domain.clone(); @@ -66,6 +65,5 @@ Assert.assertEquals("varname", clone.getVariableName()); Assert.assertEquals(0.05, clone.getCoefficient()); Assert.assertEquals(90.0, clone.getReferenceValue()); - Assert.assertEquals(89.5, clone.getValue()); } } Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomainTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomainTest.java 2011-06-07 09:19:29 UTC (rev 3354) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomainTest.java 2011-06-07 14:08:23 UTC (rev 3355) @@ -58,9 +58,8 @@ domain.setMaxBound(0.74); domain.setCardinality(5); // child - domain.setMatrix(matrix); + domain.setReferenceValue(matrix); domain.setCoefficient(0.05); - domain.setValue(89.5); // clone MatrixContinuousDomain clone = domain.clone(); @@ -69,8 +68,7 @@ Assert.assertEquals(0.55, clone.minBound); // getter return 0.0 Assert.assertEquals(0.74, clone.maxBound); // getter return 1.0 Assert.assertEquals(5, clone.getCardinality()); - Assert.assertEquals(matrix, clone.getMatrix()); + Assert.assertEquals(matrix, clone.getReferenceValue()); Assert.assertEquals(0.05, clone.getCoefficient()); - Assert.assertEquals(89.5, clone.getValue()); } }