Index: lutinmatrix/src/java/org/codelutin/math/matrix/AbstractMatrixND.java diff -u lutinmatrix/src/java/org/codelutin/math/matrix/AbstractMatrixND.java:1.7 lutinmatrix/src/java/org/codelutin/math/matrix/AbstractMatrixND.java:1.8 --- lutinmatrix/src/java/org/codelutin/math/matrix/AbstractMatrixND.java:1.7 Fri Jan 13 16:55:30 2006 +++ lutinmatrix/src/java/org/codelutin/math/matrix/AbstractMatrixND.java Mon Jan 23 13:50:05 2006 @@ -23,9 +23,9 @@ * Created: 29 oct. 2004 * * @author Benjamin Poussin - * @version $Revision: 1.7 $ + * @version $Revision: 1.8 $ * - * Mise a jour: $Date: 2006/01/13 16:55:30 $ + * Mise a jour: $Date: 2006/01/23 13:50:05 $ * par : $Author: bpoussin $ */ @@ -46,13 +46,13 @@ abstract public double getValue(int [] coordinates); abstract public void setValue(int [] coordinates, double d); - protected DimensionHelper dimHelper = new DimensionHelper(); + transient protected DimensionHelper dimHelper = new DimensionHelper(); - protected MatrixFactory factory = null; - protected int [] dim = null; - protected List[] semantics = null; + transient protected MatrixFactory factory = null; protected String name = ""; protected String [] dimNames = null; + protected int [] dim = null; + protected List[] semantics = null; protected double defaultValue = 0; protected void init(int [] dim){ Index: lutinmatrix/src/java/org/codelutin/math/matrix/FloatBigVector.java diff -u lutinmatrix/src/java/org/codelutin/math/matrix/FloatBigVector.java:1.1 lutinmatrix/src/java/org/codelutin/math/matrix/FloatBigVector.java:1.2 --- lutinmatrix/src/java/org/codelutin/math/matrix/FloatBigVector.java:1.1 Fri Oct 21 14:27:23 2005 +++ lutinmatrix/src/java/org/codelutin/math/matrix/FloatBigVector.java Mon Jan 23 13:50:05 2006 @@ -23,23 +23,18 @@ * Created: 6 octobre 2005 02:54:36 CEST * * @author Benjamin POUSSIN - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Last update: $Date: 2005/10/21 14:27:23 $ + * Last update: $Date: 2006/01/23 13:50:05 $ * by : $Author: bpoussin $ */ package org.codelutin.math.matrix; import java.util.Arrays; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; public class FloatBigVector implements Vector { // FloatBigVector - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(FloatBigVector.class); - protected float data[] = null; public FloatBigVector(int capacity){ Index: lutinmatrix/src/java/org/codelutin/math/matrix/FloatVector.java diff -u lutinmatrix/src/java/org/codelutin/math/matrix/FloatVector.java:1.1 lutinmatrix/src/java/org/codelutin/math/matrix/FloatVector.java:1.2 --- lutinmatrix/src/java/org/codelutin/math/matrix/FloatVector.java:1.1 Fri Oct 21 14:27:23 2005 +++ lutinmatrix/src/java/org/codelutin/math/matrix/FloatVector.java Mon Jan 23 13:50:05 2006 @@ -23,18 +23,17 @@ * Created: 6 octobre 2005 01:29:23 CEST * * @author Benjamin POUSSIN - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Last update: $Date: 2005/10/21 14:27:23 $ + * Last update: $Date: 2006/01/23 13:50:05 $ * by : $Author: bpoussin $ */ package org.codelutin.math.matrix; import java.util.Arrays; + import org.apache.commons.collections.primitives.ArrayFloatList; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * Permet de stocker des données à une position lineair et de la redemander @@ -45,9 +44,6 @@ */ public class FloatVector implements Vector { // FloatVector - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(FloatVector.class); - /** maximum number of element, maximum pos value */ protected int capacity = 0; Index: lutinmatrix/src/java/org/codelutin/math/matrix/MatrixDecoder.java diff -u lutinmatrix/src/java/org/codelutin/math/matrix/MatrixDecoder.java:1.1.1.1 lutinmatrix/src/java/org/codelutin/math/matrix/MatrixDecoder.java:1.2 --- lutinmatrix/src/java/org/codelutin/math/matrix/MatrixDecoder.java:1.1.1.1 Tue Nov 2 16:25:31 2004 +++ lutinmatrix/src/java/org/codelutin/math/matrix/MatrixDecoder.java Mon Jan 23 13:50:05 2006 @@ -23,9 +23,9 @@ * Created: 21 oct. 2004 * * @author Benjamin Poussin - * @version $Revision: 1.1.1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/11/02 16:25:31 $ + * Mise a jour: $Date: 2006/01/23 13:50:05 $ * par : $Author: bpoussin $ */ @@ -93,7 +93,7 @@ } // creation du resultat - MatrixND result = new MatrixNDImpl(dims); + MatrixND result = MatrixFactory.getInstance().create(dims); // recuperation de la valeur par defaut de la matrice String defaultValueString = root.attributeValue("defaultValue"); Index: lutinmatrix/src/java/org/codelutin/math/matrix/MatrixException.java diff -u lutinmatrix/src/java/org/codelutin/math/matrix/MatrixException.java:1.1.1.1 lutinmatrix/src/java/org/codelutin/math/matrix/MatrixException.java:1.2 --- lutinmatrix/src/java/org/codelutin/math/matrix/MatrixException.java:1.1.1.1 Tue Nov 2 16:25:31 2004 +++ lutinmatrix/src/java/org/codelutin/math/matrix/MatrixException.java Mon Jan 23 13:50:05 2006 @@ -24,9 +24,9 @@ * Created: Tue Jun 29 11:46:39 1999 * * @author -* @version $Revision: 1.1.1.1 $ +* @version $Revision: 1.2 $ * -* Mise a jour: $Date: 2004/11/02 16:25:31 $ +* Mise a jour: $Date: 2006/01/23 13:50:05 $ * par : $Author: bpoussin $ */ @@ -34,6 +34,9 @@ public class MatrixException extends RuntimeException { + /** */ + private static final long serialVersionUID = 1917420713781767581L; + public MatrixException(String s) { super(s); } Index: lutinmatrix/src/java/org/codelutin/math/matrix/MatrixHelper.java diff -u lutinmatrix/src/java/org/codelutin/math/matrix/MatrixHelper.java:1.7 lutinmatrix/src/java/org/codelutin/math/matrix/MatrixHelper.java:1.8 --- lutinmatrix/src/java/org/codelutin/math/matrix/MatrixHelper.java:1.7 Fri Jan 13 16:55:30 2006 +++ lutinmatrix/src/java/org/codelutin/math/matrix/MatrixHelper.java Mon Jan 23 13:50:05 2006 @@ -23,17 +23,14 @@ * Created: 28 oct. 2004 * * @author Benjamin Poussin - * @version $Revision: 1.7 $ + * @version $Revision: 1.8 $ * - * Mise a jour: $Date: 2006/01/13 16:55:30 $ + * Mise a jour: $Date: 2006/01/23 13:50:05 $ * par : $Author: bpoussin $ */ package org.codelutin.math.matrix; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.io.IOException; import java.io.StreamTokenizer; import java.io.StringReader; @@ -41,10 +38,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Stack; -import java.util.logging.Level; -import java.util.logging.Logger; import java.util.NoSuchElementException; +import java.util.Stack; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.codelutin.xml.XMLEncoderDecoder; public class MatrixHelper { Index: lutinmatrix/src/java/org/codelutin/math/matrix/MatrixND.java diff -u lutinmatrix/src/java/org/codelutin/math/matrix/MatrixND.java:1.6 lutinmatrix/src/java/org/codelutin/math/matrix/MatrixND.java:1.7 --- lutinmatrix/src/java/org/codelutin/math/matrix/MatrixND.java:1.6 Fri Jan 13 16:55:30 2006 +++ lutinmatrix/src/java/org/codelutin/math/matrix/MatrixND.java Mon Jan 23 13:50:05 2006 @@ -23,17 +23,18 @@ * Created: 29 oct. 2004 * * @author Benjamin Poussin -* @version $Revision: 1.6 $ +* @version $Revision: 1.7 $ * -* Mise a jour: $Date: 2006/01/13 16:55:30 $ +* Mise a jour: $Date: 2006/01/23 13:50:05 $ * par : $Author: bpoussin $ */ package org.codelutin.math.matrix; +import java.io.Serializable; import java.util.List; -public interface MatrixND { // MatrixND +public interface MatrixND extends Serializable, Cloneable { // MatrixND /** * Retourne la factory qui a permit de creer la matrice Index: lutinmatrix/src/java/org/codelutin/math/matrix/MatrixNDImpl.java diff -u lutinmatrix/src/java/org/codelutin/math/matrix/MatrixNDImpl.java:1.5 lutinmatrix/src/java/org/codelutin/math/matrix/MatrixNDImpl.java:1.6 --- lutinmatrix/src/java/org/codelutin/math/matrix/MatrixNDImpl.java:1.5 Thu Oct 20 20:58:04 2005 +++ lutinmatrix/src/java/org/codelutin/math/matrix/MatrixNDImpl.java Mon Jan 23 13:50:05 2006 @@ -23,9 +23,9 @@ * Created: 29 oct. 2004 * * @author Benjamin Poussin -* @version $Revision: 1.5 $ +* @version $Revision: 1.6 $ * -* Mise a jour: $Date: 2005/10/20 20:58:04 $ +* Mise a jour: $Date: 2006/01/23 13:50:05 $ * par : $Author: bpoussin $ */ @@ -36,6 +36,9 @@ public class MatrixNDImpl extends AbstractMatrixND { // MatrixNDImpl + /** */ + private static final long serialVersionUID = 1L; + protected BasicMatrix matrix = null; protected MatrixNDImpl(MatrixFactory factory, int [] dim){ Index: lutinmatrix/src/java/org/codelutin/math/matrix/MatrixNDXMLConverter.java diff -u lutinmatrix/src/java/org/codelutin/math/matrix/MatrixNDXMLConverter.java:1.1 lutinmatrix/src/java/org/codelutin/math/matrix/MatrixNDXMLConverter.java:1.2 --- lutinmatrix/src/java/org/codelutin/math/matrix/MatrixNDXMLConverter.java:1.1 Thu Oct 27 12:28:10 2005 +++ lutinmatrix/src/java/org/codelutin/math/matrix/MatrixNDXMLConverter.java Mon Jan 23 13:50:05 2006 @@ -23,9 +23,9 @@ * Created: 27 octobre 2005 00:40:56 CEST * * @author Benjamin POUSSIN - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Last update: $Date: 2005/10/27 12:28:10 $ + * Last update: $Date: 2006/01/23 13:50:05 $ * by : $Author: bpoussin $ */ @@ -35,8 +35,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; + import org.codelutin.util.ArrayUtil; import org.codelutin.util.FormatConverter; import org.codelutin.util.FormatConverterFactory; @@ -56,9 +55,6 @@ private static final String VERSION = "1"; - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(MatrixNDXMLConverter.class); - public String getVersion() { return VERSION; } Index: lutinmatrix/src/java/org/codelutin/math/matrix/SubMatrix.java diff -u lutinmatrix/src/java/org/codelutin/math/matrix/SubMatrix.java:1.5 lutinmatrix/src/java/org/codelutin/math/matrix/SubMatrix.java:1.6 --- lutinmatrix/src/java/org/codelutin/math/matrix/SubMatrix.java:1.5 Thu Oct 20 20:58:04 2005 +++ lutinmatrix/src/java/org/codelutin/math/matrix/SubMatrix.java Mon Jan 23 13:50:05 2006 @@ -23,14 +23,15 @@ * Created: 29 oct. 2004 * * @author Benjamin Poussin - * @version $Revision: 1.5 $ + * @version $Revision: 1.6 $ * - * Mise a jour: $Date: 2005/10/20 20:58:04 $ + * Mise a jour: $Date: 2006/01/23 13:50:05 $ * par : $Author: bpoussin $ */ package org.codelutin.math.matrix; +import java.io.Serializable; import java.util.Arrays; import java.util.LinkedList; import java.util.List; @@ -43,6 +44,9 @@ */ public class SubMatrix extends AbstractMatrixND { // SubMatrix + /** */ + private static final long serialVersionUID = 1L; + protected MatrixND matrix = null; protected DimensionConverter converter = null; @@ -140,7 +144,7 @@ * Permet de faire une conversion de la dimension demandé dans la sous * matrice avec la position reel de la matrice sous jacente. */ - protected interface DimensionConverter { + protected interface DimensionConverter extends Serializable { public int [] convertCoordinates(int [] coordinates); } @@ -148,6 +152,9 @@ * La conversion est juste un decalage d'indice */ protected class ShiftConverter implements DimensionConverter { + /** */ + private static final long serialVersionUID = 1L; + protected int dim; protected int start; protected int nb; @@ -172,6 +179,9 @@ * La conversion est le mapping d'un element vers un autre element */ protected class MappingConverter implements DimensionConverter { + /** */ + private static final long serialVersionUID = 1L; + protected int dim; protected int [] elem = null; public MappingConverter(int dim, int [] elem){