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

r289 - in trunk/src: main/java/org/nuiton/math/matrix test/java/org/nuiton/math/matrix
by echatellier＠users.nuiton.org 25 Nov '10

25 Nov '10

Author: echatellier Date: 2010-11-25 10:20:22 +0100 (Thu, 25 Nov 2010) New Revision: 289 Url: http://nuiton.org/repositories/revision/nuiton-matrix/289 Log: #1093 : Add new function to reduce matrix with mean over dimension Modified: trunk/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java trunk/src/main/java/org/nuiton/math/matrix/MatrixND.java trunk/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java Modified: trunk/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2010-11-21 14:30:41 UTC (rev 288) +++ trunk/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2010-11-25 09:20:22 UTC (rev 289) @@ -666,8 +666,56 @@ return result; } + + @Override + public double meanAll() { + double sum = 0; + double number = 0; + for (MatrixIterator i = iterator(); i.next();) { + sum += i.getValue(); + number++; + } + double result = sum / number; + return result; + } @Override + public MatrixND meanOverDim(int dim) { + return meanOverDim(dim, getDim(dim)); + } + + @Override + public MatrixND meanOverDim(int dim, int step) { + if (step < 0) { + step = getDim(dim); + } else if (step <= 1) { + // il n'y a rien a faire, on fait une copie et on la retrourne + return getFactory().create(this); + } + + // le nombre d'element qu'il y aura dans la dim pour le resultat + int nbDim = getDim(dim) / step; + + List<?>[] semantics = new List<?>[getDimCount()]; + System.arraycopy(getSemantics(), 0, semantics, 0, getDimCount()); + semantics[dim] = semantics[dim].subList(0, nbDim); + + // creation du resultat + MatrixND result = getFactory().create(getName(), semantics, + getDimensionNames()); + + for (int i = 0; i < result.getDim(dim); i++) { + MatrixND temp = getSubMatrix(dim, i * step, step); + MatrixND sum = result.getSubMatrix(dim, i, 1); + for (int s = 0; s < temp.getDim(dim); s++) { + sum.add(temp.getSubMatrix(dim, s, 1)); + } + sum.divs(temp.getDim(dim)); // mean specifics + } + return result; + } + + @Override public MatrixND cut(int dim, int[] toCut) { throw new UnsupportedOperationException("Méthode non implantée"); } Modified: trunk/src/main/java/org/nuiton/math/matrix/MatrixND.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/MatrixND.java 2010-11-21 14:30:41 UTC (rev 288) +++ trunk/src/main/java/org/nuiton/math/matrix/MatrixND.java 2010-11-25 09:20:22 UTC (rev 289) @@ -440,8 +440,78 @@ public MatrixND sumOverDim(int dim, int step); public MatrixND sumOverDim(int dim, int start, int nb); + + /** + * Return all matrix data mean value + * + * @return mean value + */ + public double meanAll(); /** + * Effectue la moyenne des valeurs sur une dimension donnée. La matrice + * résultat à le même nombre de dimension, pas la dimension moyenisée, ne + * contient qu'une ligne. + * <p> + * par exemple pour la matrice suivante si on fait la moyenne sur la + * dimension 1 cela donnera + * + * <pre> + * 1 2 3 + * 8 9 4 + * 7 6 5 + * </pre> + * + * <pre> + * 5.33 4.66 4 + * </pre> + * + * @param dim la dimension sur lequel il faut faire la moyenne + * @return new matrix + */ + public MatrixND meanOverDim(int dim); + + /** + * Effectue la moyenne des valeurs sur une dimension donnée. la moyenne + * permet juste de regrouper dans une dimension un certain nombre de valeur. + * <p> + * pour la matrice suivante : + * + * <pre> + * 1 2 3 4 + * 2 3 4 5 + * 3 4 5 6 + * 4 5 6 7 + * </pre> + * + * la moyenne sur la dimension 1 avec un pas de 2 donnera : + * + * <pre> + * 1.5 3.5 4.5 4.5 + * 4.5 4.5 5.5 6.5 + * </pre> + * + * c'est à dire que sur la ligne 0 et la ligne 1 on fait la moyenne. ainsi + * que la ligne 2 avec la ligne 3. + * + * @param dim la dimension sur lequel il faut faire les sommes + * @param step le pas qu'il faut utiliser pour regrouper les elements. Si le + * pas est inférieur à 0, le pas se comporte comme si on avait + * passé en argument la taille de la dimension. Un pas de 0 ou 1, + * retourne juste une copie de la matrice actuelle. si la + * division du pas avec la taille de la dimension ne donne pas un + * nombre entier, les elements restants ne sont pas pris en + * compte. Par exemple si la dimension a 10 élements et que l'on + * donne un pas de 3, dans la matrice resultat la dimension aura + * 3 elements qui seront la somme par 3 des 9 premiers element de + * la matrice courante. Le 10eme element sera perdu. + * @return une nouvelle matrice avec le meme nombre de dimension mais dont + * la dimension passé en paramètre aura comme taille, le resultat de + * la division entier de la taille actuelle par le step + */ + public MatrixND meanOverDim(int dim, int step); + + /** * Permet de supprimer des éléments de la matrice. * Par exemple, pour la matrice * @@ -592,7 +662,7 @@ public MatrixND getSubMatrix(int dim, int[] elem); /** - * Addition la matrice courante avec la matrice passe en parametre et ce + * Addition la matrice courante avec la matrice passe en parametre et se * retourne elle meme. * * @param m matrix to add Modified: trunk/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java =================================================================== --- trunk/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java 2010-11-21 14:30:41 UTC (rev 288) +++ trunk/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java 2010-11-25 09:20:22 UTC (rev 289) @@ -322,7 +322,114 @@ Assert.assertEquals(9, mat.getValue(5, 0, 3), 0); } + /** + * Test les fonctions meanOverDim... + * + * La matrice de test est + * 1 2 3 4 + * 5 6 7 8 + * 9 10 11 12 + * 13 14 15 16 + * @throws Exception + */ @Test + public void testMeanOverDim() throws Exception { + + // first test matrix : + // 1 2 3 4 + // 5 6 7 8 + // 9 10 11 12 + // 13 14 15 16 + + MatrixND mat = null; + mat = getFactory().create(new int[] { 4, 4 }); + MatrixND mat2 = mat; + int i = 0; + for (MatrixIterator mi = mat.iterator(); mi.next();) { + mi.setValue(++i); + } + + Assert.assertEquals(mat, mat2); + mat2 = mat.meanOverDim(1, 0); + Assert.assertEquals(mat, mat2); + mat2 = mat.meanOverDim(1, 1); + Assert.assertEquals(mat, mat2); + mat2 = mat.meanOverDim(1, 2); + Assert.assertEquals(2, mat2.getDim(1)); + Assert.assertEquals(1.5, mat2.getValue(0, 0), 0); + Assert.assertEquals(3.5, mat2.getValue(0, 1), 0); + Assert.assertEquals(5.5, mat2.getValue(1, 0), 0); + Assert.assertEquals(7.5, mat2.getValue(1, 1), 0); + Assert.assertEquals(9.5, mat2.getValue(2, 0), 0); + Assert.assertEquals(11.5, mat2.getValue(2, 1), 0); + Assert.assertEquals(13.5, mat2.getValue(3, 0), 0); + Assert.assertEquals(15.5, mat2.getValue(3, 1), 0); + + mat2 = mat.meanOverDim(1, 3); + Assert.assertEquals(1, mat2.getDim(1)); + Assert.assertEquals(2.0, mat2.getValue(0, 0), 0); + Assert.assertEquals(6.0, mat2.getValue(1, 0), 0); + Assert.assertEquals(10.0, mat2.getValue(2, 0), 0); + Assert.assertEquals(14.0, mat2.getValue(3, 0), 0); + + mat2 = mat.meanOverDim(1, 4); + Assert.assertEquals(1, mat2.getDim(1)); + Assert.assertEquals(2.5, mat2.getValue(0, 0), 0); + Assert.assertEquals(6.5, mat2.getValue(1, 0), 0); + Assert.assertEquals(10.5, mat2.getValue(2, 0), 0); + Assert.assertEquals(14.5, mat2.getValue(3, 0), 0); + + // meanAll + double meanAll = mat.meanAll(); + Assert.assertEquals(8.5, meanAll, 0); + + // seconde matrice (en 3 dimension :D) + // 2 3 3 3 3 3 3 3 3 + // 3 3 3 3 3 3 3 3 3 + // 3 3 3 3 3 3 3 3 4 + List<String> s1 = Arrays.asList(new String[] { "a", "b", "c" }); + List<String> s2 = Arrays.asList(new String[] { "e", "f", "g" }); + List<String> s3 = Arrays.asList(new String[] { "k", "l", "m" }); + mat = getFactory().create("Ma mat", new List[] { s1, s2, s3 }, + new String[] { "dim abc", "dim efg", "dim klm" }); + + MatrixHelper.fill(mat, 3); + mat.setValue(0, 0, 0, 2); + mat.setValue(2, 2, 2, 4); + mat = mat.meanOverDim(1); + // donne : + // 2.66 3 3 3 3 3 3 3 3.33 + Assert.assertTrue(MatrixHelper.sameDimension(new int[] { 3, 1, 3 }, mat + .getDim())); + + Assert.assertEquals(2.6666, mat.getValue(0, 0, 0), 0.0001); + Assert.assertEquals(3, mat.getValue(2, 0, 1), 0); + Assert.assertEquals(3.3333, mat.getValue(2, 0, 2), 0.0001); + + mat = getFactory().create(new int[] { 6, 6, 6 }); + + MatrixHelper.fill(mat, 3); + mat.setValue(0, 0, 0, 0); + mat.setValue(0, 1, 0, 1); + mat.setValue(0, 2, 0, 2); + mat.setValue(0, 3, 0, 3); + mat.setValue(0, 4, 0, 4); + mat.setValue(0, 5, 0, 5); + + // meanAll + meanAll = mat.meanAll(); + Assert.assertEquals(2.9861, meanAll, 0.0001); + + mat = mat.meanOverDim(1, 3); + Assert.assertTrue(MatrixHelper.sameDimension(new int[] { 6, 2, 6 }, mat + .getDim())); + Assert.assertEquals(1.0, mat.getValue(0, 0, 0), 0); + Assert.assertEquals(4.0, mat.getValue(0, 1, 0), 0); + Assert.assertEquals(3.0, mat.getValue(1, 1, 5), 0); + Assert.assertEquals(3.0, mat.getValue(5, 0, 3), 0); + } + + @Test public void testTranspose() throws Exception { MatrixND mat = null;

