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

r407 - trunk
by maven-release＠users.nuiton.org 04 Jan '12

04 Jan '12

Author: maven-release Date: 2012-01-04 18:19:06 +0100 (Wed, 04 Jan 2012) New Revision: 407 Url: http://nuiton.org/repositories/revision/nuiton-matrix/407 Log: Update mavenpom4redmineAndCentral to 3.0.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 14:35:47 UTC (rev 406) +++ trunk/pom.xml 2012-01-04 17:19:06 UTC (rev 407) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.6</version> + <version>3.0.7</version> </parent> <artifactId>matrix</artifactId>

1 0

r406 - in trunk/nuiton-matrix-gui/src: main/java/org/nuiton/math/matrix/gui test/java/org/nuiton/math/matrix/gui
by echatellier＠users.nuiton.org 04 Jan '12

04 Jan '12

Author: echatellier Date: 2012-01-04 15:35:47 +0100 (Wed, 04 Jan 2012) New Revision: 406 Url: http://nuiton.org/repositories/revision/nuiton-matrix/406 Log: #1860 : Constructor MatrixPanelEditor(Matrix m) doesn't render matrix Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.jaxx trunk/nuiton-matrix-gui/src/test/java/org/nuiton/math/matrix/gui/MatrixPanelEditorTest.java Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.jaxx =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.jaxx 2012-01-04 14:03:15 UTC (rev 405) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.jaxx 2012-01-04 14:35:47 UTC (rev 406) @@ -56,7 +56,8 @@ public MatrixPanelEditor(MatrixND m, boolean dimensionEdit) { this(dimensionEdit); - matrix = m; + //this.matrix = m; doesn't work + setMatrix(m); } @Override Modified: trunk/nuiton-matrix-gui/src/test/java/org/nuiton/math/matrix/gui/MatrixPanelEditorTest.java =================================================================== --- trunk/nuiton-matrix-gui/src/test/java/org/nuiton/math/matrix/gui/MatrixPanelEditorTest.java 2012-01-04 14:03:15 UTC (rev 405) +++ trunk/nuiton-matrix-gui/src/test/java/org/nuiton/math/matrix/gui/MatrixPanelEditorTest.java 2012-01-04 14:35:47 UTC (rev 406) @@ -31,6 +31,7 @@ import javax.swing.JFrame; +import org.junit.Assert; import org.junit.Test; import org.nuiton.math.matrix.MatrixFactory; import org.nuiton.math.matrix.MatrixHelper; @@ -125,6 +126,17 @@ editor.setMatrix(matrix); show(editor); } + + /** + * En 2.2.2 mettre la matrice en construteur ne fonctionnait pas. + */ + @Test + public void testModelNDDim3MInConstructor() { + MatrixND matrix = getMatrixTest(3); + MatrixPanelEditor editor = new MatrixPanelEditor(matrix, false); + Assert.assertTrue(editor.getTable().getModel() instanceof MatrixTableModel); + show(editor); + } @Test public void testModelNDDim4() {

1 0

r405 - in trunk: . nuiton-matrix-gui nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart
by echatellier＠users.nuiton.org 04 Jan '12

04 Jan '12

