r2830 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity - Isis-fish-commits

14 Dec 2009

Author: chatellier
Date: 2009-12-14 15:51:18 +0000 (Mon, 14 Dec 2009)
New Revision: 2830

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/SensitivityCalculatorRandomMock.java
Log:
Update doc and format

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-12-14 15:51:06 UTC (rev 2829)
+++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java	2009-12-14 15:51:18 UTC (rev 2830)
@@ -98,8 +98,7 @@
         domain.getValues().put("m1", matrix1);
         domain.getValues().put("m2", matrix2);
         factor.setDomain(domain);
-        factor
-                .setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
+        factor.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
         factor.setValueForIdentifier("m2");
 
         Assert.assertEquals(matrix2, factor.getValue());
@@ -143,8 +142,7 @@
         domain.setCoefficient(0.1);
         domain.setOperator("*");
         factor.setDomain(domain);
-        factor
-                .setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
+        factor.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
         factor.setValueForIdentifier(0.1);
 
         Assert.assertEquals(0.92, factor.getValue().getValue(new int[] { 0, 0 }),0.0000001);
@@ -152,8 +150,8 @@
         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
+
+        // matrix 2
         MatrixND matrix2 = MatrixFactory.getInstance().create("test1",
                 new int[] { 3, 2 }, new String[] { "col1", "col2" });
         matrix2.setValue(new int[] { 0, 0 }, 1);
@@ -162,8 +160,7 @@
         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,Double> factor2 = new Factor<MatrixND,Double>("testmatrix");
         MatrixContinuousDomain domain2 = new MatrixContinuousDomain();
@@ -171,19 +168,15 @@
         domain2.setCoefficient(0.1);
         domain2.setOperator("/");
         factor2.setDomain(domain2);
-        factor2
-                .setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
+        factor2.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
         factor2.setValueForIdentifier(0.1);
- 
-       // val + ((val / coefficient) * ((2 * Double
-                           // .valueOf((String) identifier)) - 1))
 
         Assert.assertEquals(-7.0, factor2.getValue().getValue(new int[] { 0, 0 }),0.0000001);
         Assert.assertEquals(-21.0, 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
+
+        // matrix 3
         MatrixND matrix3 = MatrixFactory.getInstance().create("test1",
                 new int[] { 3, 2 }, new String[] { "col1", "col2" });
         matrix3.setValue(new int[] { 0, 0 }, 1);
@@ -200,16 +193,15 @@
         domain3.setCoefficient(0.1);
         domain3.setOperator("-");
         factor3.setDomain(domain3);
-        factor3
-                .setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
+        factor3.setPath("org.nuiton.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
+
+        // matrix 3
         MatrixND matrix4 = MatrixFactory.getInstance().create("test1",
                 new int[] { 3, 2 }, new String[] { "col1", "col2" });
         matrix4.setValue(new int[] { 0, 0 }, 1);
@@ -226,8 +218,7 @@
         domain4.setCoefficient(0.1);
         domain4.setOperator("+");
         factor4.setDomain(domain4);
-        factor4
-                .setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
+        factor4.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
         factor4.setValueForIdentifier(0.1);
 
         Assert.assertEquals(0.12, factor4.getValue().getValue(new int[] { 0, 0 }),0.0000001);
@@ -239,7 +230,7 @@
             log.info("factor#toString() = " + factor);
         }
     }
-    
+
     /**
      * Test factor with matrix.
      * 
@@ -256,17 +247,14 @@
         domain.setVariableName("Linf");
         domain.setReferenceValue(3.0);
         factor.setDomain(domain);
-        factor
-                .setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
+        factor.setPath("org.nuiton.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);
         Assert.assertEquals(0.1, ((EquationContinuousDomain)factor.getDomain()).getValue(),0);
-        
-      
-        
+
         // factor 2
         Factor<Double,Double> factor2 = new Factor<Double,Double>("testequation");
         EquationContinuousDomain domain2 = new EquationContinuousDomain();
@@ -275,14 +263,13 @@
         domain2.setVariableName("Linf");
         domain2.setReferenceValue(3.0);
         factor2.setDomain(domain2);
-        factor2
-                .setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
+        factor2.setPath("org.nuiton.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,Double> factor3 = new Factor<Double,Double>("testequation");
         EquationContinuousDomain domain3 = new EquationContinuousDomain();
@@ -291,14 +278,13 @@
         domain3.setVariableName("Linf");
         domain3.setReferenceValue(3.0);
         factor3.setDomain(domain3);
-        factor3
-                .setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
+        factor3.setPath("org.nuiton.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,Double> factor4 = new Factor<Double,Double>("testequation");
         EquationContinuousDomain domain4 = new EquationContinuousDomain();
@@ -307,8 +293,7 @@
         domain4.setVariableName("Linf");
         domain4.setReferenceValue(3.0);
         factor4.setDomain(domain4);
-        factor4
-                .setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
+        factor4.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
         factor4.setValueForIdentifier(0.1);
 
         Assert.assertEquals(0.68, Double.valueOf(factor4.getValue()),0.0000001);

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-12-14 15:51:06 UTC (rev 2829)
+++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java	2009-12-14 15:51:18 UTC (rev 2830)
@@ -43,8 +43,7 @@
  */
 public class SensitivityCalculatorRandomMock implements SensitivityCalculator {
 
-    private static final Log log = LogFactory
-            .getLog(SimulationServiceTest.class);
+    private static final Log log = LogFactory.getLog(SimulationServiceTest.class);
 
     public String getDescription() {
         return "Implementation of random sensibility calculator";
@@ -66,14 +65,11 @@
      * 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

    

r2830 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity

chatellier＠users.labs.libre-entreprise.org

tags

participants (1)