1 0

r288 - branches/nuiton-matrix-2.1.x
by tchemit＠users.nuiton.org 21 Nov '10

21 Nov '10

Author: tchemit Date: 2010-11-21 15:30:41 +0100 (Sun, 21 Nov 2010) New Revision: 288 Url: http://nuiton.org/repositories/revision/nuiton-matrix/288 Log: Update mavenpom4redmineAndCentral to 2.4.1. 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 2010-11-21 14:30:36 UTC (rev 287) +++ branches/nuiton-matrix-2.1.x/pom.xml 2010-11-21 14:30:41 UTC (rev 288) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4</version> + <version>2.4.1</version> </parent> <artifactId>nuiton-matrix</artifactId>

1 0

r287 - trunk
by tchemit＠users.nuiton.org 21 Nov '10

21 Nov '10

Author: tchemit Date: 2010-11-21 15:30:36 +0100 (Sun, 21 Nov 2010) New Revision: 287 Url: http://nuiton.org/repositories/revision/nuiton-matrix/287 Log: Update mavenpom4redmineAndCentral to 2.4.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-16 17:05:57 UTC (rev 286) +++ trunk/pom.xml 2010-11-21 14:30:36 UTC (rev 287) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -11,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4</version> + <version>2.4.1</version> </parent> <artifactId>nuiton-matrix</artifactId>

1 0

r286 - trunk/src/main/java/org/nuiton/math/matrix/gui
by echatellier＠users.nuiton.org 16 Nov '10

16 Nov '10

Author: echatellier Date: 2010-11-16 18:05:57 +0100 (Tue, 16 Nov 2010) New Revision: 286 Url: http://nuiton.org/repositories/revision/nuiton-matrix/286 Log: Change matrix nd cell renderer visibility to public Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java 2010-11-16 17:01:08 UTC (rev 285) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java 2010-11-16 17:05:57 UTC (rev 286) @@ -233,7 +233,7 @@ return renderer; } - class MatrixCellRenderer extends DefaultTableCellRenderer { + public static class MatrixCellRenderer extends DefaultTableCellRenderer { /** serialVersionUID. */ private static final long serialVersionUID = 6537813058357761914L; Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java 2010-11-16 17:01:08 UTC (rev 285) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java 2010-11-16 17:05:57 UTC (rev 286) @@ -324,7 +324,7 @@ return renderer; } - class MatrixCellRenderer extends DefaultTableCellRenderer { + public static class MatrixCellRenderer extends DefaultTableCellRenderer { /** serialVersionUID. */ private static final long serialVersionUID = 6537813058357761914L;

1 0

r285 - trunk/src/main/java/org/nuiton/math/matrix/gui
by echatellier＠users.nuiton.org 16 Nov '10

16 Nov '10

Author: echatellier Date: 2010-11-16 18:01:08 +0100 (Tue, 16 Nov 2010) New Revision: 285 Url: http://nuiton.org/repositories/revision/nuiton-matrix/285 Log: Replace jul by jcl Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java 2010-11-10 15:26:33 UTC (rev 284) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java 2010-11-16 17:01:08 UTC (rev 285) @@ -30,8 +30,6 @@ import java.awt.Color; import java.awt.Component; import java.awt.Font; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.swing.JTable; import javax.swing.UIManager; @@ -41,6 +39,8 @@ import javax.swing.table.JTableHeader; import javax.swing.table.TableCellRenderer; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixException; import org.nuiton.math.matrix.MatrixND; @@ -61,6 +61,8 @@ /** serialVersionUID. */ private static final long serialVersionUID = 983978774901981167L; + private static Log log = LogFactory.getLog(MatrixTableModelND.class); + protected MatrixND m; /** nombre de ligne ajouté */ @@ -286,10 +288,10 @@ m.setValue(coord, val); fireTableDataChanged(); } catch (Exception eee) { - Logger.getLogger(getClass().getName() + ".setValueAt").log( - Level.FINE, - "La nouvelle valeur n'est pas convertible en double: " + if (log.isWarnEnabled()) { + log.warn("Can't convert value as double: " + obj, eee); + } } } }

