January 2012 - Isis-fish-commits - mailman.cloud.codelutin.com

r3590 - trunk/src/main/java/fr/ifremer/isisfish/simulator
by echatellier＠users.forge.codelutin.com Jan. 12, 2012

Jan. 12, 2012

Author: echatellier Date: 2012-01-12 15:52:22 +0100 (Thu, 12 Jan 2012) New Revision: 3590 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3590 Log: #719 : Equation context value is computed from defaultValue Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2012-01-11 18:17:22 UTC (rev 3589) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2012-01-12 14:52:22 UTC (rev 3590) @@ -345,9 +345,9 @@ * @return computed value or <tt>defaultValue</tt> if not found */ public double getValueAndCompute(String key, double defaultValue) { - - double result = defaultValue; + double result; + // for equation, name is set not R escaped in database by swing ui // but is set escaped in prescripts because of r escape // need to be escaped here @@ -356,20 +356,21 @@ if (contextEquationValue.containsKey(localKey)) { Double value = contextEquationValue.get(localKey); - + if (log.isTraceEnabled()) { log.trace("Found key '" + localKey + "' current value = " + value); } // since 3.4.0.0, operator is always * - result = value * defaultValue; + result = value; } else { + result = defaultValue; if (log.isTraceEnabled()) { log.trace("No key defined for key '" + localKey + "' in context"); } } - + return result; } }

1 0

r3589 - trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by echatellier＠users.forge.codelutin.com Jan. 11, 2012

Jan. 11, 2012

Author: echatellier Date: 2012-01-11 19:17:22 +0100 (Wed, 11 Jan 2012) New Revision: 3589 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3589 Log: Remplacement des characters particulier de R Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2012-01-11 15:53:17 UTC (rev 3588) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2012-01-11 18:17:22 UTC (rev 3589) @@ -421,8 +421,10 @@ // sinon, à la sauvegarde elle sera reajoutée if (domain instanceof EquationContinuousDomain) { EquationContinuousDomain equationDomain = (EquationContinuousDomain)domain; - String suffix = "." + equationDomain.getVariableName(); - factorName = StringUtils.removeEnd(factorName, suffix); + String suffix = equationDomain.getVariableName(); + factorName = StringUtils.removeEnd(factorName, "." + suffix); + // can be called _xxx after char remplacement for R + factorName = StringUtils.removeEnd(factorName, "_" + suffix); } if (domain instanceof ContinuousDomain) {

1 0

r3588 - trunk/src/main/java/fr/ifremer/isisfish
by echatellier＠users.forge.codelutin.com Jan. 11, 2012

Jan. 11, 2012

