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

r319 - in trunk: nuiton-matrix/src/main/java/org/nuiton/math/matrix nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart src/site/rst
by echatellier＠users.nuiton.org 17 Dec '10

17 Dec '10

Author: echatellier Date: 2010-12-17 10:38:15 +0100 (Fri, 17 Dec 2010) New Revision: 319 Url: http://nuiton.org/repositories/revision/nuiton-matrix/319 Log: Update javadoc and site Added: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/package-info.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/package-info.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/package-info.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/package-info.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/package-info.java Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixND.java trunk/src/site/rst/index.rst Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixND.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixND.java 2010-12-16 17:21:23 UTC (rev 318) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixND.java 2010-12-17 09:38:15 UTC (rev 319) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2010 CodeLutin + * Copyright (C) 2004 - 2010 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -32,7 +32,7 @@ import java.util.List; /** - * MatrixND. + * MatrixND interface for different matrix implementation. * * Created: 29 oct. 2004 * @@ -63,7 +63,7 @@ public List<?>[] getSemantics(); /** - * Retourne la semantique pour une dimension + * Retourne la semantique pour une dimension. * * @param dim la dimension pour lequel on veut la semantique * @return la semantique de la dimension on null s'il n'y a pas de @@ -75,7 +75,7 @@ public List<?> getSemantics(int dim); /** - * Retourne la semantique pour une dimension + * Retourne la semantique pour une dimension. * * @param dim la dimension pour lequel on veut la semantique * @return la semantique de la dimension on null s'il n'y a pas de @@ -84,23 +84,24 @@ public List<?> getSemantic(int dim); /** - * Modifie la semantique d'une dimension + * Modifie la semantique d'une dimension. * * @param <E> data type * @param dim dimension to modify semantic * @param sem new semantic to set * - * @deprecated use #setSemantics(int, List<E>) instead + * @deprecated (since 1.0.3) use #setSemantics(int, List<E>) instead */ @Deprecated public <E> void setSemantics(int dim, List<E> sem); /** - * Modifie la semantique d'une dimension + * Modifie la semantique d'une dimension. * * @param <E> data type * @param dim dimension to modify semantic * @param sem new semantic to set + * @since 1.0.3 */ public <E> void setSemantic(int dim, List<E> sem); @@ -112,7 +113,7 @@ public void setName(String name); /** - * Retourne le nom de la matrice + * Retourne le nom de la matrice. * * @return le nom de la matrice ou la chaine vide si pas de nom. */ @@ -122,8 +123,7 @@ * Permet de mettre des noms aux différentes dimension. * * @param names names to set - * - * @deprecated (since 1.0.3) Use #setDimensionNames(String[]) + * @deprecated since 1.0.3, use {@link #setDimensionNames(String[])} instead */ @Deprecated public void setDimensionName(String[] names); @@ -132,7 +132,6 @@ * Permet de mettre des noms aux différentes dimension. * * @param names names to set - * * @since 1.0.3 */ public void setDimensionNames(String[] names); @@ -142,7 +141,7 @@ * * @return tableau des noms de dimension. * - * @deprecated (since 1.0.3) Use #getDimensionNames() + * @deprecated since 1.0.3, use {@link #getDimensionNames()} instead */ @Deprecated public String[] getDimensionName(); @@ -151,7 +150,6 @@ * Permet de recuperer les noms des dimension. * * @return tableau des noms de dimension. - * * @since 1.0.3 */ public String[] getDimensionNames(); @@ -165,7 +163,7 @@ public void setDimensionName(int dim, String name); /** - * Retourne le nom de la dimension demandé. + * Retourne le nom de la dimension demandée. * * @param dim la dimension dont on veut le nom * @return le nom de la dimension ou la chaine vide si la dimension n'a pas @@ -174,7 +172,7 @@ public String getDimensionName(int dim); /** - * Retourne la valeur la plus courrement rencontrer dans un tableau. si + * Retourne la valeur la plus couramment rencontree dans un tableau. Si * plusieurs valeurs ont le même nombre d'occurrence la plus petite valeur * est retourné. * @@ -186,11 +184,12 @@ public double getMaxOccurence(); /** - * Retourne la valeur la plus courrement rencontrer dans un tableau. si + * 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 + * @since 2.1 */ public double getMaxOccurrence(); @@ -198,7 +197,7 @@ * Retourne le nombre de dimensions de la matrice. * * @return le nombre de dimensions de la matrice. - * @deprecated use #getDimCount() instead + * @deprecated since 1.0.3, use {@link #getDimCount()} instead */ public int getNbDim(); @@ -206,6 +205,7 @@ * Retourne le nombre de dimensions de la matrice. * * @return le nombre de dimensions de la matrice. + * @since 1.0.3 */ public int getDimCount(); @@ -235,7 +235,7 @@ * Applique une fonction sur chaque valeur de la matrice. * * @param f function to apply - * @return <tt>this</tt> + * @return {@code this} */ public MatrixND map(MapFunction f); Added: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/package-info.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/package-info.java (rev 0) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/package-info.java 2010-12-17 09:38:15 UTC (rev 319) @@ -0,0 +1,26 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/** + * Nuiton matrix api. + */ +package org.nuiton.math.matrix; Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/package-info.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/package-info.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/package-info.java (rev 0) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/package-info.java 2010-12-17 09:38:15 UTC (rev 319) @@ -0,0 +1,26 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/** + * Nuiton matrix panel. + */ +package org.nuiton.math.matrix.gui; Property changes on: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/package-info.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/package-info.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/package-info.java (rev 0) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/package-info.java 2010-12-17 09:38:15 UTC (rev 319) @@ -0,0 +1,26 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/** + * Nuiton matrix viewer. + */ +package org.nuiton.math.matrix.viewer; Property changes on: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/package-info.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java 2010-12-16 17:21:23 UTC (rev 318) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java 2010-12-17 09:38:15 UTC (rev 319) @@ -102,9 +102,10 @@ } /** - * Chart renderer combo box. + * Chart renderers combo box. * - * @return + * @return chart renderers combo box + * @see CategoryItemRenderer */ protected JComboBox getChartRendererComboBox() { JComboBox rendererComboBox = new JComboBox(); @@ -125,10 +126,11 @@ } /** - * Data model. + * JFreechart data model. * * @param matrix - * @return + * @return jfreechart data model + * @see CategoryDataset */ protected CategoryDataset getCategoryDataset(MatrixND matrix) { CategoryDataset categoryDataset = new GraphMatrixNDDataset(matrix); @@ -139,7 +141,7 @@ * Abscisse (nom + valeur à la verticale). * * @param matrix - * @return + * @return category axis */ protected CategoryAxis getCategoryAxis(MatrixND matrix) { CategoryAxis horizontalAxis = new CategoryAxis(); @@ -152,7 +154,7 @@ * Ordonnées (valeur seule). * * @param matrix - * @return + * @return value axis */ protected ValueAxis getValueAxis(MatrixND matrix) { ValueAxis verticalAxis = new NumberAxis3D(); @@ -160,10 +162,10 @@ } /** - * Plot. + * Category plot. * * @param matrix - * @return + * @return category plot */ protected CategoryPlot getCategoryPlot(MatrixND matrix) { CategoryPlot categoryPlot = new CategoryPlot(getCategoryDataset(matrix), @@ -175,7 +177,7 @@ /** * Build chart. * - * @return + * @return chart */ protected JFreeChart getJFreeChart(MatrixND matrix) { JFreeChart chart = new JFreeChart(_(matrix.getName()), JFreeChart.DEFAULT_TITLE_FONT, getCategoryPlot(matrix), true); Added: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/package-info.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/package-info.java (rev 0) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/package-info.java 2010-12-17 09:38:15 UTC (rev 319) @@ -0,0 +1,26 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/** + * Nuiton matrix viewer renderers. + */ +package org.nuiton.math.matrix.viewer.renderer.jfreechart; Property changes on: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/package-info.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/package-info.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/package-info.java (rev 0) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/package-info.java 2010-12-17 09:38:15 UTC (rev 319) @@ -0,0 +1,26 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/** + * Nuiton matrix viewer jfreechart renderer. + */ +package org.nuiton.math.matrix.viewer.renderer; Property changes on: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/package-info.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2010-12-16 17:21:23 UTC (rev 318) +++ trunk/src/site/rst/index.rst 2010-12-17 09:38:15 UTC (rev 319) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2004 - 2010 CodeLutin +.. * Copyright (C) 2004 - 2010 CodeLutin, Chatellier Eric .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU Lesser General Public License as @@ -31,9 +31,9 @@ Présentation ------------ -NuitonMatrix est une librairie, pour la manipulation de matrice à n dimension. +NuitonMatrix est une librairie, pour la manipulation de matrice à n dimensions. Elle contient les fonctions mathématiques classiques sur les matrices, somme, -multiplication, ... +multiplication, produit scalaire, produit matriciel... Cette librairie dispose de plus un ensemble de composants pour faciliter son intégration dans les interfaces graphiques de type swing. @@ -49,5 +49,6 @@ - itération sur les matrices - import/export CSV - composants graphiques + - génération automatique de graphique basé sur JFreeChart **Veuillez consulter la JavaDoc pour de plus ample détails.**