1 0

r284 - in trunk/src: main/java/org/nuiton/math/matrix test/java/org/nuiton/math/matrix
by echatellier＠users.nuiton.org 10 Nov '10

10 Nov '10

Author: echatellier Date: 2010-11-10 16:26:33 +0100 (Wed, 10 Nov 2010) New Revision: 284 Url: http://nuiton.org/repositories/revision/nuiton-matrix/284 Log: Make getOccurence() deprecated replaced by getOccurrence() Modified: trunk/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java trunk/src/main/java/org/nuiton/math/matrix/BasicMatrix.java trunk/src/main/java/org/nuiton/math/matrix/DoubleBigVector.java trunk/src/main/java/org/nuiton/math/matrix/DoubleVector.java trunk/src/main/java/org/nuiton/math/matrix/FloatBigVector.java trunk/src/main/java/org/nuiton/math/matrix/FloatVector.java trunk/src/main/java/org/nuiton/math/matrix/MatrixEncoder.java trunk/src/main/java/org/nuiton/math/matrix/MatrixHelper.java trunk/src/main/java/org/nuiton/math/matrix/MatrixND.java trunk/src/main/java/org/nuiton/math/matrix/Vector.java trunk/src/test/java/org/nuiton/math/matrix/BasicMatrixTest.java trunk/src/test/java/org/nuiton/math/matrix/FloatVectorTest.java trunk/src/test/java/org/nuiton/math/matrix/MatrixHelperTest.java Modified: trunk/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2010-11-09 14:56:08 UTC (rev 283) +++ trunk/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2010-11-10 15:26:33 UTC (rev 284) @@ -280,7 +280,13 @@ } @Override + @Deprecated public double getMaxOccurence() { + return getMaxOccurrence(); + } + + @Override + public double getMaxOccurrence() { // on creer un tableau dans cette classe, car on ne sait pas sur quelle // implantation on s'appuie. Mais dans les sous classes, si on a deja // un tableau il ne faut pas le recréer, on peut le passer directement @@ -293,7 +299,7 @@ for (MatrixIterator mi = iterator(); mi.next();) { data[i++] = mi.getValue(); } - return MatrixHelper.maxOccurence(data); + return MatrixHelper.maxOccurrence(data); } /** Modified: trunk/src/main/java/org/nuiton/math/matrix/BasicMatrix.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/BasicMatrix.java 2010-11-09 14:56:08 UTC (rev 283) +++ trunk/src/main/java/org/nuiton/math/matrix/BasicMatrix.java 2010-11-10 15:26:33 UTC (rev 284) @@ -90,12 +90,27 @@ * * @return la valeur la plus nombreuse dans la matrice, ou la plus petite si * plusieurs valeur se retourve le même nombre de fois + * + * @deprecated since 2.1, use {@link #getMaxOccurrence()} instead */ + @Deprecated public double getMaxOccurence() { - return data.getMaxOccurence(); + return getMaxOccurrence(); } /** + * Retourne la valeur la plus courrement rencontrer dans la matrice. si + * plusieurs valeurs ont le même nombre d'occurence la plus petite valeur + * est retourné. + * + * @return la valeur la plus nombreuse dans la matrice, ou la plus petite si + * plusieurs valeur se retourve le même nombre de fois + */ + public double getMaxOccurrence() { + return data.getMaxOccurrence(); + } + + /** * Retourne le nombre de dimension de la matrice * * @return le nombre de dimension de la matrice; Modified: trunk/src/main/java/org/nuiton/math/matrix/DoubleBigVector.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/DoubleBigVector.java 2010-11-09 14:56:08 UTC (rev 283) +++ trunk/src/main/java/org/nuiton/math/matrix/DoubleBigVector.java 2010-11-10 15:26:33 UTC (rev 284) @@ -51,12 +51,18 @@ return data.length; } + @Deprecated @Override public double getMaxOccurence() { - return MatrixHelper.maxOccurence(data); + return getMaxOccurrence(); } @Override + public double getMaxOccurrence() { + return MatrixHelper.maxOccurrence(data); + } + + @Override public double getValue(int pos) { return data[pos]; } Modified: trunk/src/main/java/org/nuiton/math/matrix/DoubleVector.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/DoubleVector.java 2010-11-09 14:56:08 UTC (rev 283) +++ trunk/src/main/java/org/nuiton/math/matrix/DoubleVector.java 2010-11-10 15:26:33 UTC (rev 284) @@ -74,10 +74,16 @@ return capacity; } + @Deprecated + @Override + public double getMaxOccurence() { + return getMaxOccurrence(); + } + // poussin 20060827 TODO: verifier l'implantation, il semble quelle soit // fausse et ne puisse pas recherche le nombre max correctement @Override - public double getMaxOccurence() { + public double getMaxOccurrence() { double result = defaultValue; double[] tmp = data.toArray(); Modified: trunk/src/main/java/org/nuiton/math/matrix/FloatBigVector.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/FloatBigVector.java 2010-11-09 14:56:08 UTC (rev 283) +++ trunk/src/main/java/org/nuiton/math/matrix/FloatBigVector.java 2010-11-10 15:26:33 UTC (rev 284) @@ -51,10 +51,16 @@ return data.length; } + @Deprecated @Override public double getMaxOccurence() { - return MatrixHelper.maxOccurence(data); + return getMaxOccurrence(); } + + @Override + public double getMaxOccurrence() { + return MatrixHelper.maxOccurrence(data); + } @Override public double getValue(int pos) { Modified: trunk/src/main/java/org/nuiton/math/matrix/FloatVector.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/FloatVector.java 2010-11-09 14:56:08 UTC (rev 283) +++ trunk/src/main/java/org/nuiton/math/matrix/FloatVector.java 2010-11-10 15:26:33 UTC (rev 284) @@ -74,8 +74,14 @@ return capacity; } + @Deprecated @Override public double getMaxOccurence() { + return getMaxOccurrence(); + } + + @Override + public double getMaxOccurrence() { float result = defaultValue; float[] tmp = data.toArray(); Modified: trunk/src/main/java/org/nuiton/math/matrix/MatrixEncoder.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/MatrixEncoder.java 2010-11-09 14:56:08 UTC (rev 283) +++ trunk/src/main/java/org/nuiton/math/matrix/MatrixEncoder.java 2010-11-10 15:26:33 UTC (rev 284) @@ -85,7 +85,7 @@ public void writeMatrice(MatrixND mat) throws IOException { // l'element que l'on defini comme element par defaut est celui // que l'on retrouve le plus souvent - double defaultValue = mat.getMaxOccurence(); + double defaultValue = mat.getMaxOccurrence(); out.write("<matrix defaultValue=\"" + defaultValue + "\" name=\"" + mat.getName() + "\" dimensions=\""); Modified: trunk/src/main/java/org/nuiton/math/matrix/MatrixHelper.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/MatrixHelper.java 2010-11-09 14:56:08 UTC (rev 283) +++ trunk/src/main/java/org/nuiton/math/matrix/MatrixHelper.java 2010-11-10 15:26:33 UTC (rev 284) @@ -265,24 +265,62 @@ /** * Retourne la valeur la plus courrement rencontrer dans un tableau. si - * plusieurs valeurs ont le même nombre d'occurence la plus petite valeur + * plusieurs valeurs ont le même nombre d'occurrence la plus petite valeur * est retournée. * * @param tab le tableau de valeur * @return la valeur la plus nombreuse dans le tableau + * + * @deprecated since 2.1, use {@link #maxOccurrence(double[])} instead */ + @Deprecated public static double maxOccurence(double[] tab) { + return maxOccurrence(tab); + } + + /** + * Retourne la valeur la plus courrement rencontrer dans un tableau. si + * plusieurs valeurs ont le même nombre d'occurrence la plus petite valeur + * est retournée. + * + * @param tab le tableau de valeur + * @return la valeur la plus nombreuse dans le tableau + * + * @deprecated since 2.1, use {@link #maxOccurrence(float[])} instead + */ + @Deprecated + public static double maxOccurence(float[] tab) { + return maxOccurrence(tab); + } + + /** + * Retourne la valeur la plus courrement rencontrer dans un tableau. si + * plusieurs valeurs ont le même nombre d'occurrence la plus petite valeur + * est retournée. + * + * @param tab le tableau de valeur + * @return la valeur la plus nombreuse dans le tableau + */ + public static double maxOccurrence(double[] tab) { double[] tmp = new double[tab.length]; System.arraycopy(tab, 0, tmp, 0, tab.length); - return maxOccurence1(tmp); + return maxOccurrence1(tmp); } - public static double maxOccurence(float[] tab) { + /** + * Retourne la valeur la plus courrement rencontrer dans un tableau. si + * plusieurs valeurs ont le même nombre d'occurrence la plus petite valeur + * est retournée. + * + * @param tab le tableau de valeur + * @return la valeur la plus nombreuse dans le tableau + */ + public static double maxOccurrence(float[] tab) { double[] tmp = new double[tab.length]; for (int i = 0; i < tab.length; i++) { tmp[i] = tab[i]; } - return maxOccurence1(tmp); + return maxOccurrence1(tmp); } /** @@ -291,7 +329,7 @@ * @param tmp TODO * @return TODO */ - protected static double maxOccurence1(double[] tmp) { + protected static double maxOccurrence1(double[] tmp) { if (tmp.length == 0) { throw new IllegalArgumentException("Array must be not empty"); } Modified: trunk/src/main/java/org/nuiton/math/matrix/MatrixND.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/MatrixND.java 2010-11-09 14:56:08 UTC (rev 283) +++ trunk/src/main/java/org/nuiton/math/matrix/MatrixND.java 2010-11-10 15:26:33 UTC (rev 284) @@ -175,12 +175,24 @@ /** * Retourne la valeur la plus courrement rencontrer dans un tableau. si - * plusieurs valeurs ont le même nombre d'occurence la plus petite valeur + * plusieurs valeurs ont le même nombre d'occurrence la plus petite valeur * est retourné. * * @return la valeur la plus nombreuse dans le tableau + * + * @deprecated since 2.1, use {@link #getMaxOccurrence} instead */ + @Deprecated public double getMaxOccurence(); + + /** + * Retourne la valeur la plus courrement rencontrer dans un tableau. si + * plusieurs valeurs ont le même nombre d'occurrence la plus petite valeur + * est retourné. + * + * @return la valeur la plus nombreuse dans le tableau + */ + public double getMaxOccurrence(); /** * Retourne le nombre de dimensions de la matrice. Modified: trunk/src/main/java/org/nuiton/math/matrix/Vector.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/Vector.java 2010-11-09 14:56:08 UTC (rev 283) +++ trunk/src/main/java/org/nuiton/math/matrix/Vector.java 2010-11-10 15:26:33 UTC (rev 284) @@ -38,7 +38,13 @@ */ public interface Vector { // Vector + /** + * @deprecated since 2.1, use {@link #getMaxOccurrence()} instead + */ + @Deprecated public double getMaxOccurence(); + + public double getMaxOccurrence(); public double getValue(int pos); Modified: trunk/src/test/java/org/nuiton/math/matrix/BasicMatrixTest.java =================================================================== --- trunk/src/test/java/org/nuiton/math/matrix/BasicMatrixTest.java 2010-11-09 14:56:08 UTC (rev 283) +++ trunk/src/test/java/org/nuiton/math/matrix/BasicMatrixTest.java 2010-11-10 15:26:33 UTC (rev 284) @@ -68,7 +68,7 @@ mat = new BasicMatrix(getFactory(), new int[] { 100 }); mat = new BasicMatrix(getFactory(), new int[] { 10, 1 }); - Assert.assertEquals(0.0, mat.getMaxOccurence(), 0); + Assert.assertEquals(0.0, mat.getMaxOccurrence(), 0); mat = new BasicMatrix(getFactory(), new int[] { 10, 10, 10, 10 }); try { mat = new BasicMatrix(getFactory(), new int[] { -10 }); Modified: trunk/src/test/java/org/nuiton/math/matrix/FloatVectorTest.java =================================================================== --- trunk/src/test/java/org/nuiton/math/matrix/FloatVectorTest.java 2010-11-09 14:56:08 UTC (rev 283) +++ trunk/src/test/java/org/nuiton/math/matrix/FloatVectorTest.java 2010-11-10 15:26:33 UTC (rev 284) @@ -49,7 +49,7 @@ @Test public void testAll() throws Exception { FloatVector v = new FloatVector(16); - Assert.assertEquals(0.0, v.getMaxOccurence(), 0); + Assert.assertEquals(0.0, v.getMaxOccurrence(), 0); v.setValue(0, 1); Assert.assertEquals(1.0, v.getValue(0), 0); @@ -69,11 +69,11 @@ v.setValue(4, 4); v.setValue(5, 4); v.setValue(6, 4); - Assert.assertEquals(0.0, v.getMaxOccurence(), 0); + Assert.assertEquals(0.0, v.getMaxOccurrence(), 0); v.setValue(8, 4); - Assert.assertEquals(4.0, v.getMaxOccurence(), 0); + Assert.assertEquals(4.0, v.getMaxOccurrence(), 0); v.setValue(0, 0); - Assert.assertEquals(0.0, v.getMaxOccurence(), 0); + Assert.assertEquals(0.0, v.getMaxOccurrence(), 0); try { v.getValue(-1); Modified: trunk/src/test/java/org/nuiton/math/matrix/MatrixHelperTest.java =================================================================== --- trunk/src/test/java/org/nuiton/math/matrix/MatrixHelperTest.java 2010-11-09 14:56:08 UTC (rev 283) +++ trunk/src/test/java/org/nuiton/math/matrix/MatrixHelperTest.java 2010-11-10 15:26:33 UTC (rev 284) @@ -129,42 +129,42 @@ } @Test - public void testMaxOccurence() { + public void testMaxOccurrence() { double[] val = new double[5]; - Assert.assertEquals(0, MatrixHelper.maxOccurence(val), 0); + Assert.assertEquals(0, MatrixHelper.maxOccurrence(val), 0); val[2] = -1; - Assert.assertEquals(0, MatrixHelper.maxOccurence(val), 0); + Assert.assertEquals(0, MatrixHelper.maxOccurrence(val), 0); val[0] = -1; - Assert.assertEquals(0, MatrixHelper.maxOccurence(val), 0); + Assert.assertEquals(0, MatrixHelper.maxOccurrence(val), 0); val[1] = -1; - Assert.assertEquals(-1, MatrixHelper.maxOccurence(val), 0); + Assert.assertEquals(-1, MatrixHelper.maxOccurrence(val), 0); val[4] = -3; - Assert.assertEquals(-1, MatrixHelper.maxOccurence(val), 0); + Assert.assertEquals(-1, MatrixHelper.maxOccurrence(val), 0); val[3] = 3; - Assert.assertEquals(-1, MatrixHelper.maxOccurence(val), 0); + Assert.assertEquals(-1, MatrixHelper.maxOccurrence(val), 0); val = new double[6]; - Assert.assertEquals(0, MatrixHelper.maxOccurence(val), 0); + Assert.assertEquals(0, MatrixHelper.maxOccurrence(val), 0); val[2] = -1; - Assert.assertEquals(0, MatrixHelper.maxOccurence(val), 0); + Assert.assertEquals(0, MatrixHelper.maxOccurrence(val), 0); val[0] = -1; - Assert.assertEquals(0, MatrixHelper.maxOccurence(val), 0); + Assert.assertEquals(0, MatrixHelper.maxOccurrence(val), 0); val[1] = -1; - Assert.assertEquals(-1, MatrixHelper.maxOccurence(val), 0); + Assert.assertEquals(-1, MatrixHelper.maxOccurrence(val), 0); val[4] = -3; - Assert.assertEquals(-1, MatrixHelper.maxOccurence(val), 0); + Assert.assertEquals(-1, MatrixHelper.maxOccurrence(val), 0); val[3] = -3; - Assert.assertEquals(-1, MatrixHelper.maxOccurence(val), 0); + Assert.assertEquals(-1, MatrixHelper.maxOccurrence(val), 0); val[5] = -3; - Assert.assertEquals(-3, MatrixHelper.maxOccurence(val), 0); + Assert.assertEquals(-3, MatrixHelper.maxOccurrence(val), 0); val = new double[0]; try { - MatrixHelper.maxOccurence(val); + MatrixHelper.maxOccurrence(val); Assert.fail("An exception must be thrown"); } catch (IllegalArgumentException e) { if (log.isDebugEnabled()) {