Author: echatellier Date: 2012-01-11 16:53:17 +0100 (Wed, 11 Jan 2012) New Revision: 3588 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3588 Log: Prepare next release Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2012-01-11 15:50:00 UTC (rev 3587) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2012-01-11 15:53:17 UTC (rev 3588) @@ -119,7 +119,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(4, 0, 0, 1); + protected final static Version version = new Version(4, 0, 0, 2); protected final static Version majorVersion = new Version(version.getNumber(0)); protected final static Version databaseVersion = new Version(

1 0

r3587 - trunk
by echatellier＠users.forge.codelutin.com Jan. 11, 2012

Jan. 11, 2012

Author: echatellier Date: 2012-01-11 16:50:00 +0100 (Wed, 11 Jan 2012) New Revision: 3587 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3587 Log: Back to working maven pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-11 15:48:04 UTC (rev 3586) +++ trunk/pom.xml 2012-01-11 15:50:00 UTC (rev 3587) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.7</version> + <version>3.0.6</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r3586 - in trunk/src: main/java/fr/ifremer/isisfish/simulator main/java/fr/ifremer/isisfish/simulator/launcher main/java/fr/ifremer/isisfish/simulator/sensitivity test/java/fr/ifremer/isisfish/simulator/sensitivity
by echatellier＠users.forge.codelutin.com Jan. 11, 2012

Jan. 11, 2012

Author: echatellier Date: 2012-01-11 16:48:04 +0100 (Wed, 11 Jan 2012) New Revision: 3586 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3586 Log: #716 : Can't found factor name in simulation context Added: trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtils.java trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtilsTest.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2012-01-10 13:52:45 UTC (rev 3585) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2012-01-11 15:48:04 UTC (rev 3586) @@ -37,6 +37,7 @@ import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.simulator.sensitivity.SensitivityUtils; /** * Keep all information on one simulation. @@ -347,12 +348,17 @@ double result = defaultValue; - if (contextEquationValue.containsKey(key)) { + // for equation, name is set not R escaped in database by swing ui + // but is set escaped in prescripts because of r escape + // need to be escaped here + String localKey = SensitivityUtils.espaceFactorName(key); - Double value = contextEquationValue.get(key); + if (contextEquationValue.containsKey(localKey)) { + + Double value = contextEquationValue.get(localKey); if (log.isTraceEnabled()) { - log.trace("Found key '" + key + "' current value = " + value); + log.trace("Found key '" + localKey + "' current value = " + value); } // since 3.4.0.0, operator is always * @@ -360,7 +366,7 @@ } else { if (log.isTraceEnabled()) { - log.trace("No key defined for key '" + key + "' in context"); + log.trace("No key defined for key '" + localKey + "' in context"); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2012-01-10 13:52:45 UTC (rev 3585) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2012-01-11 15:48:04 UTC (rev 3586) @@ -97,6 +97,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.Scenario; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityAnalysis; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityScenarios; +import fr.ifremer.isisfish.simulator.sensitivity.SensitivityUtils; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; @@ -559,9 +560,7 @@ } // also fix factor name for sensitivity calculator - String name = factor.getName(); - name = StringUtil.unaccent(name); - name = name.replaceAll("\\W", "_"); + String name = SensitivityUtils.espaceFactorName(factor.getName()); factor.setName(name); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2012-01-10 13:52:45 UTC (rev 3585) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2012-01-11 15:48:04 UTC (rev 3586) @@ -91,7 +91,6 @@ for (Factor factor:factors){ if (factor instanceof FactorGroup && ((FactorGroup) factor).isDiscrete()) { - System.out.println("Discrete group"); List<Factor> subfactors = ((FactorGroup) factor).getFactors(); int cardinality = subfactors.get(0).getCardinality(); for (Factor subfactor:subfactors) { Added: trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtils.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtils.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtils.java 2012-01-11 15:48:04 UTC (rev 3586) @@ -0,0 +1,54 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 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 + * 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 fr.ifremer.isisfish.simulator.sensitivity; + +import org.apache.commons.lang3.StringUtils; + +/** + * Utility methods for sensitivity analysis. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class SensitivityUtils { + + /** + * Escape factor name. + * + * R don't like factor name with special characters such as "." and accents. + * @param factorName factor name to escape + * @return escaped factor name + * @since 4.0.0.2 + */ + public static String espaceFactorName(String factorName) { + String name = StringUtils.stripAccents(factorName); + name = name.replaceAll("\\W", "_"); + return name; + } +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtils.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtilsTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtilsTest.java (rev 0) +++ trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtilsTest.java 2012-01-11 15:48:04 UTC (rev 3586) @@ -0,0 +1,50 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 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 + * 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 fr.ifremer.isisfish.simulator.sensitivity; + +import org.junit.Assert; +import org.junit.Test; + +/** + * Test for SensitivityUtils class. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class SensitivityUtilsTest { + + /** + * Test le résultat attendu de l'echappement des noms de facteurs. + */ + @Test + public void testEspaceFactorName() { + Assert.assertEquals("test_factor_pour_R", SensitivityUtils.espaceFactorName("test factor pour R")); + Assert.assertEquals("factor2_selectivite", SensitivityUtils.espaceFactorName("factor2.sélectivité")); + } +} Property changes on: trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtilsTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r3585 - trunk
by echatellier＠users.forge.codelutin.com Jan. 10, 2012

Jan. 10, 2012

Author: echatellier Date: 2012-01-10 14:52:45 +0100 (Tue, 10 Jan 2012) New Revision: 3585 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3585 Log: Update nuiton-matrix and eugene Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-10 09:01:07 UTC (rev 3584) +++ trunk/pom.xml 2012-01-10 13:52:45 UTC (rev 3585) @@ -62,14 +62,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.3</version> <scope>compile</scope> <exclusions> <exclusion> @@ -523,7 +523,7 @@  <jaxxVersion>2.4.2</jaxxVersion> - <eugeneVersion>2.4.1</eugeneVersion> + <eugeneVersion>2.4.2</eugeneVersion> <topiaVersion>2.6.5</topiaVersion> <hibernateVersion>3.6.9.Final</hibernateVersion> <nuitonUtilsVersion>2.4.2</nuitonUtilsVersion>

1 0

r3584 - trunk
by echatellier＠users.forge.codelutin.com Jan. 10, 2012

Jan. 10, 2012

Author: echatellier Date: 2012-01-10 10:01:07 +0100 (Tue, 10 Jan 2012) New Revision: 3584 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3584 Log: Evolution #652: Update to h2 1.3.163 Evolution #674: Update to nuiton-utils 2.4.2 Evolution #675: Update to topia 2.6.5 Evolution #676: Update to hibernate 3.6.9.Final Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 17:39:18 UTC (rev 3583) +++ trunk/pom.xml 2012-01-10 09:01:07 UTC (rev 3584) @@ -524,9 +524,9 @@  <jaxxVersion>2.4.2</jaxxVersion> <eugeneVersion>2.4.1</eugeneVersion> - <topiaVersion>2.6.4</topiaVersion> - <hibernateVersion>3.6.8.Final</hibernateVersion> - <nuitonUtilsVersion>2.4.1</nuitonUtilsVersion> + <topiaVersion>2.6.5</topiaVersion> + <hibernateVersion>3.6.9.Final</hibernateVersion> + <nuitonUtilsVersion>2.4.2</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> <aspectwerkzVersion>2.0</aspectwerkzVersion>

1 0

r3583 - in trunk/src/main: java/fr/ifremer/isisfish/ui/result resources/i18n
by echatellier＠users.forge.codelutin.com Jan. 4, 2012

Jan. 4, 2012

Author: echatellier Date: 2012-01-04 18:39:18 +0100 (Wed, 04 Jan 2012) New Revision: 3583 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3583 Log: #392 : labels erron?\195?\169s lors de l'affichage des r?\195?\169sultats somm?\195?\169s par an Added: trunk/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2012-01-04 17:26:45 UTC (rev 3582) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2012-01-04 17:39:18 UTC (rev 3583) @@ -196,6 +196,7 @@ matrixViewerPanel.addMatrixRenderer(new MatrixMapRenderer(fisheryRegion)); matrixViewerPanel.addMatrixRenderer(new MatrixPanelRenderer()); matrixViewerPanel.addMatrixFilter(new ResultMatrixFilter(resultStorage)); + matrixViewerPanel.addMatrixFilter(new SumByYearMatrixFilter()); // init available results list StringComboModel model = new StringComboModel(resultStorage.getResultName()); Added: trunk/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java 2012-01-04 17:39:18 UTC (rev 3583) @@ -0,0 +1,70 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 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 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. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.ui.result; + +import static org.nuiton.i18n.I18n._; + +import java.util.ArrayList; +import java.util.List; + +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.viewer.MatrixFilter; + +/** + * Filtre qui change le nom des semantiques dans le cas d'une somme + * par années. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class SumByYearMatrixFilter implements MatrixFilter { + + /* + * @see org.nuiton.math.matrix.viewer.MatrixFilter#filter(org.nuiton.math.matrix.MatrixND) + */ + @Override + public MatrixND filter(MatrixND matrix) { + return matrix; + } + + /* + * @see org.nuiton.math.matrix.viewer.MatrixFilter#filterDimension(org.nuiton.math.matrix.MatrixND, int, int) + */ + @Override + public MatrixND filterDimension(MatrixND matrix, int dim, int sumStep) { + + if (dim == 0) { // in isis 0 = time step + int semCount = matrix.getSemantic(0).size(); + List<String> newSems = new ArrayList<String>(semCount); + for (int i = 0; i < semCount ; i++) { + newSems.add(_("isisfish.result.matrix.sumbyyearlabel", i)); + } + matrix.setSemantic(0, newSems); + } + return matrix; + } +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2012-01-04 17:26:45 UTC (rev 3582) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2012-01-04 17:39:18 UTC (rev 3583) @@ -760,6 +760,7 @@ isisfish.result.export=Export isisfish.result.export.file=Export text file isisfish.result.map=Map +isisfish.result.matrix.sumbyyearlabel=Year %d isisfish.result.new.window=Open isisfish.result.remove.simulation=Remove isisfish.result.selectResult=Result \: Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-01-04 17:26:45 UTC (rev 3582) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-01-04 17:39:18 UTC (rev 3583) @@ -760,6 +760,7 @@ isisfish.result.export=Export isisfish.result.export.file=Exporter un fichier texte isisfish.result.map=Carte +isisfish.result.matrix.sumbyyearlabel=Année %d isisfish.result.new.window=Ouvrir isisfish.result.remove.simulation=Supprimer isisfish.result.selectResult=Résultat \:

1 0

r3582 - trunk
by maven-release＠users.forge.codelutin.com Jan. 4, 2012

Jan. 4, 2012

Author: maven-release Date: 2012-01-04 18:26:45 +0100 (Wed, 04 Jan 2012) New Revision: 3582 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3582 Log: Update mavenpom4redmine to 3.0.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 14:19:04 UTC (rev 3581) +++ trunk/pom.xml 2012-01-04 17:26:45 UTC (rev 3582) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.6</version> + <version>3.0.7</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r3581 - trunk
by echatellier＠users.forge.codelutin.com Jan. 4, 2012

Jan. 4, 2012

Author: echatellier Date: 2012-01-04 15:19:04 +0100 (Wed, 04 Jan 2012) New Revision: 3581 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3581 Log: Use nuiton-matrix snapshot Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 11:08:02 UTC (rev 3580) +++ trunk/pom.xml 2012-01-04 14:19:04 UTC (rev 3581) @@ -62,14 +62,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.2.2</version> + <version>2.2.3-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.2.2</version> + <version>2.2.3-SNAPSHOT</version> <scope>compile</scope> <exclusions> <exclusion> @@ -396,13 +396,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - - <dependency> - <groupId>jfree</groupId> - <artifactId>jfreechart</artifactId> - <version>1.0.12</version> - <scope>runtime</scope> - </dependency> </dependencies>

1 0