1 0

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

16 Dec '10

Author: echatellier Date: 2010-12-16 18:21:23 +0100 (Thu, 16 Dec 2010) New Revision: 318 Url: http://nuiton.org/repositories/revision/nuiton-matrix/318 Log: Fix les tests Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2010-12-16 16:45:33 UTC (rev 317) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2010-12-16 17:21:23 UTC (rev 318) @@ -811,9 +811,17 @@ @Override public MatrixND getSubMatrix(Object[]... elems) { + + // la reduction doit se faire sur le meme nombre de dimension + if (elems.length != dim.length) { + throw new IllegalArgumentException(String.format("Can't get sub matrix with different dimension count (expected: %d, got %d)", dim.length, elems.length)); + } + MatrixND result = this; for (int i = 0; i < elems.length; ++i) { - result = result.getSubMatrix(i, elems[i]); + if (elems[i] != null) { + result = result.getSubMatrix(i, elems[i]); + } } return result; } @@ -825,9 +833,17 @@ @Override public MatrixND getSubMatrix(int[]... elems) { + + // la reduction doit se faire sur le meme nombre de dimension + if (elems.length != dim.length) { + throw new IllegalArgumentException(String.format("Can't get sub matrix with different dimension count (expected: %d, got %d)", dim.length, elems.length)); + } + MatrixND result = this; for (int i = 0; i < elems.length; ++i) { - result = new SubMatrix(result, i, elems[i]); + if (elems[i] != null) { + result = new SubMatrix(result, i, elems[i]); + } } return result; } Modified: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java =================================================================== --- trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java 2010-12-16 16:45:33 UTC (rev 317) +++ trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java 2010-12-16 17:21:23 UTC (rev 318) @@ -445,9 +445,9 @@ // reduction de "e", "f", "g" en "f", "g" MatrixND mat2 = mat.getSubMatrix(1, new int[]{1,2}); - Assert.assertEquals(new String[]{"f","g"}, mat2.getSemantic(1)); + Assert.assertEquals(Arrays.asList(new String[]{"f","g"}), mat2.getSemantic(1)); mat2 = mat2.getSubMatrix(2, new int[]{2}); - Assert.assertEquals(new String[]{"m"}, mat2.getSemantic(2)); + Assert.assertEquals(Arrays.asList(new String[]{"m"}), mat2.getSemantic(2)); } /** @@ -466,9 +466,9 @@ // reduction de "e", "f", "g" en "f", "g" MatrixND mat2 = mat.getSubMatrix(1, "f", "g"); - Assert.assertEquals(new String[]{"f","g"}, mat2.getSemantic(1)); + Assert.assertEquals(Arrays.asList(new String[]{"f","g"}), mat2.getSemantic(1)); mat2 = mat2.getSubMatrix(2, "m"); - Assert.assertEquals(new String[]{"m"}, mat2.getSemantic(2)); + Assert.assertEquals(Arrays.asList(new String[]{"m"}), mat2.getSemantic(2)); } /** @@ -487,13 +487,13 @@ // reduction de "e", "f", "g" en "f", "g" et "k", "l", "m" en "m" MatrixND mat2 = mat.getSubMatrix(new int[][]{new int[]{0, 1, 2}, new int[]{1,2}, new int[]{2}}); - Assert.assertEquals(new String[]{"f","g"}, mat2.getSemantic(1)); - Assert.assertEquals(new String[]{"m"}, mat2.getSemantic(2)); + Assert.assertEquals(Arrays.asList(new String[]{"f","g"}), mat2.getSemantic(1)); + Assert.assertEquals(Arrays.asList(new String[]{"m"}), mat2.getSemantic(2)); // meme test avec des null mat2 = mat.getSubMatrix(new int[][]{null, new int[]{1,2}, new int[]{2}}); - Assert.assertEquals(new String[]{"f","g"}, mat2.getSemantic(1)); - Assert.assertEquals(new String[]{"m"}, mat2.getSemantic(2)); + Assert.assertEquals(Arrays.asList(new String[]{"f","g"}), mat2.getSemantic(1)); + Assert.assertEquals(Arrays.asList(new String[]{"m"}), mat2.getSemantic(2)); } /**