1 0

r283 - trunk/src/main/java/org/nuiton/math/matrix/gui
by echatellier＠users.nuiton.org 09 Nov '10

09 Nov '10

Author: echatellier Date: 2010-11-09 15:56:08 +0100 (Tue, 09 Nov 2010) New Revision: 283 Url: http://nuiton.org/repositories/revision/nuiton-matrix/283 Log: Remove duplicated import Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixEditor.java trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.jaxx trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEvent.java trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelListener.java trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPopupMenu.java trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModel.java trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixEditor.java 2010-11-08 15:47:52 UTC (rev 282) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixEditor.java 2010-11-09 14:56:08 UTC (rev 283) @@ -22,24 +22,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -/* - * *##% NuitonMatrix - * Copyright (C) 2004 - 2009 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>. ##%* - */ + package org.nuiton.math.matrix.gui; import javax.swing.JButton; Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.jaxx 2010-11-08 15:47:52 UTC (rev 282) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.jaxx 2010-11-09 14:56:08 UTC (rev 283) @@ -22,24 +22,6 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> - <MatrixEditor layout='{new BorderLayout()}'> <MatrixTableModel id='tableModel' javaBean='null'/> Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEvent.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEvent.java 2010-11-08 15:47:52 UTC (rev 282) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEvent.java 2010-11-09 14:56:08 UTC (rev 283) @@ -22,22 +22,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 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>. ##%*/ package org.nuiton.math.matrix.gui; Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelListener.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelListener.java 2010-11-08 15:47:52 UTC (rev 282) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelListener.java 2010-11-09 14:56:08 UTC (rev 283) @@ -22,22 +22,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 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>. ##%*/ + package org.nuiton.math.matrix.gui; import java.util.EventListener; Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPopupMenu.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPopupMenu.java 2010-11-08 15:47:52 UTC (rev 282) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPopupMenu.java 2010-11-09 14:56:08 UTC (rev 283) @@ -22,22 +22,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 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>. ##%*/ package org.nuiton.math.matrix.gui; Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModel.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModel.java 2010-11-08 15:47:52 UTC (rev 282) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModel.java 2010-11-09 14:56:08 UTC (rev 283) @@ -22,22 +22,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 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>. ##%*/ package org.nuiton.math.matrix.gui; Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java 2010-11-08 15:47:52 UTC (rev 282) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java 2010-11-09 14:56:08 UTC (rev 283) @@ -22,22 +22,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 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>. ##%*/ package org.nuiton.math.matrix.gui; Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java 2010-11-08 15:47:52 UTC (rev 282) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java 2010-11-09 14:56:08 UTC (rev 283) @@ -22,22 +22,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -/*##% NuitonMatrix - * Copyright (C) 2004 - 2009 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>. ##%*/ package org.nuiton.math.matrix.gui;

