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

r457 - in trunk: . nuiton-matrix nuiton-matrix-gui
by maven-release＠users.nuiton.org 14 Sep '12

14 Sep '12

Author: maven-release Date: 2012-09-14 15:39:26 +0200 (Fri, 14 Sep 2012) New Revision: 457 Url: http://nuiton.org/repositories/revision/nuiton-matrix/457 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-09-14 13:39:25 UTC (rev 456) +++ trunk/nuiton-matrix/pom.xml 2012-09-14 13:39:26 UTC (rev 457) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml 2012-09-14 13:39:25 UTC (rev 456) +++ trunk/nuiton-matrix-gui/pom.xml 2012-09-14 13:39:26 UTC (rev 457) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-14 13:39:25 UTC (rev 456) +++ trunk/pom.xml 2012-09-14 13:39:26 UTC (rev 457) @@ -14,7 +14,7 @@ </parent> <artifactId>matrix</artifactId> - <version>2.3.2</version> + <version>2.3.3-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.2 + 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.2 + 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

r456 - in tags: . nuiton-matrix-2.3.2
by maven-release＠users.nuiton.org 14 Sep '12

14 Sep '12

Author: maven-release Date: 2012-09-14 15:39:25 +0200 (Fri, 14 Sep 2012) New Revision: 456 Url: http://nuiton.org/repositories/revision/nuiton-matrix/456 Log: [maven-release-plugin] copy for tag nuiton-matrix-2.3.2 Added: tags/nuiton-matrix-2.3.2/ Property changes on: tags/nuiton-matrix-2.3.2 ___________________________________________________________________ Added: svn:ignore + target .settings .classpath .project *.ipr *.iml bin Added: svn:mergeinfo +

1 0

r455 - in trunk: . nuiton-matrix nuiton-matrix-gui
by maven-release＠users.nuiton.org 14 Sep '12

14 Sep '12

Author: maven-release Date: 2012-09-14 15:39:23 +0200 (Fri, 14 Sep 2012) New Revision: 455 Url: http://nuiton.org/repositories/revision/nuiton-matrix/455 Log: [maven-release-plugin] prepare release nuiton-matrix-2.3.2 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-09-14 13:38:09 UTC (rev 454) +++ trunk/nuiton-matrix/pom.xml 2012-09-14 13:39:23 UTC (rev 455) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.3.2-SNAPSHOT</version> + <version>2.3.2</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml 2012-09-14 13:38:09 UTC (rev 454) +++ trunk/nuiton-matrix-gui/pom.xml 2012-09-14 13:39:23 UTC (rev 455) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.3.2-SNAPSHOT</version> + <version>2.3.2</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-14 13:38:09 UTC (rev 454) +++ trunk/pom.xml 2012-09-14 13:39:23 UTC (rev 455) @@ -14,7 +14,7 @@ </parent> <artifactId>matrix</artifactId> - <version>2.3.2-SNAPSHOT</version> + <version>2.3.2</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.2 </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.2 </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

r454 - trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix
by echatellier＠users.nuiton.org 14 Sep '12

14 Sep '12

Author: echatellier Date: 2012-09-14 15:38:09 +0200 (Fri, 14 Sep 2012) New Revision: 454 Url: http://nuiton.org/repositories/revision/nuiton-matrix/454 Log: Add missing headers Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixSemanticsDecorator.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/SemanticsDecorator.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixSemanticsDecorator.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixSemanticsDecorator.java 2012-09-13 21:31:30 UTC (rev 453) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixSemanticsDecorator.java 2012-09-14 13:38:09 UTC (rev 454) @@ -1,6 +1,29 @@ +/* + * #%L + * NuitonMatrix :: Nuiton-matrix + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 CodeLutin, Poussin Benjamin + * %% + * 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% + */ + package org.nuiton.math.matrix; - import java.io.File; import java.io.IOException; import java.io.Reader; Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/SemanticsDecorator.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/SemanticsDecorator.java 2012-09-13 21:31:30 UTC (rev 453) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/SemanticsDecorator.java 2012-09-14 13:38:09 UTC (rev 454) @@ -1,3 +1,27 @@ +/* + * #%L + * NuitonMatrix :: Nuiton-matrix + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 CodeLutin, Poussin Benjamin + * %% + * 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% + */ + package org.nuiton.math.matrix; /**

1 0

r453 - trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix
by bpoussin＠users.nuiton.org 13 Sep '12

13 Sep '12

Author: bpoussin Date: 2012-09-13 23:31:30 +0200 (Thu, 13 Sep 2012) New Revision: 453 Url: http://nuiton.org/repositories/revision/nuiton-matrix/453 Log: get semantics cree maintenant a chaque appel un nouveau tableau pour evite les modifications externe. Mais pour les utilisations interne cela est trop couteux, on accede donc directement a la variable (pour eviter la copie) Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.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-09-13 21:29:26 UTC (rev 452) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2012-09-13 21:31:30 UTC (rev 453) @@ -392,8 +392,8 @@ @Override public void setValue(Object[] coordinates, double d) { - setValue( - MatrixHelper.semanticsToDimension(getSemantics(), coordinates), + setValue( // on accede directement a semantics (pas de get) pour eviter la creation d'un tableau + MatrixHelper.semanticsToDimension(semantics, coordinates), d); }

1 0

r452 - trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix
by bpoussin＠users.nuiton.org 13 Sep '12

13 Sep '12