1 0

r317 - in trunk: nuiton-matrix/src/main/java/org/nuiton/math/matrix nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer nuiton-matrix-gui/src/test/java/org/nuiton/math/matrix/viewer
by echatellier＠users.nuiton.org 16 Dec '10

16 Dec '10

Author: echatellier Date: 2010-12-16 17:45:33 +0100 (Thu, 16 Dec 2010) New Revision: 317 Url: http://nuiton.org/repositories/revision/nuiton-matrix/317 Log: Update panel viewer to use multiple unique matrix submatrix method Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java trunk/nuiton-matrix-gui/src/test/java/org/nuiton/math/matrix/viewer/MatrixViewerPanelTest.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixProxy.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixProxy.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixProxy.java 2010-12-16 16:06:06 UTC (rev 316) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixProxy.java 2010-12-16 16:45:33 UTC (rev 317) @@ -30,6 +30,7 @@ import java.util.List; import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang.ObjectUtils; /** * Matrix proxy contains only dimension and semantics definition, but @@ -155,7 +156,7 @@ // la reduction doit se faire sur le meme nombre de dimension if (elems.length != dim.length) { - throw new IllegalArgumentException(String.format("Can't reduce matrix with different dimension count (expected: %d, got %d)", dim.length, elems.length)); + throw new IllegalArgumentException(String.format("Can't get sub matrix with different dimension count (expected: %d, got %d)", dim.length, elems.length)); } // recopie seulement des sous semantiques voulues @@ -177,5 +178,28 @@ matrixProvider.fillValues(subMatrix); return subMatrix; } - + + /* + * Idem, mais ne compare pas les valeurs. + */ + @Override + public boolean equals(MatrixND mat) { + boolean result = true; + // le nom doit être le même + result = result && getName().equals(mat.getName()); + + // les sémantiques doivent-être identique + for (int i = 0; result && i < getDimCount(); i++) { + String dimName1 = getDimensionName(i); + String dimName2 = mat.getDimensionName(i); + result = ObjectUtils.equals(dimName1, dimName2); + + List<?> sem1 = getSemantic(i); + List<?> sem2 = mat.getSemantic(i); + result = result && ObjectUtils.equals(sem1, sem2); + + } + + return result; + } } Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java 2010-12-16 16:06:06 UTC (rev 316) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java 2010-12-16 16:45:33 UTC (rev 317) @@ -194,9 +194,13 @@ protected MatrixND createAndReduce(MatrixND matrix) { - // Reduit la matrice en fonction des choix de l utilisateur - // dans les autres InfoItem recuperation des autres elements - // selectionnees. + if (log.isDebugEnabled()) { + log.debug("matrice avant submatrice : " + matrix); + } + + // la matrice doit être reduite avant tout et en une seule + // fois pour fonctionner avec des matrices réelles ou des proxy + int[][] dimIndices = new int[subPanelList.size()][]; for (int i = 0; i < subPanelList.size(); i++) { SubDimensionPanel subDimPanel = subPanelList.get(i); JList list = subDimPanel.getList(); @@ -208,18 +212,23 @@ indList = list.getSelectedIndices(); } - if (log.isDebugEnabled()) { - log.debug("matrice avant submatrice de la dim " + i + ": " + matrix); - } - if (0 < indList.length && indList.length < matrix.getDim(i)) { - matrix = matrix.getSubMatrix(i, indList); + dimIndices[i] = indList; } + } - if (log.isDebugEnabled()) { - log.debug("matrice apres submatrice de la dim " + i + ": " + matrix); - } + // reduction effective de la matrice + matrix = matrix.getSubMatrix(dimIndices); + if (log.isDebugEnabled()) { + log.debug("matrice apres submatrice : " + matrix); + } + + // Effectue la somme si l'utilisateur a selectionné l'option somme + // dans le panel + for (int i = 0; i < subPanelList.size(); i++) { + SubDimensionPanel subDimPanel = subPanelList.get(i); + if (subDimPanel.getSumStep() != 1) { // on somme matrix = matrix.sumOverDim(i, subDimPanel.getSumStep()); @@ -265,7 +274,7 @@ } // end semantics modification */ } - + if (log.isDebugEnabled()) { log.debug("matrice apres sum de la dim " + i + ": " + matrix); } Modified: trunk/nuiton-matrix-gui/src/test/java/org/nuiton/math/matrix/viewer/MatrixViewerPanelTest.java =================================================================== --- trunk/nuiton-matrix-gui/src/test/java/org/nuiton/math/matrix/viewer/MatrixViewerPanelTest.java 2010-12-16 16:06:06 UTC (rev 316) +++ trunk/nuiton-matrix-gui/src/test/java/org/nuiton/math/matrix/viewer/MatrixViewerPanelTest.java 2010-12-16 16:45:33 UTC (rev 317) @@ -34,6 +34,7 @@ import org.nuiton.math.matrix.MatrixFactory; import org.nuiton.math.matrix.MatrixHelper; import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixProvider; import org.nuiton.math.matrix.viewer.renderer.MatrixChartRenderer; import org.nuiton.math.matrix.viewer.renderer.MatrixInfoTableRenderer; @@ -48,7 +49,7 @@ */ public class MatrixViewerPanelTest { - protected MatrixND getTestMatrix() { + protected MatrixND getTestMatrix(boolean proxy) { List<String> years = new ArrayList<String>(); years.add("1999"); years.add("2000"); @@ -66,10 +67,21 @@ cities.add("Toulouse"); cities.add("Marseille"); - MatrixND matrix = MatrixFactory.getInstance().create("test matrix", new List<?>[] { years, cities }); - matrix.setDimensionNames(new String[] { "Years", "Cities"}); - MatrixHelper.fill(matrix, 10000.0); - matrix.setValue(0, 0, 1000); + MatrixND matrix = null; + if (proxy) { + matrix = MatrixFactory.getInstance().createProxy("test matrix", new List<?>[]{years, cities}, new String[]{"Years", "Cities"}, new MatrixProvider() { + @Override + public void fillValues(MatrixND matrix) { + MatrixHelper.fill(matrix, 10000.0); + matrix.setValue(0, 0, 1000); + } + }); + } + else { + matrix = MatrixFactory.getInstance().create("test matrix", new List<?>[]{years, cities}, new String[]{"Years", "Cities"}); + MatrixHelper.fill(matrix, 10000.0); + matrix.setValue(0, 0, 1000); + } return matrix; } @@ -81,7 +93,7 @@ JFrame frame = new JFrame(); MatrixViewerPanel panel = new MatrixViewerPanel(); - MatrixND testMatrix = getTestMatrix(); + MatrixND testMatrix = getTestMatrix(false); panel.addMatrix(testMatrix, testMatrix); panel.addMatrixRenderer(new MatrixInfoTableRenderer()); panel.addMatrixRenderer(new MatrixChartRenderer()); @@ -97,4 +109,29 @@ e.printStackTrace(); }*/ } + + /** + * Test d'un affichage simple, par defaut (cas avec un proxy). + */ + @Test + public void testViewerPanelProxy() { + JFrame frame = new JFrame(); + + MatrixViewerPanel panel = new MatrixViewerPanel(); + MatrixND testMatrix = getTestMatrix(true); + panel.addMatrix(testMatrix, testMatrix); + panel.addMatrixRenderer(new MatrixInfoTableRenderer()); + panel.addMatrixRenderer(new MatrixChartRenderer()); + frame.add(panel); + + frame.pack(); + frame.setLocationRelativeTo(null); + frame.setVisible(true); + + /*try { + Thread.sleep(60000); + } catch (InterruptedException e) { + e.printStackTrace(); + }*/ + } }

