r3663 - in branches/4.0.1/src: main/java/fr/ifremer/isisfish/mexico/xml test/java/fr/ifremer/isisfish/mexico test/resources/mexico - Isis-fish-commits

19 Mar 2012

Author: echatellier
Date: 2012-03-19 18:45:36 +0100 (Mon, 19 Mar 2012)
New Revision: 3663

Url: http://forge.codelutin.com/repositories/revision/isis-fish/3663

Log:
Fix more tests

Modified:
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationDiscreteDomainXMLVisitor.java
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/RuleDiscreteDomainXMLVisitor.java
   branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java
   branches/4.0.1/src/test/resources/mexico/mexicohelper_designplan.xml
   branches/4.0.1/src/test/resources/mexico/mexicohelper_designplanV2.xml
   branches/4.0.1/src/test/resources/mexico/mexicohelper_factorgroupdp.xml

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java
===================================================================

--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java	2012-03-19 16:39:55 UTC (rev 3662)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java	2012-03-19 17:45:36 UTC (rev 3663)
@@ -54,7 +54,7 @@
      */
     @Override
     public void visit(Domain domain, Object label, Object value) {
-        xmlBuffer.append("<level name=\"" + label + "\">");
+        xmlBuffer.append("<level>");
         xmlBuffer.append(MexicoHelper.getStringFromObject(value));
         xmlBuffer.append("</level>");
     }

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java	2012-03-19 16:39:55 UTC (rev 3662)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java	2012-03-19 17:45:36 UTC (rev 3663)
@@ -42,7 +42,6 @@
 import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan;
 import fr.ifremer.isisfish.simulator.sensitivity.Distribution;
 import fr.ifremer.isisfish.simulator.sensitivity.Distribution.DistributionParam;
-import fr.ifremer.isisfish.simulator.sensitivity.Domain;
 import fr.ifremer.isisfish.simulator.sensitivity.Factor;
 import fr.ifremer.isisfish.simulator.sensitivity.FactorGroup;
 import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
@@ -144,20 +143,19 @@
                         // matrix specific
                         // <coefficient operator="-" value="0.799"/>
                         domain = new ContinuousDomain(Distribution.QUNIFPC);
-                        Element coefficientElement = fixedElement.element("coefficient");
-                        domain.addDistributionParam("coefficient", Double.valueOf(coefficientElement.attributeValue("value")));
 
                         // <mx name="test1" step="0">...
                         Element matrixElement = fixedElement.element("mx");
                         MatrixND matrix = MexicoHelper.getMatrixFromXml(matrixElement, topiaContext);
                         domain.addDistributionParam("reference", matrix);
