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

r374 - branches/nuiton-matrix-2.1.x
by tchemit＠users.nuiton.org 07 Jun '11

07 Jun '11

Author: tchemit Date: 2011-06-07 22:09:10 +0200 (Tue, 07 Jun 2011) New Revision: 374 Url: http://nuiton.org/repositories/revision/nuiton-matrix/374 Log: Update mavenpom4redmineAndCentral to 2.5.5. Modified: branches/nuiton-matrix-2.1.x/pom.xml Modified: branches/nuiton-matrix-2.1.x/pom.xml =================================================================== --- branches/nuiton-matrix-2.1.x/pom.xml 2011-06-07 20:09:06 UTC (rev 373) +++ branches/nuiton-matrix-2.1.x/pom.xml 2011-06-07 20:09:10 UTC (rev 374) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.4</version> + <version>2.5.5</version> </parent> <artifactId>nuiton-matrix</artifactId>

1 0

r373 - trunk
by tchemit＠users.nuiton.org 07 Jun '11

07 Jun '11

Author: tchemit Date: 2011-06-07 22:09:06 +0200 (Tue, 07 Jun 2011) New Revision: 373 Url: http://nuiton.org/repositories/revision/nuiton-matrix/373 Log: Update mavenpom4redmineAndCentral to 2.5.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-01 08:53:33 UTC (rev 372) +++ trunk/pom.xml 2011-06-07 20:09:06 UTC (rev 373) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.4</version> + <version>2.5.5</version> </parent> <artifactId>matrix</artifactId>

1 0

r372 - in trunk/src/site: . rst
by echatellier＠users.nuiton.org 01 Jun '11

01 Jun '11

Author: echatellier Date: 2011-06-01 10:53:33 +0200 (Wed, 01 Jun 2011) New Revision: 372 Url: http://nuiton.org/repositories/revision/nuiton-matrix/372 Log: Update site Added: trunk/src/site/rst/importexport.rst Removed: trunk/src/site/rst/Todo.rst Modified: trunk/src/site/rst/Serializable.rst trunk/src/site/rst/gui-matrixpanelviewer.rst trunk/src/site/site_fr.xml Modified: trunk/src/site/rst/Serializable.rst =================================================================== --- trunk/src/site/rst/Serializable.rst 2011-06-01 08:52:36 UTC (rev 371) +++ trunk/src/site/rst/Serializable.rst 2011-06-01 08:53:33 UTC (rev 372) @@ -44,6 +44,7 @@ Dans MatrixNDImpl et SubMatrix ecriture + - matrixVersionUID (long) - nom (String) - defaultValue (double) @@ -53,10 +54,12 @@ pour MatrixNDImpl ecriture + - matrix (BasicMatrix) pour SubMatrix ecriture + - matrix (MatrixND) - converter (DimensionConverter) @@ -66,8 +69,11 @@ Dans MatrixNDImpl et SubMatrix lecture + - matrixVersionUID + La suite de la lecture peut-etre conditionné a la valeur de matrixVersionUID + - nom - defaultValue (double) - dimensions (int[]) @@ -76,15 +82,17 @@ pour MatrixNDImpl lecture + - matrix (BasicMatrix) pour SubMatrix lecture + - matrix (MatrixND) - converter (DimensionConverter) -... +- ... -Il faut ensuite recrer une factory, un dimHelper. +Il faut ensuite recreer une factory, un dimHelper. La factory est recreer en fonction du type de Vector utilisé (FloatVector, FloatBigVector, ...). Deleted: trunk/src/site/rst/Todo.rst =================================================================== --- trunk/src/site/rst/Todo.rst 2011-06-01 08:52:36 UTC (rev 371) +++ trunk/src/site/rst/Todo.rst 2011-06-01 08:53:33 UTC (rev 372) @@ -1,34 +0,0 @@ -.. - -.. * #%L -.. * NuitonMatrix -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2004 - 2010 CodeLutin -.. * %% -.. * This program is free software: you can redistribute it and/or modify -.. * it under the terms of the GNU Lesser General Public License as -.. * published by the Free Software Foundation, either version 3 of the -.. * License, or (at your option) any later version. -.. * -.. * This program is distributed in the hope that it will be useful, -.. * but WITHOUT ANY WARRANTY; without even the implied warranty of -.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.. * GNU General Lesser Public License for more details. -.. * -.. * You should have received a copy of the GNU General Lesser Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. -.. * #L% -.. - -==== -Todo -==== - -Voici la liste des tâches qui reste à faire. Si quelqu'un souhaite aider, ou -a une idée à proposer il ne faut pas hésiter. - -- La documentation utilisateur -- La documentation développeur - Modified: trunk/src/site/rst/gui-matrixpanelviewer.rst =================================================================== --- trunk/src/site/rst/gui-matrixpanelviewer.rst 2011-06-01 08:52:36 UTC (rev 371) +++ trunk/src/site/rst/gui-matrixpanelviewer.rst 2011-06-01 08:53:33 UTC (rev 372) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * Nuiton Matrix +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2011 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 +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - MatrixPanelViewer component =========================== Added: trunk/src/site/rst/importexport.rst =================================================================== --- trunk/src/site/rst/importexport.rst (rev 0) +++ trunk/src/site/rst/importexport.rst 2011-06-01 08:53:33 UTC (rev 372) @@ -0,0 +1,71 @@ +.. - +.. * #%L +.. * Nuiton Matrix +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2011 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 +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - +Matrix CSV Import/Export +======================== + +Nuiton-matrix supports 2 format to import/export matrix as string representation +in CSV file : + +- one and two dimensional matrix +- n dimensional matrix + +API +--- + +To use matrix import/export method use following API: + + - MatrixND#importCSV(Reader reader, int[] position) + - MatrixND#exportCSV(Writer writer, boolean withSemantics) + + +one and two dimensional matrix +------------------------------ + +One and two dimensional CSV file is a basic CSV file containing all +values separated by ';' character. + +For example :: + + 10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;10000.0; + 10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; + 10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; + 10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; + 10000.0;10000.0;2000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; + 10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; + 10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; + 10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; + 10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; + 10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;10000.0; + +With semantics +~~~~~~~~~~~~~~ + + +Without semantics +~~~~~~~~~~~~~~~~~ + +n dimensional matrix +-------------------- + Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2011-06-01 08:52:36 UTC (rev 371) +++ trunk/src/site/site_fr.xml 2011-06-01 08:53:33 UTC (rev 372) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2004 - 2010 CodeLutin + Copyright (C) 2004 - 2011 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 @@ -45,25 +45,17 @@ <menu name="Utilisateur"> <item href="index.html" name="Accueil"/> - <item href="gui-matrixpanelviewer.png" name="Matrix panel viewer"/> + <item href="usage.html" name="Usage" /> + <item href="importexport.html" name="Import/Export" /> + <item href="gui-matrixpanelviewer.html" name="Matrix panel viewer"/> </menu> <menu name="Développeur"> <item name="Serializable" href="Serializable.html"/> - <item name="Todo" href="Todo.html"/> </menu> - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> +  - <menu ref="modules"/> - <menu ref="reports"/> </body>