1 0

r316 - trunk/nuiton-matrix-gui
by echatellier＠users.nuiton.org 16 Dec '10

16 Dec '10

Author: echatellier Date: 2010-12-16 17:06:06 +0100 (Thu, 16 Dec 2010) New Revision: 316 Url: http://nuiton.org/repositories/revision/nuiton-matrix/316 Log: Forgot one relocation Modified: trunk/nuiton-matrix-gui/pom.xml Modified: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml 2010-12-16 15:59:22 UTC (rev 315) +++ trunk/nuiton-matrix-gui/pom.xml 2010-12-16 16:06:06 UTC (rev 316) @@ -19,7 +19,7 @@ <dependencies> <dependency> - <groupId>org.nuiton.nuiton-matrix</groupId> + <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> <version>${project.version}</version> <scope>compile</scope>

1 0

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

16 Dec '10

Author: echatellier Date: 2010-12-16 16:59:22 +0100 (Thu, 16 Dec 2010) New Revision: 315 Url: http://nuiton.org/repositories/revision/nuiton-matrix/315 Log: Add new matrix proxy empty matrix implementation that use provider to fill value after reduction Added: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixProvider.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixProxy.java trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixProxyTest.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixHelper.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixND.java trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2010-12-16 15:58:02 UTC (rev 314) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2010-12-16 15:59:22 UTC (rev 315) @@ -73,6 +73,10 @@ protected List<?>[] semantics = null; + /** + * @deprecated as of 2.1 seams unused + */ + @Deprecated protected double defaultValue = 0; /** @@ -806,10 +810,28 @@ } @Override + public MatrixND getSubMatrix(Object[]... elems) { + MatrixND result = this; + for (int i = 0; i < elems.length; ++i) { + result = result.getSubMatrix(i, elems[i]); + } + return result; + } + + @Override public MatrixND getSubMatrix(int dim, int[] elem) { return new SubMatrix(this, dim, elem); } + @Override + public MatrixND getSubMatrix(int[]... elems) { + MatrixND result = this; + for (int i = 0; i < elems.length; ++i) { + result = new SubMatrix(result, i, elems[i]); + } + return result; + } + /** * Modifie la matrice actuelle en lui ajoutant les valeurs de la matrice * passé en parametre. La matrice passé en parametre doit avoir le meme Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java 2010-12-16 15:58:02 UTC (rev 314) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java 2010-12-16 15:59:22 UTC (rev 315) @@ -64,7 +64,7 @@ * Retourne une factory utilisant vectorClass comme classe de base a * l'implantation des matrices. * - * @param vectorClass vector class implememantation + * @param vectorClass vector class implementation * @return factory */ public static MatrixFactory getInstance(Class<?> vectorClass) { @@ -165,5 +165,35 @@ throw new RuntimeException("Can't create vector", eee); } } + + public MatrixProxy createProxy(List<?>[] semantics, MatrixProvider matrixProvider) { + MatrixProxy matrixProxy = new MatrixProxy(this, semantics); + matrixProxy.setMatrixProvider(matrixProvider); + return matrixProxy; + } + public MatrixProxy createProxy(String name, int[] dim, MatrixProvider matrixProvider) { + MatrixProxy matrixProxy = new MatrixProxy(this, name, dim); + matrixProxy.setMatrixProvider(matrixProvider); + return matrixProxy; + } + + public MatrixProxy createProxy(String name, int[] dim, String[] dimNames, MatrixProvider matrixProvider) { + MatrixProxy matrixProxy = new MatrixProxy(this, name, dim, dimNames); + matrixProxy.setMatrixProvider(matrixProvider); + return matrixProxy; + } + + public MatrixProxy createProxy(String name, List<?>[] semantics, MatrixProvider matrixProvider) { + MatrixProxy matrixProxy = new MatrixProxy(this, name, semantics); + matrixProxy.setMatrixProvider(matrixProvider); + return matrixProxy; + } + + public MatrixProxy createProxy(String name, List<?>[] semantics, String[] dimNames, MatrixProvider matrixProvider) { + MatrixProxy matrixProxy = new MatrixProxy(this, name, semantics, dimNames); + matrixProxy.setMatrixProvider(matrixProvider); + return matrixProxy; + } + } // MatrixFactory Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixHelper.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixHelper.java 2010-12-16 15:58:02 UTC (rev 314) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixHelper.java 2010-12-16 15:59:22 UTC (rev 315) @@ -32,6 +32,8 @@ import java.util.NoSuchElementException; import java.util.Stack; +import org.apache.commons.lang.ArrayUtils; + /** * Contains usefull methods to get information on matrix. * Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixND.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixND.java 2010-12-16 15:58:02 UTC (rev 314) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixND.java 2010-12-16 15:59:22 UTC (rev 315) @@ -656,12 +656,34 @@ * prend que certain élément. * * @param dim la dimension dans lequel on veut une sous matrice - * @param elem les éléments dans la dimension à conserver + * @param elem les indices des éléments dans la dimension à conserver * @return new matrix */ public MatrixND getSubMatrix(int dim, int[] elem); /** + * Permet de prendre une sous matrice dans la matrice courante. + * + * Réalise plusieurs appels à {@link #getSubMatrix(int, Object...)} suivant + * l'implémentation. + * + * @param elem les éléments dans la dimension à conserver + * @return new matrix + */ + public MatrixND getSubMatrix(Object[]... elem); + + /** + * Permet de prendre une sous matrice dans la matrice courante. + * + * Réalise plusieurs appels a {@link #getSubMatrix(int, int[])} suivant + * l'implementation. + * + * @param elems les indices des éléments pour chaque dimension à conserver + * @return new matrix + */ + public MatrixND getSubMatrix(int[]... elems); + + /** * Addition la matrice courante avec la matrice passe en parametre et se * retourne elle meme. * Added: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixProvider.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixProvider.java (rev 0) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixProvider.java 2010-12-16 15:59:22 UTC (rev 315) @@ -0,0 +1,47 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.math.matrix; + +/** + * Matrix provider used by {@link MatrixProxy} to fill matrix value after + * dimensions reductions. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public interface MatrixProvider { + + /** + * Fill a matrix after dimensions reductions. + * + * @param matrix matrix to fill + */ + public void fillValues(MatrixND matrix); + +} Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixProvider.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixProxy.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixProxy.java (rev 0) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixProxy.java 2010-12-16 15:59:22 UTC (rev 315) @@ -0,0 +1,181 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.math.matrix; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.apache.commons.lang.ArrayUtils; + +/** + * Matrix proxy contains only dimension and semantics definition, but + * does not allocate memory spaces for value. + * Call to getSubMatrix method will return a really allocated memory + * matrix and use a {@link MatrixProvider} to fill matrix value. + * + * This is usefull for huge matrix that need to not be filled at first + * use, but after some dimensions reductions. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + * + * @see MatrixProvider + */ +public class MatrixProxy extends AbstractMatrixND { + + /** serialVersionUID. */ + private static final long serialVersionUID = 2338394722090201478L; + + protected MatrixProvider matrixProvider; + + protected MatrixProxy(MatrixFactory factory, int[] dim) { + super(factory, dim); + } + + protected MatrixProxy(MatrixFactory factory, List<?>[] semantics) { + super(factory, semantics); + } + + protected MatrixProxy(MatrixFactory factory, String name, int[] dim) { + super(factory, name, dim); + } + + protected MatrixProxy(MatrixFactory factory, String name, int[] dim, + String[] dimNames) { + super(factory, name, dim, dimNames); + } + + protected MatrixProxy(MatrixFactory factory, String name, + List<?>[] semantics) { + super(factory, name, semantics); + } + + protected MatrixProxy(MatrixFactory factory, String name, + List<?>[] semantics, String[] dimNames) { + super(factory, name, semantics, dimNames); + } + + public MatrixProvider getMatrixProvider() { + return matrixProvider; + } + + public void setMatrixProvider(MatrixProvider matrixProvider) { + this.matrixProvider = matrixProvider; + } + + /* + * @see org.nuiton.math.matrix.AbstractMatrixND#iterator() + */ + @Override + public MatrixIterator iterator() { + throw new UnsupportedOperationException("Not implemented on matrix proxy"); + } + + /* + * @see org.nuiton.math.matrix.AbstractMatrixND#getValue(int[]) + */ + @Override + public double getValue(int[] coordinates) { + throw new UnsupportedOperationException("Not implemented on matrix proxy"); + } + + /* + * @see org.nuiton.math.matrix.AbstractMatrixND#setValue(int[], double) + */ + @Override + public void setValue(int[] coordinates, double d) { + throw new UnsupportedOperationException("Not implemented on matrix proxy"); + } + + @Override + public MatrixND getSubMatrix(int dim, int start, int nb) { + //TODO echatellier 20101216 could be implemented + throw new UnsupportedOperationException("Not yet implemented"); + } + + @Override + public MatrixND getSubMatrix(int dim, Object... elem) { + //TODO echatellier 20101216 could be implemented + throw new UnsupportedOperationException("Not yet implemented"); + } + + @Override + public MatrixND getSubMatrix(Object[]... elems) { + + // convert semantics to indices + int[][] elemIndices = new int[elems.length][]; + for (int i = 0 ; i < elemIndices.length ; ++i) { + if (elems[i] != null) { + elemIndices[i] = new int[elems[i].length]; + for (int j = 0; j < elems[i].length; j++) { + elemIndices[i][j] = MatrixHelper.indexOf(getSemantics(), i, elems[i][j]); + } + } + } + + MatrixND subMatrix = getSubMatrix(elemIndices); + return subMatrix; + } + + @Override + public MatrixND getSubMatrix(int dim, int[] elem) { + //TODO echatellier 20101216 could be implemented + throw new UnsupportedOperationException("Not yet implemented"); + } + + @Override + public MatrixND getSubMatrix(int[]... elems) { + + // la reduction doit se faire sur le meme nombre de dimension + if (elems.length != dim.length) { + throw new IllegalArgumentException(String.format("Can't reduce matrix with different dimension count (expected: %d, got %d)", dim.length, elems.length)); + } + + // recopie seulement des sous semantiques voulues + // a partir des semantics du parent (super) + List<Object>[] subSem = new List[elems.length]; + for (int iDim = 0 ; iDim < elems.length ; iDim++) { + subSem[iDim] = new ArrayList<Object>(); + List<?> semantics = super.semantics[iDim]; + + for (int iElem = 0; iElem < semantics.size(); iElem++) { + // si c'est null, on copies tout + if (elems[iDim] == null || ArrayUtils.contains(elems[iDim], iElem)) { + subSem[iDim].add(semantics.get(iElem)); + } + } + } + + MatrixND subMatrix = factory.create(name, subSem, dimNames); + matrixProvider.fillValues(subMatrix); + return subMatrix; + } + +} Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixProxy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java =================================================================== --- trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java 2010-12-16 15:58:02 UTC (rev 314) +++ trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java 2010-12-16 15:59:22 UTC (rev 315) @@ -429,7 +429,92 @@ Assert.assertEquals(3.0, mat.getValue(5, 0, 3), 0); } + /** + * Test de reduction simple par indice. + * + * @throws Exception + */ @Test + public void testSubMatrixIntIntArray() throws Exception { + 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" }); + + MatrixND mat = getFactory().create("Ma mat", new List[] { s1, s2, s3 }, + new String[] { "dim abc", "dim efg", "dim klm" }); + + // reduction de "e", "f", "g" en "f", "g" + MatrixND mat2 = mat.getSubMatrix(1, new int[]{1,2}); + Assert.assertEquals(new String[]{"f","g"}, mat2.getSemantic(1)); + mat2 = mat2.getSubMatrix(2, new int[]{2}); + Assert.assertEquals(new String[]{"m"}, mat2.getSemantic(2)); + } + + /** + * Test de reduction simple par semantic. + * + * @throws Exception + */ + @Test + public void testSubMatrixIntObjectArray() throws Exception { + 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" }); + + MatrixND mat = getFactory().create("Ma mat", new List[] { s1, s2, s3 }, + new String[] { "dim abc", "dim efg", "dim klm" }); + + // reduction de "e", "f", "g" en "f", "g" + MatrixND mat2 = mat.getSubMatrix(1, "f", "g"); + Assert.assertEquals(new String[]{"f","g"}, mat2.getSemantic(1)); + mat2 = mat2.getSubMatrix(2, "m"); + Assert.assertEquals(new String[]{"m"}, mat2.getSemantic(2)); + } + + /** + * Test de reduction multiple par indices. + * + * @throws Exception + */ + @Test + public void testSubMatrixIntArrayArray() throws Exception { + 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" }); + + MatrixND mat = getFactory().create("Ma mat", new List[] { s1, s2, s3 }, + new String[] { "dim abc", "dim efg", "dim klm" }); + + // reduction de "e", "f", "g" en "f", "g" et "k", "l", "m" en "m" + MatrixND mat2 = mat.getSubMatrix(new int[][]{new int[]{0, 1, 2}, new int[]{1,2}, new int[]{2}}); + Assert.assertEquals(new String[]{"f","g"}, mat2.getSemantic(1)); + Assert.assertEquals(new String[]{"m"}, mat2.getSemantic(2)); + + // meme test avec des null + mat2 = mat.getSubMatrix(new int[][]{null, new int[]{1,2}, new int[]{2}}); + Assert.assertEquals(new String[]{"f","g"}, mat2.getSemantic(1)); + Assert.assertEquals(new String[]{"m"}, mat2.getSemantic(2)); + } + + /** + * Test de reduction sur le mauvais nombre de dimension. + * + * @throws Exception + */ + @Test(expected=IllegalArgumentException.class) + public void testSubMatrixIntArrayArrayException() throws Exception { + 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" }); + + MatrixND mat = getFactory().create("Ma mat", new List[] { s1, s2, s3 }, + new String[] { "dim abc", "dim efg", "dim klm" }); + + // reduction de "e", "f", "g" en "f", "g" + mat.getSubMatrix(new int[][]{null}); + } + + @Test public void testTranspose() throws Exception { MatrixND mat = null; Added: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixProxyTest.java =================================================================== --- trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixProxyTest.java (rev 0) +++ trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixProxyTest.java 2010-12-16 15:59:22 UTC (rev 315) @@ -0,0 +1,122 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.math.matrix; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; + +/** + * Test about matrix proxy and provider class. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class MatrixProxyTest { + + private static final Log log = LogFactory.getLog(MatrixProxyTest.class); + + public MatrixFactory getFactory() throws Exception { + return MatrixFactory.getInstance(DoubleVector.class); + } + + static class MatrixTestProvider implements MatrixProvider { + @Override + public void fillValues(MatrixND matrix) { + MatrixHelper.fill(matrix, 10.0); + } + } + + protected MatrixND getTestProxy(int dim) throws Exception { + + List<String> years = new ArrayList<String>(); + List<String> cities = new ArrayList<String>(); + List<String> quarter = new ArrayList<String>(); + for (int i = 0 ; i < dim ; i ++) { + years.add("200" + i); + cities.add("City " + i); + quarter.add("Quarter " + i); + } + + MatrixProxy matrix = getFactory().createProxy("test matrix", new List<?>[] { years, cities, quarter}, + new String[] {"Years", "Cities", "Quarter"}, new MatrixTestProvider()); + return matrix; + } + + /** + * Test de manipuler la matrice comme une matrice normale + * et que ses valeurs soit setter par le provider. + * + * Test par indices. + * + * @throws Exception + */ + @Test + public void testReductionAndProvider() throws Exception { + MatrixND matrix = getTestProxy(7); + Assert.assertEquals(3, matrix.getDimCount()); + Assert.assertEquals(7, matrix.getDim(0)); + Assert.assertEquals("Cities", matrix.getDimensionName(1)); + + // toutes la matrice, mais juste pour les années 2002/2003 + MatrixND subMatrix = matrix.getSubMatrix(new int[][]{new int[]{2,3}, null, null}); + if (log.isDebugEnabled()) { + log.debug("subMatrix = " + subMatrix); + } + Assert.assertEquals(2, subMatrix.getDim(0)); + Assert.assertEquals(10.0, subMatrix.getValue(0, 0, 0), 0.0001); + } + + /** + * Test de manipuler la matrice comme une matrice normale + * et que ses valeurs soit setter par le provider. + * + * Test par objet de semantique. + * + * @throws Exception + */ + @Test + public void testReductionAndProviderObject() throws Exception { + MatrixND matrix = getTestProxy(7); + Assert.assertEquals(3, matrix.getDimCount()); + Assert.assertEquals(7, matrix.getDim(0)); + Assert.assertEquals("Cities", matrix.getDimensionName(1)); + + // toutes la matrice, mais juste pour les années 2002/2003 + MatrixND subMatrix = matrix.getSubMatrix(new Object[][]{new String[]{"2002","2003"}, null, null}); + Assert.assertEquals(2, subMatrix.getDim(0)); + Assert.assertEquals(10.0, subMatrix.getValue(0, 0, 0), 0.0001); + } + + +} Property changes on: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixProxyTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r314 - trunk/nuiton-matrix/src/test/resources
by echatellier＠users.nuiton.org 16 Dec '10

