- Nuiton-matrix-commits - mailman.cloud.codelutin.com

r438 - in trunk: . nuiton-matrix nuiton-matrix-gui
by maven-release＠users.nuiton.org Aug. 27, 2012

Aug. 27, 2012

Author: maven-release Date: 2012-08-27 20:33:51 +0200 (Mon, 27 Aug 2012) New Revision: 438 Url: http://nuiton.org/repositories/revision/nuiton-matrix/438 Log: [maven-release-plugin] prepare release nuiton-matrix-2.3.1 Modified: trunk/nuiton-matrix-gui/pom.xml trunk/nuiton-matrix/pom.xml trunk/pom.xml Modified: trunk/nuiton-matrix/pom.xml =================================================================== --- trunk/nuiton-matrix/pom.xml 2012-08-25 06:34:12 UTC (rev 437) +++ trunk/nuiton-matrix/pom.xml 2012-08-27 18:33:51 UTC (rev 438) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.3.1-SNAPSHOT</version> + <version>2.3.1</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml 2012-08-25 06:34:12 UTC (rev 437) +++ trunk/nuiton-matrix-gui/pom.xml 2012-08-27 18:33:51 UTC (rev 438) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.3.1-SNAPSHOT</version> + <version>2.3.1</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-25 06:34:12 UTC (rev 437) +++ trunk/pom.xml 2012-08-27 18:33:51 UTC (rev 438) @@ -14,7 +14,7 @@ </parent> <artifactId>matrix</artifactId> - <version>2.3.1-SNAPSHOT</version> + <version>2.3.1</version> <modules> <module>nuiton-matrix</module> @@ -139,12 +139,12 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/tags/nuiton-matrix-2.3.1 </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/tags/nuiton-matrix-2.3.1 </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-matrix/repository/show/trunk</url> + <url>http://www.nuiton.org/projects/nuiton-matrix/repository/show/tags/nuiton-ma…</url> </scm> <distributionManagement>

1 0

r437 - trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix
by echatellier＠users.nuiton.org Aug. 25, 2012

Aug. 25, 2012