+                        
+                        Element coefficientElement = fixedElement.element("coefficient");
+                        domain.addDistributionParam("coefficient", Double.valueOf(coefficientElement.attributeValue("value")));
                     }
                     else if (property.equals("equationcontinuous")) {
                         // equation specific
                         domain = new ContinuousDomain(Distribution.QUNIFPC);
-                        Element coefficientElement = fixedElement.element("coefficient");
-                        domain.addDistributionParam("coefficient", Double.valueOf(coefficientElement.attributeValue("value")));
-
+                        
                         Element equationElement = fixedElement.element("equation");
                         domain.addDistributionParam("reference", Double.valueOf(equationElement.attributeValue("reference")));
                         String variable = equationElement.attributeValue("variable");
@@ -165,7 +163,11 @@
                         // hack since 4.0.1, factor name doesn't contains variable
                         name = StringUtils.removeEnd(name, "." + variable);
                         factor.setName(name);
+                        
+                        Element coefficientElement = fixedElement.element("coefficient");
+                        domain.addDistributionParam("coefficient", Double.valueOf(coefficientElement.attributeValue("value")));
 
+
                     }
                     else {
                         // continous domain
@@ -173,8 +175,8 @@
                         Element percentageElement = fixedElement.element("percentage");
                         if (percentageElement != null) {
                             domain = new ContinuousDomain(Distribution.QUNIFPC);
+                            domain.addDistributionParam("reference", Double.valueOf(percentageElement.attributeValue("reference")));
                             domain.addDistributionParam("coefficient", Double.valueOf(percentageElement.attributeValue("coefficient")));
-                            domain.addDistributionParam("reference", Double.valueOf(percentageElement.attributeValue("reference")));
                         }
                         else {
                             // <range max="1.0" min="0.0"/>
@@ -210,19 +212,17 @@
                         // matrix specific
                         domain = new ContinuousDomain(Distribution.QUNIFPC);
 
-                        Element coefficientElement = fixedElement.element("coefficient");
-                        domain.addDistributionParam("coefficient", Double.valueOf(coefficientElement.attributeValue("value")));
-
                         // matrix specific
                         Element matrixElement = fixedElement.element("mx");
                         MatrixND matrix = MexicoHelper.getMatrixFromXml(matrixElement, topiaContext);
                         domain.addDistributionParam("reference", matrix);
+                        
+                        Element coefficientElement = fixedElement.element("coefficient");
+                        domain.addDistributionParam("coefficient", Double.valueOf(coefficientElement.attributeValue("value")));
                     }
                     else if (property.equals("equationcontinuous")) {
                         // equation specific
                         domain = new ContinuousDomain(Distribution.QUNIFPC);
-                        Element coefficientElement = fixedElement.element("coefficient");
-                        domain.addDistributionParam("coefficient", Double.valueOf(coefficientElement.attributeValue("value")));
 
                         Element equationElement = fixedElement.element("equation");
                         domain.addDistributionParam("reference", Double.valueOf(equationElement.attributeValue("reference")));
@@ -231,14 +231,17 @@
                         // hack since 4.0.1, factor name doesn't contains variable
                         name = StringUtils.removeEnd(name, "." + variable);
                         factor.setName(name);
+
+                        Element coefficientElement = fixedElement.element("coefficient");
+                        domain.addDistributionParam("coefficient", Double.valueOf(coefficientElement.attributeValue("value")));
                     }
                     else {
                         // continous domain
                         Element percentageElement = fixedElement.element("percentage");
                         if (percentageElement != null) {
                             domain = new ContinuousDomain(Distribution.QUNIFPC);
+                            domain.addDistributionParam("reference", Double.valueOf(percentageElement.attributeValue("reference")));
                             domain.addDistributionParam("coefficient", Double.valueOf(percentageElement.attributeValue("coefficient")));
-                            domain.addDistributionParam("reference", Double.valueOf(percentageElement.attributeValue("reference")));
                         }
                         else {
                             // <range max="1" min="3"/>
@@ -346,11 +349,12 @@
                             domain = new ContinuousDomain(Distribution.QUNIFPC);
                             // matrix specific
                             // <coefficient operator="-" value="0.799"/>
-                            domain.addDistributionParam("coefficient", Double.valueOf(referenceElement.attributeValue("coefficient")));
                             // <mx name="test1" step="0">...
                             Element matrixElement = referenceElement.element("mx");
                             MatrixND matrix = MexicoHelper.getMatrixFromXml(matrixElement, topiaContext);
                             domain.addDistributionParam("reference", matrix);
+                            
+                            domain.addDistributionParam("coefficient", Double.valueOf(referenceElement.attributeValue("coefficient")));
                         }
                         else {
                             domain = new ContinuousDomain(Distribution.QUNIFMM);
@@ -363,7 +367,7 @@
                             domain.addDistributionParam("max", maxMatrix);
                         }
                     }
-                    else if (property.equals("equationcontinuos")) {
+                    else if (property.equals("equationcontinuous")) {
                         // equation specific
                         
                         String variable = fixedElement.attributeValue("variable");
@@ -375,8 +379,8 @@
                         Element referenceElement = fixedElement.element("reference");
                         if (referenceElement != null) {
                             domain = new ContinuousDomain(Distribution.QUNIFPC);
+                            domain.addDistributionParam("reference", Double.valueOf(referenceElement.getTextTrim()));
                             domain.addDistributionParam("coefficient", Double.valueOf(referenceElement.attributeValue("coefficient")));
-                            domain.addDistributionParam("reference", Double.valueOf(referenceElement.getTextTrim()));
                         }
                         else {
                             domain = new ContinuousDomain(Distribution.QUNIFMM);
@@ -392,8 +396,8 @@
                         Element referenceElement = fixedElement.element("reference");
                         if (referenceElement != null) {
                             domain = new ContinuousDomain(Distribution.QUNIFPC);
+                            domain.addDistributionParam("reference", Double.valueOf(referenceElement.getTextTrim()));
                             domain.addDistributionParam("coefficient", Double.valueOf(referenceElement.attributeValue("coefficient")));
-                            domain.addDistributionParam("reference", Double.valueOf(referenceElement.getTextTrim()));
                         }
                         else {
                             // <range max="1.0" min="0.0"/>
@@ -436,11 +440,11 @@
                             domain = new ContinuousDomain(Distribution.QUNIFPC);
                             // matrix specific
                             // <coefficient operator="-" value="0.799"/>
-                            domain.addDistributionParam("coefficient", Double.valueOf(referenceElement.attributeValue("coefficient")));
                             // <mx name="test1" step="0">...
                             Element matrixElement = referenceElement.element("mx");
                             MatrixND matrix = MexicoHelper.getMatrixFromXml(matrixElement, topiaContext);
                             domain.addDistributionParam("reference", matrix);
+                            domain.addDistributionParam("coefficient", Double.valueOf(referenceElement.attributeValue("coefficient")));
                         }
                         else {
                             domain = new ContinuousDomain(Distribution.QUNIFMM);
@@ -464,8 +468,8 @@
                         Element referenceElement = fixedElement.element("reference");
                         if (referenceElement != null) {
                             domain = new ContinuousDomain(Distribution.QUNIFPC);
+                            domain.addDistributionParam("reference", Double.valueOf(referenceElement.getTextTrim()));
                             domain.addDistributionParam("coefficient", Double.valueOf(referenceElement.attributeValue("coefficient")));
-                            domain.addDistributionParam("reference", Double.valueOf(referenceElement.getTextTrim()));
                         }
                         else {
                             domain = new ContinuousDomain(Distribution.QUNIFMM);
@@ -481,8 +485,8 @@
                         Element referenceElement = fixedElement.element("reference");
                         if (referenceElement != null) {
                             domain = new ContinuousDomain(Distribution.QUNIFPC);
+                            domain.addDistributionParam("reference", Double.valueOf(referenceElement.getTextTrim()));
                             domain.addDistributionParam("coefficient", Double.valueOf(referenceElement.attributeValue("coefficient")));
-                            domain.addDistributionParam("reference", Double.valueOf(referenceElement.getTextTrim()));
                         }
                         else {
                             // <range max="1.0" min="0.0"/>
@@ -631,32 +635,39 @@
                 List<Element> levelElements = domainElement.elements("level");
                 if ("rule".equals(type)) {
                     domain = new RuleDiscreteDomain();
+                    int valueName = 0;
                     for (Element levelElement : levelElements) {
-                        String levelName = levelElement.attributeValue("name");
                         Element rulesElement = levelElement.element("rules");
                         List<Rule> rulesValue = MexicoHelper.getRulesFromXml(rulesElement, topiaContext);
-                        domain.getValues().put(levelName, rulesValue);
+                        domain.getValues().put(valueName++, rulesValue);
                     }
+                } else if ("equation".equals(type)) { // topia entities ...
+                    domain = new EquationDiscreteDomain();
+                    int valueName = 0;
+                    for (Element levelElement : levelElements) { // no trim here
+                        Object object = StringEscapeUtils.unescapeXml(levelElement.getText());
+                        domain.getValues().put(valueName++, object);
+                    }
                 } else if ("string".equals(type)) { // topia entities ...
                     domain = new DiscreteDomain();
+                    int valueName = 0;
                     for (Element levelElement : levelElements) {
-                        String levelName = levelElement.attributeValue("name");
                         Object object = MexicoHelper.getObjectFromString(levelElement.getTextTrim(), topiaContext);
-                        domain.getValues().put(levelName, object);
+                        domain.getValues().put(valueName++, object);
                     }
                 } else if ("integer".equals(type)) {
                     domain = new DiscreteDomain();
+                    int valueName = 0;
                     for (Element levelElement : levelElements) {
-                        String levelName = levelElement.attributeValue("name");
                         Integer levelValue = Integer.valueOf(levelElement.getTextTrim());
-                        domain.getValues().put(levelName, levelValue);
+                        domain.getValues().put(valueName++, levelValue);
                     }
                 } else {
                     domain = new DiscreteDomain();
+                    int valueName = 0;
                     for (Element levelElement : levelElements) {
-                        String levelName = levelElement.attributeValue("name");
                         Double levelValue = Double.valueOf(levelElement.getTextTrim());
-                        domain.getValues().put(levelName, levelValue);
+                        domain.getValues().put(valueName++, levelValue);
                     }
                 }
 

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationDiscreteDomainXMLVisitor.java
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationDiscreteDomainXMLVisitor.java	2012-03-19 16:39:55 UTC (rev 3662)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationDiscreteDomainXMLVisitor.java	2012-03-19 17:45:36 UTC (rev 3663)
@@ -44,7 +44,7 @@
     public void start(Domain domain) {
         // lorsque le facteur est catégoriel, la liste de ses niveaux, par une
         // liste ouverte d'éléments 'level', d'attributs 'value' et 'weight')
-        xmlBuffer.append("<domain distributionName=\"categorical\" type=\"equation\"");
+        xmlBuffer.append("<domain distributionName=\"categorical\" type=\"equation\">");
     }
 
     /**
@@ -53,8 +53,8 @@
     @Override
     public void visit(Domain domain, Object label, Object value) {
         String content = (String)value;
-        xmlBuffer.append("<value>");
+        xmlBuffer.append("<level>");
         xmlBuffer.append(StringEscapeUtils.escapeXml(content));
-        xmlBuffer.append("</value>");
+        xmlBuffer.append("</level>");
     }
 }

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/RuleDiscreteDomainXMLVisitor.java
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/RuleDiscreteDomainXMLVisitor.java	2012-03-19 16:39:55 UTC (rev 3662)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/RuleDiscreteDomainXMLVisitor.java	2012-03-19 17:45:36 UTC (rev 3663)
@@ -57,7 +57,7 @@
         List<Rule> rulesList = (List<Rule>)value;
         String rulesAsXml = MexicoHelper.getRulesAsXml(rulesList);
 
-        xmlBuffer.append("<level name=\"" + label + "\">");
+        xmlBuffer.append("<level>");
         xmlBuffer.append(rulesAsXml);
         xmlBuffer.append("</level>");
     }

Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java
===================================================================
--- branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java	2012-03-19 16:39:55 UTC (rev 3662)
+++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java	2012-03-19 17:45:36 UTC (rev 3663)
@@ -138,7 +138,7 @@
         Factor factorContinuous = new Factor("factor 1 (double continuous)");
         ContinuousDomain domain1 = new ContinuousDomain(Distribution.QUNIFMM);
         domain1.addDistributionParam("min", 0.0);
-        domain1.addDistributionParam("max", 0.0);
+        domain1.addDistributionParam("max", 50.0);
         factorContinuous.setDomain(domain1);
         factorContinuous.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength");
 
@@ -175,8 +175,8 @@
         Factor factorEquationContinuous = new Factor("factor 5 (EquationContinuous)");
         factorEquationContinuous.setEquationVariableName("Ktemp");
         ContinuousDomain domain5 = new ContinuousDomain(Distribution.QUNIFPC);
-        domain5.addDistributionParam("reference", 0.1);
-        domain5.addDistributionParam("coefficient", 45.0);
+        domain5.addDistributionParam("reference", 45.0);
+        domain5.addDistributionParam("coefficient", 0.1);
         factorEquationContinuous.setDomain(domain5);
         factorEquationContinuous.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#maxLength");
 
@@ -256,25 +256,26 @@
         // test xml export
         String xml = MexicoHelper.getDesignPlanAsXML(testDesignPlan);
 
+        if (log.isDebugEnabled()) {
+            log.debug("testGetDesignPlanAsXML xml = " + xml);
+        }
+
         // factor 1
-        Assert.assertTrue(xml.contains("<min>0.0</min>"));
-        Assert.assertTrue(xml.contains("<max>50.0</max>"));
+        Assert.assertTrue(xml.contains("distributionParameter name=\"min\" type=\"decimal\">0.0"));
+        Assert.assertTrue(xml.contains("distributionParameter name=\"max\" type=\"decimal\">50.0"));
         // factor 2
-        Assert.assertTrue(xml.contains("<factor name=\"factor 2 (double discrete)\""));
-        Assert.assertTrue(xml.contains("<value>70.9</value>"));
+        Assert.assertTrue(xml.contains("name=\"factor 2 (double discrete)\""));
+        Assert.assertTrue(xml.contains("<level>70.9</level>"));
         // factor 3
-        Assert.assertTrue(xml.contains("<value>14</value>"));
+        Assert.assertTrue(xml.contains("<level>14</level>"));
         // factor 4
         Assert.assertTrue(xml.contains("<d>-14.0</d>"));
         Assert.assertTrue(xml.contains("0.799"));
         Assert.assertTrue(xml.contains("<mx name=\"test1\">"));
         // factor 5
-        Assert.assertTrue(xml.contains("<fixed variable=\"L1\">"));
-        Assert.assertTrue(xml.contains("<reference coefficient=\"0.1\">45.0</reference>"));
-
-        if (log.isDebugEnabled()) {
-            log.debug("testGetDesignPlanAsXML xml = " + xml);
-        }
+        Assert.assertTrue(xml.contains("name=\"equationVariableName\">Ktemp"));
+        Assert.assertTrue(xml.contains("distributionParameter name=\"coefficient\" type=\"decimal\">0.1"));
+        Assert.assertTrue(xml.contains("distributionParameter name=\"reference\" type=\"decimal\">45.0"));
     }
 
     /**
@@ -350,19 +351,21 @@
         // test xml export
         String xml = MexicoHelper.getDesignPlanAsXML(testDesignPlan);
 
+        if (log.isDebugEnabled()) {
+            log.debug("testFactorGroupAndRule xml = " + xml);
+        }
+
         // factor groups
-        Assert.assertTrue(xml.indexOf("<factors name=\"continuousgrp\" type=\"continuous\">") != -1);
-        Assert.assertTrue(xml.indexOf("<factors name=\"discretegrp\" type=\"discrete\">") != -1);
+        Assert.assertTrue(xml.indexOf("<feature name=\"group\">continuousgrp") != -1);
+        Assert.assertTrue(xml.indexOf("<feature name=\"grouptype\">continuous") != -1);
+        Assert.assertTrue(xml.indexOf("<feature name=\"group\">discretegrp") != -1);
+        Assert.assertTrue(xml.indexOf("<feature name=\"group\">discrete") != -1);
         
         // factor 6
         Assert.assertTrue(xml.indexOf("<rule name=\"TACpoids\">") != -1);
         Assert.assertTrue(xml.indexOf("<rule name=\"TailleMin\">") != -1);
         Assert.assertTrue(xml.indexOf("<param key=\"rule.0.parameter.propSurvie\">42.0</param>") != -1);
         Assert.assertTrue(xml.indexOf("<param key=\"rule.0.parameter.species\">fr.ifremer.isisfish.entities.Species#1169028645830#0.022262364425031378</param>") != -1);
-
-        if (log.isDebugEnabled()) {
-            log.debug("testFactorGroupAndRule xml = " + xml);
-        }
     }
     
     /**
@@ -381,7 +384,6 @@
         if (log.isDebugEnabled()) {
             log.debug("xml 1 = " + xml1);
         }
-        System.out.println(xml1);
         
         // export
         File testFile = new File("src/test/resources/mexico/mexicohelper_factorgroupdp.xml");
@@ -412,16 +414,16 @@
         // test xml export
         String xml = MexicoHelper.getDesignPlanAsXML(testDesignPlan);
 
+        if (log.isDebugEnabled()) {
+            log.debug("testFactorRuleParams xml = " + xml);
+        }
+
         // factor groups
         Assert.assertTrue(xml.indexOf("type=\"string\"") != -1);
         
         // factor 8
-        Assert.assertTrue(xml.indexOf("<value>Strategy:PelProfil1</value>") != -1);
-        Assert.assertTrue(xml.indexOf("<value>Strategy:PelProfil2</value>") != -1);
-
-        if (log.isDebugEnabled()) {
-            log.debug("testFactorRuleParams xml = " + xml);
-        }
+        Assert.assertTrue(xml.indexOf("<level>Strategy:PelProfil1</level>") != -1);
+        Assert.assertTrue(xml.indexOf("<level>Strategy:PelProfil2</level>") != -1);
     }
 
     /**
@@ -454,7 +456,7 @@
         Factor factorMatrixContinuous = new Factor("factor x4");
         ContinuousDomain domain4 = new ContinuousDomain(Distribution.QUNIFMM);
         domain4.addDistributionParam("min", matrix1);
-        domain4.addDistributionParam("min", matrix1);
+        domain4.addDistributionParam("max", matrix1);
         factorMatrixContinuous.setDomain(domain4);
         factorMatrixContinuous.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength");
 
@@ -507,8 +509,9 @@
 
         testDesignPlan.addFactor(factorEquationDiscrete);
 
+        Date date = new Date();
         // test write
-        String content = MexicoHelper.getDesignPlanAsXML(testDesignPlan);
+        String content = MexicoHelper.getDesignPlanAsXML(testDesignPlan, "date", date.toString());
         Assert.assertTrue(content.contains("context.getValue() < 1.0"));
 
         File tempFile = File.createTempFile("testdesignplan", ".xml");
@@ -517,7 +520,7 @@
 
         // test to read it and get content
         DesignPlan plan = MexicoHelper.getDesignPlanFromXML(tempFile, null);
-        String reReadContent = MexicoHelper.getDesignPlanAsXML(plan);
+        String reReadContent = MexicoHelper.getDesignPlanAsXML(plan, "date", date.toString());
         
         Assert.assertEquals(content, reReadContent);
     }
@@ -533,9 +536,11 @@
     @Test
     public void testExportImportV2() throws IOException, IsisFishException, TopiaException {
 
+        Date date = new Date();
+
         // first export
         DesignPlan testDesignPlan = getTestDesignPlan(false, false);
-        String xml1 = MexicoHelper.getDesignPlanAsXML(testDesignPlan);
+        String xml1 = MexicoHelper.getDesignPlanAsXML(testDesignPlan, "date", date.toString());
         if (log.isDebugEnabled()) {
             log.debug("xml 1 = " + xml1);
         }
@@ -544,7 +549,7 @@
         File testFile = new File("src/test/resources/mexico/mexicohelper_designplanV2.xml");
         // topia context can be null in tests
         DesignPlan plan = MexicoHelper.getDesignPlanFromXML(testFile, regionContext);
-        String xml2 = MexicoHelper.getDesignPlanAsXML(plan);
+        String xml2 = MexicoHelper.getDesignPlanAsXML(plan, "date", date.toString());
         if (log.isDebugEnabled()) {
             log.debug("xml 2 = " + xml2);
         }

Modified: branches/4.0.1/src/test/resources/mexico/mexicohelper_designplan.xml
===================================================================
--- branches/4.0.1/src/test/resources/mexico/mexicohelper_designplan.xml	2012-03-19 16:39:55 UTC (rev 3662)
+++ branches/4.0.1/src/test/resources/mexico/mexicohelper_designplan.xml	2012-03-19 17:45:36 UTC (rev 3663)
@@ -93,7 +93,7 @@
         <fixed cardinality="0">
           <range max="1.0" min="0.0"/>
           <coefficient operator="-" value="0.1"/>
-          <equation reference="45.0" variable="L1"/>
+          <equation reference="45.0" variable="Ktemp"/>
         </fixed>
       </domain>
     </factor>

Modified: branches/4.0.1/src/test/resources/mexico/mexicohelper_designplanV2.xml
===================================================================
--- branches/4.0.1/src/test/resources/mexico/mexicohelper_designplanV2.xml	2012-03-19 16:39:55 UTC (rev 3662)
+++ branches/4.0.1/src/test/resources/mexico/mexicohelper_designplanV2.xml	2012-03-19 17:45:36 UTC (rev 3663)
@@ -92,7 +92,7 @@
     <factor name="factor 5 (EquationContinuous)" property="equationcontinuous" type="real" cardinality="0">
       <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#maxLength</target>
       <domain>
-        <fixed variable="L1">
+        <fixed variable="Ktemp">
           <reference coefficient="0.1">45.0</reference>
         </fixed>
       </domain>

Modified: branches/4.0.1/src/test/resources/mexico/mexicohelper_factorgroupdp.xml
===================================================================
--- branches/4.0.1/src/test/resources/mexico/mexicohelper_factorgroupdp.xml	2012-03-19 16:39:55 UTC (rev 3662)
+++ branches/4.0.1/src/test/resources/mexico/mexicohelper_factorgroupdp.xml	2012-03-19 17:45:36 UTC (rev 3663)
@@ -67,7 +67,7 @@
       <factor name="factor 5 (EquationContinuous)" property="equationcontinuous" type="real" cardinality="0">
         <target>fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#maxLength</target>
         <domain>
-          <fixed variable="L1">
+          <fixed variable="Ktemp">
             <reference coefficient="0.1">45.0</reference>
           </fixed>
         </domain>

    

r3663 - in branches/4.0.1/src: main/java/fr/ifremer/isisfish/mexico/xml test/java/fr/ifremer/isisfish/mexico test/resources/mexico

echatellier＠users.forge.codelutin.com

tags

participants (1)