16 Dec '10

Author: echatellier Date: 2010-12-16 16:58:02 +0100 (Thu, 16 Dec 2010) New Revision: 314 Url: http://nuiton.org/repositories/revision/nuiton-matrix/314 Log: Set log level to info Modified: trunk/nuiton-matrix/src/test/resources/log4j.properties Modified: trunk/nuiton-matrix/src/test/resources/log4j.properties =================================================================== --- trunk/nuiton-matrix/src/test/resources/log4j.properties 2010-12-16 10:25:57 UTC (rev 313) +++ trunk/nuiton-matrix/src/test/resources/log4j.properties 2010-12-16 15:58:02 UTC (rev 314) @@ -31,4 +31,4 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.org.nuiton.math=DEBUG \ No newline at end of file +log4j.logger.org.nuiton.math=INFO \ No newline at end of file

1 0

r313 - trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix
by echatellier＠users.nuiton.org 16 Dec '10

16 Dec '10

Author: echatellier Date: 2010-12-16 11:25:57 +0100 (Thu, 16 Dec 2010) New Revision: 313 Url: http://nuiton.org/repositories/revision/nuiton-matrix/313 Log: Add doc. Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/SubMatrix.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/SubMatrix.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/SubMatrix.java 2010-12-16 09:41:57 UTC (rev 312) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/SubMatrix.java 2010-12-16 10:25:57 UTC (rev 313) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2010 CodeLutin + * Copyright (C) 2004 - 2010 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -36,6 +36,8 @@ * que la matrice qu'elle contient. Elle permet juste de reduire le nombre * d'element d'une dimension. * + * C'est comme une "vue" réduite sur la vraie matrices. + * * Created: 29 oct. 2004 * * @author Benjamin Poussin <poussin(a)codelutin.com> @@ -48,8 +50,9 @@ /** serialVersionUID. */ private static final long serialVersionUID = 4092234115185263506L; - + protected MatrixND matrix = null; + protected DimensionConverter converter = null; public SubMatrix(MatrixND matrix, int dim, int start, int nb) { @@ -165,8 +168,8 @@ /** * La conversion est juste un decalage d'indice */ - protected class ShiftConverter implements DimensionConverter { - /** */ + protected static class ShiftConverter implements DimensionConverter { + /** serialVersionUID. */ private static final long serialVersionUID = 1L; protected int dim; @@ -195,13 +198,13 @@ } /** - * La conversion est le mapping d'un element vers un autre element + * La conversion est le mapping d'un element vers un autre element. */ - protected class MappingConverter implements DimensionConverter { + protected static class MappingConverter implements DimensionConverter { /** serialVersionUID. */ private static final long serialVersionUID = -6367416559713556559L; - + protected int dim; protected int[] elem = null; @@ -218,7 +221,7 @@ result = new int[coordinates.length]; System.arraycopy(coordinates, 0, result, 0, result.length); result[dim] = elem[coordinates[dim]]; - + } else { throw new NoSuchElementException( "L'indice est supérieur au nombre d'élements de la sous matrice pour cette dimension."); @@ -228,4 +231,3 @@ } } // SubMatrix -