1 0

r282 - in trunk: . src/license src/main/java/org/nuiton/math/matrix src/main/java/org/nuiton/math/matrix/gui src/site src/site/rst src/test/java/org/nuiton/math/matrix src/test/java/org/nuiton/math/matrix/gui src/test/resources
by echatellier＠users.nuiton.org 08 Nov '10

08 Nov '10

Author: echatellier Date: 2010-11-08 16:47:52 +0100 (Mon, 08 Nov 2010) New Revision: 282 Url: http://nuiton.org/repositories/revision/nuiton-matrix/282 Log: Merge 2.1.x branche. Add licence header. Update dependencies. Removed: trunk/src/main/java/org/nuiton/math/matrix/gui/JAXXMatrixEditor.jaxx Modified: trunk/README.txt trunk/pom.xml trunk/src/license/THIRD-PARTY.properties trunk/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java trunk/src/main/java/org/nuiton/math/matrix/BasicMatrix.java trunk/src/main/java/org/nuiton/math/matrix/BasicMatrixIterator.java trunk/src/main/java/org/nuiton/math/matrix/DimensionHelper.java trunk/src/main/java/org/nuiton/math/matrix/DoubleBigVector.java trunk/src/main/java/org/nuiton/math/matrix/DoubleVector.java trunk/src/main/java/org/nuiton/math/matrix/FloatBigVector.java trunk/src/main/java/org/nuiton/math/matrix/FloatVector.java trunk/src/main/java/org/nuiton/math/matrix/MapFunction.java trunk/src/main/java/org/nuiton/math/matrix/MatrixEncoder.java trunk/src/main/java/org/nuiton/math/matrix/MatrixException.java trunk/src/main/java/org/nuiton/math/matrix/MatrixFactory.java trunk/src/main/java/org/nuiton/math/matrix/MatrixHelper.java trunk/src/main/java/org/nuiton/math/matrix/MatrixIterator.java trunk/src/main/java/org/nuiton/math/matrix/MatrixIteratorImpl.java trunk/src/main/java/org/nuiton/math/matrix/MatrixND.java trunk/src/main/java/org/nuiton/math/matrix/MatrixNDImpl.java trunk/src/main/java/org/nuiton/math/matrix/MatrixStringEncoder.java trunk/src/main/java/org/nuiton/math/matrix/SemanticList.java trunk/src/main/java/org/nuiton/math/matrix/SubMatrix.java trunk/src/main/java/org/nuiton/math/matrix/Vector.java trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixEditor.java trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.jaxx trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEvent.java trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelListener.java trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPopupMenu.java trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModel.java trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java trunk/src/site/rst/Serializable.rst trunk/src/site/rst/Todo.rst trunk/src/site/rst/index.rst trunk/src/site/site_fr.xml trunk/src/test/java/org/nuiton/math/matrix/BasicMatrixBigTest.java trunk/src/test/java/org/nuiton/math/matrix/BasicMatrixTest.java trunk/src/test/java/org/nuiton/math/matrix/FloatVectorTest.java trunk/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java trunk/src/test/java/org/nuiton/math/matrix/MatrixHelperTest.java trunk/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java trunk/src/test/java/org/nuiton/math/matrix/MatrixStringEncoderTest.java trunk/src/test/java/org/nuiton/math/matrix/PerfTest.java trunk/src/test/java/org/nuiton/math/matrix/SubMatrixTest.java trunk/src/test/java/org/nuiton/math/matrix/gui/MatrixEditorsTests.jaxx trunk/src/test/java/org/nuiton/math/matrix/gui/MatrixPanelListenerTest.java trunk/src/test/java/org/nuiton/math/matrix/gui/MatrixTableModelTest.java trunk/src/test/resources/log4j.properties Modified: trunk/README.txt =================================================================== --- trunk/README.txt 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/README.txt 2010-11-08 15:47:52 UTC (rev 282) @@ -1,2 +1,2 @@ -Lutin Matrix -============ \ No newline at end of file +Nuiton Matrix +============= \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/pom.xml 2010-11-08 15:47:52 UTC (rev 282) @@ -1,280 +1,250 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmineAndCentral</artifactId> + <version>2.4</version> + </parent> - <artifactId>nuiton-matrix</artifactId> - <version>2.0.2-SNAPSHOT</version> + <artifactId>nuiton-matrix</artifactId> + <version>2.1-SNAPSHOT</version> - <dependencies> + <dependencies> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <dependency> - <groupId>commons-primitives</groupId> - <artifactId>commons-primitives</artifactId> - </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> -  - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime-swing</artifactId> - <version>${jaxxVersion}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>javax.help</groupId> - <artifactId>javahelp</artifactId> - </exclusion> - <exclusion> - <groupId>com.opensymphony</groupId> - <artifactId>xwork</artifactId> - </exclusion> - <exclusion> - <groupId>opensymphony</groupId> - <artifactId>ognl</artifactId> - </exclusion> - <exclusion> - <groupId>commons-jxpath</groupId> - <artifactId>commons-jxpath</artifactId> - </exclusion> - <exclusion> - <groupId>org.swinglabs</groupId> - <artifactId>jxlayer</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependency> + <groupId>commons-primitives</groupId> + <artifactId>commons-primitives</artifactId> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> +  + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${jaxxVersion}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>javax.help</groupId> + <artifactId>javahelp</artifactId> + </exclusion> + <exclusion> + <groupId>com.opensymphony</groupId> + <artifactId>xwork</artifactId> + </exclusion> + <exclusion> + <groupId>opensymphony</groupId> + <artifactId>ognl</artifactId> + </exclusion> + <exclusion> + <groupId>commons-jxpath</groupId> + <artifactId>commons-jxpath</artifactId> + </exclusion> + <exclusion> + <groupId>org.swinglabs</groupId> + <artifactId>jxlayer</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> - </dependencies> +  +  +  -  -  -  + <name>NuitonMatrix</name> + <description>Multiple dimensions matrix library</description> + <inceptionYear>2004</inceptionYear> + <url>http://maven-site.nuiton.org/nuiton-matrix</url> - <name>NuitonMatrix</name> - <description>Librairie de matrice multi-dimensions.</description> - <inceptionYear>2004</inceptionYear> - <url>http://maven-site.nuiton.org/nuiton-matrix</url> +  +  +  -  -  -  + <packaging>jar</packaging> - <packaging>jar</packaging> + <properties> - <properties> + <jaxxVersion>2.2.3</jaxxVersion> + <nuitonUtilsVersion>1.5</nuitonUtilsVersion> + <nuitonI18nVersion>1.2.2</nuitonI18nVersion> - <jaxxVersion>1.7.1</jaxxVersion> - <nuitonUtilsVersion>1.3.1</nuitonUtilsVersion> - <nuitonI18nVersion>1.2.2</nuitonI18nVersion> +  + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> -  - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + </properties> - </properties> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxxVersion}</version> + </plugin> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${nuitonI18nVersion}</version> + </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrstPluginVersion}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> - <build> - <plugins> - - <plugin> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - <id>generate-ui</id> - <configuration> - <extraImportList>jaxx.runtime.SwingUtil,static - jaxx.runtime.Util.getStringValue - </extraImportList> - <addSourcesToClassPath>true</addSourcesToClassPath> - <addProjectClassPath>true</addProjectClassPath> - </configuration> - </execution> - <execution> - <goals> - <goal>generate</goal> - </goals> - <id>generate-tests</id> - <phase>generate-test-sources</phase> - <configuration> - <testPhase>true</testPhase> - <src>src/test/java</src> - <outJava>target/generated-sources/test-java</outJava> - <addProjectClassPath>true</addProjectClassPath> - <addCompileClassPath>true</addCompileClassPath> - </configuration> - </execution> - </executions> - </plugin> - -  - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <configuration> - <entries> - <entry> - <basedir>${project.build.directory}/generated-sources/java/ - </basedir> - </entry> - </entries> - </configuration> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - - <pluginManagement> - <plugins> - - <plugin> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxxVersion}</version> - </plugin> - - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>${nuitonI18nVersion}</version> - </plugin> - - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrstPluginVersion}</version> - </dependency> - </dependencies> - </plugin> - - </plugins> - </pluginManagement> - - </build> - -  - <reporting> - <excludeDefaults>true</excludeDefaults> - </reporting> - -  -  -  - -  - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk - </connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk - </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-matrix/trunk</url> - </scm> - - <profiles> - -  - <profile> - <id>assembly-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> <plugins> + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + <id>generate-ui</id> + <configuration> + <extraImportList>jaxx.runtime.SwingUtil,static jaxx.runtime.JAXXUtil.getStringValue</extraImportList> + <addSourcesToClassPath>true</addSourcesToClassPath> + <addProjectClassPath>true</addProjectClassPath> + </configuration> + </execution> + <execution> + <goals> + <goal>generate</goal> + </goals> + <id>generate-tests</id> + <phase>generate-test-sources</phase> + <configuration> + <testPhase>true</testPhase> + <src>src/test/java</src> + <outJava>target/generated-sources/test-java</outJava> + <addProjectClassPath>true</addProjectClassPath> + <addCompileClassPath>true</addCompileClassPath> + </configuration> + </execution> + </executions> + </plugin> -  - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-assemblies</id> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <configuration> - <attach>false</attach> - <descriptorRefs> - <descriptorRef>deps</descriptorRef> - <descriptorRef>full</descriptorRef> - </descriptorRefs> - </configuration> - </plugin> - +  + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <configuration> + <entries> + <entry> + <basedir>${project.build.directory}/generated-sources/java/</basedir> + </entry> + </entries> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> - </build> - </profile> + </build> -  - <profile> - <id>reporting-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <reporting> +  +  +  - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>1.2</version> - </plugin> - </plugins> - </reporting> - </profile> +  + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-matrix/trunk</url> + </scm> - </profiles> + <profiles> +  + <profile> + <id>assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> +  + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assemblies</id> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <attach>false</attach> + <descriptorRefs> + <descriptorRef>deps</descriptorRef> + <descriptorRef>full</descriptorRef> + </descriptorRefs> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: trunk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/src/license/THIRD-PARTY.properties 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/license/THIRD-PARTY.properties 2010-11-08 15:47:52 UTC (rev 282) @@ -1,3 +1,27 @@ +### +# #%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% +### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : Modified: trunk/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/main/java/org/nuiton/math/matrix/BasicMatrix.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/BasicMatrix.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/BasicMatrix.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/main/java/org/nuiton/math/matrix/BasicMatrixIterator.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/BasicMatrixIterator.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/BasicMatrixIterator.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/main/java/org/nuiton/math/matrix/DimensionHelper.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/DimensionHelper.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/DimensionHelper.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/main/java/org/nuiton/math/matrix/DoubleBigVector.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/DoubleBigVector.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/DoubleBigVector.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/main/java/org/nuiton/math/matrix/DoubleVector.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/DoubleVector.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/DoubleVector.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/main/java/org/nuiton/math/matrix/FloatBigVector.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/FloatBigVector.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/FloatBigVector.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/main/java/org/nuiton/math/matrix/FloatVector.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/FloatVector.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/FloatVector.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/main/java/org/nuiton/math/matrix/MapFunction.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/MapFunction.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/MapFunction.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/main/java/org/nuiton/math/matrix/MatrixEncoder.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/MatrixEncoder.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/MatrixEncoder.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/main/java/org/nuiton/math/matrix/MatrixException.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/MatrixException.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/MatrixException.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/*##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /** * MatriceException.java Modified: trunk/src/main/java/org/nuiton/math/matrix/MatrixFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/MatrixFactory.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/MatrixFactory.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/main/java/org/nuiton/math/matrix/MatrixHelper.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/MatrixHelper.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/MatrixHelper.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/main/java/org/nuiton/math/matrix/MatrixIterator.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/MatrixIterator.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/MatrixIterator.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/main/java/org/nuiton/math/matrix/MatrixIteratorImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/MatrixIteratorImpl.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/MatrixIteratorImpl.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/main/java/org/nuiton/math/matrix/MatrixND.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/MatrixND.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/MatrixND.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/main/java/org/nuiton/math/matrix/MatrixNDImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/MatrixNDImpl.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/MatrixNDImpl.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/main/java/org/nuiton/math/matrix/MatrixStringEncoder.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/MatrixStringEncoder.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/MatrixStringEncoder.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/main/java/org/nuiton/math/matrix/SemanticList.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/SemanticList.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/SemanticList.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; @@ -69,8 +77,8 @@ */ @Override public int indexOf(Object o) { - Map<Object, Integer> i = getIndex(); - Integer result = i.get(o); + Map<Object, Integer> index = getIndex(); + Integer result = index.get(o); int resultIndex = -1; if (result != null) { resultIndex = result.intValue(); Modified: trunk/src/main/java/org/nuiton/math/matrix/SubMatrix.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/SubMatrix.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/SubMatrix.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/*##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/main/java/org/nuiton/math/matrix/Vector.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/Vector.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/Vector.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Deleted: trunk/src/main/java/org/nuiton/math/matrix/gui/JAXXMatrixEditor.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/JAXXMatrixEditor.jaxx 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/JAXXMatrixEditor.jaxx 2010-11-08 15:47:52 UTC (rev 282) @@ -1,188 +0,0 @@ - -<MatrixEditor id='jaxxMatrixManel' layout='{new BorderLayout()}'> - - <MatrixTableModel id='tableModel' javaBean='null'/> - -  - <Boolean id='linearModel' javaBean='false'/> - -  - <Boolean id='linearModelShowDefault' javaBean='false'/> - -  - <Boolean id='dimensionEdit' javaBean='false'/> - - <script><![CDATA[ - -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.Event; -import java.awt.event.KeyEvent; -import java.awt.event.MouseEvent; -import java.util.Iterator; - -import org.nuiton.i18n.I18n; -import org.nuiton.math.matrix.MatrixFactory; -import org.nuiton.math.matrix.MatrixND; -import org.nuiton.util.ListenerSet; - -private final static int DEFAULT_WIDTH = 150; - -private final static int DEFAULT_HEIGHT = 150; - -protected ListenerSet<MatrixPanelListener> listeners = new ListenerSet<MatrixPanelListener>(); -protected MatrixPopupMenu popupMenu = null; -protected MatrixND matrix = null; -initObject(); - -/** - * @deprecated since 2.0.1 use MatrixPanelEditor - */ -public JAXXMatrixEditor(MatrixND m, boolean dimensionEdit) { - this(dimensionEdit, DEFAULT_WIDTH, DEFAULT_HEIGHT); -} - -/** - * @deprecated since 2.0.1 use MatrixPanelEditor - */ -public JAXXMatrixEditor(boolean dimensionEdit, int width, int height) { - this.dimensionEdit = dimensionEdit; - setPreferredSize(new Dimension(width, height)); -} - -/** - * @deprecated since 2.0.1 use MatrixPanelEditor - */ -public JAXXMatrixEditor(boolean dimensionEdit) { - this(dimensionEdit, DEFAULT_WIDTH, DEFAULT_HEIGHT); -} - -public void setMatrix(MatrixND m){ - this.matrix = m; - initObject(); -} - -public MatrixND getMatrix() { - return matrix; -} - -protected MatrixFactory getFactory() { - return MatrixFactory.getInstance(); -} - -/** - * - * @param l listener to add - * @deprecated since 2.0.0 : this is not a valid listener adder - */ -@Deprecated -public void addMatrixListener(MatrixPanelListener l) { - listeners.add(l); -} - -public void addMatrixPanelListener(MatrixPanelListener l) { - listeners.add(l); -} - -public void removeMatrixPanelListener(MatrixPanelListener l) { - listeners.remove(l); -} - - -public MatrixPanelListener[] getMatrixPanelListeners() { - java.util.List<MatrixPanelListener> r = new java.util.ArrayList<MatrixPanelListener>(); - for (java.util.Iterator<MatrixPanelListener> itr = listeners.iterator(); itr.hasNext();) { - r.add(itr.next()); - } - return r.toArray(new MatrixPanelListener[r.size()]); -} - -protected void initObject() { - if (getMatrix() == null) { - editArea.setViewportView(null); - } - else { - popupMenu = new MatrixPopupMenu(this); - table = new JTable() { - public void processMouseEvent(MouseEvent event) { - if (event.isPopupTrigger()) { - popupMenu.show(event.getComponent(), event.getX(), event.getY()); - } - super.processMouseEvent(event); - } - }; - - table.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_C, Event.CTRL_MASK),"copy"); - table.getActionMap().put("copy",popupMenu.getSendToClipBoardSelectionCopyAction()); - table.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_V, Event.CTRL_MASK),"paste"); - table.getActionMap().put("paste",popupMenu.getSendToClipBoardCurrentPasteAction()); - if (isLinearModel()) { - setTableModel(new MatrixTableModelLinear(getMatrix(), isLinearModelShowDefault())); - } - else { - setTableModel(new MatrixTableModelND(getMatrix())); - } - - getTableModel().addTableModelListener(new TableModelListener() { - - @Override - public void tableChanged(TableModelEvent e) { - fireEvent(); - } - }); - - table.setModel(getTableModel()); - table.setDefaultRenderer(String.class, tableModel.getMatrixCellRenderer()); - table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); - table.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION); - editArea.setViewportView(table); - } - repaint(); -} - -protected void btnAction(){ - String dim; - dim = JOptionPane.showInputDialog(null, I18n._("nuitonmatrix.create.matrix.message"), I18n._("nuitonmatrix.create.matrix.title"), JOptionPane.DEFAULT_OPTION); - - if (dim != null) { - String[] sdim = dim.split(";"); - int[] idim = new int[sdim.length]; - for (int i = 0; i < idim.length; i++) { - idim[i] = Integer.parseInt(sdim[i]); - } - setMatrix(getFactory().create(idim)); - } -} - -protected void fireEvent() { - MatrixPanelEvent e = new MatrixPanelEvent(this); - for (Iterator i = listeners.iterator(); i.hasNext();) { - MatrixPanelListener l = (MatrixPanelListener) i.next(); - l.matrixChanged(e); - } -} - ]]> - </script> - <JScrollPane id='editArea' constraints='BorderLayout.CENTER'> - <JTable id='table' autoResizeMode='{JTable.AUTO_RESIZE_OFF}' cellSelectionEnabled='{true}' selectionMode='{ListSelectionModel.SINGLE_INTERVAL_SELECTION}'/> - </JScrollPane> - <JButton id='buttonEdit' text='nuitonmatrix.create.matrix.button' visible='{isDimensionEdit()}' - onActionPerformed='btnAction()' constraints='BorderLayout.SOUTH'/> -</MatrixEditor> Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixEditor.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixEditor.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixEditor.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,4 +1,28 @@ /* + * #%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% + */ +/* * *##% NuitonMatrix * Copyright (C) 2004 - 2009 CodeLutin * Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.jaxx 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.jaxx 2010-11-08 15:47:52 UTC (rev 282) @@ -1,4 +1,28 @@  + + <project name="${project.name}"> <bannerLeft> Modified: trunk/src/test/java/org/nuiton/math/matrix/BasicMatrixBigTest.java =================================================================== --- trunk/src/test/java/org/nuiton/math/matrix/BasicMatrixBigTest.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/test/java/org/nuiton/math/matrix/BasicMatrixBigTest.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/test/java/org/nuiton/math/matrix/BasicMatrixTest.java =================================================================== --- trunk/src/test/java/org/nuiton/math/matrix/BasicMatrixTest.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/test/java/org/nuiton/math/matrix/BasicMatrixTest.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/test/java/org/nuiton/math/matrix/FloatVectorTest.java =================================================================== --- trunk/src/test/java/org/nuiton/math/matrix/FloatVectorTest.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/test/java/org/nuiton/math/matrix/FloatVectorTest.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java =================================================================== --- trunk/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/test/java/org/nuiton/math/matrix/MatrixHelperTest.java =================================================================== --- trunk/src/test/java/org/nuiton/math/matrix/MatrixHelperTest.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/test/java/org/nuiton/math/matrix/MatrixHelperTest.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java =================================================================== --- trunk/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/test/java/org/nuiton/math/matrix/MatrixStringEncoderTest.java =================================================================== --- trunk/src/test/java/org/nuiton/math/matrix/MatrixStringEncoderTest.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/test/java/org/nuiton/math/matrix/MatrixStringEncoderTest.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/test/java/org/nuiton/math/matrix/PerfTest.java =================================================================== --- trunk/src/test/java/org/nuiton/math/matrix/PerfTest.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/test/java/org/nuiton/math/matrix/PerfTest.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/test/java/org/nuiton/math/matrix/SubMatrixTest.java =================================================================== --- trunk/src/test/java/org/nuiton/math/matrix/SubMatrixTest.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/test/java/org/nuiton/math/matrix/SubMatrixTest.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/*##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix; Modified: trunk/src/test/java/org/nuiton/math/matrix/gui/MatrixEditorsTests.jaxx =================================================================== --- trunk/src/test/java/org/nuiton/math/matrix/gui/MatrixEditorsTests.jaxx 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/test/java/org/nuiton/math/matrix/gui/MatrixEditorsTests.jaxx 2010-11-08 15:47:52 UTC (rev 282) @@ -1,27 +1,28 @@  + #%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% + -->  <JPanel> <MatrixPanelEditor onMatrixChanged='log.info("something changes "+event)'/> - <JAXXMatrixEditor onMatrixChanged='log.info("something changes "+event)'/> </JPanel> Modified: trunk/src/test/java/org/nuiton/math/matrix/gui/MatrixPanelListenerTest.java =================================================================== --- trunk/src/test/java/org/nuiton/math/matrix/gui/MatrixPanelListenerTest.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/test/java/org/nuiton/math/matrix/gui/MatrixPanelListenerTest.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,26 +1,34 @@ -/** - * *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%* + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% */ + package org.nuiton.math.matrix.gui; import java.beans.BeanInfo; import java.beans.EventSetDescriptor; import java.beans.Introspector; + import org.junit.Assert; import org.junit.Test; @@ -42,7 +50,6 @@ @Test public void testMatrixPanelEditor() throws Exception { verifyMatrixPanelListener(MatrixPanelEditor.class); - verifyMatrixPanelListener(JAXXMatrixEditor.class); } protected void verifyMatrixPanelListener(Class<?> klass) throws Exception { Modified: trunk/src/test/java/org/nuiton/math/matrix/gui/MatrixTableModelTest.java =================================================================== --- trunk/src/test/java/org/nuiton/math/matrix/gui/MatrixTableModelTest.java 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/test/java/org/nuiton/math/matrix/gui/MatrixTableModelTest.java 2010-11-08 15:47:52 UTC (rev 282) @@ -1,19 +1,27 @@ -/* *##% NuitonMatrix - * Copyright (C) 2004 - 2009 CodeLutin - * +/* + * #%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 + * 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 + * + * 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>. ##%*/ + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.math.matrix.gui; Modified: trunk/src/test/resources/log4j.properties =================================================================== --- trunk/src/test/resources/log4j.properties 2010-10-29 08:29:20 UTC (rev 281) +++ trunk/src/test/resources/log4j.properties 2010-11-08 15:47:52 UTC (rev 282) @@ -1,3 +1,27 @@ +### +# #%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% +### # Global logging configuration log4j.rootLogger=ERROR, stdout

1 0