Author: echatellier Date: 2012-08-25 08:34:12 +0200 (Sat, 25 Aug 2012) New Revision: 437 Url: http://nuiton.org/repositories/revision/nuiton-matrix/437 Log: Imporve equals code (for performances reason) Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleVector.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixNDImpl.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2012-08-14 18:55:09 UTC (rev 436) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2012-08-25 06:34:12 UTC (rev 437) @@ -445,37 +445,44 @@ } public boolean equals(MatrixND mat) { + boolean result = true; - // le nom doit être le même - result = result && getName().equals(mat.getName()); - - result = result && equalsValues(mat); - - // les sémantiques doivent-être identique - for (int i = 0; result && i < getDimCount(); i++) { - String dimName1 = getDimensionName(i); - String dimName2 = mat.getDimensionName(i); - result = ObjectUtils.equals(dimName1, dimName2); - if (log.isTraceEnabled()) { - log.trace("dimName1(" + dimName1 + ")==dimName2(" + dimName2 - + ")=" + result); + + if (mat != this) { + // le nom doit être le même + result = result && getName().equals(mat.getName()); + + result = result && equalsValues(mat); + + if (result) { + // les sémantiques doivent-être identique + for (int i = 0; result && i < getDimCount(); i++) { + String dimName1 = getDimensionName(i); + String dimName2 = mat.getDimensionName(i); + result = ObjectUtils.equals(dimName1, dimName2); + if (log.isTraceEnabled()) { + log.trace("dimName1(" + dimName1 + ")==dimName2(" + dimName2 + + ")=" + result); + } + // System.out.println("dimName1("+dimName1+")==dimName2("+dimName2+ + // ")="+result); + + List<?> sem1 = getSemantic(i); + List<?> sem2 = mat.getSemantic(i); + result = result && ObjectUtils.equals(sem1, sem2); + if (log.isTraceEnabled()) { + log.trace("sem1(" + sem1 + ")==sem2(" + sem2 + ")=" + result); + } + // System.out.println("sem1("+sem1+")==sem1("+sem2+ ")="+result); + } } - // System.out.println("dimName1("+dimName1+")==dimName2("+dimName2+ - // ")="+result); - - List<?> sem1 = getSemantic(i); - List<?> sem2 = mat.getSemantic(i); - result = result && ObjectUtils.equals(sem1, sem2); + if (log.isTraceEnabled()) { - log.trace("sem1(" + sem1 + ")==sem2(" + sem2 + ")=" + result); + log.trace("result=" + result); } - // System.out.println("sem1("+sem1+")==sem1("+sem2+ ")="+result); + // System.out.println("result="+result); } - if (log.isTraceEnabled()) { - log.trace("result=" + result); - } - // System.out.println("result="+result); return result; } @@ -492,13 +499,15 @@ // les dimensions doivent-être identique result = result && MatrixHelper.sameDimension(getDim(), mat.getDim()); - // toutes les données doivent être identique - for (MatrixIterator i = mat.iterator(); result && i.next();) { - double v1 = i.getValue(); - double v2 = getValue(i.getCoordinates()); - result = v1 == v2; - if (log.isTraceEnabled()) { - log.trace("v1(" + v1 + ")==v2(" + v2 + ")=" + result); + if (result) { + // toutes les données doivent être identique + for (MatrixIterator i = mat.iterator(); result && i.next();) { + double v1 = i.getValue(); + double v2 = getValue(i.getCoordinates()); + result = v1 == v2; + if (log.isTraceEnabled()) { + log.trace("v1(" + v1 + ")==v2(" + v2 + ")=" + result); + } } } Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleVector.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleVector.java 2012-08-14 18:55:09 UTC (rev 436) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleVector.java 2012-08-25 06:34:12 UTC (rev 437) @@ -183,11 +183,12 @@ @Override public boolean equals(Object o) { boolean result = false; - if (o instanceof DoubleVector) { + if (o instanceof DoubleVector && defaultValue == ((DoubleVector)o).defaultValue) { DoubleVector other = (DoubleVector) o; result = Arrays.equals(this.position, other.position) && data.equals(other.data); - } else if (o instanceof Vector) { + } else + if (o instanceof Vector) { Vector other = (Vector) o; result = true; for (int i = 0; i < size() && result; i++) { Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixNDImpl.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixNDImpl.java 2012-08-14 18:55:09 UTC (rev 436) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixNDImpl.java 2012-08-25 06:34:12 UTC (rev 437) @@ -87,6 +87,17 @@ } @Override + public boolean equalsValues(MatrixND mat) { + boolean result; + if (mat instanceof MatrixNDImpl) { + result = matrix.equals(((MatrixNDImpl)mat).matrix); + } else { + result = super.equalsValues(mat); + } + return result; + } + + @Override public MatrixIterator iterator() { return new MatrixIteratorImpl(matrix.iterator(), getSemantics()); }

1 0

r436 - trunk
by tchemit＠users.nuiton.org Aug. 14, 2012

Aug. 14, 2012

Author: tchemit Date: 2012-08-14 20:55:09 +0200 (Tue, 14 Aug 2012) New Revision: 436 Url: http://nuiton.org/repositories/revision/nuiton-matrix/436 Log: Update mavenpom4redmineAndCentral to 3.3.6. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 14:40:09 UTC (rev 435) +++ trunk/pom.xml 2012-08-14 18:55:09 UTC (rev 436) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.5</version> + <version>3.3.6</version> </parent> <artifactId>matrix</artifactId>

1 0

r435 - in trunk: . nuiton-matrix nuiton-matrix-gui
by maven-release＠users.nuiton.org Aug. 10, 2012

Aug. 10, 2012

Author: maven-release Date: 2012-08-10 16:40:09 +0200 (Fri, 10 Aug 2012) New Revision: 435 Url: http://nuiton.org/repositories/revision/nuiton-matrix/435 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-matrix-gui/pom.xml trunk/nuiton-matrix/pom.xml trunk/pom.xml Modified: trunk/nuiton-matrix/pom.xml =================================================================== --- trunk/nuiton-matrix/pom.xml 2012-08-10 14:40:07 UTC (rev 434) +++ trunk/nuiton-matrix/pom.xml 2012-08-10 14:40:09 UTC (rev 435) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.3</version> + <version>2.3.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml 2012-08-10 14:40:07 UTC (rev 434) +++ trunk/nuiton-matrix-gui/pom.xml 2012-08-10 14:40:09 UTC (rev 435) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.3</version> + <version>2.3.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 14:40:07 UTC (rev 434) +++ trunk/pom.xml 2012-08-10 14:40:09 UTC (rev 435) @@ -14,7 +14,7 @@ </parent> <artifactId>matrix</artifactId> - <version>2.3</version> + <version>2.3.1-SNAPSHOT</version> <modules> <module>nuiton-matrix</module> @@ -139,12 +139,12 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/tags/nuiton-matrix-2.3 + scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/tags/nuiton-matrix-2.3 + scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-matrix/repository/show/tags/nuiton-ma…</url> + <url>http://www.nuiton.org/projects/nuiton-matrix/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r434 - in tags: . nuiton-matrix-2.3
by maven-release＠users.nuiton.org Aug. 10, 2012