1 0

r312 - trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix
by echatellier＠users.nuiton.org 16 Dec '10

16 Dec '10

Author: echatellier Date: 2010-12-16 10:41:57 +0100 (Thu, 16 Dec 2010) New Revision: 312 Url: http://nuiton.org/repositories/revision/nuiton-matrix/312 Log: Add doc. Remove abstract methods (mandatory by interface implementation) Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2010-12-16 09:30:38 UTC (rev 311) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2010-12-16 09:41:57 UTC (rev 312) @@ -42,7 +42,8 @@ import org.nuiton.util.ArrayUtil; /** - * AbstractMatrixND. + * Abstract matrix class with all dimension and semantics support (but + * no internal value storage). * * Created: 29 oct. 2004 * @@ -60,15 +61,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static Log log = LogFactory.getLog(AbstractMatrixND.class); - @Override - public abstract MatrixIterator iterator(); - - @Override - public abstract double getValue(int[] coordinates); - - @Override - public abstract void setValue(int[] coordinates, double d); - protected transient DimensionHelper dimHelper = new DimensionHelper(); protected transient MatrixFactory factory = null;

1 0

r311 - trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix
by echatellier＠users.nuiton.org 16 Dec '10

16 Dec '10

Author: echatellier Date: 2010-12-16 10:30:38 +0100 (Thu, 16 Dec 2010) New Revision: 311 Url: http://nuiton.org/repositories/revision/nuiton-matrix/311 Log: set getMaxOccurence deprecated Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixNDImpl.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixNDImpl.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixNDImpl.java 2010-12-15 18:06:36 UTC (rev 310) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixNDImpl.java 2010-12-16 09:30:38 UTC (rev 311) @@ -102,11 +102,17 @@ } @Override + @Deprecated public double getMaxOccurence() { - return matrix.getMaxOccurence(); + return getMaxOccurrence(); } @Override + public double getMaxOccurrence() { + return matrix.getMaxOccurrence(); + } + + @Override public String toString() { return getName() + " " + matrix.toString(); }