Author: bpoussin Date: 2012-09-13 23:29:26 +0200 (Thu, 13 Sep 2012) New Revision: 452 Url: http://nuiton.org/repositories/revision/nuiton-matrix/452 Log: Possibilite d'associete une factory specifique au thread courant Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java 2012-09-07 23:15:28 UTC (rev 451) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java 2012-09-13 21:29:26 UTC (rev 452) @@ -50,6 +50,10 @@ protected static SemanticMapper defaultSemanticMapper = new SemanticMapper(); + private static ThreadLocal<MatrixFactory> matrixFactoryThreadLocal = + new ThreadLocal<MatrixFactory>(); + + protected MatrixFactory(Class<?> vectorClass) { this.vectorClass = vectorClass; } @@ -82,14 +86,36 @@ } /** - * Utilise par defaut {@link FloatBigVector}. + * Utilise par defaut {@link #defaultVectorClass}. Si une factory a ete + * initialisee pour le thread local, alors celle-ci sera reutilise, sinon + * une nouvelle est cree avec le backend par defaut * * @return factory */ public static MatrixFactory getInstance() { - return getInstance(defaultVectorClass); + MatrixFactory result = matrixFactoryThreadLocal.get(); + if (result == null) { + result = getInstance(defaultVectorClass); + } + return result; } + /** + * Initialise une factory pour le thread courant avec le vectorClass passe + * en parametre. + * @param vectorClass + */ + public static void initMatrixFactoryThreadLocal(Class<?> vectorClass) { + matrixFactoryThreadLocal.set(getInstance(vectorClass)); + } + + /** + * Retire la factory pour le thread courant + */ + public static void removeMatrixFactoryThreadLocal() { + matrixFactoryThreadLocal.remove(); + } + public MatrixND create(int[] dim) { return new MatrixNDImpl(this, dim); }

1 0

r451 - trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix
by bpoussin＠users.nuiton.org 07 Sep '12

07 Sep '12

Author: bpoussin Date: 2012-09-08 01:15:28 +0200 (Sat, 08 Sep 2012) New Revision: 451 Url: http://nuiton.org/repositories/revision/nuiton-matrix/451 Log: un fichier check de nullite avec une action sur le fichier, c'est mieux :) Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleBigMappedVector.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleBigMappedVector.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleBigMappedVector.java 2012-09-07 17:48:11 UTC (rev 450) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleBigMappedVector.java 2012-09-07 23:15:28 UTC (rev 451) @@ -56,7 +56,9 @@ @Override protected void finalize() throws Throwable { super.finalize(); - file.delete(); + if (file != null) { + file.delete(); + } } /**

1 0

r450 - trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix
by bpoussin＠users.nuiton.org 07 Sep '12

07 Sep '12

Author: bpoussin Date: 2012-09-07 19:48:11 +0200 (Fri, 07 Sep 2012) New Revision: 450 Url: http://nuiton.org/repositories/revision/nuiton-matrix/450 Log: ajout de mise ne garde sur l'implantation des fonctions Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MapFunction.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/Vector.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MapFunction.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MapFunction.java 2012-09-07 17:45:50 UTC (rev 449) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MapFunction.java 2012-09-07 17:48:11 UTC (rev 450) @@ -29,6 +29,11 @@ * Permet de faire un traitement sur des valeurs et d'en retourner * des nouvelles. * + * ATTENTION une function ne doit pas converser d'etat interne qui + * modifierait son comportement a chaque execution, sinon cette methode + * ne fonctionne pas, car pour les Vector implanter a base de Map + * la fonction n'est appliqué qu'au defaultValue et au valeur deja existante + * * Created: 27 oct. 2004 * * @author Benjamin Poussin <poussin(a)codelutin.com> Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/Vector.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/Vector.java 2012-09-07 17:45:50 UTC (rev 449) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/Vector.java 2012-09-07 17:48:11 UTC (rev 450) @@ -107,6 +107,11 @@ /** * applique a chaque valeur du vector la {@link MapFunction}. * + * ATTENTION cette function ne doit pas converser d'etat interne qui + * modifierait son comportement a chaque execution, sinon cette methode + * ne fonctionne pas, car pour les Vector implanter a base de Map + * la fonction n'est appliqué qu'au defaultValue et au valeur deja existante + * * @param f funtion to apply */ public void map(MapFunction f);

1 0

r449 - trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix
by bpoussin＠users.nuiton.org 07 Sep '12

07 Sep '12

Author: bpoussin Date: 2012-09-07 19:45:50 +0200 (Fri, 07 Sep 2012) New Revision: 449 Url: http://nuiton.org/repositories/revision/nuiton-matrix/449 Log: supprimer d'import non uitilise Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java 2012-09-07 17:45:20 UTC (rev 448) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java 2012-09-07 17:45:50 UTC (rev 449) @@ -25,7 +25,6 @@ package org.nuiton.math.matrix; -import java.io.RandomAccessFile; import java.lang.reflect.Constructor; import java.util.List;

1 0

r448 - trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix
by bpoussin＠users.nuiton.org 07 Sep '12

07 Sep '12

Author: bpoussin Date: 2012-09-07 19:45:20 +0200 (Fri, 07 Sep 2012) New Revision: 448 Url: http://nuiton.org/repositories/revision/nuiton-matrix/448 Log: surcharge du toString pour appeler celui de la matrice decorer Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixSemanticsDecorator.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixSemanticsDecorator.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixSemanticsDecorator.java 2012-09-02 22:58:25 UTC (rev 447) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixSemanticsDecorator.java 2012-09-07 17:45:20 UTC (rev 448) @@ -50,6 +50,11 @@ } @Override + public String toString() { + return matrix.toString(); + } + + @Override public MatrixFactory getFactory() { return matrix.getFactory(); }

1 0