Aug. 10, 2012

Author: maven-release Date: 2012-08-10 16:40:07 +0200 (Fri, 10 Aug 2012) New Revision: 434 Url: http://nuiton.org/repositories/revision/nuiton-matrix/434 Log: [maven-release-plugin] copy for tag nuiton-matrix-2.3 Added: tags/nuiton-matrix-2.3/ Property changes on: tags/nuiton-matrix-2.3 ___________________________________________________________________ Added: svn:ignore + target .settings .classpath .project *.ipr *.iml bin Added: svn:mergeinfo +

1 0

r433 - in trunk: . nuiton-matrix nuiton-matrix-gui
by maven-release＠users.nuiton.org Aug. 10, 2012

Aug. 10, 2012

Author: maven-release Date: 2012-08-10 16:40:04 +0200 (Fri, 10 Aug 2012) New Revision: 433 Url: http://nuiton.org/repositories/revision/nuiton-matrix/433 Log: [maven-release-plugin] prepare release nuiton-matrix-2.3 Modified: trunk/nuiton-matrix-gui/pom.xml trunk/nuiton-matrix/pom.xml trunk/pom.xml Modified: trunk/nuiton-matrix/pom.xml =================================================================== --- trunk/nuiton-matrix/pom.xml 2012-08-10 13:10:22 UTC (rev 432) +++ trunk/nuiton-matrix/pom.xml 2012-08-10 14:40:04 UTC (rev 433) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml 2012-08-10 13:10:22 UTC (rev 432) +++ trunk/nuiton-matrix-gui/pom.xml 2012-08-10 14:40:04 UTC (rev 433) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 13:10:22 UTC (rev 432) +++ trunk/pom.xml 2012-08-10 14:40:04 UTC (rev 433) @@ -14,7 +14,7 @@ </parent> <artifactId>matrix</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> <modules> <module>nuiton-matrix</module> @@ -139,12 +139,12 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/tags/nuiton-matrix-2.3 </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/tags/nuiton-matrix-2.3 </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-matrix/repository/show/trunk</url> + <url>http://www.nuiton.org/projects/nuiton-matrix/repository/show/tags/nuiton-ma…</url> </scm> <distributionManagement>

1 0

r432 - trunk
by echatellier＠users.nuiton.org Aug. 10, 2012

Aug. 10, 2012

Author: echatellier Date: 2012-08-10 15:10:22 +0200 (Fri, 10 Aug 2012) New Revision: 432 Url: http://nuiton.org/repositories/revision/nuiton-matrix/432 Log: Update libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 13:07:07 UTC (rev 431) +++ trunk/pom.xml 2012-08-10 13:10:22 UTC (rev 432) @@ -98,8 +98,8 @@ <projectId>nuiton-matrix</projectId> - <jaxxVersion>2.5.3</jaxxVersion> - <nuitonUtilsVersion>2.5.2</nuitonUtilsVersion> + <jaxxVersion>2.5.4</jaxxVersion> + <nuitonUtilsVersion>2.5.3</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> </properties>

1 0

r431 - trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix
by echatellier＠users.nuiton.org Aug. 10, 2012

Aug. 10, 2012

