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="modules"/> - <menu ref="reports"/> </body>