1 0

r310 - in trunk: . nuiton-matrix nuiton-matrix-gui nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart
by echatellier＠users.nuiton.org 15 Dec '10

15 Dec '10

Author: echatellier Date: 2010-12-15 19:06:36 +0100 (Wed, 15 Dec 2010) New Revision: 310 Url: http://nuiton.org/repositories/revision/nuiton-matrix/310 Log: Relocate to org.nuiton.matrix Modified: trunk/nuiton-matrix-gui/pom.xml trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphComboRenderer.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphMatrixNDDataset.java trunk/nuiton-matrix/pom.xml trunk/pom.xml Modified: trunk/nuiton-matrix/pom.xml =================================================================== --- trunk/nuiton-matrix/pom.xml 2010-12-10 10:01:28 UTC (rev 309) +++ trunk/nuiton-matrix/pom.xml 2010-12-15 18:06:36 UTC (rev 310) @@ -9,11 +9,11 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>nuiton-matrix</artifactId> + <artifactId>matrix</artifactId> <version>2.1-SNAPSHOT</version> </parent> - <groupId>org.nuiton.nuiton-matrix</groupId> + <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> <dependencies> Modified: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml 2010-12-10 10:01:28 UTC (rev 309) +++ trunk/nuiton-matrix-gui/pom.xml 2010-12-15 18:06:36 UTC (rev 310) @@ -9,11 +9,11 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>nuiton-matrix</artifactId> + <artifactId>matrix</artifactId> <version>2.1-SNAPSHOT</version> </parent> - <groupId>org.nuiton.nuiton-matrix</groupId> + <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> <dependencies> Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphComboRenderer.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphComboRenderer.java 2010-12-10 10:01:28 UTC (rev 309) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphComboRenderer.java 2010-12-15 18:06:36 UTC (rev 310) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2002 - 2010 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 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 Public License for more details. + * GNU General Lesser Public License for more details. * - * You should have received a copy of the GNU General 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/gpl-2.0.html>. + * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphMatrixNDDataset.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphMatrixNDDataset.java 2010-12-10 10:01:28 UTC (rev 309) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphMatrixNDDataset.java 2010-12-15 18:06:36 UTC (rev 310) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2002 - 2010 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 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 Public License for more details. + * GNU General Lesser Public License for more details. * - * You should have received a copy of the GNU General 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/gpl-2.0.html>. + * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-10 10:01:28 UTC (rev 309) +++ trunk/pom.xml 2010-12-15 18:06:36 UTC (rev 310) @@ -14,7 +14,7 @@ <version>2.4.1</version> </parent> - <artifactId>nuiton-matrix</artifactId> + <artifactId>matrix</artifactId> <version>2.1-SNAPSHOT</version> <modules> @@ -95,6 +95,8 @@ <properties> + <projectId>nuiton-matrix</projectId> + <jaxxVersion>2.2.3</jaxxVersion> <nuitonUtilsVersion>1.5</nuitonUtilsVersion> <nuitonI18nVersion>2.0</nuitonI18nVersion>

1 0