Author: echatellier Date: 2012-08-10 15:07:07 +0200 (Fri, 10 Aug 2012) New Revision: 431 Url: http://nuiton.org/repositories/revision/nuiton-matrix/431 Log: Fix test Modified: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java Modified: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java =================================================================== --- trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java 2012-08-10 12:57:11 UTC (rev 430) +++ trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java 2012-08-10 13:07:07 UTC (rev 431) @@ -218,7 +218,7 @@ * @throws IOException */ @Test - public void testMatrix2DImport() throws IOException { + public void testMatrix3DImport() throws IOException { String matrix3D = "[2, 2, 2]\n" + "java.lang.String:2009,2010\n" + @@ -230,16 +230,21 @@ "1;0;0;-4.0E-7\n" + "1;0;1;2.0\n" + "1;1;0;4.0\n" + - "1;1;1;42.0"; + "1;1;1;42.0\n"; - MatrixND m = MatrixFactory.getInstance().create(new int[]{2, 2, 2}); + MatrixND m = MatrixFactory.getInstance().create(new List[]{ + Arrays.asList("2009", "2010"), + Arrays.asList("Nantes", "Lille"), + Arrays.asList("Informatique", "Administration") + }); m.importCSV(new StringReader(matrix3D), null); + // dim Assert.assertArrayEquals(new int[]{2, 2, 2}, m.getDim()); // default value Assert.assertEquals(0.0, m.getValue(0, 1, 0), 0.0001); // some test - Assert.assertEquals(-4.0e-7, m.getValue(1, 0, 0), 0.0001); + Assert.assertEquals(-4.0e-7, m.getValue(1, 0, 0), 1e-8); Assert.assertEquals(42, m.getValue(1, 1, 1), 0.0001); } @@ -277,7 +282,7 @@ * @throws IOException */ @Test(expected=MatrixException.class) - public void testMatrix2DImportSemError() throws IOException { + public void testMatrix3DImportSemError() throws IOException { String matrix3D = "[2, 2, 2] , 3.14159265 \n" + "java.lang.String:2009,2010\n" + @@ -302,7 +307,7 @@ * @throws IOException */ @Test - public void testMatrix2DImportReader() throws IOException { + public void testMatrix3DImportReader() throws IOException { String matrix3D = "[2, 2, 2] , 3.14159265 \n" + "java.lang.String:2009,2010\n" + @@ -329,7 +334,7 @@ * @throws IOException */ @Test(expected=MatrixException.class) - public void testMatrix2DImportSemError2() throws IOException { + public void testMatrix3DImportSemError2() throws IOException { String matrix3D = "[2, 2, 2]\n" + "java.lang.String:2009,2010\n" + @@ -354,7 +359,7 @@ * @throws IOException */ @Test(expected=MatrixException.class) - public void testMatrix2DImportSemError3() throws IOException { + public void testMatrix3DImportSemError3() throws IOException { String matrix3D = "[2, 2, 2] , 3.14159265 \n" + "0;0;0;0.0\n" +

1 0

r430 - in trunk/nuiton-matrix/src: main/java/org/nuiton/math/matrix test/java/org/nuiton/math/matrix test/resources
by echatellier＠users.nuiton.org Aug. 10, 2012

Aug. 10, 2012

