Author: chatellier Date: 2010-01-13 15:51:55 +0000 (Wed, 13 Jan 2010) New Revision: 2911 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java Log: Udpate doc, step attribute not used Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2010-01-13 15:18:13 UTC (rev 2910) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2010-01-13 15:51:55 UTC (rev 2911) @@ -298,7 +298,7 @@ * * Format is : * <pre> - * <mx step="0" name="une matrice"> + * <mx name="une matrice"> * <dimension name="classe" size="2"> * <label>jeune</label> * <label>vieux</label> @@ -340,17 +340,17 @@ for (Element labelElement : labelElements) { String content = labelElement.getText(); Object value = null; - + if (content != null) { content = content.trim(); - + Pattern matrixPattern = Pattern.compile("^(.*)\\((.*\\))$"); Matcher matcher = matrixPattern.matcher(content); - + if (matcher.find()) { String objectType = matcher.group(1); String objectString = matcher.group(2); - + if (log.isDebugEnabled()) { log.debug("Looking for object : " + objectType + ":" + objectString); } @@ -379,11 +379,11 @@ } semantics.add(semantic); } - + MatrixND result = MatrixFactory.getInstance().create(name, semantics.toArray(new List<?>[semantics.size()]), dimNames.toArray(new String[dimNames.size()])); - + MatrixIterator iterator = result.iterator(); // TODO it's d for double here, can be int... List<Element> values = mxElement.elements("d"); @@ -393,7 +393,7 @@ double doubleValue = Double.parseDouble(text); iterator.setValue(doubleValue); } - + return result; } 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 2010-01-13 15:18:13 UTC (rev 2910) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2010-01-13 15:51:55 UTC (rev 2911) @@ -149,7 +149,7 @@ // factor 4 Assert.assertTrue(xml.indexOf("<d>-14.0</d>") != -1); Assert.assertTrue(xml.indexOf("0.799") != -1); - Assert.assertTrue(xml.indexOf("<mx name=\"test1\" step=\"0\">") != -1); + Assert.assertTrue(xml.indexOf("<mx name=\"test1\">") != -1); // factor 5 Assert.assertTrue(xml.indexOf("reference=\"45.0\" variable=\"L1\"") != -1);