1 0

r371 - in trunk/nuiton-matrix/src: main/java/org/nuiton/math/matrix test/java/org/nuiton/math/matrix test/resources
by echatellier＠users.nuiton.org 01 Jun '11

01 Jun '11

Author: echatellier Date: 2011-06-01 10:52:36 +0200 (Wed, 01 Jun 2011) New Revision: 371 Url: http://nuiton.org/repositories/revision/nuiton-matrix/371 Log: Add new method to import from file and set matrix name automatically Added: trunk/nuiton-matrix/src/test/resources/matrix2dtest.csv trunk/nuiton-matrix/src/test/resources/matrix2dtest2 Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixND.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 2011-06-01 08:40:32 UTC (rev 370) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2011-06-01 08:52:36 UTC (rev 371) @@ -25,6 +25,9 @@ package org.nuiton.math.matrix; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; import java.io.IOException; import java.io.Reader; import java.io.Writer; @@ -37,12 +40,14 @@ import org.apache.commons.collections.primitives.ArrayIntList; import org.apache.commons.collections.primitives.IntList; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.math.NumberUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ArrayUtil; +import org.nuiton.util.FileUtil; /** * Abstract matrix class with all dimension and semantics support (but @@ -1186,6 +1191,42 @@ } /** + * Import depuis un reader au format CSV des données dans la matrice. + * + * @param reader le reader à importer + * @param origin le point à partir duquel il faut faire l'importation + * @param matrixName le nom de la matrice + * @throws IOException + */ + public void importCSV(Reader reader, int[] origin, String matrixName) throws IOException { + importCSV(reader, origin); + setName(matrixName); + } + + /** + * Import depuis un reader au format CSV des données dans la matrice. + * + * Call {importCSV(Reader, int[], String)} with file name as matrix name. + * + * @param file file to read + * @param origin le point à partir duquel il faut faire l'importation + * @throws IOException + */ + public void importCSV(File file, int[] origin) throws IOException { + Reader reader = null; + try { + reader = new BufferedReader(new FileReader(file)); + String matrixName = file.getName(); + if (matrixName.lastIndexOf('.') != -1) { // remove extension + matrixName = matrixName.substring(0, matrixName.lastIndexOf('.')); + } + importCSV(reader, origin, matrixName); + } finally { + IOUtils.closeQuietly(reader); + } + } + + /** * Import CSV file defined in Matrix ND format. * * @param reader reader containing content Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixND.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixND.java 2011-06-01 08:40:32 UTC (rev 370) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixND.java 2011-06-01 08:52:36 UTC (rev 371) @@ -25,6 +25,7 @@ package org.nuiton.math.matrix; +import java.io.File; import java.io.IOException; import java.io.Reader; import java.io.Serializable; @@ -869,13 +870,34 @@ public boolean isSupportedCSV(); /** - * Import depuis un reader au format CSV des données dans la matrice + * Import depuis un reader au format CSV des données dans la matrice. * * @param reader le reader à importer * @param origin le point à partir duquel il faut faire l'importation * @throws IOException */ public void importCSV(Reader reader, int[] origin) throws IOException; + + /** + * Import depuis un reader au format CSV des données dans la matrice. + * + * @param reader le reader à importer + * @param origin le point à partir duquel il faut faire l'importation + * @param matrixName le nom de la matrice + * @throws IOException + */ + public void importCSV(Reader reader, int[] origin, String matrixName) throws IOException; + + /** + * Import depuis un reader au format CSV des données dans la matrice. + * + * Call {importCSV(Reader, int[], String)} with file name as matrix name. + * + * @param file file to read + * @param origin le point à partir duquel il faut faire l'importation + * @throws IOException + */ + public void importCSV(File file, int[] origin) throws IOException; /** * Export dans un writer au format CSV de la matrice 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 2011-06-01 08:40:32 UTC (rev 370) +++ trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java 2011-06-01 08:52:36 UTC (rev 371) @@ -25,12 +25,14 @@ package org.nuiton.math.matrix; +import java.io.File; import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; import java.util.Arrays; import java.util.List; +import org.apache.commons.lang.StringUtils; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -337,4 +339,22 @@ MatrixND m = MatrixFactory.getInstance().create(new int[]{2, 2, 2}); m.importCSV(new StringReader(matrix3D), null); } + + /** + * Test l'import depuis un {@link File}. + * + * @throws IOException + */ + @Test + public void testImportMatrixFromFile() throws IOException { + MatrixND m = MatrixFactory.getInstance().create(new int[]{5, 6}); + + File testFile = new File(StringUtils.replace("src/test/resources/matrix2dtest.csv", "/", File.separator)); + m.importCSV(testFile, new int[] {0, 0}); + Assert.assertEquals("matrix2dtest", m.getName()); + + testFile = new File(StringUtils.replace("src/test/resources/matrix2dtest2", "/", File.separator)); + m.importCSV(testFile, new int[] {0, 0}); + Assert.assertEquals("matrix2dtest2", m.getName()); + } } Added: trunk/nuiton-matrix/src/test/resources/matrix2dtest.csv =================================================================== --- trunk/nuiton-matrix/src/test/resources/matrix2dtest.csv (rev 0) +++ trunk/nuiton-matrix/src/test/resources/matrix2dtest.csv 2011-06-01 08:52:36 UTC (rev 371) @@ -0,0 +1,10 @@ +10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;10000.0; +10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; +10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; +10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; +10000.0;10000.0;2000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; +10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; +10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; +10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; +10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; +10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;10000.0; Added: trunk/nuiton-matrix/src/test/resources/matrix2dtest2 =================================================================== --- trunk/nuiton-matrix/src/test/resources/matrix2dtest2 (rev 0) +++ trunk/nuiton-matrix/src/test/resources/matrix2dtest2 2011-06-01 08:52:36 UTC (rev 371) @@ -0,0 +1,10 @@ +10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;10000.0; +10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; +10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; +10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; +10000.0;10000.0;2000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; +10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; +10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; +10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; +10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;0.0; +10000.0;10000.0;10000.0;5000.0;10000.0;10000.0;10000.0;10000.0;10000.0;

1 0

r370 - trunk
by echatellier＠users.nuiton.org 01 Jun '11

01 Jun '11

Author: echatellier Date: 2011-06-01 10:40:32 +0200 (Wed, 01 Jun 2011) New Revision: 370 Url: http://nuiton.org/repositories/revision/nuiton-matrix/370 Log: Fix url Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-30 16:27:57 UTC (rev 369) +++ trunk/pom.xml 2011-06-01 08:40:32 UTC (rev 370) @@ -145,6 +145,6 @@ <developerConnection> scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-matrix/trunk</url> + <url>http://www.nuiton.org/projects/nuiton-matrix/repository/show/trunk</url> </scm> </project>

1 0