Author: echatellier Date: 2012-08-10 14:57:11 +0200 (Fri, 10 Aug 2012) New Revision: 430 Url: http://nuiton.org/repositories/revision/nuiton-matrix/430 Log: fixes #2245 : ImportND must paste import content using semantics Added: trunk/nuiton-matrix/src/test/resources/testimportcrlf.csv Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixHelper.java trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2012-08-09 08:34:07 UTC (rev 429) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2012-08-10 12:57:11 UTC (rev 430) @@ -926,8 +926,8 @@ public MatrixND reduceDims(int... dims) { Arrays.sort(dims); // tableau permettant de faire la correspondance entre les dimensions - // de la matrice actuelle et les dimentsions de la nouvelle matrice - // l'element i du tableau qui correcpond à la dimensions i de la + // de la matrice actuelle et les dimensions de la nouvelle matrice + // l'element i du tableau qui correspond à la dimension i de la // nouvelle matrice contient la dimension equivalente dans // la matrice actuelle int[] correspondance = new int[getDimCount()]; @@ -956,8 +956,8 @@ @Override public MatrixND reduce(int minNbDim) { // tableau permettant de faire la correspondance entre les dimensions - // de la matrice actuelle et les dimentsions de la nouvelle matrice - // l'element i du tableau qui correcpond à la dimensions i de la + // de la matrice actuelle et les dimensions de la nouvelle matrice + // l'element i du tableau qui correspond à la dimension i de la // nouvelle matrice contient la dimension equivalente dans // la matrice actuelle int[] correspondance = new int[getDimCount()]; @@ -1273,10 +1273,10 @@ // read defaut value while ((c = reader.read()) != -1) { - if (c == ',' || c == ' ') { + if (c == ',' || c == ' ' || c == '\r') { // skip } - else if (c == '\n' || c == '\r') { + else if (c == '\n') { break; } else { @@ -1339,7 +1339,7 @@ } while (c != -1); // finally paste loaded matrix into this - paste(matrix); + pasteSemantics(matrix); } /** Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixHelper.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixHelper.java 2012-08-09 08:34:07 UTC (rev 429) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixHelper.java 2012-08-10 12:57:11 UTC (rev 430) @@ -410,8 +410,8 @@ } public static MatrixDimensionIndex valueOf(int i) { - if(i >= 0 && i <= MatrixDimensionIndexCache.high) { - return MatrixDimensionIndexCache.cache[i + 128]; + if (i >= 0 && i <= MatrixDimensionIndexCache.high) { + return MatrixDimensionIndexCache.cache[i]; } else { return new MatrixDimensionIndex(i); Modified: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java =================================================================== --- trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java 2012-08-09 08:34:07 UTC (rev 429) +++ trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java 2012-08-10 12:57:11 UTC (rev 430) @@ -40,7 +40,6 @@ import org.junit.Test; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.ClassPathI18nInitializer; -import org.nuiton.util.FileUtil; /** * Test de l'import et export CSV. @@ -387,4 +386,18 @@ m.importCSV(testFile, new int[] {0, 0}); Assert.assertEquals("matrix2dtest2", m.getName()); } + + /** + * Test l'import depuis un {@link File} windows. + * + * @throws IOException + */ + @Test + public void testImportMatrixFromFileCrlf() throws IOException { + MatrixND m = MatrixFactory.getInstance().create(new int[]{1,65,12}); + + File testFile = new File(StringUtils.replace("src/test/resources/testimportcrlf.csv", "/", File.separator)); + m.importCSV(testFile, new int[] {0, 0, 0}); + Assert.assertEquals("testimportcrlf", m.getName()); + } } Added: trunk/nuiton-matrix/src/test/resources/testimportcrlf.csv =================================================================== --- trunk/nuiton-matrix/src/test/resources/testimportcrlf.csv (rev 0) +++ trunk/nuiton-matrix/src/test/resources/testimportcrlf.csv 2012-08-10 12:57:11 UTC (rev 430) @@ -0,0 +1,12 @@ +[1,4,12] +java.lang.String:HakeLargeGuilvinec +java.lang.String:group1, group2, group3, group4 +java.lang.String:0,1,2,3,4,5,6,7,8,9,10,11 +0;0;0;1 +0;1;0;1 +0;2;0;1 +0;3;0;1 +0;0;1;1 +0;1;1;1 +0;2;1;1 +0;3;1;1

1 0

r429 - trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer
by echatellier＠users.nuiton.org Aug. 9, 2012

Aug. 9, 2012

