Author: chatellier Date: 2009-12-17 14:35:23 +0000 (Thu, 17 Dec 2009) New Revision: 2849 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java isis-fish/trunk/src/test/resources/mexico/mexicohelper_designplan.xml Log: Update mexico design test and test data. 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-12-16 15:21:02 UTC (rev 2848) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-12-17 14:35:23 UTC (rev 2849) @@ -95,8 +95,8 @@ "factor 3 (integer discrete)"); DiscreteDomain<Integer, Double> domain3 = new DiscreteDomain<Integer, Double>(); domain3.getValues().put(0.0, 13); - domain3.getValues().put(0.0, 14); - domain3.getValues().put(0.0, 15); + domain3.getValues().put(1.0, 14); + domain3.getValues().put(2.0, 45); factorContinuous2.setDomain(domain3); factorContinuous2 .setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength"); Modified: isis-fish/trunk/src/test/resources/mexico/mexicohelper_designplan.xml =================================================================== --- isis-fish/trunk/src/test/resources/mexico/mexicohelper_designplan.xml 2009-12-16 15:21:02 UTC (rev 2848) +++ isis-fish/trunk/src/test/resources/mexico/mexicohelper_designplan.xml 2009-12-17 14:35:23 UTC (rev 2849) @@ -1,74 +1,74 @@ <experimentalDesign> - <factors> - <factor name="factor 1 (double continuous)" property="continuous" type="real"> - <target> - fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength - </target> - <domain> - <fixed cardinality="0"> - <range min="0.0" max="50.0" /> - </fixed> - </domain> - </factor> - <factor name="factor 2 (double discrete)" property="discrete" type="real"> - <target> - fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength - </target> - <value> - 3.0</value> - <domain> - <fixed cardinality="5"> - <enumeration> - <value> - 12.3</value> - <value> - 70.9</value> - <value> - 21.0</value> - <value> - -12.1</value> - <value> - -8.45</value> - </enumeration> - </fixed> - </domain> - </factor> - <factor name="factor 3 (integer discrete)" property="discrete" type="integer"> - <target> - fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength - </target> - <domain> - <fixed cardinality="1"> - <enumeration> - <value> - 15</value> - </enumeration> - </fixed> - </domain> - </factor> - <factor name="factor 4 (MatrixContinuous)" property="matrixcontinuous" type="real"> - <target> - fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength - </target> - <domain> - <fixed cardinality="0"> - <range min="0.0" max="1.0" /> - <matrix coefficient="0.1" operator="-"> - [test1,[3, 2],[\"col1\", \"col2\"],[[null(), null(), null()], [null(), null()]],[[13.0, -14.0], [21.0, - 2.0], [12.0, -1.0]]]</matrix> - </fixed> - </domain> - </factor> - <factor name="factor 5 (EquationContinuous)" property="equationcontinuous" type="real"> - <target> - fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#maxLength - </target> - <domain> - <fixed cardinality="0"> - <range min="0.0" max="1.0" /> - <equation variable="L1" operator="-" coefficient="0.1" reference="45.0" /> - </fixed> - </domain> - </factor> - </factors> + <factors> + <factor name="factor 1 (double continuous)" property="continuous" + type="real"> + <target> + fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength + </target> + <domain> + <fixed cardinality="0"> + <range min="0.0" max="50.0" /> + </fixed> + </domain> + </factor> + <factor name="factor 2 (double discrete)" property="discrete" + type="real"> + <target> + fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength + </target> + <domain> + <fixed cardinality="5"> + <enumeration> + <value>12.3</value> + <value>70.9</value> + <value>21.0</value> + <value>-12.1</value> + <value>-8.45</value> + </enumeration> + </fixed> + </domain> + </factor> + <factor name="factor 3 (integer discrete)" property="discrete" + type="integer"> + <target> + fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength + </target> + <domain> + <fixed cardinality="3"> + <enumeration> + <value>13</value> + <value>14</value> + <value>45</value> + </enumeration> + </fixed> + </domain> + </factor> + <factor name="factor 4 (MatrixContinuous)" property="matrixcontinuous" + type="real"> + <target> + fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength + </target> + <domain> + <fixed cardinality="0"> + <range min="0.0" max="1.0" /> + <matrix coefficient="0.1" operator="-"> + [test1,[3, 2],[\"col1\", \"col2\"],[[null(), + null(), null()], [null(), null()]],[[13.0, + -14.0], [21.0, 2.0], [12.0, -1.0]]]</matrix> + </fixed> + </domain> + </factor> + <factor name="factor 5 (EquationContinuous)" property="equationcontinuous" + type="real"> + <target> + fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#maxLength + </target> + <domain> + <fixed cardinality="0"> + <range min="0.0" max="1.0" /> + <equation variable="L1" operator="-" coefficient="0.1" reference="45.0" /> + </fixed> + </domain> + </factor> + </factors> </experimentalDesign> \ No newline at end of file