Author: echatellier Date: 2012-01-04 15:03:15 +0100 (Wed, 04 Jan 2012) New Revision: 405 Url: http://nuiton.org/repositories/revision/nuiton-matrix/405 Log: #1861 : Graph rendering only works with jfreechart 1.0.12 Modified: trunk/nuiton-matrix-gui/pom.xml trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphMatrixNDDataset.java trunk/pom.xml Modified: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml 2012-01-04 11:44:38 UTC (rev 404) +++ trunk/nuiton-matrix-gui/pom.xml 2012-01-04 14:03:15 UTC (rev 405) @@ -51,7 +51,7 @@ </dependency> <dependency> - <groupId>jfree</groupId> + <groupId>org.jfree</groupId> <artifactId>jfreechart</artifactId> </dependency> </dependencies> 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 2012-01-04 11:44:38 UTC (rev 404) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphMatrixNDDataset.java 2012-01-04 14:03:15 UTC (rev 405) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, CodeLutin, Chatellier Eric + * Copyright (C) 2002 - 2012 Ifremer, 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 @@ -47,10 +47,10 @@ private static final long serialVersionUID = -891382923646394164L; /** The series names. */ - protected List<?> seriesNames; + protected List<String> seriesNames; /** The categories. */ - protected List<?> categories; + protected List<String> categoriesNames; /** Storage for the data. */ protected MatrixND mat; @@ -63,11 +63,11 @@ * Constructs a GraphMatrixNDDataset, populates it with the matrix, and uses the * supplied names for the series and the supplied objects for the categories. * - * @param seriesNames series names. + * @param series series names. * @param categories categories. * @param mat matrix. */ - public GraphMatrixNDDataset(List<?> seriesNames, List<?> categories, MatrixND mat) { + public GraphMatrixNDDataset(List<?> series, List<?> categories, MatrixND mat) { this.mat = mat; @@ -80,49 +80,59 @@ if (seriesCount > 0) { // set up the series names... - if (seriesNames != null) { - - if (seriesNames.size() != seriesCount) { + if (series != null) { + + if (series.size() != seriesCount) { throw new IllegalArgumentException( "DefaultCategoryDataset: the number of " + "series names does not match the number of series in the data."); } - this.seriesNames = seriesNames; + //since jfreechart 1.0.13 doesn't work anymore + //because of getRowKey that return toString + //so indexOf(String) in a list of entities always return -1 + //this.seriesNames = seriesNames; + seriesNames = new ArrayList<String>(seriesCount); + for (int i = 0; i < seriesCount; i++) { + Object dim = mat.getSemantic(1).get(i); + seriesNames.add(dim.toString()); // must match getRowKey() + } } else { String prefix = resources - .getString("series.default-prefix") - + " "; + .getString("series.default-prefix") + " "; this.seriesNames = this.generateNames(seriesCount, prefix); } - if (mat.getDimCount() > 1) { - // set up the category names... - int categoryCount = mat.getDim(0); - if (categories != null) { - if (categories.size() != categoryCount) { - throw new IllegalArgumentException( - "DefaultCategoryDataset: the number of " - + "categories does not match the number of categories in the data."); - } - this.categories = categories; - } else { - String prefix = resources - .getString("categories.default-prefix") - + " "; - this.categories = this.generateNames(categoryCount, - prefix); + // set up the category names... + int categoryCount = mat.getDim(0); + if (categories != null) { + if (categories.size() != categoryCount) { + throw new IllegalArgumentException( + "DefaultCategoryDataset: the number of " + + "categories does not match the number of categories in the data."); } + + //since jfreechart 1.0.13 doesn't work anymore + //because of getRowKey that return toString + //so indexOf(String) in a list of entities always return -1 + //this.categoriesNames = categories; + categoriesNames = new ArrayList<String>(categoryCount); + for (int i = 0; i < categoryCount; i++) { + Object dim = mat.getSemantic(0).get(i); + categoriesNames.add(dim.toString()); // must match getRowKey() + } } else { - this.categories = null; + String prefix2 = resources + .getString("categories.default-prefix") + " "; + categoriesNames = this.generateNames(categoryCount, prefix2); } } else { this.seriesNames = null; - this.categories = null; + this.categoriesNames = null; } } else { this.seriesNames = null; - this.categories = null; + this.categoriesNames = null; } } @@ -134,10 +144,9 @@ * @param prefix name prefix. */ protected List<String> generateNames(int count, String prefix) { - List<String> result = new ArrayList<String>(); - String name; + List<String> result = new ArrayList<String>(count); for (int i = 0; i < count; i++) { - name = prefix + (i + 1); + String name = prefix + (i + 1); result.add(name); } return result; @@ -168,7 +177,7 @@ */ @Override public int getColumnIndex(Comparable key) { - return categories.indexOf(key); + return categoriesNames.indexOf(key); } /* @@ -176,7 +185,7 @@ */ @Override public Comparable getColumnKey(int column) { - return categories.get(column).toString(); + return categoriesNames.get(column).toString(); } /* @@ -187,10 +196,10 @@ // the CategoryDataset interface expects a list of categories, but we've stored them in // an array... - if (categories == null) { + if (categoriesNames == null) { return Collections.EMPTY_LIST; } else { - return Collections.unmodifiableList(categories); + return Collections.unmodifiableList(categoriesNames); } } @@ -231,7 +240,7 @@ */ @Override public int getColumnCount() { - return categories.size(); + return categoriesNames.size(); } /* @@ -247,6 +256,7 @@ */ @Override public Number getValue(int row, int column) { - return new Double(mat.getValue(column, row)); + Number result = new Double(mat.getValue(column, row)); + return result; } } // GraphMatrixNDDataset Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 11:44:38 UTC (rev 404) +++ trunk/pom.xml 2012-01-04 14:03:15 UTC (rev 405) @@ -65,9 +65,9 @@ </dependency> <dependency> - <groupId>jfree</groupId> + <groupId>org.jfree</groupId> <artifactId>jfreechart</artifactId> - <version>1.0.13</version> + <version>1.0.14</version> <scope>compile</scope> </dependency> </dependencies> @@ -147,5 +147,4 @@ <url>${our.site.repository}/${projectId}</url> </site> </distributionManagement> - </project>

1 0

r404 - trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer
by echatellier＠users.nuiton.org 04 Jan '12

04 Jan '12

Author: echatellier Date: 2012-01-04 12:44:38 +0100 (Wed, 04 Jan 2012) New Revision: 404 Url: http://nuiton.org/repositories/revision/nuiton-matrix/404 Log: Fix log message Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java 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 2011-12-02 17:11:25 UTC (rev 403) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java 2012-01-04 11:44:38 UTC (rev 404) @@ -355,7 +355,7 @@ } if (log.isDebugEnabled()) { - log.debug("Matrix febore reduce: " + matrix); + log.debug("Matrix bebore reduce: " + matrix); } // arrive ici on a une matrice qui a des tailles de dimension 1

1 0