Author: echatellier Date: 2012-08-09 10:34:07 +0200 (Thu, 09 Aug 2012) New Revision: 429 Url: http://nuiton.org/repositories/revision/nuiton-matrix/429 Log: fixes : #2243 Add option to initialize selected values in dimension and default displayed graph Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java 2012-08-07 14:24:28 UTC (rev 428) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java 2012-08-09 08:34:07 UTC (rev 429) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2012 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -34,8 +34,10 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; +import java.util.Enumeration; import java.util.List; +import javax.swing.AbstractButton; import javax.swing.ButtonGroup; import javax.swing.ButtonModel; import javax.swing.DefaultListModel; @@ -46,6 +48,7 @@ import javax.swing.JToggleButton; import javax.swing.JToggleButton.ToggleButtonModel; +import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; @@ -78,7 +81,7 @@ setLayout(new GridLayout(0, 1)); subPanelList = new ArrayList<MatrixDimensionPanel.SubDimensionPanel>(); matrixDimentionActions = new ArrayList<MatrixDimensionAction>(); - + // default sum all action matrixDimentionActions.add(new SumAllAction()); } @@ -209,9 +212,20 @@ } // semantic list + //MatrixDimensionFilter filter = matrixDimensionFilters.get(index); semList = new JList(); - SemanticListModel semModel = new SemanticListModel(semantic); + List<?> dimSemantic = semantic; + /*if (filter != null) { + dimSemantic = filter.filterSemantic(dimSemantic); + }*/ + SemanticListModel semModel = new SemanticListModel(dimSemantic); semList.setModel(semModel); + /*if (filter != null) { + ListCellRenderer renderer = filter.getListCellRenderer(); + if (renderer != null) { + semList.setCellRenderer(renderer); + } + }*/ add(new JScrollPane(semList), new GridBagConstraints(0, 1, 1 + nbActionAdded, 1, 1, 1, GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(0, 0, 5, 0), 0, 0)); } @@ -372,4 +386,43 @@ return result; } + + /** + * Autoselect some dimensions values and some dimensions + * action. And perform rendering. + * + * @param dimSelectedValues selected values in each dimensions + * @param selectedActions selected actions in each dimensions + */ + public void initRenderering(List[] dimSelectedValues, + int[] selectedActions) { + + // values selection + for (int dimIndex = 0; dimIndex < dimSelectedValues.length; dimIndex++) { + List selectedValues = dimSelectedValues[dimIndex]; + if (selectedValues != null) { + SubDimensionPanel panel = subPanelList.get(dimIndex); + panel.semList.clearSelection(); + for (Object value : selectedValues) { + int index = panel.semantic.indexOf(value); + panel.semList.addSelectionInterval(index, index); + } + } + } + + // action selection + for (int dimIndex = 0; dimIndex < selectedActions.length; dimIndex++) { + int actionIndices = selectedActions[dimIndex]; + SubDimensionPanel panel = subPanelList.get(dimIndex); + int buttonIndex = 0; + Enumeration<AbstractButton> buttons = panel.buttonGroup.getElements(); + while (buttons.hasMoreElements()) { + AbstractButton button = buttons.nextElement(); + if (actionIndices == buttonIndex) { + button.setSelected(true); + } + buttonIndex++; + } + } + } } Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java 2012-08-07 14:24:28 UTC (rev 428) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java 2012-08-09 08:34:07 UTC (rev 429) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2012 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -300,27 +300,29 @@ String actionCommand = e.getActionCommand(); if ("render".equals(actionCommand)) { - // get matrix to display filtered - MatrixND matrix = dimensionPanel.getModifiedMatrix(matrixFilters); + performRendering(); + } else { + // clic on render button + updateSelectedRenderingComponent(); + } + } - // matrice superieur a 2 dimensions non geree!! - if (matrix.getDimCount() > 2) { - JOptionPane.showMessageDialog(this, _("nuitonmatrix.viewer.matrix.more.2d"), - _("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); + protected void performRendering() { + // get matrix to display filtered + MatrixND matrix = dimensionPanel.getModifiedMatrix(matrixFilters); + + // matrice superieur a 2 dimensions non geree!! + if (matrix.getDimCount() > 2) { + JOptionPane.showMessageDialog(this, _("nuitonmatrix.viewer.matrix.more.2d"), + _("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); + } else { + // get all display component for each renderer + componentForRenderers.clear(); + for (MatrixRenderer matrixRenderer : matrixRenderers.keySet()) { + Component component = matrixRenderer.getComponent(matrix); + componentForRenderers.put(matrixRenderer, component); } - else { - // get all display component for each renderer - componentForRenderers.clear(); - for (MatrixRenderer matrixRenderer : matrixRenderers.keySet()) { - Component component = matrixRenderer.getComponent(matrix); - componentForRenderers.put(matrixRenderer, component); - } - - updateSelectedRenderingComponent(); - } - } - else { - // clic on render button + updateSelectedRenderingComponent(); } } @@ -475,8 +477,7 @@ renderingComponentContainer.add(component, BorderLayout.CENTER); } } - } - else { + } else { // if enables default rendering if (matrixRenderers.get(matrixRenderer)) { Component component = matrixRenderer.getComponent(null); @@ -489,4 +490,20 @@ renderingComponentContainer.validate(); renderingComponentContainer.repaint(); } + + /** + * Init renderering by autoselecting some dimensions values and some dimensions + * action. And perform rendering. + * + * @param dimSelectedValues selected values in each dimensions + * @param selectedActions selected action in each dimensions + * @throws IllegalArgumentException if matrix has not been set + */ + public void initRenderering(List[] dimSelectedValues, int[] selectedActions) { + if (this.matrix == null) { + throw new IllegalArgumentException("Must set matrix first"); + } + dimensionPanel.initRenderering(dimSelectedValues, selectedActions); + iconPanel.performRendering(); + } }

1 0