Isis-fish-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- 3175 discussions
Author: tchemit
Date: 2011-06-07 20:11:23 +0000 (Tue, 07 Jun 2011)
New Revision: 3359
Log:
Update mavenpom4labs to 2.5.5.
Modified:
isis-fish/trunk/pom.xml
Modified: isis-fish/trunk/pom.xml
===================================================================
--- isis-fish/trunk/pom.xml 2011-06-07 20:11:20 UTC (rev 3358)
+++ isis-fish/trunk/pom.xml 2011-06-07 20:11:23 UTC (rev 3359)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>mavenpom4labs</artifactId>
- <version>2.5.4</version>
+ <version>2.5.5</version>
</parent>
<groupId>fr.ifremer</groupId>
1
0
Author: tchemit
Date: 2011-06-07 20:11:20 +0000 (Tue, 07 Jun 2011)
New Revision: 3358
Log:
Update mavenpom4labs to 2.5.5.
Modified:
isis-fish/branches/3.3.1/pom.xml
Modified: isis-fish/branches/3.3.1/pom.xml
===================================================================
--- isis-fish/branches/3.3.1/pom.xml 2011-06-07 16:56:23 UTC (rev 3357)
+++ isis-fish/branches/3.3.1/pom.xml 2011-06-07 20:11:20 UTC (rev 3358)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>mavenpom4labs</artifactId>
- <version>2.5.4</version>
+ <version>2.5.5</version>
</parent>
<groupId>fr.ifremer</groupId>
1
0
r3357 - in isis-fish/branches/3.3.1/src/test: java/fr/ifremer/isisfish resources/test-database/analyseplans resources/test-database/exports resources/test-database/rules resources/test-database/scripts resources/test-database/sensitivity resources/test-database/sensitivityexports
by chatellier@users.labs.libre-entreprise.org 07 Jun '11
by chatellier@users.labs.libre-entreprise.org 07 Jun '11
07 Jun '11
Author: chatellier
Date: 2011-06-07 16:56:23 +0000 (Tue, 07 Jun 2011)
New Revision: 3357
Log:
Remove nuiton migration.
Modified:
isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java
isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/CalibrationSimplexePasVariable2Capturabilite.java
isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/SimulationNumberRestriction.java
isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Abundances.java
isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Biomasses.java
isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesNombre.java
isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesPoids.java
isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CellsDefinition.java
isis-fish/branches/3.3.1/src/test/resources/test-database/exports/EffortsMetier.java
isis-fish/branches/3.3.1/src/test/resources/test-database/exports/MetierZone.java
isis-fish/branches/3.3.1/src/test/resources/test-database/exports/NonActivite.java
isis-fish/branches/3.3.1/src/test/resources/test-database/exports/OwnerMargin.java
isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RegionDefinition.java
isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsNombre.java
isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsPoids.java
isis-fish/branches/3.3.1/src/test/resources/test-database/exports/VesselMargin.java
isis-fish/branches/3.3.1/src/test/resources/test-database/exports/ZonesDefinition.java
isis-fish/branches/3.3.1/src/test/resources/test-database/rules/Cantonnement.java
isis-fish/branches/3.3.1/src/test/resources/test-database/rules/CantonnementPreSimu.java
isis-fish/branches/3.3.1/src/test/resources/test-database/rules/ChangementParamControlablePresimu.java
isis-fish/branches/3.3.1/src/test/resources/test-database/rules/EffortReduction.java
isis-fish/branches/3.3.1/src/test/resources/test-database/rules/GraviteVPUE1.java
isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEngin.java
isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEnginPreSimu.java
isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TACpoids.java
isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TailleMin.java
isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TotalClosure.java
isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/GravityModel.java
isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/ResultName.java
isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/RuleUtil.java
isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorJavaExpandGrid.java
isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFast.java
isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFrF2.java
isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRMorris.java
isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorROptimumLHS.java
isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRRandomLHS.java
isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRSobol.java
isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRegularFractions.java
isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassReferenceY9.java
isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java
isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeY6.java
isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassY3.java
isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightReferenceY7.java
isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeReferenceY10.java
isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeY4.java
isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightY1.java
isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassReferenceY8.java
isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeReferenceY11.java
isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeY5.java
isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassY2.java
Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -112,8 +112,6 @@
return result;
}
});
-
- IsisFish.doNuitonMigration();
}
/**
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/CalibrationSimplexePasVariable2Capturabilite.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/CalibrationSimplexePasVariable2Capturabilite.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/CalibrationSimplexePasVariable2Capturabilite.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,7 +24,7 @@
*/
package analyseplans;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.io.File;
import java.io.FileReader;
@@ -35,12 +35,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixFactory;
-import org.codelutin.math.matrix.MatrixIterator;
-import org.codelutin.math.matrix.MatrixND;
-import org.codelutin.topia.TopiaContext;
-import org.codelutin.util.FileUtil;
-import org.codelutin.util.StringUtil;
+import org.nuiton.math.matrix.MatrixFactory;
+import org.nuiton.math.matrix.MatrixIterator;
+import org.nuiton.math.matrix.MatrixND;
+import org.nuiton.topia.TopiaContext;
+import org.nuiton.util.FileUtil;
+import org.nuiton.util.StringUtil;
import scripts.ResultName;
import fr.ifremer.isisfish.datastore.ResultStorage;
@@ -399,7 +399,7 @@
exportHisto += experiences.getExperience(number).q1 + ";"
+ experiences.getExperience(number).q2 + ";"
+ experiences.getExperience(number).criteria + "\n";
- org.codelutin.util.FileUtil.writeString(exportHistoric, exportHisto);
+ org.nuiton.util.FileUtil.writeString(exportHistoric, exportHisto);
return doNext;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/SimulationNumberRestriction.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/SimulationNumberRestriction.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/SimulationNumberRestriction.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,7 +24,7 @@
*/
package analyseplans;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Abundances.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Abundances.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Abundances.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -29,8 +29,8 @@
import java.io.Writer;
-import static org.codelutin.i18n.I18n._;
-import org.codelutin.math.matrix.*;
+import static org.nuiton.i18n.I18n._;
+import org.nuiton.math.matrix.*;
import scripts.ResultName;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Biomasses.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Biomasses.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Biomasses.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,14 +24,14 @@
*/
package exports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import java.io.Writer;
-import org.codelutin.math.matrix.*;
+import org.nuiton.math.matrix.*;
import scripts.ResultName;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesNombre.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesNombre.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesNombre.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,14 +24,14 @@
*/
package exports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.io.Writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixIterator;
-import org.codelutin.math.matrix.MatrixND;
+import org.nuiton.math.matrix.MatrixIterator;
+import org.nuiton.math.matrix.MatrixND;
import scripts.ResultName;
import fr.ifremer.isisfish.datastore.SimulationStorage;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesPoids.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesPoids.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesPoids.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,14 +24,14 @@
*/
package exports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.io.Writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixIterator;
-import org.codelutin.math.matrix.MatrixND;
+import org.nuiton.math.matrix.MatrixIterator;
+import org.nuiton.math.matrix.MatrixND;
import scripts.ResultName;
import fr.ifremer.isisfish.datastore.SimulationStorage;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CellsDefinition.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CellsDefinition.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CellsDefinition.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,14 +24,14 @@
*/
package exports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.io.Writer;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.topia.TopiaContext;
+import org.nuiton.topia.TopiaContext;
import fr.ifremer.isisfish.datastore.SimulationStorage;
import fr.ifremer.isisfish.entities.Cell;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/EffortsMetier.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/EffortsMetier.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/EffortsMetier.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,14 +24,14 @@
*/
package exports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import java.io.Writer;
-import org.codelutin.math.matrix.*;
+import org.nuiton.math.matrix.*;
import scripts.ResultName;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/MetierZone.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/MetierZone.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/MetierZone.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -29,8 +29,8 @@
import java.io.Writer;
-import static org.codelutin.i18n.I18n._;
-import org.codelutin.math.matrix.*;
+import static org.nuiton.i18n.I18n._;
+import org.nuiton.math.matrix.*;
import scripts.ResultName;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/NonActivite.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/NonActivite.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/NonActivite.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,14 +24,14 @@
*/
package exports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import java.io.Writer;
-import org.codelutin.math.matrix.*;
+import org.nuiton.math.matrix.*;
import scripts.ResultName;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/OwnerMargin.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/OwnerMargin.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/OwnerMargin.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,14 +24,14 @@
*/
package exports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import java.io.Writer;
-import org.codelutin.math.matrix.*;
+import org.nuiton.math.matrix.*;
import scripts.ResultName;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RegionDefinition.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RegionDefinition.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RegionDefinition.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -29,8 +29,8 @@
import java.io.Writer;
-import static org.codelutin.i18n.I18n._;
-import org.codelutin.topia.TopiaContext;
+import static org.nuiton.i18n.I18n._;
+import org.nuiton.topia.TopiaContext;
import fr.ifremer.isisfish.entities.*;
import fr.ifremer.isisfish.export.Export;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsNombre.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsNombre.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsNombre.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,14 +24,14 @@
*/
package exports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.io.Writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixIterator;
-import org.codelutin.math.matrix.MatrixND;
+import org.nuiton.math.matrix.MatrixIterator;
+import org.nuiton.math.matrix.MatrixND;
import scripts.ResultName;
import fr.ifremer.isisfish.datastore.SimulationStorage;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsPoids.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsPoids.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsPoids.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,14 +24,14 @@
*/
package exports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.io.Writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixIterator;
-import org.codelutin.math.matrix.MatrixND;
+import org.nuiton.math.matrix.MatrixIterator;
+import org.nuiton.math.matrix.MatrixND;
import scripts.ResultName;
import fr.ifremer.isisfish.datastore.SimulationStorage;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/VesselMargin.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/VesselMargin.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/VesselMargin.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,14 +24,14 @@
*/
package exports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import java.io.Writer;
-import org.codelutin.math.matrix.*;
+import org.nuiton.math.matrix.*;
import scripts.ResultName;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/ZonesDefinition.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/ZonesDefinition.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/ZonesDefinition.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -30,8 +30,8 @@
import java.io.Writer;
import java.util.List;
-import static org.codelutin.i18n.I18n._;
-import org.codelutin.topia.TopiaContext;
+import static org.nuiton.i18n.I18n._;
+import org.nuiton.topia.TopiaContext;
import fr.ifremer.isisfish.entities.*;
import fr.ifremer.isisfish.export.Export;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/Cantonnement.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/Cantonnement.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/Cantonnement.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,7 +24,7 @@
*/
package rules;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -38,7 +38,7 @@
import java.util.Iterator;
import java.util.List;
-import org.codelutin.math.matrix.*;
+import org.nuiton.math.matrix.*;
import fr.ifremer.isisfish.IsisFishDAOHelper;
import fr.ifremer.isisfish.simulator.MetierMonitor;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/CantonnementPreSimu.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/CantonnementPreSimu.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/CantonnementPreSimu.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,8 +24,8 @@
*/
package rules;
-import static org.codelutin.i18n.I18n.n_;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n.n_;
+import static org.nuiton.i18n.I18n._;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -38,7 +38,7 @@
import java.util.List;
import java.util.Map;
-import org.codelutin.math.matrix.*;
+import org.nuiton.math.matrix.*;
import fr.ifremer.isisfish.IsisFishDAOHelper;
import fr.ifremer.isisfish.simulator.MetierMonitor;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/ChangementParamControlablePresimu.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/ChangementParamControlablePresimu.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/ChangementParamControlablePresimu.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,7 +24,7 @@
*/
package rules;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.util.ArrayList;
import java.util.List;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/EffortReduction.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/EffortReduction.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/EffortReduction.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,7 +24,7 @@
*/
package rules;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.util.List;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/GraviteVPUE1.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/GraviteVPUE1.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/GraviteVPUE1.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,7 +24,7 @@
*/
package rules;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -36,7 +36,7 @@
import java.util.List;
import java.util.Collection;
-import org.codelutin.math.matrix.*;
+import org.nuiton.math.matrix.*;
import fr.ifremer.isisfish.simulator.SimulationContext;
import fr.ifremer.isisfish.types.Date;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEngin.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEngin.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEngin.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,7 +24,7 @@
*/
package rules;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -36,7 +36,7 @@
import java.util.Iterator;
import java.util.List;
-import org.codelutin.math.matrix.*;
+import org.nuiton.math.matrix.*;
import fr.ifremer.isisfish.simulator.MetierMonitor;
import fr.ifremer.isisfish.simulator.SimulationContext;
@@ -229,7 +229,7 @@
MetiersInterdits.put(new Chaine(p.metier.getNom(),true));
//récupère toutes les stratégies pratiquant le métier et pour lesquelles la proportion !=0
-var ListeStrat=new Packages.org.codelutin.dbobject.DBCollection(StrategyFactory);
+var ListeStrat=new Packages.org.nuiton.dbobject.DBCollection(StrategyFactory);
var Vessels=SetOfVesselsFactory.findAllByRegion(p.metier.getRegion());
for (var ves=0; ves<Vessels.size();ves++){
if (Vessels.get(ves).getMetiers().contains(p.metier)){
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEnginPreSimu.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEnginPreSimu.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEnginPreSimu.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,8 +24,8 @@
*/
package rules;
-import static org.codelutin.i18n.I18n._;
-import static org.codelutin.i18n.I18n.n_;
+import static org.nuiton.i18n.I18n._;
+import static org.nuiton.i18n.I18n.n_;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -38,7 +38,7 @@
import java.util.List;
import java.util.Map;
-import org.codelutin.math.matrix.*;
+import org.nuiton.math.matrix.*;
import fr.ifremer.isisfish.simulator.MetierMonitor;
import fr.ifremer.isisfish.simulator.SimulationContext;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TACpoids.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TACpoids.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TACpoids.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,15 +24,15 @@
*/
package rules;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.util.HashSet;
import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixIterator;
-import org.codelutin.math.matrix.MatrixND;
+import org.nuiton.math.matrix.MatrixIterator;
+import org.nuiton.math.matrix.MatrixND;
import scripts.ResultName;
import scripts.RuleUtil;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TailleMin.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TailleMin.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TailleMin.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,14 +24,14 @@
*/
package rules;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixIterator;
-import org.codelutin.math.matrix.MatrixND;
+import org.nuiton.math.matrix.MatrixIterator;
+import org.nuiton.math.matrix.MatrixND;
import scripts.ResultName;
import scripts.SiMatrix;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TotalClosure.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TotalClosure.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TotalClosure.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,13 +24,13 @@
*/
package rules;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixND;
+import org.nuiton.math.matrix.MatrixND;
import scripts.ResultName;
import scripts.SiMatrix;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/GravityModel.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/GravityModel.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/GravityModel.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -25,17 +25,17 @@
package scripts;
-import static org.codelutin.i18n.I18n.n_;
+import static org.nuiton.i18n.I18n.n_;
import java.util.Collection;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixFactory;
-import org.codelutin.math.matrix.MatrixND;
-import org.codelutin.topia.TopiaContext;
-import org.codelutin.topia.TopiaException;
+import org.nuiton.math.matrix.MatrixFactory;
+import org.nuiton.math.matrix.MatrixND;
+import org.nuiton.topia.TopiaContext;
+import org.nuiton.topia.TopiaException;
import fr.ifremer.isisfish.datastore.ResultStorage;
import fr.ifremer.isisfish.datastore.StorageException;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/ResultName.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/ResultName.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/ResultName.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -37,7 +37,7 @@
package scripts;
-import static org.codelutin.i18n.I18n.n_;
+import static org.nuiton.i18n.I18n.n_;
import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605)
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/RuleUtil.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/RuleUtil.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/RuleUtil.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -29,7 +29,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.*;
+import org.nuiton.math.matrix.*;
import fr.ifremer.isisfish.entities.Population;
import fr.ifremer.isisfish.entities.PopulationGroup;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorJavaExpandGrid.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -30,9 +30,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.j2r.REngine;
-import org.codelutin.j2r.RProxy;
-import org.codelutin.util.FileUtil;
+import org.nuiton.j2r.REngine;
+import org.nuiton.j2r.RProxy;
+import org.nuiton.util.FileUtil;
import fr.ifremer.isisfish.datastore.SimulationStorage;
import fr.ifremer.isisfish.simulator.SimulationParameter;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFast.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFast.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFast.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -37,12 +37,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.j2r.REngine;
-import org.codelutin.j2r.RException;
-import org.codelutin.j2r.RProxy;
-import org.codelutin.math.matrix.MatrixFactory;
-import org.codelutin.math.matrix.MatrixND;
-import org.codelutin.util.FileUtil;
+import org.nuiton.j2r.REngine;
+import org.nuiton.j2r.RException;
+import org.nuiton.j2r.RProxy;
+import org.nuiton.math.matrix.MatrixFactory;
+import org.nuiton.math.matrix.MatrixND;
+import org.nuiton.util.FileUtil;
import org.rosuda.JRI.REXP;
import fr.ifremer.isisfish.datastore.SimulationStorage;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFrF2.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFrF2.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFrF2.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -30,12 +30,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.j2r.REngine;
-import org.codelutin.j2r.RException;
-import org.codelutin.j2r.RProxy;
-import org.codelutin.math.matrix.MatrixFactory;
-import org.codelutin.math.matrix.MatrixND;
-import org.codelutin.util.FileUtil;
+import org.nuiton.j2r.REngine;
+import org.nuiton.j2r.RException;
+import org.nuiton.j2r.RProxy;
+import org.nuiton.math.matrix.MatrixFactory;
+import org.nuiton.math.matrix.MatrixND;
+import org.nuiton.util.FileUtil;
import fr.ifremer.isisfish.datastore.SimulationStorage;
import fr.ifremer.isisfish.simulator.SimulationParameter;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRMorris.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRMorris.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRMorris.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -36,12 +36,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.j2r.REngine;
-import org.codelutin.j2r.RException;
-import org.codelutin.j2r.RProxy;
-import org.codelutin.math.matrix.MatrixFactory;
-import org.codelutin.math.matrix.MatrixND;
-import org.codelutin.util.FileUtil;
+import org.nuiton.j2r.REngine;
+import org.nuiton.j2r.RException;
+import org.nuiton.j2r.RProxy;
+import org.nuiton.math.matrix.MatrixFactory;
+import org.nuiton.math.matrix.MatrixND;
+import org.nuiton.util.FileUtil;
import fr.ifremer.isisfish.datastore.SimulationStorage;
import fr.ifremer.isisfish.simulator.SimulationParameter;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorROptimumLHS.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorROptimumLHS.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorROptimumLHS.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -36,11 +36,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.j2r.REngine;
-import org.codelutin.j2r.RProxy;
-import org.codelutin.math.matrix.MatrixFactory;
-import org.codelutin.math.matrix.MatrixND;
-import org.codelutin.util.FileUtil;
+import org.nuiton.j2r.REngine;
+import org.nuiton.j2r.RProxy;
+import org.nuiton.math.matrix.MatrixFactory;
+import org.nuiton.math.matrix.MatrixND;
+import org.nuiton.util.FileUtil;
import fr.ifremer.isisfish.datastore.SimulationStorage;
import fr.ifremer.isisfish.simulator.SimulationParameter;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRRandomLHS.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRRandomLHS.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRRandomLHS.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -36,11 +36,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.j2r.REngine;
-import org.codelutin.j2r.RProxy;
-import org.codelutin.math.matrix.MatrixFactory;
-import org.codelutin.math.matrix.MatrixND;
-import org.codelutin.util.FileUtil;
+import org.nuiton.j2r.REngine;
+import org.nuiton.j2r.RProxy;
+import org.nuiton.math.matrix.MatrixFactory;
+import org.nuiton.math.matrix.MatrixND;
+import org.nuiton.util.FileUtil;
import fr.ifremer.isisfish.datastore.SimulationStorage;
import fr.ifremer.isisfish.simulator.SimulationParameter;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRSobol.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRSobol.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRSobol.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -37,11 +37,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.j2r.REngine;
-import org.codelutin.j2r.RProxy;
-import org.codelutin.math.matrix.MatrixFactory;
-import org.codelutin.math.matrix.MatrixND;
-import org.codelutin.util.FileUtil;
+import org.nuiton.j2r.REngine;
+import org.nuiton.j2r.RProxy;
+import org.nuiton.math.matrix.MatrixFactory;
+import org.nuiton.math.matrix.MatrixND;
+import org.nuiton.util.FileUtil;
import org.rosuda.JRI.REXP;
import fr.ifremer.isisfish.datastore.SimulationStorage;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRegularFractions.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRegularFractions.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRegularFractions.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -35,12 +35,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.j2r.REngine;
-import org.codelutin.j2r.RException;
-import org.codelutin.j2r.RProxy;
-import org.codelutin.math.matrix.MatrixFactory;
-import org.codelutin.math.matrix.MatrixND;
-import org.codelutin.util.FileUtil;
+import org.nuiton.j2r.REngine;
+import org.nuiton.j2r.RException;
+import org.nuiton.j2r.RProxy;
+import org.nuiton.math.matrix.MatrixFactory;
+import org.nuiton.math.matrix.MatrixND;
+import org.nuiton.util.FileUtil;
import fr.ifremer.isisfish.datastore.SimulationStorage;
import fr.ifremer.isisfish.simulator.SimulationParameter;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassReferenceY9.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassReferenceY9.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassReferenceY9.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,14 +24,14 @@
*/
package sensitivityexports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.io.Writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixND;
-import org.codelutin.topia.TopiaContext;
+import org.nuiton.math.matrix.MatrixND;
+import org.nuiton.topia.TopiaContext;
import scripts.ResultName;
import fr.ifremer.isisfish.datastore.ResultStorage;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,14 +24,14 @@
*/
package sensitivityexports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.io.Writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixND;
-import org.codelutin.topia.TopiaContext;
+import org.nuiton.math.matrix.MatrixND;
+import org.nuiton.topia.TopiaContext;
import scripts.ResultName;
import fr.ifremer.isisfish.datastore.ResultStorage;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeY6.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeY6.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeY6.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,13 +24,13 @@
*/
package sensitivityexports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.io.Writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixND;
+import org.nuiton.math.matrix.MatrixND;
import scripts.ResultName;
import fr.ifremer.isisfish.datastore.ResultStorage;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassY3.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassY3.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassY3.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,13 +24,13 @@
*/
package sensitivityexports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.io.Writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixND;
+import org.nuiton.math.matrix.MatrixND;
import scripts.ResultName;
import fr.ifremer.isisfish.datastore.ResultStorage;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightReferenceY7.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightReferenceY7.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightReferenceY7.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,14 +24,14 @@
*/
package sensitivityexports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.io.Writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixND;
-import org.codelutin.topia.TopiaContext;
+import org.nuiton.math.matrix.MatrixND;
+import org.nuiton.topia.TopiaContext;
import scripts.ResultName;
import fr.ifremer.isisfish.datastore.ResultStorage;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeReferenceY10.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeReferenceY10.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeReferenceY10.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,14 +24,14 @@
*/
package sensitivityexports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.io.Writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixND;
-import org.codelutin.topia.TopiaContext;
+import org.nuiton.math.matrix.MatrixND;
+import org.nuiton.topia.TopiaContext;
import scripts.ResultName;
import fr.ifremer.isisfish.datastore.ResultStorage;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeY4.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeY4.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeY4.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,13 +24,13 @@
*/
package sensitivityexports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.io.Writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixND;
+import org.nuiton.math.matrix.MatrixND;
import scripts.ResultName;
import fr.ifremer.isisfish.datastore.ResultStorage;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightY1.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightY1.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightY1.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,13 +24,13 @@
*/
package sensitivityexports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.io.Writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixND;
+import org.nuiton.math.matrix.MatrixND;
import scripts.ResultName;
import fr.ifremer.isisfish.datastore.ResultStorage;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassReferenceY8.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassReferenceY8.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassReferenceY8.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,15 +24,15 @@
*/
package sensitivityexports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.io.Writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixIterator;
-import org.codelutin.math.matrix.MatrixND;
-import org.codelutin.topia.TopiaContext;
+import org.nuiton.math.matrix.MatrixIterator;
+import org.nuiton.math.matrix.MatrixND;
+import org.nuiton.topia.TopiaContext;
import scripts.ResultName;
import fr.ifremer.isisfish.datastore.ResultStorage;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeReferenceY11.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeReferenceY11.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeReferenceY11.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,15 +24,15 @@
*/
package sensitivityexports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.io.Writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixIterator;
-import org.codelutin.math.matrix.MatrixND;
-import org.codelutin.topia.TopiaContext;
+import org.nuiton.math.matrix.MatrixIterator;
+import org.nuiton.math.matrix.MatrixND;
+import org.nuiton.topia.TopiaContext;
import scripts.ResultName;
import fr.ifremer.isisfish.datastore.ResultStorage;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeY5.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeY5.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeY5.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,14 +24,14 @@
*/
package sensitivityexports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.io.Writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixIterator;
-import org.codelutin.math.matrix.MatrixND;
+import org.nuiton.math.matrix.MatrixIterator;
+import org.nuiton.math.matrix.MatrixND;
import scripts.ResultName;
import fr.ifremer.isisfish.datastore.ResultStorage;
Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassY2.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassY2.java 2011-06-07 16:44:33 UTC (rev 3356)
+++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassY2.java 2011-06-07 16:56:23 UTC (rev 3357)
@@ -24,14 +24,14 @@
*/
package sensitivityexports;
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
import java.io.Writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codelutin.math.matrix.MatrixIterator;
-import org.codelutin.math.matrix.MatrixND;
+import org.nuiton.math.matrix.MatrixIterator;
+import org.nuiton.math.matrix.MatrixND;
import scripts.ResultName;
import fr.ifremer.isisfish.datastore.ResultStorage;
1
0
r3356 - in isis-fish/branches/3.3.1/src: main/java/fr/ifremer/isisfish/mexico/xml main/java/fr/ifremer/isisfish/simulator/sensitivity/domain test/java/fr/ifremer/isisfish/mexico test/java/fr/ifremer/isisfish/simulator/launcher test/java/fr/ifremer/isisfish/simulator/sensitivity test/java/fr/ifremer/isisfish/ui/sensitivity
by jcouteau@users.labs.libre-entreprise.org 07 Jun '11
by jcouteau@users.labs.libre-entreprise.org 07 Jun '11
07 Jun '11
Author: jcouteau
Date: 2011-06-07 16:44:33 +0000 (Tue, 07 Jun 2011)
New Revision: 3356
Log:
Fix almost all tests, still one test fail on matrix equality
Modified:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java
isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java
isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java
isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java
isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-06-07 14:08:23 UTC (rev 3355)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-06-07 16:44:33 UTC (rev 3356)
@@ -166,6 +166,7 @@
Element matrixElement = fixedElement.element(MX);
MatrixND matrix = MexicoHelper.getMatrixFromXml(matrixElement, topiaContext);
mdomain.setReferenceValue(matrix);
+ mdomain.setPercentageType(true);
domain = mdomain;
}
@@ -178,6 +179,7 @@
Element equationElement = fixedElement.element(EQUATION);
edomain.setReferenceValue(Double.valueOf(equationElement.attributeValue(REFERENCE)));
edomain.setVariableName(equationElement.attributeValue(VARIABLE));
+ edomain.setPercentageType(true);
domain = edomain;
}
@@ -189,6 +191,7 @@
if (percentageElement != null) {
domain.setCoefficient(Double.valueOf(percentageElement.attributeValue(COEFFICIENT)));
domain.setReferenceValue(Double.valueOf(percentageElement.attributeValue(REFERENCE)));
+ domain.setPercentageType(true);
}
else {
// <range max="1.0" min="0.0"/>
@@ -232,6 +235,7 @@
Element matrixElement = fixedElement.element(MX);
MatrixND matrix = MexicoHelper.getMatrixFromXml(matrixElement, topiaContext);
mdomain.setReferenceValue(matrix);
+ mdomain.setPercentageType(true);
domain = mdomain;
}
@@ -246,6 +250,7 @@
Element equationElement = fixedElement.element(EQUATION);
edomain.setReferenceValue(Double.valueOf(equationElement.attributeValue(REFERENCE)));
edomain.setVariableName(equationElement.attributeValue(VARIABLE));
+ edomain.setPercentageType(true);
domain = edomain;
}
@@ -257,6 +262,7 @@
if (percentageElement != null) {
domain.setCoefficient(Double.valueOf(percentageElement.attributeValue(COEFFICIENT)));
domain.setReferenceValue(Double.valueOf(percentageElement.attributeValue(REFERENCE)));
+ domain.setPercentageType(true);
}
else {
// <range max="1" min="3"/>
@@ -358,6 +364,7 @@
Element matrixElement = referenceElement.element(MX);
MatrixND matrix = MexicoHelper.getMatrixFromXml(matrixElement, topiaContext);
mdomain.setReferenceValue(matrix);
+ mdomain.setPercentageType(true);
}
else {
Element rangeElement = fixedElement.element(RANGE);
@@ -379,6 +386,7 @@
if (referenceElement != null) {
edomain.setCoefficient(Double.valueOf(referenceElement.attributeValue(COEFFICIENT)));
edomain.setReferenceValue(Double.valueOf(referenceElement.getTextTrim()));
+ edomain.setPercentageType(true);
}
else {
Element rangeElement = fixedElement.element(RANGE);
@@ -398,6 +406,7 @@
if (referenceElement != null) {
domain.setCoefficient(Double.valueOf(referenceElement.attributeValue(COEFFICIENT)));
domain.setReferenceValue(Double.valueOf(referenceElement.getTextTrim()));
+ domain.setPercentageType(true);
}
else {
// <range max="1.0" min="0.0"/>
@@ -430,7 +439,7 @@
factor.setPath(path);
Element fixedElement = factorElement.element(DOMAIN).element(FIXED);
if (CONTINUOUS.equals(property)) {
- ContinuousDomain domain = null;
+ ContinuousDomain domain;
if(property.equals(MATRIXCONTINUOUS)) {
@@ -444,6 +453,7 @@
Element matrixElement = referenceElement.element(MX);
MatrixND matrix = MexicoHelper.getMatrixFromXml(matrixElement, topiaContext);
mdomain.setReferenceValue(matrix);
+ mdomain.setPercentageType(true);
}
else {
Element rangeElement = fixedElement.element(RANGE);
@@ -465,6 +475,7 @@
if (referenceElement != null) {
edomain.setCoefficient(Double.valueOf(referenceElement.attributeValue(COEFFICIENT)));
edomain.setReferenceValue(Double.valueOf(referenceElement.getTextTrim()));
+ edomain.setPercentageType(true);
}
else {
Element rangeElement = fixedElement.element(RANGE);
@@ -484,6 +495,7 @@
if (referenceElement != null) {
domain.setCoefficient(Double.valueOf(referenceElement.attributeValue(COEFFICIENT)));
domain.setReferenceValue(Double.valueOf(referenceElement.getTextTrim()));
+ domain.setPercentageType(true);
}
else {
// <range max="1.0" min="0.0"/>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2011-06-07 14:08:23 UTC (rev 3355)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2011-06-07 16:44:33 UTC (rev 3356)
@@ -110,15 +110,9 @@
*/
public Object getMinBound() {
if (isPercentageType()) {
- MatrixND temp = ((MatrixND) getReferenceValue()).copy();
- // since 3.4.0.0, operator is always *
- temp.map(new MapFunction() {
- public double apply(double val) {
- return (val + ((val * coefficient) * ((2 * getCalculatorMinBound() - 1))));
- }
- });
- return temp;
+ return ((Double)referenceValue + (((Double)referenceValue * coefficient) * ((2 * getCalculatorMinBound() - 1))));
+
} else {
return minBound;
}
@@ -150,16 +144,9 @@
*/
public Object getMaxBound() {
if (isPercentageType()) {
- MatrixND temp = ((MatrixND) getReferenceValue()).copy();
-
- // since 3.4.0.0, operator is always *
- temp.map(new MapFunction() {
- public double apply(double val) {
- return (val + ((val * coefficient) *
- ((2 * getCalculatorMaxBound() - 1))));
- }
- });
- return temp;
+ return ((Double) referenceValue +
+ (((Double) referenceValue * coefficient)
+ * ((2 * getCalculatorMaxBound() - 1))));
} else {
return maxBound;
}
@@ -224,9 +211,17 @@
* {@inheritDoc}.
*/
public Object getValueForIdentifier(Object identifier) {
+
+ Double result;
+
+ if (isPercentageType()) {
// since 3.4.0.0, operator is always *
- Double result = ((Double)referenceValue + (((Double)referenceValue * coefficient)
+ result = ((Double)referenceValue + (((Double)referenceValue * coefficient)
* ((2 * (Double)identifier - 1))));
+ } else {
+ result = ((Double)identifier * ((Double)maxBound - (Double)minBound))
+ + (Double)minBound;
+ }
return result;
}
Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-06-07 14:08:23 UTC (rev 3355)
+++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-06-07 16:44:33 UTC (rev 3356)
@@ -149,6 +149,7 @@
MatrixContinuousDomain domain4 = new MatrixContinuousDomain();
domain4.setCoefficient(0.799);
domain4.setReferenceValue(matrix1);
+ domain4.setPercentageType(true);
factorMatrixContinuous.setDomain(domain4);
factorMatrixContinuous.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength");
@@ -158,6 +159,7 @@
domain5.setCoefficient(0.1);
domain5.setReferenceValue(45.0);
domain5.setVariableName("L1");
+ domain5.setPercentageType(true);
factorEquationContinuous.setDomain(domain5);
factorEquationContinuous.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#maxLength");
Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2011-06-07 14:08:23 UTC (rev 3355)
+++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2011-06-07 16:44:33 UTC (rev 3356)
@@ -231,18 +231,18 @@
* @throws TopiaException
*/
@Test
- public void testFactorPreScriptFactorInt() throws StorageException, TopiaException {
+ public void testFactorPreScriptFactor() throws StorageException, TopiaException {
// factor
- Factor factor = new Factor("testint");
+ Factor factor = new Factor("test");
ContinuousDomain domain = new ContinuousDomain();
domain.setMinBound(0.0);
domain.setMaxBound(50.0);
factor.setDomain(domain);
factor.setPath("fr.ifremer.entities.Cell#1234567890#length");
- factor.setValueForIdentifier(49);
+ factor.setValueForIdentifier(0.5);
- Assert.assertEquals((Integer)49, factor.getValue());
+ Assert.assertEquals(25.0, factor.getValue());
// scenario
Scenario scenario = new Scenario();
@@ -252,7 +252,7 @@
SimulationService service = SimulationService.getService();
String scriptContent = service.generatePreScript(scenario);
- Assert.assertTrue(scriptContent.contains("java.lang.Integer"));
+ Assert.assertTrue(scriptContent.contains("java.lang.Double"));
Assert.assertTrue(scriptContent.contains("db.findByTopiaId(\"fr.ifremer.entities.Cell#1234567890\")"));
Assert.assertTrue(scriptContent.contains("BeanUtils.setProperty(entity0, \"length\""));
}
@@ -333,6 +333,7 @@
domain1.setReferenceValue(10.0);
domain1.setCoefficient(0.1);
domain1.setVariableName("K1");
+ domain1.setPercentageType(true);
factorEquation.setDomain(domain1);
factorEquation.setPath("fr.ifremer.equation1#testFactorPreScriptEquation");
factorEquation.setValueForIdentifier(0.4);
Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2011-06-07 14:08:23 UTC (rev 3355)
+++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2011-06-07 16:44:33 UTC (rev 3356)
@@ -68,9 +68,9 @@
domain.setMaxBound(50.0);
factor.setDomain(domain);
factor.setPath("org.nuiton.factor#1234567890#0.12242345354#name");
- factor.setValueForIdentifier(49);
+ factor.setValueForIdentifier(0.5);
- Assert.assertEquals(49, factor.getValue());
+ Assert.assertEquals(25.0, factor.getValue());
if (log.isInfoEnabled()) {
log.info("factor#toString() = " + factor);
@@ -148,6 +148,26 @@
matrix1.setValue(new int[] { 2, 0 }, 3);
matrix1.setValue(new int[] { 2, 1 }, -1);
+ // matrix minBound
+ MatrixND minBound = MatrixFactory.getInstance().create("test1",
+ new int[]{3, 2}, new String[]{"col1", "col2"});
+ minBound.setValue(new int[]{0, 0}, 0.9);
+ minBound.setValue(new int[]{0, 1}, -15.4);
+ minBound.setValue(new int[]{1, 0}, 18.9);
+ minBound.setValue(new int[]{1, 1}, 1.8);
+ minBound.setValue(new int[]{2, 0}, 2.7);
+ minBound.setValue(new int[]{2, 1}, -1.1);
+
+ // matrix maxBound
+ MatrixND maxBound = MatrixFactory.getInstance().create("test1",
+ new int[]{3, 2}, new String[]{"col1", "col2"});
+ maxBound.setValue(new int[]{0, 0}, 1.1);
+ maxBound.setValue(new int[]{0, 1}, -12.6);
+ maxBound.setValue(new int[]{1, 0}, 23.1);
+ maxBound.setValue(new int[]{1, 1}, 2.2);
+ maxBound.setValue(new int[]{2, 0}, 3.3);
+ maxBound.setValue(new int[]{2, 1}, -0.9);
+
// factor
Factor factor = new Factor("testmatrix");
MatrixContinuousDomain domain = new MatrixContinuousDomain ();
@@ -159,8 +179,8 @@
Assert.assertEquals(0.92, ((MatrixND)factor.getValue()).getValue(new int[] { 0, 0 }),0.0000001);
Assert.assertEquals(2.76, ((MatrixND)factor.getValue()).getValue(new int[] { 2, 0 }),0.0000001);
- Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0);
- Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0);
+ Assert.assertTrue(minBound.equalsValues((MatrixND)((ContinuousDomain)factor.getDomain()).getMinBound()));
+ Assert.assertTrue(maxBound.equalsValues((MatrixND)((ContinuousDomain)factor.getDomain()).getMaxBound()));
Assert.assertEquals(0.1, (Double)factor.getDisplayedValue(),0);
// matrix 2
@@ -254,14 +274,14 @@
domain.setCoefficient(0.1);
domain.setVariableName("Linf");
domain.setReferenceValue(3.0);
+ domain.setPercentageType(true);
factor.setDomain(domain);
factor.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
factor.setValueForIdentifier(0.1);
Assert.assertEquals(2.76, (Double)factor.getValue(),0.0000001);
- Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0);
- Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0);
- Assert.assertEquals(0.1, (Double)factor.getValue(),0);
+ Assert.assertEquals(2.7,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0);
+ Assert.assertEquals(3.3,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0);
// factor 2
Factor factor2 = new Factor("testequation");
@@ -269,13 +289,14 @@
domain2.setCoefficient(0.1);
domain2.setVariableName("Linf");
domain2.setReferenceValue(3.0);
+ domain2.setPercentageType(true);
factor2.setDomain(domain2);
factor2.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
factor2.setValueForIdentifier(0.1);
Assert.assertEquals(2.76, (Double)factor2.getValue(),0.0000001);
- Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0);
- Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0);
+ Assert.assertEquals(2.7,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0);
+ Assert.assertEquals(3.3,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0);
// factor 3
Factor factor3 = new Factor("testequation");
@@ -283,13 +304,14 @@
domain3.setCoefficient(0.1);
domain3.setVariableName("Linf");
domain3.setReferenceValue(3.0);
+ domain3.setPercentageType(true);
factor3.setDomain(domain3);
factor3.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
factor3.setValueForIdentifier(0.2);
Assert.assertEquals(2.82, (Double)factor3.getValue(),0.0000001);
- Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0);
- Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0);
+ Assert.assertEquals(2.7,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0);
+ Assert.assertEquals(3.3,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0);
// factor 4
Factor factor4 = new Factor("testequation");
@@ -297,13 +319,14 @@
domain4.setCoefficient(0.05);
domain4.setVariableName("Linf");
domain4.setReferenceValue(3.0);
+ domain4.setPercentageType(true);
factor4.setDomain(domain4);
factor4.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
factor4.setValueForIdentifier(0.1);
Assert.assertEquals(2.88, (Double)factor4.getValue(),0.0000001);
- Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0);
- Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0);
+ Assert.assertEquals(2.7,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0);
+ Assert.assertEquals(3.3,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0);
if (log.isInfoEnabled()) {
log.info("factor#toString() = " + factor);
@@ -352,13 +375,14 @@
Factor factor = new Factor("testclone");
factor.setPath("fr.ifremer.isisfish.entities.Cell#lenght");
factor.setComment("answer to life");
- factor.setValue(42.0);
ContinuousDomain domain = new ContinuousDomain();
domain.setMinBound(0.0);
domain.setMaxBound(50.0);
factor.setDomain(domain);
+ factor.setValueForIdentifier(0.84);
+
// clone
Factor clone = (Factor)factor.clone();
@@ -368,6 +392,6 @@
Assert.assertEquals("answer to life", clone.getComment());
Assert.assertEquals(42.0, clone.getValue());
Assert.assertNotSame(domain, clone.getDomain());
- Assert.assertEquals("id1", clone.getDomain().getValueForIdentifier("id1"));
+ Assert.assertEquals(42.0, clone.getDomain().getValueForIdentifier(0.84));
}
}
Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2011-06-07 14:08:23 UTC (rev 3355)
+++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2011-06-07 16:44:33 UTC (rev 3356)
@@ -77,7 +77,7 @@
domain1.setMaxBound(50.0);
factor1.setDomain(domain1);
factor1.setPath("org.nuiton.factor#1234567890#0.12242345354#name");
- factor1.setValueForIdentifier(49);
+ factor1.setValueForIdentifier(0.5);
// matrix 1
MatrixND matrix1 = MatrixFactory.getInstance().create("test1",
1
0
r3355 - in isis-fish/branches/3.3.1/src: main/resources test/java/fr/ifremer/isisfish/mexico test/java/fr/ifremer/isisfish/simulator/sensitivity test/java/fr/ifremer/isisfish/simulator/sensitivity/domain
by jcouteau@users.labs.libre-entreprise.org 07 Jun '11
by jcouteau@users.labs.libre-entreprise.org 07 Jun '11
07 Jun '11
Author: jcouteau
Date: 2011-06-07 14:08:23 +0000 (Tue, 07 Jun 2011)
New Revision: 3355
Log:
Fix test compilation
Modified:
isis-fish/branches/3.3.1/src/main/resources/log4j.properties
isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java
isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java
isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomainTest.java
isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomainTest.java
Modified: isis-fish/branches/3.3.1/src/main/resources/log4j.properties
===================================================================
--- isis-fish/branches/3.3.1/src/main/resources/log4j.properties 2011-06-07 09:19:29 UTC (rev 3354)
+++ isis-fish/branches/3.3.1/src/main/resources/log4j.properties 2011-06-07 14:08:23 UTC (rev 3355)
@@ -31,6 +31,7 @@
# package level
log4j.logger.fr.ifremer.isisfish=INFO
+log4j.logger.org.nuiton.j2r=DEBUG
log4j.logger.org.nuiton=WARN
log4j.logger.analyseplans=INFO
log4j.logger.exports=INFO
Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-06-07 09:19:29 UTC (rev 3354)
+++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-06-07 14:08:23 UTC (rev 3355)
@@ -148,7 +148,7 @@
Factor factorMatrixContinuous = new Factor("factor 4 (MatrixContinuous)");
MatrixContinuousDomain domain4 = new MatrixContinuousDomain();
domain4.setCoefficient(0.799);
- domain4.setMatrix(matrix1);
+ domain4.setReferenceValue(matrix1);
factorMatrixContinuous.setDomain(domain4);
factorMatrixContinuous.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength");
Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2011-06-07 09:19:29 UTC (rev 3354)
+++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2011-06-07 14:08:23 UTC (rev 3355)
@@ -70,7 +70,7 @@
factor.setPath("org.nuiton.factor#1234567890#0.12242345354#name");
factor.setValueForIdentifier(49);
- Assert.assertEquals((Integer) 49, factor.getValue());
+ Assert.assertEquals(49, factor.getValue());
if (log.isInfoEnabled()) {
log.info("factor#toString() = " + factor);
@@ -151,7 +151,7 @@
// factor
Factor factor = new Factor("testmatrix");
MatrixContinuousDomain domain = new MatrixContinuousDomain ();
- domain.setMatrix(matrix1);
+ domain.setReferenceValue(matrix1);
domain.setCoefficient(0.1);
factor.setDomain(domain);
factor.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
@@ -161,7 +161,7 @@
Assert.assertEquals(2.76, ((MatrixND)factor.getValue()).getValue(new int[] { 2, 0 }),0.0000001);
Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0);
Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0);
- Assert.assertEquals(0.1, ((MatrixContinuousDomain)factor.getDomain()).getValue(),0);
+ Assert.assertEquals(0.1, (Double)factor.getDisplayedValue(),0);
// matrix 2
MatrixND matrix2 = MatrixFactory.getInstance().create("test1",
@@ -176,7 +176,7 @@
// factor 2
Factor factor2 = new Factor("testmatrix");
MatrixContinuousDomain domain2 = new MatrixContinuousDomain();
- domain2.setMatrix(matrix2);
+ domain2.setReferenceValue(matrix2);
domain2.setCoefficient(0.1);
factor2.setDomain(domain2);
factor2.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
@@ -200,7 +200,7 @@
// factor 3
Factor factor3 = new Factor("testmatrix");
MatrixContinuousDomain domain3 = new MatrixContinuousDomain();
- domain3.setMatrix(matrix3);
+ domain3.setReferenceValue(matrix3);
domain3.setCoefficient(0.2);
factor3.setDomain(domain3);
factor3.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
@@ -224,7 +224,7 @@
// factor 3
Factor factor4 = new Factor("testmatrix");
MatrixContinuousDomain domain4 = new MatrixContinuousDomain();
- domain4.setMatrix(matrix4);
+ domain4.setReferenceValue(matrix4);
domain4.setCoefficient(0.3);
factor4.setDomain(domain4);
factor4.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim");
@@ -261,7 +261,7 @@
Assert.assertEquals(2.76, (Double)factor.getValue(),0.0000001);
Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0);
Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0);
- Assert.assertEquals(0.1, ((EquationContinuousDomain)factor.getDomain()).getValue(),0);
+ Assert.assertEquals(0.1, (Double)factor.getValue(),0);
// factor 2
Factor factor2 = new Factor("testequation");
Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomainTest.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomainTest.java 2011-06-07 09:19:29 UTC (rev 3354)
+++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomainTest.java 2011-06-07 14:08:23 UTC (rev 3355)
@@ -54,7 +54,6 @@
domain.setVariableName("varname");
domain.setCoefficient(0.05);
domain.setReferenceValue(90.0);
- domain.setValue(89.5);
// clone
EquationContinuousDomain clone = domain.clone();
@@ -66,6 +65,5 @@
Assert.assertEquals("varname", clone.getVariableName());
Assert.assertEquals(0.05, clone.getCoefficient());
Assert.assertEquals(90.0, clone.getReferenceValue());
- Assert.assertEquals(89.5, clone.getValue());
}
}
Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomainTest.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomainTest.java 2011-06-07 09:19:29 UTC (rev 3354)
+++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomainTest.java 2011-06-07 14:08:23 UTC (rev 3355)
@@ -58,9 +58,8 @@
domain.setMaxBound(0.74);
domain.setCardinality(5);
// child
- domain.setMatrix(matrix);
+ domain.setReferenceValue(matrix);
domain.setCoefficient(0.05);
- domain.setValue(89.5);
// clone
MatrixContinuousDomain clone = domain.clone();
@@ -69,8 +68,7 @@
Assert.assertEquals(0.55, clone.minBound); // getter return 0.0
Assert.assertEquals(0.74, clone.maxBound); // getter return 1.0
Assert.assertEquals(5, clone.getCardinality());
- Assert.assertEquals(matrix, clone.getMatrix());
+ Assert.assertEquals(matrix, clone.getReferenceValue());
Assert.assertEquals(0.05, clone.getCoefficient());
- Assert.assertEquals(89.5, clone.getValue());
}
}
1
0
r3354 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui: . config input queue script sensitivity simulator simulator/filter vcs widget/filter
by chatellier@users.labs.libre-entreprise.org 07 Jun '11
by chatellier@users.labs.libre-entreprise.org 07 Jun '11
07 Jun '11
Author: chatellier
Date: 2011-06-07 09:19:29 +0000 (Tue, 07 Jun 2011)
New Revision: 3354
Log:
Fix tab char
Modified:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -24,9 +24,9 @@
-->
<JPanel layout='{new BorderLayout()}' abstract="true">
<import>
- fr.ifremer.isisfish.ui.simulator.SimulAction;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ fr.ifremer.isisfish.ui.simulator.SimulAction;
+ java.beans.PropertyChangeEvent;
+ java.beans.PropertyChangeListener;
javax.swing.JFileChooser
java.io.File
</import>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -24,10 +24,10 @@
-->
<JPanel layout='{new BorderLayout()}'>
<import>
- fr.ifremer.isisfish.ui.simulator.SimulAction
- jaxx.runtime.context.JAXXInitialContext
- fr.ifremer.isisfish.ui.input.InputAction
- fr.ifremer.isisfish.ui.input.InputSaveVerifier
+ fr.ifremer.isisfish.ui.simulator.SimulAction
+ jaxx.runtime.context.JAXXInitialContext
+ fr.ifremer.isisfish.ui.input.InputAction
+ fr.ifremer.isisfish.ui.input.InputSaveVerifier
fr.ifremer.isisfish.ui.sensitivity.SensitivitySaveVerifier
javax.swing.ImageIcon
</import>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -33,7 +33,7 @@
// fill default values
getAction().resetSSHConfiguration();
- ]]></script>
+ ]]></script>
<Table border='{BorderFactory.createTitledBorder(_("isisfish.simulator.ssh.configuration.connection"))}'
fill='horizontal'>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -31,13 +31,13 @@
<import>
java.util.ArrayList;
- fr.ifremer.isisfish.entities.EffortDescription;
- fr.ifremer.isisfish.entities.SetOfVessels;
- fr.ifremer.isisfish.types.TimeUnit;
- fr.ifremer.isisfish.ui.input.model.EffortDescriptionListModel;
- fr.ifremer.isisfish.ui.input.renderer.EffortDescriptionListRenderer;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ fr.ifremer.isisfish.entities.EffortDescription;
+ fr.ifremer.isisfish.entities.SetOfVessels;
+ fr.ifremer.isisfish.types.TimeUnit;
+ fr.ifremer.isisfish.ui.input.model.EffortDescriptionListModel;
+ fr.ifremer.isisfish.ui.input.renderer.EffortDescriptionListRenderer;
+ java.beans.PropertyChangeEvent;
+ java.beans.PropertyChangeListener;
</import>
<BeanValidator id='validator' context="effortdescriptionparameters"
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -28,16 +28,16 @@
<fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/>
<import>
- java.util.ArrayList;
- fr.ifremer.isisfish.entities.EffortDescription;
- fr.ifremer.isisfish.entities.SetOfVessels;
- fr.ifremer.isisfish.entities.Metier;
- fr.ifremer.isisfish.ui.input.model.MetierListModel;
- fr.ifremer.isisfish.ui.input.renderer.MetierListRenderer;
- fr.ifremer.isisfish.ui.input.model.EffortDescriptionListModel;
- fr.ifremer.isisfish.ui.input.renderer.EffortDescriptionListRenderer;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ java.util.ArrayList;
+ fr.ifremer.isisfish.entities.EffortDescription;
+ fr.ifremer.isisfish.entities.SetOfVessels;
+ fr.ifremer.isisfish.entities.Metier;
+ fr.ifremer.isisfish.ui.input.model.MetierListModel;
+ fr.ifremer.isisfish.ui.input.renderer.MetierListRenderer;
+ fr.ifremer.isisfish.ui.input.model.EffortDescriptionListModel;
+ fr.ifremer.isisfish.ui.input.renderer.EffortDescriptionListRenderer;
+ java.beans.PropertyChangeEvent;
+ java.beans.PropertyChangeListener;
</import>
<BeanValidator id='validator' context="effortdescription"
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -29,16 +29,16 @@
<Boolean id="resultOk" javaBean="false" />
<import>
- fr.ifremer.isisfish.util.CompileHelper;
- fr.ifremer.isisfish.util.EvaluatorHelper;
- org.nuiton.util.FileUtil;
- javax.swing.text.html.HTMLEditorKit;
- javax.swing.text.html.HTMLDocument;
- javax.swing.event.HyperlinkListener;
- javax.swing.text.html.HTMLFrameHyperlinkEvent;
- javax.swing.event.HyperlinkEvent;
- java.io.PrintWriter;
- java.io.StringWriter;
+ fr.ifremer.isisfish.util.CompileHelper;
+ fr.ifremer.isisfish.util.EvaluatorHelper;
+ org.nuiton.util.FileUtil;
+ javax.swing.text.html.HTMLEditorKit;
+ javax.swing.text.html.HTMLDocument;
+ javax.swing.event.HyperlinkListener;
+ javax.swing.text.html.HTMLFrameHyperlinkEvent;
+ javax.swing.event.HyperlinkEvent;
+ java.io.PrintWriter;
+ java.io.StringWriter;
java.awt.Color
java.awt.Desktop
</import>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -29,12 +29,12 @@
<import>
static org.nuiton.i18n.I18n.n_
- fr.ifremer.isisfish.entities.FisheryRegion;
- fr.ifremer.isisfish.map.CopyMapToClipboardListener;
- com.bbn.openmap.gui.Tool;
- com.bbn.openmap.gui.OMToolSet;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ fr.ifremer.isisfish.entities.FisheryRegion;
+ fr.ifremer.isisfish.map.CopyMapToClipboardListener;
+ com.bbn.openmap.gui.Tool;
+ com.bbn.openmap.gui.OMToolSet;
+ java.beans.PropertyChangeEvent;
+ java.beans.PropertyChangeListener;
javax.swing.DefaultListModel
</import>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -28,8 +28,8 @@
<import>
static org.nuiton.i18n.I18n.n_
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ java.beans.PropertyChangeEvent;
+ java.beans.PropertyChangeListener;
</import>
<script><![CDATA[
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -61,14 +61,14 @@
<jaxx.runtime.validator.swing.SwingValidatorMessageTableModel id='errorsTableModel' /> -->
<import>
- javax.swing.JComponent
- javax.swing.event.ChangeListener
- fr.ifremer.isisfish.entities.FisheryRegion
- fr.ifremer.isisfish.ui.sensitivity.SensitivityUtils
- fr.ifremer.isisfish.ui.WelcomePanelUI
- org.nuiton.topia.persistence.TopiaEntityContextable
- org.nuiton.topia.TopiaContext
- org.apache.commons.lang.StringUtils
+ javax.swing.JComponent
+ javax.swing.event.ChangeListener
+ fr.ifremer.isisfish.entities.FisheryRegion
+ fr.ifremer.isisfish.ui.sensitivity.SensitivityUtils
+ fr.ifremer.isisfish.ui.WelcomePanelUI
+ org.nuiton.topia.persistence.TopiaEntityContextable
+ org.nuiton.topia.TopiaContext
+ org.apache.commons.lang.StringUtils
java.awt.Color
javax.swing.AbstractAction
javax.swing.JTable
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -43,17 +43,17 @@
<Boolean id="autoSaveModification" javaBean="true" />
<import>
- java.lang.reflect.Method;
- java.io.File;
- fr.ifremer.isisfish.entities.Formule;
- fr.ifremer.isisfish.entities.Equation;
- fr.ifremer.isisfish.ui.input.formule.FormuleComboModel;
- org.apache.commons.lang.StringUtils;
- org.nuiton.topia.TopiaContext;
- javax.swing.event.DocumentListener;
+ java.lang.reflect.Method;
+ java.io.File;
+ fr.ifremer.isisfish.entities.Formule;
+ fr.ifremer.isisfish.entities.Equation;
+ fr.ifremer.isisfish.ui.input.formule.FormuleComboModel;
+ org.apache.commons.lang.StringUtils;
+ org.nuiton.topia.TopiaContext;
+ javax.swing.event.DocumentListener;
javax.swing.event.DocumentEvent
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ java.beans.PropertyChangeEvent;
+ java.beans.PropertyChangeListener;
java.io.IOException
javax.swing.DefaultComboBoxModel
</import>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -32,8 +32,8 @@
<fr.ifremer.isisfish.entities.Species id='species' javaBean='null'/>
<import>
- fr.ifremer.isisfish.entities.MetierSeasonInfo;
- fr.ifremer.isisfish.ui.input.model.MetierSeasonInfoComboModel;
+ fr.ifremer.isisfish.entities.MetierSeasonInfo;
+ fr.ifremer.isisfish.ui.input.model.MetierSeasonInfoComboModel;
fr.ifremer.isisfish.entities.Equation;
fr.ifremer.isisfish.entities.Metier;
fr.ifremer.isisfish.entities.Species;
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -30,16 +30,16 @@
<fr.ifremer.isisfish.entities.MetierSeasonInfo id='metierSeasonInfo' javaBean='null'/>
<import>
- fr.ifremer.isisfish.entities.Metier;
- fr.ifremer.isisfish.entities.MetierSeasonInfo;
- fr.ifremer.isisfish.entities.Zone;
- fr.ifremer.isisfish.types.Month;
- fr.ifremer.isisfish.ui.input.model.MetierSeasonInfoComboModel;
+ fr.ifremer.isisfish.entities.Metier;
+ fr.ifremer.isisfish.entities.MetierSeasonInfo;
+ fr.ifremer.isisfish.entities.Zone;
+ fr.ifremer.isisfish.types.Month;
+ fr.ifremer.isisfish.ui.input.model.MetierSeasonInfoComboModel;
fr.ifremer.isisfish.ui.input.model.ZoneListModel;
- fr.ifremer.isisfish.ui.widget.Interval;
- fr.ifremer.isisfish.ui.widget.IntervalPanel;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ fr.ifremer.isisfish.ui.widget.Interval;
+ fr.ifremer.isisfish.ui.widget.IntervalPanel;
+ java.beans.PropertyChangeEvent;
+ java.beans.PropertyChangeListener;
java.util.ArrayList
java.awt.Dimension
</import>
@@ -103,7 +103,7 @@
}
protected void create() {
- MetierSeasonInfo newMSI = getContextValue(InputAction.class).createMetierSeasonInfo(getBean());
+ MetierSeasonInfo newMSI = getContextValue(InputAction.class).createMetierSeasonInfo(getBean());
setMetierSeasonInfo(newMSI);
setMetierSeasonInfoCombo();
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -28,11 +28,11 @@
<fr.ifremer.isisfish.entities.Metier id='bean' javaBean='null'/>
<import>
- fr.ifremer.isisfish.entities.Gear;
- fr.ifremer.isisfish.entities.Metier;
+ fr.ifremer.isisfish.entities.Gear;
+ fr.ifremer.isisfish.entities.Metier;
fr.ifremer.isisfish.ui.input.model.GearComboModel;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ java.beans.PropertyChangeEvent;
+ java.beans.PropertyChangeListener;
java.awt.Dimension
</import>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -28,12 +28,12 @@
<fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/>
<import>
- fr.ifremer.isisfish.entities.Species;
- fr.ifremer.isisfish.entities.PopulationGroup;
- fr.ifremer.isisfish.entities.Population;
- javax.swing.table.DefaultTableModel;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ fr.ifremer.isisfish.entities.Species;
+ fr.ifremer.isisfish.entities.PopulationGroup;
+ fr.ifremer.isisfish.entities.Population;
+ javax.swing.table.DefaultTableModel;
+ java.beans.PropertyChangeEvent;
+ java.beans.PropertyChangeListener;
javax.swing.JOptionPane
javax.swing.JFrame
java.awt.BorderLayout
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -28,11 +28,11 @@
<fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/>
<import>
- fr.ifremer.isisfish.entities.Population;
- org.nuiton.math.matrix.gui.MatrixPanelEvent;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
- org.nuiton.math.matrix.gui.MatrixPanelListener;
+ fr.ifremer.isisfish.entities.Population;
+ org.nuiton.math.matrix.gui.MatrixPanelEvent;
+ java.beans.PropertyChangeEvent;
+ java.beans.PropertyChangeListener;
+ org.nuiton.math.matrix.gui.MatrixPanelListener;
</import>
<BeanValidator id='validator' context="capturability"
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -28,7 +28,7 @@
<fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/>
<import>
- fr.ifremer.isisfish.entities.Population;
+ fr.ifremer.isisfish.entities.Population;
</import>
<BeanValidator id='validator' context="equation"
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -40,11 +40,11 @@
<fr.ifremer.isisfish.entities.PopulationGroup id='populationGroup' javaBean='null'/>
<import>
- fr.ifremer.isisfish.entities.PopulationGroup;
- fr.ifremer.isisfish.entities.Population;
- org.nuiton.math.matrix.MatrixND;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ fr.ifremer.isisfish.entities.PopulationGroup;
+ fr.ifremer.isisfish.entities.Population;
+ org.nuiton.math.matrix.MatrixND;
+ java.beans.PropertyChangeEvent;
+ java.beans.PropertyChangeListener;
</import>
<BeanValidator id='validator' context="group"
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -33,15 +33,15 @@
<Boolean id='coefNonVide' javaBean='false'/>
<import>
- fr.ifremer.isisfish.entities.Population;
- fr.ifremer.isisfish.entities.PopulationGroup;
- fr.ifremer.isisfish.entities.PopulationSeasonInfo;
- fr.ifremer.isisfish.entities.Zone;
- org.nuiton.math.matrix.MatrixND;
- org.nuiton.math.matrix.gui.MatrixPanelEvent;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
- org.nuiton.math.matrix.gui.MatrixPanelListener;
+ fr.ifremer.isisfish.entities.Population;
+ fr.ifremer.isisfish.entities.PopulationGroup;
+ fr.ifremer.isisfish.entities.PopulationSeasonInfo;
+ fr.ifremer.isisfish.entities.Zone;
+ org.nuiton.math.matrix.MatrixND;
+ org.nuiton.math.matrix.gui.MatrixPanelEvent;
+ java.beans.PropertyChangeEvent;
+ java.beans.PropertyChangeListener;
+ org.nuiton.math.matrix.gui.MatrixPanelListener;
</import>
<script><![CDATA[
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -30,8 +30,8 @@
<fr.ifremer.isisfish.entities.PopulationSeasonInfo id='popInfo' javaBean='null'/>
<import>
- fr.ifremer.isisfish.entities.PopulationSeasonInfo;
- fr.ifremer.isisfish.entities.Population;
+ fr.ifremer.isisfish.entities.PopulationSeasonInfo;
+ fr.ifremer.isisfish.entities.Population;
</import>
<script><![CDATA[
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -33,15 +33,15 @@
<Boolean id='coefNonVide' javaBean='false'/>
<import>
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
- fr.ifremer.isisfish.entities.Population;
- fr.ifremer.isisfish.entities.PopulationGroup;
- fr.ifremer.isisfish.entities.PopulationSeasonInfo;
- fr.ifremer.isisfish.entities.Zone;
- org.nuiton.math.matrix.MatrixND;
- org.nuiton.math.matrix.gui.MatrixPanelEvent;
- org.nuiton.math.matrix.gui.MatrixPanelListener;
+ java.beans.PropertyChangeEvent;
+ java.beans.PropertyChangeListener;
+ fr.ifremer.isisfish.entities.Population;
+ fr.ifremer.isisfish.entities.PopulationGroup;
+ fr.ifremer.isisfish.entities.PopulationSeasonInfo;
+ fr.ifremer.isisfish.entities.Zone;
+ org.nuiton.math.matrix.MatrixND;
+ org.nuiton.math.matrix.gui.MatrixPanelEvent;
+ org.nuiton.math.matrix.gui.MatrixPanelListener;
</import>
<script><![CDATA[
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -34,16 +34,16 @@
<Boolean id='coefNonVide' javaBean='false'/>
<import>
- fr.ifremer.isisfish.entities.PopulationSeasonInfo;
- fr.ifremer.isisfish.entities.Population;
- fr.ifremer.isisfish.entities.PopulationGroup;
- fr.ifremer.isisfish.entities.PopulationSeasonInfo;
- fr.ifremer.isisfish.entities.Zone;
- org.nuiton.math.matrix.MatrixND;
- org.nuiton.math.matrix.gui.MatrixPanelEvent;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
- org.nuiton.math.matrix.gui.MatrixPanelListener;
+ fr.ifremer.isisfish.entities.PopulationSeasonInfo;
+ fr.ifremer.isisfish.entities.Population;
+ fr.ifremer.isisfish.entities.PopulationGroup;
+ fr.ifremer.isisfish.entities.PopulationSeasonInfo;
+ fr.ifremer.isisfish.entities.Zone;
+ org.nuiton.math.matrix.MatrixND;
+ org.nuiton.math.matrix.gui.MatrixPanelEvent;
+ java.beans.PropertyChangeEvent;
+ java.beans.PropertyChangeListener;
+ org.nuiton.math.matrix.gui.MatrixPanelListener;
javax.swing.text.Document
</import>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -30,12 +30,12 @@
<fr.ifremer.isisfish.entities.PopulationSeasonInfo id='popInfo' javaBean='null'/>
<import>
- fr.ifremer.isisfish.entities.PopulationSeasonInfo;
- fr.ifremer.isisfish.entities.Population;
- fr.ifremer.isisfish.ui.input.model.PopulationSeasonInfoComboModel;
- fr.ifremer.isisfish.ui.input.renderer.PopulationSeasonInfoComboRenderer;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ fr.ifremer.isisfish.entities.PopulationSeasonInfo;
+ fr.ifremer.isisfish.entities.Population;
+ fr.ifremer.isisfish.ui.input.model.PopulationSeasonInfoComboModel;
+ fr.ifremer.isisfish.ui.input.renderer.PopulationSeasonInfoComboRenderer;
+ java.beans.PropertyChangeEvent;
+ java.beans.PropertyChangeListener;
java.awt.CardLayout
</import>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -28,11 +28,11 @@
<fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/>
<import>
- fr.ifremer.isisfish.entities.Population;
- org.nuiton.math.matrix.gui.MatrixPanelEvent;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
- org.nuiton.math.matrix.gui.MatrixPanelListener;
+ fr.ifremer.isisfish.entities.Population;
+ org.nuiton.math.matrix.gui.MatrixPanelEvent;
+ java.beans.PropertyChangeEvent;
+ java.beans.PropertyChangeListener;
+ org.nuiton.math.matrix.gui.MatrixPanelListener;
</import>
<BeanValidator id='validator' context="recruitement"
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -32,12 +32,12 @@
<Boolean id='ageGroupType' javaBean='false'/>
<import>
- fr.ifremer.isisfish.entities.PopulationSeasonInfo;
- fr.ifremer.isisfish.ui.util.ErrorHelper;
- org.nuiton.math.matrix.MatrixND;
- org.nuiton.math.matrix.gui.MatrixPanelEditor;
- org.nuiton.math.matrix.gui.MatrixPanelEvent;
- org.nuiton.math.matrix.gui.MatrixPanelListener;
+ fr.ifremer.isisfish.entities.PopulationSeasonInfo;
+ fr.ifremer.isisfish.ui.util.ErrorHelper;
+ org.nuiton.math.matrix.MatrixND;
+ org.nuiton.math.matrix.gui.MatrixPanelEditor;
+ org.nuiton.math.matrix.gui.MatrixPanelEvent;
+ org.nuiton.math.matrix.gui.MatrixPanelListener;
javax.swing.JOptionPane
</import>
@@ -110,19 +110,19 @@
</cell>
<cell fill='horizontal' weightx='0.5'>
<JRadioButton id="radioPopulationSeasonGroupChangeLengthNoSpacialized"
- buttonGroup="radioPopulationSeasonGroupChangeLengthSpacializedGroup"
- selected='{getPopulationSeasonInfo().getSimpleLengthChangeMatrix()}'
- enabled='{getPopulationSeasonInfo() != null}'
- text="isisfish.populationSeasons.noSpacialized" onActionPerformed='spacializedActionPerformed()'
- visible='{isAgeGroupType()}' decorator='boxed' />
+ buttonGroup="radioPopulationSeasonGroupChangeLengthSpacializedGroup"
+ selected='{getPopulationSeasonInfo().getSimpleLengthChangeMatrix()}'
+ enabled='{getPopulationSeasonInfo() != null}'
+ text="isisfish.populationSeasons.noSpacialized" onActionPerformed='spacializedActionPerformed()'
+ visible='{isAgeGroupType()}' decorator='boxed' />
</cell>
<cell fill='horizontal' weightx='0.5'>
<JRadioButton id="radioPopulationSeasonGroupChangeLengthSpacialized"
- buttonGroup="radioPopulationSeasonGroupChangeLengthSpacializedGroup"
- selected='{!getPopulationSeasonInfo().getSimpleLengthChangeMatrix()}'
- enabled='{getPopulationSeasonInfo() != null}'
- text="isisfish.populationSeasons.spacialized" onActionPerformed='spacializedActionPerformed()'
- visible='{isAgeGroupType()}' decorator='boxed' />
+ buttonGroup="radioPopulationSeasonGroupChangeLengthSpacializedGroup"
+ selected='{!getPopulationSeasonInfo().getSimpleLengthChangeMatrix()}'
+ enabled='{getPopulationSeasonInfo() != null}'
+ text="isisfish.populationSeasons.spacialized" onActionPerformed='spacializedActionPerformed()'
+ visible='{isAgeGroupType()}' decorator='boxed' />
</cell>
</row>
<row>
@@ -136,9 +136,9 @@
</cell>
<cell fill='horizontal' weightx='0.5'>
<JButton id="buttonPopulationSeasonGroupChangeLengthButtonShow" text="isisfish.populationSeasons.showSpacialized"
- enabled='{radioPopulationSeasonGroupChangeLengthNoSpacialized.isSelected() && getPopulationSeasonInfo() != null}'
- onActionPerformed='showSpacializedMatrixChangeOfGroup()'
- visible='{isAgeGroupType()}' decorator='boxed'/>
+ enabled='{radioPopulationSeasonGroupChangeLengthNoSpacialized.isSelected() && getPopulationSeasonInfo() != null}'
+ onActionPerformed='showSpacializedMatrixChangeOfGroup()'
+ visible='{isAgeGroupType()}' decorator='boxed'/>
</cell>
</row>
<row>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -33,13 +33,13 @@
java.beans.PropertyChangeEvent
java.beans.PropertyChangeListener
fr.ifremer.isisfish.ui.input.model.PopulationSeasonInfoComboModel
- fr.ifremer.isisfish.entities.PopulationSeasonInfo
- fr.ifremer.isisfish.types.Month
- fr.ifremer.isisfish.entities.Population
- fr.ifremer.isisfish.ui.widget.Interval
- org.nuiton.math.matrix.MatrixND
- org.nuiton.math.matrix.gui.MatrixPanelEvent
- org.nuiton.math.matrix.gui.MatrixPanelListener
+ fr.ifremer.isisfish.entities.PopulationSeasonInfo
+ fr.ifremer.isisfish.types.Month
+ fr.ifremer.isisfish.entities.Population
+ fr.ifremer.isisfish.ui.widget.Interval
+ org.nuiton.math.matrix.MatrixND
+ org.nuiton.math.matrix.gui.MatrixPanelEvent
+ org.nuiton.math.matrix.gui.MatrixPanelListener
</import>
<BeanValidator id='validator' context="seasons"
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -28,12 +28,12 @@
<fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/>
<import>
- fr.ifremer.isisfish.entities.Zone
- fr.ifremer.isisfish.ui.input.model.ZoneListModel
- org.nuiton.math.matrix.gui.MatrixPanelEvent
- org.nuiton.math.matrix.gui.MatrixPanelListener
- java.beans.PropertyChangeEvent
- java.beans.PropertyChangeListener
+ fr.ifremer.isisfish.entities.Zone
+ fr.ifremer.isisfish.ui.input.model.ZoneListModel
+ org.nuiton.math.matrix.gui.MatrixPanelEvent
+ org.nuiton.math.matrix.gui.MatrixPanelListener
+ java.beans.PropertyChangeEvent
+ java.beans.PropertyChangeListener
java.util.List
java.util.ArrayList
java.awt.Dimension
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -29,15 +29,15 @@
<import>
static org.nuiton.i18n.I18n.n_
- fr.ifremer.isisfish.entities.Port
- fr.ifremer.isisfish.entities.Cell
- com.bbn.openmap.gui.Tool
- com.bbn.openmap.gui.OMToolSet
- fr.ifremer.isisfish.map.CellSelectionLayer
- fr.ifremer.isisfish.map.CopyMapToClipboardListener
- com.bbn.openmap.event.SelectMouseMode
- java.beans.PropertyChangeEvent
- java.beans.PropertyChangeListener
+ fr.ifremer.isisfish.entities.Port
+ fr.ifremer.isisfish.entities.Cell
+ com.bbn.openmap.gui.Tool
+ com.bbn.openmap.gui.OMToolSet
+ fr.ifremer.isisfish.map.CellSelectionLayer
+ fr.ifremer.isisfish.map.CopyMapToClipboardListener
+ com.bbn.openmap.event.SelectMouseMode
+ java.beans.PropertyChangeEvent
+ java.beans.PropertyChangeListener
java.awt.event.MouseEvent
</import>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -28,10 +28,10 @@
<fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/>
<import>
- fr.ifremer.isisfish.types.RangeOfValues
- fr.ifremer.isisfish.entities.Gear
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener
+ fr.ifremer.isisfish.types.RangeOfValues
+ fr.ifremer.isisfish.entities.Gear
+ java.beans.PropertyChangeEvent;
+ java.beans.PropertyChangeListener
java.util.ArrayList
</import>
@@ -45,7 +45,7 @@
fieldGearParamPossibleValue.setText("");
}
if (evt.getNewValue() != null) {
- java.util.List<Object> values = new ArrayList<Object>();
+ java.util.List<Object> values = new ArrayList<Object>();
for (String value : RangeOfValues.getPossibleTypes()) {
values.add(value);
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -38,16 +38,16 @@
valid="{validator.isValid()}" />
<import>
- fr.ifremer.isisfish.entities.Equation
- fr.ifremer.isisfish.entities.Gear
- fr.ifremer.isisfish.entities.Population
- fr.ifremer.isisfish.entities.Selectivity
- fr.ifremer.isisfish.entities.Species
- fr.ifremer.isisfish.ui.input.model.GearPopulationSelectivityModel
- fr.ifremer.isisfish.ui.input.model.PopulationComboModel
- fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor
- java.beans.PropertyChangeEvent
- java.beans.PropertyChangeListener
+ fr.ifremer.isisfish.entities.Equation
+ fr.ifremer.isisfish.entities.Gear
+ fr.ifremer.isisfish.entities.Population
+ fr.ifremer.isisfish.entities.Selectivity
+ fr.ifremer.isisfish.entities.Species
+ fr.ifremer.isisfish.ui.input.model.GearPopulationSelectivityModel
+ fr.ifremer.isisfish.ui.input.model.PopulationComboModel
+ fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor
+ java.beans.PropertyChangeEvent
+ java.beans.PropertyChangeListener
java.util.ArrayList
javax.swing.DefaultComboBoxModel
</import>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -28,14 +28,14 @@
<fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/>
<import>
- fr.ifremer.isisfish.entities.Port
- fr.ifremer.isisfish.entities.VesselType
- fr.ifremer.isisfish.entities.SetOfVessels
+ fr.ifremer.isisfish.entities.Port
+ fr.ifremer.isisfish.entities.VesselType
+ fr.ifremer.isisfish.entities.SetOfVessels
fr.ifremer.isisfish.ui.input.model.PortComboModel
fr.ifremer.isisfish.ui.input.model.VesselTypeComboModel
- jaxx.runtime.swing.editor.NumberEditor
- java.beans.PropertyChangeEvent
- java.beans.PropertyChangeListener
+ jaxx.runtime.swing.editor.NumberEditor
+ java.beans.PropertyChangeEvent
+ java.beans.PropertyChangeListener
</import>
<BeanValidator id='validator' context="basics"
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -29,10 +29,10 @@
<import>
static org.nuiton.i18n.I18n.n_
- fr.ifremer.isisfish.entities.Species;
- jaxx.runtime.swing.editor.NumberEditor;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ fr.ifremer.isisfish.entities.Species;
+ jaxx.runtime.swing.editor.NumberEditor;
+ java.beans.PropertyChangeEvent;
+ java.beans.PropertyChangeListener;
</import>
<BeanValidator id='validator'
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -40,9 +40,9 @@
<fr.ifremer.isisfish.entities.StrategyMonthInfo id='strategyMonthInfo11' javaBean='null'/>
<import>
- org.apache.commons.lang.StringUtils
- java.beans.PropertyChangeEvent
- java.beans.PropertyChangeListener
+ org.apache.commons.lang.StringUtils
+ java.beans.PropertyChangeEvent
+ java.beans.PropertyChangeListener
static org.nuiton.i18n.I18n._
</import>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -32,14 +32,14 @@
<fr.ifremer.isisfish.entities.StrategyMonthInfo id='strategyMonthInfo' javaBean='null'/>
<import>
- fr.ifremer.isisfish.entities.Strategy
- fr.ifremer.isisfish.entities.StrategyMonthInfo
- org.nuiton.math.matrix.gui.MatrixPanelEvent
- jaxx.runtime.swing.editor.NumberEditor
- fr.ifremer.isisfish.entities.TripType
- org.nuiton.math.matrix.gui.MatrixPanelListener
- java.beans.PropertyChangeEvent
- java.beans.PropertyChangeListener
+ fr.ifremer.isisfish.entities.Strategy
+ fr.ifremer.isisfish.entities.StrategyMonthInfo
+ org.nuiton.math.matrix.gui.MatrixPanelEvent
+ jaxx.runtime.swing.editor.NumberEditor
+ fr.ifremer.isisfish.entities.TripType
+ org.nuiton.math.matrix.gui.MatrixPanelListener
+ java.beans.PropertyChangeEvent
+ java.beans.PropertyChangeListener
fr.ifremer.isisfish.ui.input.model.TripTypeComboModel
</import>
@@ -53,7 +53,7 @@
}
if (evt.getNewValue() != null) {
- init = true;
+ init = true;
refresh();
init = false;
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -28,8 +28,8 @@
<fr.ifremer.isisfish.entities.Strategy id='bean' javaBean='null'/>
<import>
- fr.ifremer.isisfish.entities.Strategy
- fr.ifremer.isisfish.entities.SetOfVessels
+ fr.ifremer.isisfish.entities.Strategy
+ fr.ifremer.isisfish.entities.SetOfVessels
java.beans.PropertyChangeEvent
java.beans.PropertyChangeListener
fr.ifremer.isisfish.ui.input.model.SetOfVesselsComboModel
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -29,10 +29,10 @@
<import>
static org.nuiton.i18n.I18n.n_
- fr.ifremer.isisfish.entities.TripType
- fr.ifremer.isisfish.types.TimeUnit
- java.beans.PropertyChangeEvent
- java.beans.PropertyChangeListener
+ fr.ifremer.isisfish.entities.TripType
+ fr.ifremer.isisfish.types.TimeUnit
+ java.beans.PropertyChangeEvent
+ java.beans.PropertyChangeListener
</import>
<BeanValidator id='validator'
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -29,13 +29,13 @@
<import>
static org.nuiton.i18n.I18n.n_
- fr.ifremer.isisfish.entities.VesselType
- fr.ifremer.isisfish.entities.TripType
- fr.ifremer.isisfish.types.TimeUnit
- fr.ifremer.isisfish.ui.input.model.TripTypeListModel
- jaxx.runtime.swing.editor.NumberEditor
- java.beans.PropertyChangeEvent
- java.beans.PropertyChangeListener
+ fr.ifremer.isisfish.entities.VesselType
+ fr.ifremer.isisfish.entities.TripType
+ fr.ifremer.isisfish.types.TimeUnit
+ fr.ifremer.isisfish.ui.input.model.TripTypeListModel
+ jaxx.runtime.swing.editor.NumberEditor
+ java.beans.PropertyChangeEvent
+ java.beans.PropertyChangeListener
</import>
<BeanValidator id='validator'
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -24,15 +24,15 @@
-->
<JPanel id="wizardGroup" layout='{new BorderLayout()}'>
<import>
- org.nuiton.topia.TopiaContext
- fr.ifremer.isisfish.IsisFishDAOHelper
- fr.ifremer.isisfish.entities.Equation
- fr.ifremer.isisfish.entities.Population
- fr.ifremer.isisfish.entities.PopulationGroup
- fr.ifremer.isisfish.entities.PopulationGroupDAO
+ org.nuiton.topia.TopiaContext
+ fr.ifremer.isisfish.IsisFishDAOHelper
+ fr.ifremer.isisfish.entities.Equation
+ fr.ifremer.isisfish.entities.Population
+ fr.ifremer.isisfish.entities.PopulationGroup
+ fr.ifremer.isisfish.entities.PopulationGroupDAO
java.awt.CardLayout
javax.swing.JFrame
- </import>
+ </import>
<script><![CDATA[
@@ -454,7 +454,7 @@
</cell>
</row>
</Table>
- <Table constraints='"endInputGroupLength"'>
+ <Table constraints='"endInputGroupLength"'>
<row>
<cell columns='2' fill='horizontal' weightx='1.0'>
<JLabel text="isisfish.wizardGroupCreation.populationCharacteristics" horizontalAlignment="CENTER"/>
@@ -466,7 +466,7 @@
</cell>
<cell fill='horizontal' weightx='1.0'>
<JTextField id="firstInputLength" onFocusLost='firstInputLengthChanged()'/>
- </cell>
+ </cell>
</row>
<row>
<cell>
@@ -474,7 +474,7 @@
</cell>
<cell fill='horizontal' weightx='1.0'>
<JTextField id="maximalGroupsLength" onFocusLost='maximalGroupsLengthChanged()'/>
- </cell>
+ </cell>
</row>
<row>
<cell columns='2' fill='horizontal' weightx='1.0'>
@@ -528,7 +528,7 @@
</cell>
</row>
</Table>
- <Table constraints='"endGrowthCurveGroupLength"'>
+ <Table constraints='"endGrowthCurveGroupLength"'>
<row>
<cell columns='2' fill='horizontal' weightx='1.0'>
<JLabel text="isisfish.wizardGroupCreation.populationCharacteristics" horizontalAlignment="CENTER"/>
@@ -563,7 +563,7 @@
<JLabel text="isisfish.wizardGroupCreation.undefinedGrowthEquation"/>
</cell>
</row>
- </Table>
+ </Table>
</JPanel>
<Table id="navButton" constraints='BorderLayout.SOUTH'>
<row>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -29,17 +29,17 @@
<import>
static org.nuiton.i18n.I18n.n_
- javax.swing.event.ListSelectionEvent
- fr.ifremer.isisfish.entities.Cell
- fr.ifremer.isisfish.entities.Zone
- fr.ifremer.isisfish.map.CellSelectionLayer
- fr.ifremer.isisfish.map.CopyMapToClipboardListener
+ javax.swing.event.ListSelectionEvent
+ fr.ifremer.isisfish.entities.Cell
+ fr.ifremer.isisfish.entities.Zone
+ fr.ifremer.isisfish.map.CellSelectionLayer
+ fr.ifremer.isisfish.map.CopyMapToClipboardListener
fr.ifremer.isisfish.ui.input.model.TopiaEntityListModel
- com.bbn.openmap.event.SelectMouseMode
- com.bbn.openmap.gui.Tool
- com.bbn.openmap.gui.OMToolSet
- java.beans.PropertyChangeEvent
- java.beans.PropertyChangeListener
+ com.bbn.openmap.event.SelectMouseMode
+ com.bbn.openmap.gui.Tool
+ com.bbn.openmap.gui.OMToolSet
+ java.beans.PropertyChangeEvent
+ java.beans.PropertyChangeListener
java.awt.event.MouseEvent
java.util.ArrayList
</import>
@@ -198,7 +198,7 @@
decorator='boxed' constraints='BorderLayout.NORTH'/>
<fr.ifremer.isisfish.map.IsisMapBean id='zoneMap'
javaBean='new fr.ifremer.isisfish.map.IsisMapBean()'
- selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.MULT_SELECTION}"
+ selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.MULT_SELECTION}"
fisheryRegion='{getFisheryRegion()}' selectedCells='{getBean()==null?null:bean.getCell()}'
decorator='boxed' constraints='BorderLayout.CENTER'/>
<!-- FIXME echatellier 20110429 : binding -->
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -24,10 +24,10 @@
-->
<Table>
<import>
- fr.ifremer.isisfish.simulator.launcher.SimulationServiceTableModel;
- fr.ifremer.isisfish.simulator.launcher.SimulationService;
- javax.swing.JProgressBar;
- javax.swing.ListSelectionModel;
+ fr.ifremer.isisfish.simulator.launcher.SimulationServiceTableModel;
+ fr.ifremer.isisfish.simulator.launcher.SimulationService;
+ javax.swing.JProgressBar;
+ javax.swing.ListSelectionModel;
</import>
<script><![CDATA[
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -60,8 +60,8 @@
}
protected void performImport() {
- File archiveFile = new File(archivePath.getText());
- getContextValue(ScriptAction.class).performImportScript(archiveFile, newFilesTableModel, conflictFilesTableModel);
+ File archiveFile = new File(archivePath.getText());
+ getContextValue(ScriptAction.class).performImportScript(archiveFile, newFilesTableModel, conflictFilesTableModel);
}
protected void cancel() {
@@ -119,7 +119,7 @@
<JButton id='okButton' text='isisfish.script.import.import'
enabled='{isOkEnabled()}'/>
<JButton id='cancelButton' text='isisfish.script.import.cancel'
- onActionPerformed="cancel()" />
+ onActionPerformed="cancel()" />
</JPanel>
</cell>
</row>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -52,7 +52,7 @@
<JMenuItem id="miNewSensitivity" text="isisfish.script.menu.txtNewSensitivity" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Sensitivity)' icon="script.png" />
<JMenuItem id="miNewSensitivityExport" text="isisfish.script.menu.txtNewSensitivityExport" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.SensitivityExport)' icon="script.png" />
<JMenuItem id="miNewEquationModel" text="isisfish.script.menu.txtNewEquationModel" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.EquationModel)' icon="script.png" />
- </JMenu>
+ </JMenu>
<JMenuItem id="miSave" text="isisfish.script.menu.save" onActionPerformed="getScriptAction().saveScript()" icon="script_save.png" enabled='{isSingleFileSelected()}' />
<JSeparator/>
<JMenuItem id="miImport" text="isisfish.script.menu.txtImport" enabled="false" onActionPerformed="getScriptAction().importScript()" icon="page_white_compressed.png" />
@@ -82,7 +82,7 @@
</JMenu>
</JMenuBar>
- <!-- Toolbar -->
+ <!-- Toolbar -->
<JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'>
<JPanel id="buttonBar" layout='{new GridLayout()}' constraints='BorderLayout.NORTH'>
<JComboBox id="scriptTypeChoice" model='{new ScriptTypesComboModel()}'/>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -32,15 +32,15 @@
java.util.List
java.util.regex.Matcher
java.util.regex.Pattern
- javax.swing.table.AbstractTableModel
- javax.swing.table.DefaultTableModel
+ javax.swing.table.AbstractTableModel
+ javax.swing.table.DefaultTableModel
javax.swing.table.TableCellEditor
javax.swing.table.TableModel
javax.swing.JComboBox
javax.swing.DefaultCellEditor
javax.swing.event.CellEditorListener
- fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain
- org.apache.commons.lang.StringUtils
+ fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain
+ org.apache.commons.lang.StringUtils
</import>
<String id='text' javaBean='null'/>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -25,18 +25,18 @@
<JDialog title='isisfish.sensitivity.title' modal='{true}' layout='{new BorderLayout()}'>
<import>
- org.apache.commons.lang.StringUtils;
- org.nuiton.topia.persistence.TopiaEntityContextable;
+ org.apache.commons.lang.StringUtils;
+ org.nuiton.topia.persistence.TopiaEntityContextable;
fr.ifremer.isisfish.ui.SimulationUI;
- fr.ifremer.isisfish.ui.simulator.SimulAction;
- fr.ifremer.isisfish.ui.input.InputSaveVerifier;
- fr.ifremer.isisfish.simulator.sensitivity.Factor;
- fr.ifremer.isisfish.simulator.sensitivity.Domain;
- fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
- fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain;
- fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ fr.ifremer.isisfish.ui.simulator.SimulAction;
+ fr.ifremer.isisfish.ui.input.InputSaveVerifier;
+ fr.ifremer.isisfish.simulator.sensitivity.Factor;
+ fr.ifremer.isisfish.simulator.sensitivity.Domain;
+ fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
+ fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain;
+ fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain;
+ java.beans.PropertyChangeEvent;
+ java.beans.PropertyChangeListener;
java.util.SortedMap
javax.swing.JComponent
</import>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -26,27 +26,27 @@
<import>
java.awt.CardLayout
javax.swing.ComboBoxModel
- javax.swing.table.DefaultTableModel
+ javax.swing.table.DefaultTableModel
fr.ifremer.isisfish.datastore.RegionStorage
fr.ifremer.isisfish.export.SensitivityExport
- fr.ifremer.isisfish.simulator.sensitivity.Domain
- fr.ifremer.isisfish.simulator.sensitivity.Factor
- fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator
- fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain
+ fr.ifremer.isisfish.simulator.sensitivity.Domain
+ fr.ifremer.isisfish.simulator.sensitivity.Factor
+ fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator
+ fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain
fr.ifremer.isisfish.ui.models.common.StringListModel
- fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListModel
- fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListRenderer
- fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportNameListRenderer
- fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellEditor
- fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellRenderer
- fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableModel
- fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboModel
- fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboRenderer
- fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorListModel
- fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorListRenderer
- fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableCellEditor
- fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableCellRenderer
- fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableModel
+ fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListModel
+ fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListRenderer
+ fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportNameListRenderer
+ fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellEditor
+ fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellRenderer
+ fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableModel
+ fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboModel
+ fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboRenderer
+ fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorListModel
+ fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorListRenderer
+ fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableCellEditor
+ fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableCellRenderer
+ fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableModel
fr.ifremer.isisfish.ui.simulator.SimulAction
</import>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -24,16 +24,16 @@
-->
<Table>
<import>
- java.util.ArrayList
- java.io.File
+ java.util.ArrayList
+ java.io.File
java.io.IOException
javax.swing.ComboBoxModel
- org.nuiton.util.FileUtil
+ org.nuiton.util.FileUtil
fr.ifremer.isisfish.datastore.SimulationStorage
fr.ifremer.isisfish.simulator.launcher.SimulationService
fr.ifremer.isisfish.simulator.launcher.SimulationJob
fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener
- fr.ifremer.isisfish.ui.simulator.SimulAction
+ fr.ifremer.isisfish.ui.simulator.SimulAction
fr.ifremer.isisfish.ui.models.common.StringComboModel
</import>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -24,21 +24,21 @@
-->
<fr.ifremer.isisfish.ui.NavigationUI>
<import>
- javax.swing.JPopupMenu;
- javax.swing.tree.DefaultTreeModel;
- javax.swing.tree.TreePath;
- javax.swing.tree.DefaultMutableTreeNode;
- javax.swing.tree.TreeNode;
+ javax.swing.JPopupMenu;
+ javax.swing.tree.DefaultTreeModel;
+ javax.swing.tree.TreePath;
+ javax.swing.tree.DefaultMutableTreeNode;
+ javax.swing.tree.TreeNode;
- fr.ifremer.isisfish.datastore.RegionStorage;
- fr.ifremer.isisfish.simulator.sensitivity.Factor;
- fr.ifremer.isisfish.ui.WelcomePanelUI;
- fr.ifremer.isisfish.ui.input.InputAction;
- fr.ifremer.isisfish.ui.input.InputSaveVerifier;
- fr.ifremer.isisfish.ui.simulator.SimulAction;
- fr.ifremer.isisfish.simulator.sensitivity.FactorGroup;
- fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeModel;
- fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeCellRenderer;
+ fr.ifremer.isisfish.datastore.RegionStorage;
+ fr.ifremer.isisfish.simulator.sensitivity.Factor;
+ fr.ifremer.isisfish.ui.WelcomePanelUI;
+ fr.ifremer.isisfish.ui.input.InputAction;
+ fr.ifremer.isisfish.ui.input.InputSaveVerifier;
+ fr.ifremer.isisfish.ui.simulator.SimulAction;
+ fr.ifremer.isisfish.simulator.sensitivity.FactorGroup;
+ fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeModel;
+ fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeCellRenderer;
fr.ifremer.isisfish.ui.sensitivity.model.FactorTree
javax.swing.JComponent
java.awt.event.ActionListener
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -25,9 +25,9 @@
<fr.ifremer.isisfish.ui.SimulationUI>
<import>
- fr.ifremer.isisfish.ui.input.InputAction
+ fr.ifremer.isisfish.ui.input.InputAction
fr.ifremer.isisfish.ui.sensitivity.SensitivitySaveVerifier
- jaxx.runtime.context.JAXXInitialContext
+ jaxx.runtime.context.JAXXInitialContext
jaxx.runtime.JAXXContext
</import>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -28,8 +28,8 @@
<Boolean id='changed' javaBean='false'/>
<import>
- javax.swing.table.DefaultTableModel;
- java.util.Map.Entry;
+ javax.swing.table.DefaultTableModel;
+ java.util.Map.Entry;
javax.swing.event.ListSelectionListener
java.util.Set
java.util.Iterator
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -24,8 +24,8 @@
-->
<Table>
<import>
- fr.ifremer.isisfish.ui.WelcomePanelUI;
- fr.ifremer.isisfish.ui.models.common.StringListModel;
+ fr.ifremer.isisfish.ui.WelcomePanelUI;
+ fr.ifremer.isisfish.ui.models.common.StringListModel;
javax.swing.event.ListSelectionEvent;
java.util.LinkedList
</import>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -29,38 +29,38 @@
<Boolean id='sensitivity' javaBean='false' />
<import>
- java.util.EventObject;
- java.text.ParseException;
- fr.ifremer.isisfish.datastore.RegionStorage;
- fr.ifremer.isisfish.datastore.StorageChangeEvent;
- fr.ifremer.isisfish.datastore.StorageChangeListener;
- fr.ifremer.isisfish.datastore.StorageException;
- fr.ifremer.isisfish.entities.Population;
- fr.ifremer.isisfish.entities.Strategy;
- fr.ifremer.isisfish.entities.FisheryRegion;
- fr.ifremer.isisfish.ui.SimulationUI;
- fr.ifremer.isisfish.ui.WelcomePanelUI;
- fr.ifremer.isisfish.ui.WelcomeTabUI;
- fr.ifremer.isisfish.ui.models.common.StringComboModel;
- fr.ifremer.isisfish.ui.models.rule.RuleComboModel;
- fr.ifremer.isisfish.ui.models.rule.RuleNamesListRenderer;
- fr.ifremer.isisfish.ui.models.rule.RuleListModel;
- fr.ifremer.isisfish.ui.models.rule.RuleParametersTableModel;
- fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellEditor;
- fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellRenderer;
- fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI;
- fr.ifremer.isisfish.ui.sensitivity.SensitivityUI;
- fr.ifremer.isisfish.rule.Rule;
- fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher;
- fr.ifremer.isisfish.simulator.launcher.SimulationService;
- fr.ifremer.isisfish.simulator.launcher.SimulationJob;
- fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener;
- fr.ifremer.isisfish.simulator.sensitivity.Factor;
- org.nuiton.topia.TopiaException;
- org.nuiton.topia.TopiaContext;
- org.nuiton.math.matrix.MatrixND;
- org.nuiton.math.matrix.gui.MatrixPanelEditor;
- org.apache.commons.lang.ArrayUtils;
+ java.util.EventObject;
+ java.text.ParseException;
+ fr.ifremer.isisfish.datastore.RegionStorage;
+ fr.ifremer.isisfish.datastore.StorageChangeEvent;
+ fr.ifremer.isisfish.datastore.StorageChangeListener;
+ fr.ifremer.isisfish.datastore.StorageException;
+ fr.ifremer.isisfish.entities.Population;
+ fr.ifremer.isisfish.entities.Strategy;
+ fr.ifremer.isisfish.entities.FisheryRegion;
+ fr.ifremer.isisfish.ui.SimulationUI;
+ fr.ifremer.isisfish.ui.WelcomePanelUI;
+ fr.ifremer.isisfish.ui.WelcomeTabUI;
+ fr.ifremer.isisfish.ui.models.common.StringComboModel;
+ fr.ifremer.isisfish.ui.models.rule.RuleComboModel;
+ fr.ifremer.isisfish.ui.models.rule.RuleNamesListRenderer;
+ fr.ifremer.isisfish.ui.models.rule.RuleListModel;
+ fr.ifremer.isisfish.ui.models.rule.RuleParametersTableModel;
+ fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellEditor;
+ fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellRenderer;
+ fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI;
+ fr.ifremer.isisfish.ui.sensitivity.SensitivityUI;
+ fr.ifremer.isisfish.rule.Rule;
+ fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher;
+ fr.ifremer.isisfish.simulator.launcher.SimulationService;
+ fr.ifremer.isisfish.simulator.launcher.SimulationJob;
+ fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener;
+ fr.ifremer.isisfish.simulator.sensitivity.Factor;
+ org.nuiton.topia.TopiaException;
+ org.nuiton.topia.TopiaContext;
+ org.nuiton.math.matrix.MatrixND;
+ org.nuiton.math.matrix.gui.MatrixPanelEditor;
+ org.apache.commons.lang.ArrayUtils;
javax.swing.SwingUtilities
javax.swing.DefaultComboBoxModel
java.awt.CardLayout
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -24,9 +24,9 @@
-->
<JPanel layout='{new BorderLayout()}'>
<import>
- fr.ifremer.isisfish.ui.WelcomePanelUI
- fr.ifremer.isisfish.ui.models.common.StringListModel
- javax.swing.event.ListSelectionEvent
+ fr.ifremer.isisfish.ui.WelcomePanelUI
+ fr.ifremer.isisfish.ui.models.common.StringListModel
+ javax.swing.event.ListSelectionEvent
</import>
<script><![CDATA[
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -25,18 +25,18 @@
<Table>
<import>
java.awt.Dimension
- javax.swing.table.DefaultTableModel;
- fr.ifremer.isisfish.datastore.AnalysePlanStorage;
- fr.ifremer.isisfish.datastore.StorageChangeEvent;
- fr.ifremer.isisfish.datastore.StorageChangeListener;
- fr.ifremer.isisfish.simulator.AnalysePlan;
- fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanComboModel;
- fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanComboRenderer;
- fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanListModel;
- fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanListRenderer;
- fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableModel;
- fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableCellEditor;
- fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableCellRenderer;
+ javax.swing.table.DefaultTableModel;
+ fr.ifremer.isisfish.datastore.AnalysePlanStorage;
+ fr.ifremer.isisfish.datastore.StorageChangeEvent;
+ fr.ifremer.isisfish.datastore.StorageChangeListener;
+ fr.ifremer.isisfish.simulator.AnalysePlan;
+ fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanComboModel;
+ fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanComboRenderer;
+ fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanListModel;
+ fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanListRenderer;
+ fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableModel;
+ fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableCellEditor;
+ fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableCellRenderer;
fr.ifremer.isisfish.datastore.RegionStorage;
</import>
<SimulAction id='simulAction' javaBean='getContextValue(SimulAction.class)' />
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -23,5 +23,5 @@
#L%
-->
<fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI modal="true">
- <fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterPanelUI id='content' constructorParams='this'/>
+ <fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterPanelUI id='content' constructorParams='this'/>
</fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -24,14 +24,14 @@
-->
<JDialog>
<import>
- javax.swing.text.html.HTMLEditorKit;
- javax.swing.text.html.HTMLDocument;
- javax.swing.event.HyperlinkListener;
- javax.swing.text.html.HTMLFrameHyperlinkEvent;
- javax.swing.event.HyperlinkEvent;
- java.io.PrintWriter;
- java.io.StringWriter;
- java.net.URL;
+ javax.swing.text.html.HTMLEditorKit;
+ javax.swing.text.html.HTMLDocument;
+ javax.swing.event.HyperlinkListener;
+ javax.swing.text.html.HTMLFrameHyperlinkEvent;
+ javax.swing.event.HyperlinkEvent;
+ java.io.PrintWriter;
+ java.io.StringWriter;
+ java.net.URL;
javax.swing.JComponent
java.awt.Color
java.awt.Desktop
@@ -152,8 +152,8 @@
<row fill='horizontal'>
<cell columns='2' weighty="1" fill='both'>
<JScrollPane height="60">
- <JEditorPane id="helpEditor" editable="false" />
- </JScrollPane>
+ <JEditorPane id="helpEditor" editable="false" />
+ </JScrollPane>
</cell>
</row>
<row fill='horizontal'>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -24,15 +24,15 @@
-->
<JDialog title='isisfish.server.ssh.generateKey.title' modal='true'>
<import>
- com.jcraft.jsch.JSch;
- com.jcraft.jsch.KeyPair;
- org.nuiton.util.FileUtil;
- java.io.File;
- java.io.IOException;
- java.util.ArrayList;
- java.util.Arrays;
- java.util.HashMap;
- java.util.Map;
+ com.jcraft.jsch.JSch;
+ com.jcraft.jsch.KeyPair;
+ org.nuiton.util.FileUtil;
+ java.io.File;
+ java.io.IOException;
+ java.util.ArrayList;
+ java.util.Arrays;
+ java.util.HashMap;
+ java.util.Map;
java.awt.Color
javax.swing.JComponent
</import>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354)
@@ -183,8 +183,8 @@
<row fill='horizontal'>
<cell columns='4' weighty="1" fill='both'>
<JScrollPane height="200">
- <JEditorPane id="doc" />
- </JScrollPane>
+ <JEditorPane id="doc" />
+ </JScrollPane>
</cell>
</row>
<row fill='horizontal'>
1
0
r3353 - in isis-fish/branches/3.3.1/src: main/java/fr/ifremer/isisfish/ui/widget/editor main/java/fr/ifremer/isisfish/util/ssh test/java/fr/ifremer/isisfish/ui/widget
by chatellier@users.labs.libre-entreprise.org 07 Jun '11
by chatellier@users.labs.libre-entreprise.org 07 Jun '11
07 Jun '11
Author: chatellier
Date: 2011-06-07 09:17:13 +0000 (Tue, 07 Jun 2011)
New Revision: 3353
Log:
Fix tab char
Modified:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java
isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/FormInterval.java
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2011-06-07 08:02:39 UTC (rev 3352)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2011-06-07 09:17:13 UTC (rev 3353)
@@ -226,7 +226,7 @@
log.debug("getCellEditorValue [" + type + "] [mapping:" + mapping + "="
+ editor);
}
-
+
return editor;
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java 2011-06-07 08:02:39 UTC (rev 3352)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java 2011-06-07 09:17:13 UTC (rev 3353)
@@ -64,7 +64,7 @@
*/
protected String passwd;
- /**
+ /**
* Password text field.
*/
protected JPasswordField passwordField = new JPasswordField(20);
Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/FormInterval.java
===================================================================
--- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/FormInterval.java 2011-06-07 08:02:39 UTC (rev 3352)
+++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/FormInterval.java 2011-06-07 09:17:13 UTC (rev 3353)
@@ -49,7 +49,7 @@
public FormInterval(Interval i) {
IntervalPanel ip = new IntervalPanel();
this.add(ip);
- // ip.setEnabled(false);
+ // ip.setEnabled(false);
ip.setModel(i);
this.addWindowListener(new QuitListener());
1
0
r3352 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator: launcher sensitivity
by jcouteau@users.labs.libre-entreprise.org 07 Jun '11
by jcouteau@users.labs.libre-entreprise.org 07 Jun '11
07 Jun '11
Author: jcouteau
Date: 2011-06-07 08:02:39 +0000 (Tue, 07 Jun 2011)
New Revision: 3352
Log:
Add getDisplayedValue on factors for proper display in R
Modified:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-06 15:21:10 UTC (rev 3351)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-07 08:02:39 UTC (rev 3352)
@@ -95,7 +95,7 @@
/**
* Cette classe est responsable de conservation de toutes les simulations faites
* ou a faire. Pour ajouter une nouvelle simulation on appelle une des méthodes
- * {@link #submit}.
+ * {@code submit}.
* <p>
* Cette classe sert aussi de modele pour le moniteur de queue
* <p>
@@ -534,6 +534,8 @@
log.error("An error occurred while trying to get nominal value", ex);
}
}
+ } else {
+ factor.setNominalValue("NaN");
}
}
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-06-06 15:21:10 UTC (rev 3351)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-06-07 08:02:39 UTC (rev 3352)
@@ -104,7 +104,7 @@
if (factor.getDomain() instanceof ContinuousDomain) {
//Continu values, binf values, bsup values and discrete factors attributes
- nominalValues += factor.getNominalValue();
+ nominalValues += "\"" + factor.getNominalValue() + "\"";
//Continu values
continuValues += "TRUE";
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2011-06-06 15:21:10 UTC (rev 3351)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2011-06-07 08:02:39 UTC (rev 3352)
@@ -25,6 +25,7 @@
package fr.ifremer.isisfish.simulator.sensitivity;
+import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain;
import java.io.Serializable;
import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
@@ -58,6 +59,11 @@
protected String comment;
/**
+ * The identifier used to compute value.
+ */
+ protected Object identifier;
+
+ /**
* Domaine du facteur.
*
* Ensemble des valeurs possibles a prendre en compte. La clé est un label
@@ -167,6 +173,19 @@
}
/**
+ * Get the factor value for displaying (for example in R).
+ *
+ * @return the value
+ */
+ public Object getDisplayedValue() {
+ if (domain instanceof MatrixContinuousDomain) {
+ return identifier;
+ } else {
+ return getValue();
+ }
+ }
+
+ /**
* Set value.
*
* Unused (or only for test ?).
@@ -183,6 +202,7 @@
* @param valueIdentifier new value identifier to get
*/
public void setValueForIdentifier(Object valueIdentifier) {
+ identifier = valueIdentifier;
value = domain.getValueForIdentifier(valueIdentifier);
}
1
0
06 Jun '11
Author: chatellier
Date: 2011-06-06 15:21:10 +0000 (Mon, 06 Jun 2011)
New Revision: 3351
Log:
rSyntaxTextArea is back
Modified:
isis-fish/branches/3.3.1/pom.xml
Modified: isis-fish/branches/3.3.1/pom.xml
===================================================================
--- isis-fish/branches/3.3.1/pom.xml 2011-06-06 15:12:08 UTC (rev 3350)
+++ isis-fish/branches/3.3.1/pom.xml 2011-06-06 15:21:10 UTC (rev 3351)
@@ -89,6 +89,13 @@
</dependency>
<dependency>
+ <groupId>com.fifesoft</groupId>
+ <artifactId>rsyntaxtextarea</artifactId>
+ <version>1.5.0</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4.1</version>
1
0
r3350 - in isis-fish/branches/3.3.1/src/main: java/fr/ifremer/isisfish java/fr/ifremer/isisfish/mexico/xml java/fr/ifremer/isisfish/simulator/launcher java/fr/ifremer/isisfish/simulator/sensitivity java/fr/ifremer/isisfish/simulator/sensitivity/domain java/fr/ifremer/isisfish/ui/sensitivity java/fr/ifremer/isisfish/ui/simulator resources/i18n
by jcouteau@users.labs.libre-entreprise.org 06 Jun '11
by jcouteau@users.labs.libre-entreprise.org 06 Jun '11
06 Jun '11
Author: jcouteau
Date: 2011-06-06 15:12:08 +0000 (Mon, 06 Jun 2011)
New Revision: 3350
Log:
- Remove autocomplete
- Clean factors and domains and everything that comes with it
- Clean some code
Modified:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java
isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties
isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-06-06 14:14:32 UTC (rev 3349)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-06-06 15:12:08 UTC (rev 3350)
@@ -36,7 +36,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.text.SimpleDateFormat;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
@@ -53,11 +52,6 @@
import org.apache.commons.beanutils.ConvertUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.fife.rsta.ac.LanguageSupport;
-import org.fife.rsta.ac.LanguageSupportFactory;
-import org.fife.rsta.ac.java.JarInfo;
-import org.fife.rsta.ac.java.JavaLanguageSupport;
-import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
import org.nuiton.i18n.I18n;
import org.nuiton.i18n.init.ClassPathI18nInitializer;
import org.nuiton.math.matrix.DoubleBigVector;
@@ -86,7 +80,6 @@
import fr.ifremer.isisfish.types.TimeUnit;
import fr.ifremer.isisfish.ui.WelcomeUI;
import fr.ifremer.isisfish.ui.util.ErrorHelper;
-import fr.ifremer.isisfish.util.CompileHelper;
import fr.ifremer.isisfish.util.ConverterUtil;
import fr.ifremer.isisfish.util.DateConverter;
import fr.ifremer.isisfish.util.MonthConverter;
@@ -206,7 +199,7 @@
filesToMigrate.putAll(FileUtil.grep("org\\.codelutin\\.", folder, ".*\\.java", "ISO-8859-1"));
}
- if (filesToMigrate != null && !filesToMigrate.isEmpty()) {
+ if (!filesToMigrate.isEmpty()) {
// yes by defaut (for tests)
// but ask user if UI launch
@@ -383,12 +376,11 @@
* @return true if user confirm question
*/
protected static boolean ask(Object msg) {
- boolean result = true;
int value = JOptionPane.showConfirmDialog(null, msg);
if (value == JOptionPane.CANCEL_OPTION) {
quit();
}
- result = value == JOptionPane.YES_OPTION;
+ boolean result = value == JOptionPane.YES_OPTION;
return result;
}
@@ -508,7 +500,7 @@
// il est possiblement obligatoire de ne plus etre sur le trunk, ou
// de migrer sur un autre tag
- List<File> filesInClonflict = null;
+ List<File> filesInClonflict;
// si on est sur une branche, on est en developpement, on ne fait donc rien
if (vcs.getTag().startsWith("branches")) {
@@ -703,44 +695,5 @@
// par defaut on utilise des doubles pour les matrices
MatrixFactory.setDefaultVectorClass(DoubleBigVector.class);
}
-
- /**
- * Ajout les bons jar et sources au support de language
- * de rSyntaxTextArea pour avoir un meilleur support.
- *
- * Doit être fait avant l'instanciation de l'editor rSyntaxTextArea.
- *
- * @param config config
- */
- protected static void initRSyntaxJavaSupport(IsisConfig config) {
- // TODO: This API will change! It will be easier to do per-editor
- // changes to the build path.
- LanguageSupportFactory lsf = LanguageSupportFactory.get();
- LanguageSupport support = lsf.getSupportFor(SyntaxConstants.SYNTAX_STYLE_JAVA);
- JavaLanguageSupport jls = (JavaLanguageSupport)support;
- try {
- // system JRE
- jls.getJarManager().addJar(null);
-
- // ajout des scripts utilisateur dans le lots
- JarInfo ji = new JarInfo(config.getCompileDirectory());
- ji.setSourceLocation(config.getDatabaseDirectory());
- jls.getJarManager().addJar(ji);
-
- // Ajout des jars
- String paths = CompileHelper.getClassPathAsString(Collections.EMPTY_LIST);
- for (String path : paths.split(File.pathSeparator)) {
- File filePath = new File(path);
- if (filePath.isFile()) { // bug avec les directory
- JarInfo ji2 = new JarInfo(filePath);
- jls.getJarManager().addJar(ji2);
- }
- }
- } catch (Exception ex) {
- if (log.isWarnEnabled()) {
- log.warn("Can't install Java support", ex);
- }
- }
- }
} // IsisFish
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-06-06 14:14:32 UTC (rev 3349)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-06-06 15:12:08 UTC (rev 3350)
@@ -57,6 +57,33 @@
*/
public class DomXMLParser {
+ public static final String DISCRETE = "discrete";
+ public static final String ENUMERATION = "enumeration";
+ public static final String DOMAIN = "domain";
+ public static final String FIXED = "fixed";
+ public static final String VALUE = "value";
+ public static final String RULE = "rule";
+ public static final String RULES = "rules";
+ public static final String VERSION = "version";
+ public static final String NAME = "name";
+ public static final String TYPE = "type";
+ public static final String PROPERTY = "property";
+ public static final String TARGET = "target";
+ public static final String CONTINUOUS = "continuous";
+ public static final String MATRIXCONTINUOUS = "matrixcontinuous";
+ public static final String COEFFICIENT = "coefficient";
+ public static final String EQUATIONCONTINUOUS = "equationcontinuous";
+ public static final String EQUATION = "equation";
+ public static final String VARIABLE = "variable";
+ public static final String PERCENTAGE = "percentage";
+ public static final String REFERENCE = "reference";
+ public static final String RANGE = "range";
+ public static final String MIN = "min";
+ public static final String MAX = "max";
+ public static final String CARDINALITY = "cardinality";
+ public static final String INTEGER = "integer";
+ public static final String MX = "mx";
+
/**
* Parse element root node as Design plan.
*
@@ -69,7 +96,7 @@
DesignPlan plan = new DesignPlan();
// could return "2" or null
- String version = rootElement.attributeValue("version");
+ String version = rootElement.attributeValue(VERSION);
List<Element> factorGroupElements = rootElement.selectNodes("child::factors");
FactorGroup factorGroup = null;
@@ -91,11 +118,8 @@
*
* @param fgElement factor group element (>factors<)
* @param topiaContext context
- * @param mixed {@code true} if create factor group need to be mixed
* @return factor group
- *
- * @see FactorGroup#isMixed()
- *
+ *
* @deprecated since 3.4.0.0, this parsing method parse experimentalDesign
* in version "0" or "null" version, don't remove for
* data reading purpose, but could be removed in a future version
@@ -103,7 +127,7 @@
@Deprecated
protected static FactorGroup parseFactorGroup(Element fgElement, TopiaContext topiaContext) {
- String factorGroupName = fgElement.attributeValue("name");
+ String factorGroupName = fgElement.attributeValue(NAME);
FactorGroup factorGroup = new FactorGroup(factorGroupName);
// sub factor group
@@ -117,43 +141,43 @@
List<Element> factorElements = fgElement.selectNodes("child::factor");
for (Element factorElement : factorElements) {
- String type = factorElement.attributeValue("type");
- String name = factorElement.attributeValue("name");
- String property = factorElement.attributeValue("property");
- String path = factorElement.element("target").getText().trim();
+ String type = factorElement.attributeValue(TYPE);
+ String name = factorElement.attributeValue(NAME);
+ String property = factorElement.attributeValue(PROPERTY);
+ String path = factorElement.element(TARGET).getText().trim();
// double
if ("real".equals(type)) {
Factor factor = new Factor(name);
factor.setPath(path);
- Element fixedElement = factorElement.element("domain").element("fixed");
+ Element fixedElement = factorElement.element(DOMAIN).element(FIXED);
// tous les domaines continues
- if (property.endsWith("continuous")) {
+ if (property.endsWith(CONTINUOUS)) {
ContinuousDomain domain;
- if(property.equals("matrixcontinuous")) {
+ if(property.equals(MATRIXCONTINUOUS)) {
// matrix specific
// <coefficient operator="-" value="0.799"/>
MatrixContinuousDomain mdomain = new MatrixContinuousDomain();
- Element coefficientElement = fixedElement.element("coefficient");
- mdomain.setCoefficient(Double.valueOf(coefficientElement.attributeValue("value")));
+ Element coefficientElement = fixedElement.element(COEFFICIENT);
+ mdomain.setCoefficient(Double.valueOf(coefficientElement.attributeValue(VALUE)));
// <mx name="test1" step="0">...
- Element matrixElement = fixedElement.element("mx");
+ Element matrixElement = fixedElement.element(MX);
MatrixND matrix = MexicoHelper.getMatrixFromXml(matrixElement, topiaContext);
- mdomain.setMatrix(matrix);
+ mdomain.setReferenceValue(matrix);
domain = mdomain;
}
- else if (property.equals("equationcontinuous")) {
+ else if (property.equals(EQUATIONCONTINUOUS)) {
// equation specific
EquationContinuousDomain edomain = new EquationContinuousDomain();
- Element coefficientElement = fixedElement.element("coefficient");
- edomain.setCoefficient(Double.valueOf(coefficientElement.attributeValue("value")));
+ Element coefficientElement = fixedElement.element(COEFFICIENT);
+ edomain.setCoefficient(Double.valueOf(coefficientElement.attributeValue(VALUE)));
- Element equationElement = fixedElement.element("equation");
- edomain.setReferenceValue(Double.valueOf(equationElement.attributeValue("reference")));
- edomain.setVariableName(equationElement.attributeValue("variable"));
+ Element equationElement = fixedElement.element(EQUATION);
+ edomain.setReferenceValue(Double.valueOf(equationElement.attributeValue(REFERENCE)));
+ edomain.setVariableName(equationElement.attributeValue(VARIABLE));
domain = edomain;
}
@@ -161,67 +185,67 @@
// continous domain
domain = new ContinuousDomain();
- Element percentageElement = fixedElement.element("percentage");
+ Element percentageElement = fixedElement.element(PERCENTAGE);
if (percentageElement != null) {
- domain.setCoefficient(Double.valueOf(percentageElement.attributeValue("coefficient")));
- domain.setReferenceValue(Double.valueOf(percentageElement.attributeValue("reference")));
+ domain.setCoefficient(Double.valueOf(percentageElement.attributeValue(COEFFICIENT)));
+ domain.setReferenceValue(Double.valueOf(percentageElement.attributeValue(REFERENCE)));
}
else {
// <range max="1.0" min="0.0"/>
- Element rangeElement = fixedElement.element("range");
- domain.setMinBound(Double.valueOf(rangeElement.attributeValue("min")));
- domain.setMaxBound(Double.valueOf(rangeElement.attributeValue("max")));
+ Element rangeElement = fixedElement.element(RANGE);
+ domain.setMinBound(Double.valueOf(rangeElement.attributeValue(MIN)));
+ domain.setMaxBound(Double.valueOf(rangeElement.attributeValue(MAX)));
}
}
- domain.setCardinality(Integer.valueOf(fixedElement.attributeValue("cardinality")));
+ domain.setCardinality(Integer.valueOf(fixedElement.attributeValue(CARDINALITY)));
factor.setDomain(domain);
- } else if ("discrete".equals(property)) {
+ } else if (DISCRETE.equals(property)) {
DiscreteDomain domain = new DiscreteDomain();
List<Element> valueElements = fixedElement.element(
- "enumeration").elements("value");
+ ENUMERATION).elements(VALUE);
int label = 0;
for (Element valueElement : valueElements) {
- domain.getValues().put(Integer.valueOf(label),
+ domain.getValues().put(label,
Double.valueOf(valueElement.getTextTrim()));
++label;
}
factor.setDomain(domain);
}
factorGroup.addFactor(factor);
- } else if ("integer".equals(type)) {
+ } else if (INTEGER.equals(type)) {
Factor factor = new Factor(name);
factor.setPath(path);
- Element fixedElement = factorElement.element("domain").element("fixed");
- if ("continuous".equals(property)) {
- ContinuousDomain domain = null;
+ Element fixedElement = factorElement.element(DOMAIN).element(FIXED);
+ if (CONTINUOUS.equals(property)) {
+ ContinuousDomain domain;
- if(property.equals("matrixcontinuous")) {
+ if(property.equals(MATRIXCONTINUOUS)) {
// matrix specific
MatrixContinuousDomain mdomain = new MatrixContinuousDomain();
- Element coefficientElement = fixedElement.element("coefficient");
- mdomain.setCoefficient(Double.valueOf(coefficientElement.attributeValue("value")));
+ Element coefficientElement = fixedElement.element(COEFFICIENT);
+ mdomain.setCoefficient(Double.valueOf(coefficientElement.attributeValue(VALUE)));
// matrix specific
- Element matrixElement = fixedElement.element("mx");
+ Element matrixElement = fixedElement.element(MX);
MatrixND matrix = MexicoHelper.getMatrixFromXml(matrixElement, topiaContext);
- mdomain.setMatrix(matrix);
+ mdomain.setReferenceValue(matrix);
domain = mdomain;
}
- else if (property.equals("equationcontinuous")) {
+ else if (property.equals(EQUATIONCONTINUOUS)) {
// equation specific
EquationContinuousDomain edomain = new EquationContinuousDomain();
- Element coefficientElement = fixedElement.element("coefficient");
- edomain.setCoefficient(Double.valueOf(coefficientElement.attributeValue("value")));
+ Element coefficientElement = fixedElement.element(COEFFICIENT);
+ edomain.setCoefficient(Double.valueOf(coefficientElement.attributeValue(VALUE)));
- Element equationElement = fixedElement.element("equation");
- edomain.setReferenceValue(Double.valueOf(equationElement.attributeValue("reference")));
- edomain.setVariableName(equationElement.attributeValue("variable"));
+ Element equationElement = fixedElement.element(EQUATION);
+ edomain.setReferenceValue(Double.valueOf(equationElement.attributeValue(REFERENCE)));
+ edomain.setVariableName(equationElement.attributeValue(VARIABLE));
domain = edomain;
}
@@ -229,48 +253,48 @@
// continous domain
domain = new ContinuousDomain();
- Element percentageElement = fixedElement.element("percentage");
+ Element percentageElement = fixedElement.element(PERCENTAGE);
if (percentageElement != null) {
- domain.setCoefficient(Double.valueOf(percentageElement.attributeValue("coefficient")));
- domain.setReferenceValue(Double.valueOf(percentageElement.attributeValue("reference")));
+ domain.setCoefficient(Double.valueOf(percentageElement.attributeValue(COEFFICIENT)));
+ domain.setReferenceValue(Double.valueOf(percentageElement.attributeValue(REFERENCE)));
}
else {
// <range max="1" min="3"/>
- Element rangeElement = fixedElement.element("range");
- domain.setMinBound(Integer.valueOf(rangeElement.attributeValue("min")));
- domain.setMaxBound(Integer.valueOf(rangeElement.attributeValue("max")));
+ Element rangeElement = fixedElement.element(RANGE);
+ domain.setMinBound(Integer.valueOf(rangeElement.attributeValue(MIN)));
+ domain.setMaxBound(Integer.valueOf(rangeElement.attributeValue(MAX)));
}
}
- domain.setCardinality(Integer.valueOf(fixedElement.attributeValue("cardinality")));
+ domain.setCardinality(Integer.valueOf(fixedElement.attributeValue(CARDINALITY)));
factor.setDomain(domain);
- } else if ("discrete".equals(property)) {
+ } else if (DISCRETE.equals(property)) {
DiscreteDomain domain = new DiscreteDomain();
List<Element> valueElements = fixedElement.element(
- "enumeration").elements("value");
+ ENUMERATION).elements(VALUE);
int label = 0;
for (Element valueElement : valueElements) {
- domain.getValues().put(Integer.valueOf(label),
+ domain.getValues().put(label,
Integer.valueOf(valueElement.getTextTrim()));
++label;
}
factor.setDomain(domain);
}
factorGroup.addFactor(factor);
- } else if ("rule".equals(type)) {
+ } else if (RULE.equals(type)) {
Factor factor = new Factor(name);
factor.setPath(path);
- Element fixedElement = factorElement.element("domain").element("fixed");
- if ("discrete".equals(property)) {
+ Element fixedElement = factorElement.element(DOMAIN).element(FIXED);
+ if (DISCRETE.equals(property)) {
RuleDiscreteDomain domain = new RuleDiscreteDomain();
- List<Element> valueElements = fixedElement.element("enumeration").elements("value");
+ List<Element> valueElements = fixedElement.element(ENUMERATION).elements(VALUE);
int label = 0;
for (Element valueElement : valueElements) {
- Element rulesElement = valueElement.element("rules");
+ Element rulesElement = valueElement.element(RULES);
List<Rule> rulesValue = MexicoHelper.getRulesFromXml(rulesElement, topiaContext);
- domain.getValues().put(Integer.valueOf(label), rulesValue);
+ domain.getValues().put(label, rulesValue);
++label;
}
factor.setDomain(domain);
@@ -290,14 +314,11 @@
*
* @param fgElement factor group element (>factors<)
* @param topiaContext context
- * @param mixed {@code true} if create factor group need to be mixed
* @return factor group
- *
- * @see FactorGroup#isMixed()
*/
protected static FactorGroup parseFactorGroupV2(Element fgElement, TopiaContext topiaContext) {
- String factorGroupName = fgElement.attributeValue("name");
+ String factorGroupName = fgElement.attributeValue(NAME);
FactorGroup factorGroup = new FactorGroup(factorGroupName);
// sub factor group
@@ -311,58 +332,58 @@
List<Element> factorElements = fgElement.selectNodes("child::factor");
for (Element factorElement : factorElements) {
- String type = factorElement.attributeValue("type");
- String name = factorElement.attributeValue("name");
- String property = factorElement.attributeValue("property");
- String path = factorElement.element("target").getText().trim();
+ String type = factorElement.attributeValue(TYPE);
+ String name = factorElement.attributeValue(NAME);
+ String property = factorElement.attributeValue(PROPERTY);
+ String path = factorElement.element(TARGET).getText().trim();
// double
if ("real".equals(type)) {
Factor factor = new Factor(name);
factor.setPath(path);
- Element fixedElement = factorElement.element("domain").element("fixed");
+ Element fixedElement = factorElement.element(DOMAIN).element(FIXED);
// tous les domaines continues
- if (property.endsWith("continuous")) {
+ if (property.endsWith(CONTINUOUS)) {
ContinuousDomain domain;
- if(property.equals("matrixcontinuous")) {
+ if(property.equals(MATRIXCONTINUOUS)) {
MatrixContinuousDomain mdomain = new MatrixContinuousDomain();
- Element referenceElement = fixedElement.element("reference");
+ Element referenceElement = fixedElement.element(REFERENCE);
if (referenceElement != null) {
// matrix specific
// <coefficient operator="-" value="0.799"/>
- mdomain.setCoefficient(Double.valueOf(referenceElement.attributeValue("coefficient")));
+ mdomain.setCoefficient(Double.valueOf(referenceElement.attributeValue(COEFFICIENT)));
// <mx name="test1" step="0">...
- Element matrixElement = referenceElement.element("mx");
+ Element matrixElement = referenceElement.element(MX);
MatrixND matrix = MexicoHelper.getMatrixFromXml(matrixElement, topiaContext);
- mdomain.setMatrix(matrix);
+ mdomain.setReferenceValue(matrix);
}
else {
- Element rangeElement = fixedElement.element("range");
- Element minElement = rangeElement.element("min");
- Element maxElement = rangeElement.element("max");
- MatrixND minMatrix = MexicoHelper.getMatrixFromXml(minElement.element("mx"), topiaContext);
- MatrixND maxMatrix = MexicoHelper.getMatrixFromXml(maxElement.element("mx"), topiaContext);
+ Element rangeElement = fixedElement.element(RANGE);
+ Element minElement = rangeElement.element(MIN);
+ Element maxElement = rangeElement.element(MAX);
+ MatrixND minMatrix = MexicoHelper.getMatrixFromXml(minElement.element(MX), topiaContext);
+ MatrixND maxMatrix = MexicoHelper.getMatrixFromXml(maxElement.element(MX), topiaContext);
mdomain.setMinBound(minMatrix);
mdomain.setMaxBound(maxMatrix);
}
domain = mdomain;
}
- else if (property.equals("equationcontinuous")) {
+ else if (property.equals(EQUATIONCONTINUOUS)) {
// equation specific
EquationContinuousDomain edomain = new EquationContinuousDomain();
- edomain.setVariableName(fixedElement.attributeValue("variable"));
- Element referenceElement = fixedElement.element("reference");
+ edomain.setVariableName(fixedElement.attributeValue(VARIABLE));
+ Element referenceElement = fixedElement.element(REFERENCE);
if (referenceElement != null) {
- edomain.setCoefficient(Double.valueOf(referenceElement.attributeValue("coefficient")));
+ edomain.setCoefficient(Double.valueOf(referenceElement.attributeValue(COEFFICIENT)));
edomain.setReferenceValue(Double.valueOf(referenceElement.getTextTrim()));
}
else {
- Element rangeElement = fixedElement.element("range");
- Element minElement = rangeElement.element("min");
- Element maxElement = rangeElement.element("max");
+ Element rangeElement = fixedElement.element(RANGE);
+ Element minElement = rangeElement.element(MIN);
+ Element maxElement = rangeElement.element(MAX);
edomain.setMinBound(Double.valueOf(minElement.getTextTrim()));
edomain.setMaxBound(Double.valueOf(maxElement.getTextTrim()));
}
@@ -373,82 +394,82 @@
// continous domain
domain = new ContinuousDomain();
- Element referenceElement = fixedElement.element("reference");
+ Element referenceElement = fixedElement.element(REFERENCE);
if (referenceElement != null) {
- domain.setCoefficient(Double.valueOf(referenceElement.attributeValue("coefficient")));
+ domain.setCoefficient(Double.valueOf(referenceElement.attributeValue(COEFFICIENT)));
domain.setReferenceValue(Double.valueOf(referenceElement.getTextTrim()));
}
else {
// <range max="1.0" min="0.0"/>
- Element rangeElement = fixedElement.element("range");
- Element minElement = rangeElement.element("min");
- Element maxElement = rangeElement.element("max");
+ Element rangeElement = fixedElement.element(RANGE);
+ Element minElement = rangeElement.element(MIN);
+ Element maxElement = rangeElement.element(MAX);
domain.setMinBound(Double.valueOf(minElement.getTextTrim()));
domain.setMaxBound(Double.valueOf(maxElement.getTextTrim()));
}
}
- domain.setCardinality(Integer.valueOf(fixedElement.attributeValue("cardinality")));
+ domain.setCardinality(Integer.valueOf(fixedElement.attributeValue(CARDINALITY)));
factor.setDomain(domain);
- } else if ("discrete".equals(property)) {
+ } else if (DISCRETE.equals(property)) {
DiscreteDomain domain = new DiscreteDomain();
List<Element> valueElements = fixedElement.element(
- "enumeration").elements("value");
+ ENUMERATION).elements(VALUE);
int label = 0;
for (Element valueElement : valueElements) {
- domain.getValues().put(Integer.valueOf(label),
+ domain.getValues().put(label,
Double.valueOf(valueElement.getTextTrim()));
++label;
}
factor.setDomain(domain);
}
factorGroup.addFactor(factor);
- } else if ("integer".equals(type)) {
+ } else if (INTEGER.equals(type)) {
Factor factor = new Factor(name);
factor.setPath(path);
- Element fixedElement = factorElement.element("domain").element("fixed");
- if ("continuous".equals(property)) {
+ Element fixedElement = factorElement.element(DOMAIN).element(FIXED);
+ if (CONTINUOUS.equals(property)) {
ContinuousDomain domain = null;
- if(property.equals("matrixcontinuous")) {
+ if(property.equals(MATRIXCONTINUOUS)) {
MatrixContinuousDomain mdomain = new MatrixContinuousDomain();
- Element referenceElement = fixedElement.element("reference");
+ Element referenceElement = fixedElement.element(REFERENCE);
if (referenceElement != null) {
// matrix specific
// <coefficient operator="-" value="0.799"/>
- mdomain.setCoefficient(Double.valueOf(referenceElement.attributeValue("coefficient")));
+ mdomain.setCoefficient(Double.valueOf(referenceElement.attributeValue(COEFFICIENT)));
// <mx name="test1" step="0">...
- Element matrixElement = referenceElement.element("mx");
+ Element matrixElement = referenceElement.element(MX);
MatrixND matrix = MexicoHelper.getMatrixFromXml(matrixElement, topiaContext);
- mdomain.setMatrix(matrix);
+ mdomain.setReferenceValue(matrix);
}
else {
- Element rangeElement = fixedElement.element("range");
- Element minElement = rangeElement.element("min");
- Element maxElement = rangeElement.element("max");
- MatrixND minMatrix = MexicoHelper.getMatrixFromXml(minElement.element("mx"), topiaContext);
- MatrixND maxMatrix = MexicoHelper.getMatrixFromXml(maxElement.element("mx"), topiaContext);
+ Element rangeElement = fixedElement.element(RANGE);
+ Element minElement = rangeElement.element(MIN);
+ Element maxElement = rangeElement.element(MAX);
+ MatrixND minMatrix = MexicoHelper.getMatrixFromXml(minElement.element(MX), topiaContext);
+ MatrixND maxMatrix = MexicoHelper.getMatrixFromXml(maxElement.element(MX), topiaContext);
mdomain.setMinBound(minMatrix);
mdomain.setMaxBound(maxMatrix);
}
domain = mdomain;
}
- else if (property.equals("equationcontinuous")) {
+ else if (property.equals(EQUATIONCONTINUOUS)) {
// equation specific
EquationContinuousDomain edomain = new EquationContinuousDomain();
- edomain.setVariableName(fixedElement.attributeValue("variable"));
- Element referenceElement = fixedElement.element("reference");
+ edomain.setVariableName(fixedElement.attributeValue(VARIABLE));
+ Element referenceElement = fixedElement.element(REFERENCE);
if (referenceElement != null) {
- edomain.setCoefficient(Double.valueOf(referenceElement.attributeValue("coefficient")));
+ edomain.setCoefficient(Double.valueOf(referenceElement.attributeValue(COEFFICIENT)));
edomain.setReferenceValue(Double.valueOf(referenceElement.getTextTrim()));
}
else {
- Element rangeElement = fixedElement.element("range");
- Element minElement = rangeElement.element("min");
- Element maxElement = rangeElement.element("max");
+ Element rangeElement = fixedElement.element(RANGE);
+ Element minElement = rangeElement.element(MIN);
+ Element maxElement = rangeElement.element(MAX);
edomain.setMinBound(Double.valueOf(minElement.getTextTrim()));
edomain.setMaxBound(Double.valueOf(maxElement.getTextTrim()));
}
@@ -459,65 +480,65 @@
// continous domain
domain = new ContinuousDomain();
- Element referenceElement = fixedElement.element("reference");
+ Element referenceElement = fixedElement.element(REFERENCE);
if (referenceElement != null) {
- domain.setCoefficient(Double.valueOf(referenceElement.attributeValue("coefficient")));
+ domain.setCoefficient(Double.valueOf(referenceElement.attributeValue(COEFFICIENT)));
domain.setReferenceValue(Double.valueOf(referenceElement.getTextTrim()));
}
else {
// <range max="1.0" min="0.0"/>
- Element rangeElement = fixedElement.element("range");
- Element minElement = rangeElement.element("min");
- Element maxElement = rangeElement.element("max");
+ Element rangeElement = fixedElement.element(RANGE);
+ Element minElement = rangeElement.element(MIN);
+ Element maxElement = rangeElement.element(MAX);
domain.setMinBound(Integer.valueOf(minElement.getTextTrim()));
domain.setMaxBound(Integer.valueOf(maxElement.getTextTrim()));
}
}
- domain.setCardinality(Integer.valueOf(fixedElement.attributeValue("cardinality")));
+ domain.setCardinality(Integer.valueOf(fixedElement.attributeValue(CARDINALITY)));
factor.setDomain(domain);
- } else if ("discrete".equals(property)) {
+ } else if (DISCRETE.equals(property)) {
DiscreteDomain domain = new DiscreteDomain();
List<Element> valueElements = fixedElement.element(
- "enumeration").elements("value");
+ ENUMERATION).elements(VALUE);
int label = 0;
for (Element valueElement : valueElements) {
- domain.getValues().put(Integer.valueOf(label),
+ domain.getValues().put(label,
Integer.valueOf(valueElement.getTextTrim()));
++label;
}
factor.setDomain(domain);
}
factorGroup.addFactor(factor);
- } else if ("rule".equals(type)) {
+ } else if (RULE.equals(type)) {
Factor factor = new Factor(name);
factor.setPath(path);
- Element fixedElement = factorElement.element("domain").element("fixed");
- if ("discrete".equals(property)) {
+ Element fixedElement = factorElement.element(DOMAIN).element(FIXED);
+ if (DISCRETE.equals(property)) {
RuleDiscreteDomain domain = new RuleDiscreteDomain();
- List<Element> valueElements = fixedElement.element("enumeration").elements("value");
+ List<Element> valueElements = fixedElement.element(ENUMERATION).elements(VALUE);
int label = 0;
for (Element valueElement : valueElements) {
- Element rulesElement = valueElement.element("rules");
+ Element rulesElement = valueElement.element(RULES);
List<Rule> rulesValue = MexicoHelper.getRulesFromXml(rulesElement, topiaContext);
- domain.getValues().put(Integer.valueOf(label), rulesValue);
+ domain.getValues().put(label, rulesValue);
++label;
}
factor.setDomain(domain);
}
factorGroup.addFactor(factor);
- } else if ("equation".equals(type)) {
+ } else if (EQUATION.equals(type)) {
Factor factor = new Factor(name);
factor.setPath(path);
- Element fixedElement = factorElement.element("domain").element("fixed");
- if ("discrete".equals(property)) {
+ Element fixedElement = factorElement.element(DOMAIN).element(FIXED);
+ if (DISCRETE.equals(property)) {
EquationDiscreteDomain domain = new EquationDiscreteDomain();
- List<Element> valueElements = fixedElement.element("enumeration").elements("value");
+ List<Element> valueElements = fixedElement.element(ENUMERATION).elements(VALUE);
int label = 0;
for (Element valueElement : valueElements) {
String content = StringEscapeUtils.unescapeXml(valueElement.getText());
- domain.getValues().put(Integer.valueOf(label), content);
+ domain.getValues().put(label, content);
++label;
}
factor.setDomain(domain);
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java 2011-06-06 14:14:32 UTC (rev 3349)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java 2011-06-06 15:12:08 UTC (rev 3350)
@@ -50,7 +50,11 @@
EquationContinuousDomain eDomain = (EquationContinuousDomain)domain;
// this version add variable name
- xmlBuffer.append(" cardinality=\"" + eDomain.getCardinality() + "\" variable=\"" + eDomain.getVariableName()+ "\">");
+ xmlBuffer.append(" cardinality=\"")
+ .append(eDomain.getCardinality())
+ .append("\" variable=\"")
+ .append(eDomain.getVariableName())
+ .append("\">");
appendDomain(eDomain);
}
@@ -65,15 +69,21 @@
// facteur continue pourcentage
if (domain.getCoefficient() != null || domain.getReferenceValue() != null) {
- xmlBuffer.append("<reference coefficient=\"" + eDomain.getCoefficient() + "\">");
+ xmlBuffer.append("<reference coefficient=\"")
+ .append(eDomain.getCoefficient())
+ .append( "\">");
xmlBuffer.append(eDomain.getReferenceValue());
xmlBuffer.append("</reference>");
}
else {
// facteur continue min/max
xmlBuffer.append("<range>");
- xmlBuffer.append("<min>" + domain.getOriginalMinBound() + "</min>");
- xmlBuffer.append("<max>" + domain.getOriginalMaxBound() + "</max>");
+ xmlBuffer.append("<min>")
+ .append(domain.getMinBound())
+ .append("</min>");
+ xmlBuffer.append("<max>")
+ .append(domain.getMaxBound())
+ .append("</max>");
xmlBuffer.append("</range>");
}
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2011-06-06 14:14:32 UTC (rev 3349)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2011-06-06 15:12:08 UTC (rev 3350)
@@ -54,34 +54,28 @@
@Override
public void start(Factor factor) {
xmlBuffer.append("<factor");
- xmlBuffer.append(" name=\"" + factor.getName() + "\"");
+ xmlBuffer.append(" name=\"").append(factor.getName()).append("\"");
Object referenceValueForType = null;
// property attribute
- if (factor.getDomain() instanceof MatrixContinuousDomain) {
- xmlBuffer.append(" property=\"matrixcontinuous\"");
- referenceValueForType = ((ContinuousDomain)factor.getDomain()).getReferenceValue();
- if (referenceValueForType == null) {
- referenceValueForType = ((ContinuousDomain)factor.getDomain()).getOriginalMinBound();
+
+ Domain domain = factor.getDomain();
+
+ if (domain instanceof ContinuousDomain) {
+ if (domain instanceof MatrixContinuousDomain) {
+ xmlBuffer.append(" property=\"matrixcontinuous\"");
+ } else if (domain instanceof EquationContinuousDomain) {
+ xmlBuffer.append(" property=\"equationcontinuous\"");
+ } else {
+ xmlBuffer.append(" property=\"continuous\"");
}
- }
- else if (factor.getDomain() instanceof EquationContinuousDomain) {
- xmlBuffer.append(" property=\"equationcontinuous\"");
- referenceValueForType = ((ContinuousDomain)factor.getDomain()).getReferenceValue();
+ referenceValueForType = ((ContinuousDomain) domain).getReferenceValue();
if (referenceValueForType == null) {
- referenceValueForType = ((ContinuousDomain)factor.getDomain()).getOriginalMinBound();
+ referenceValueForType = ((ContinuousDomain) domain).getMinBound();
}
- }
- else if (factor.getDomain() instanceof ContinuousDomain) {
- xmlBuffer.append(" property=\"continuous\"");
- referenceValueForType = ((ContinuousDomain)factor.getDomain()).getReferenceValue();
- if (referenceValueForType == null) {
- referenceValueForType = ((ContinuousDomain)factor.getDomain()).getOriginalMinBound();
- }
- }
- else if (factor.getDomain() instanceof DiscreteDomain) {
+ } else if (domain instanceof DiscreteDomain) {
xmlBuffer.append(" property=\"discrete\"");
- Object firstKey = ((DiscreteDomain)factor.getDomain()).getValues().firstKey();
- referenceValueForType = ((DiscreteDomain)factor.getDomain()).getValues().get(firstKey);
+ Object firstKey = ((DiscreteDomain) domain).getValues().firstKey();
+ referenceValueForType = ((DiscreteDomain) domain).getValues().get(firstKey);
}
// type attribute
if (referenceValueForType instanceof Double || referenceValueForType instanceof Float
@@ -91,15 +85,15 @@
else if (referenceValueForType instanceof Integer) {
xmlBuffer.append(" type=\"integer\"");
}
- else if (factor.getDomain() instanceof RuleDiscreteDomain) {
+ else if (domain instanceof RuleDiscreteDomain) {
xmlBuffer.append(" type=\"rule\"");
}
- else if (factor.getDomain() instanceof EquationDiscreteDomain) {
+ else if (domain instanceof EquationDiscreteDomain) {
xmlBuffer.append(" type=\"equation\"");
}
xmlBuffer.append(">");
// target element
- xmlBuffer.append("<target>" + factor.getPath() + "</target>");
+ xmlBuffer.append("<target>").append(factor.getPath()).append("</target>");
// value element
/* TODO value should be only in simulation export,
not in design plan export
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java 2011-06-06 14:14:32 UTC (rev 3349)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java 2011-06-06 15:12:08 UTC (rev 3350)
@@ -51,16 +51,22 @@
MatrixContinuousDomain mDomain = (MatrixContinuousDomain)domain;
// facteur continue pourcentage
- if (domain.getCoefficient() != null || domain.getReferenceValue() != null) {
- xmlBuffer.append("<reference coefficient=\"" + mDomain.getCoefficient() + "\">");
- xmlBuffer.append(MexicoHelper.getMatrixAsXML(mDomain.getMatrix()));
+ if (domain.isPercentageType()) {
+ xmlBuffer.append("<reference coefficient=\"")
+ .append(mDomain.getCoefficient())
+ .append("\">");
+ xmlBuffer.append(MexicoHelper.getMatrixAsXML((MatrixND)mDomain.getReferenceValue()));
xmlBuffer.append("</reference>");
}
else {
// facteur continue min/max
xmlBuffer.append("<range>");
- xmlBuffer.append("<min>" + MexicoHelper.getMatrixAsXML((MatrixND)mDomain.getOriginalMaxBound()) + "</min>");
- xmlBuffer.append("<max>" + MexicoHelper.getMatrixAsXML((MatrixND)mDomain.getOriginalMaxBound()) + "</max>");
+ xmlBuffer.append("<min>")
+ .append(MexicoHelper.getMatrixAsXML((MatrixND)mDomain.getMinBound()))
+ .append("</min>");
+ xmlBuffer.append("<max>")
+ .append(MexicoHelper.getMatrixAsXML((MatrixND)mDomain.getMaxBound()))
+ .append("</max>");
xmlBuffer.append("</range>");
}
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-06 14:14:32 UTC (rev 3349)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-06 15:12:08 UTC (rev 3350)
@@ -94,7 +94,7 @@
/**
* Cette classe est responsable de conservation de toutes les simulations faites
- * ou a faire. Pour ajouter une nouvelle simulation on appelle la methode
+ * ou a faire. Pour ajouter une nouvelle simulation on appelle une des méthodes
* {@link #submit}.
* <p>
* Cette classe sert aussi de modele pour le moniteur de queue
@@ -268,7 +268,8 @@
/**
* Ajoute le job au job en cours previent s'il n'etait pas deja present
- * les listener {@link SimulationServiceListener#simulationStart}.
+ * les listeners
+ * {@link SimulationServiceListener#simulationStart(SimulationService, SimulationJob)}.
* @param job
*/
protected synchronized void fireStartEvent(SimulationJob job) {
@@ -285,8 +286,8 @@
* Supprime le job de la liste des jobs en cours et l'ajoute le job si
* besoin a la liste des jobs faits (s'il y a une erreur ou qu'il ne sagit
* pas d'une simulation lancer par un plan d'analyse).
- * Les listener sont prevenu par la methode
- * {@link SimulationServiceListener#simulationStop}.
+ * Les listener sont prevenu par la méthode
+ * {@link SimulationServiceListener#simulationStop(SimulationService, SimulationJob)}.
* @param job
*/
protected synchronized void fireStopEvent(SimulationJob job) {
@@ -445,9 +446,6 @@
SensitivityScenarios sensitivityScenarios = sensitivitycalculator
.compute(designPlan, masterExportDirectory);
- // close context opened for nominal values
- context.closeContext();
-
// ajout des parametres de simulation
localParameters.setSensitivityCalculator(sensitivitycalculator);
localParameters.setNumberOfSensitivitySimulation(sensitivityScenarios.getScenarios().size());
@@ -585,7 +583,7 @@
*
* @param beanUtils beanUtils converter
* @param buffer buffer to fill
- * @param level call level used to avoid variables name collision
+ * @param counter call counter used to avoid variables name collision
* @param factors factor list to manage
*/
protected void generatePreScript(ConvertUtilsBean beanUtils, StringBuffer buffer, Counter counter, Collection<Factor> factors) {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-06-06 14:14:32 UTC (rev 3349)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-06-06 15:12:08 UTC (rev 3350)
@@ -36,22 +36,17 @@
import javax.swing.JScrollPane;
import javax.swing.JTextPane;
-import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.nuiton.j2r.REngine;
import org.nuiton.j2r.RException;
import org.nuiton.j2r.RProxy;
-import org.nuiton.topia.TopiaContext;
-import org.nuiton.topia.persistence.TopiaEntity;
import org.nuiton.util.FileUtil;
import fr.ifremer.isisfish.datastore.SimulationStorage;
import fr.ifremer.isisfish.export.SensitivityExport;
import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain;
-import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain;
-import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain;
public abstract class AbstractSensitivityCalculator implements
SensitivityCalculator {
@@ -59,19 +54,6 @@
/** to use log facility, just put in your code: log.info("..."); */
private static Log log = LogFactory
.getLog(AbstractSensitivityCalculator.class);
-
- /** Topia context used for discrete domain nominal value compute. */
- protected TopiaContext context;
-
- /**
- * Set topia context on current region to nominal value compute.
- *
- * @param context context
- */
- @Override
- public void setTopiaContext(TopiaContext context) {
- this.context = context;
- }
/**
* Method to create the isis.factors dataframe in R.
@@ -81,7 +63,7 @@
* destination RData file. The RData file will be named directory.RData and
* saved in the directory parent.
*
- * @throws SensitivityException
+ * @throws SensitivityException if an error occur while talking to R
*/
public void setIsisFactorsR(DesignPlan plan, File outputdirectory)
throws SensitivityException {
@@ -119,58 +101,25 @@
//Factor names
factorNames += "\"" + factor.getName() + "\"";
- if (factor.getDomain() instanceof MatrixContinuousDomain) {
+ if (factor.getDomain() instanceof ContinuousDomain) {
//Continu values, binf values, bsup values and discrete factors attributes
- nominalValues += getNominalValue(factor);
+ nominalValues += factor.getNominalValue();
//Continu values
continuValues += "TRUE";
//Binf values
- binfValues += ((MatrixContinuousDomain) factor.getDomain())
- .getRealMinBound();
-
- //Bsup values
- bsupValues += ((MatrixContinuousDomain) factor.getDomain())
- .getRealMaxBound();
-
- } else if (factor.getDomain() instanceof EquationContinuousDomain) {
- //Continu values, binf values, bsup values and discrete factors attributes
-
- nominalValues += ((EquationContinuousDomain) factor.getDomain())
- .getReferenceValue();
-
- //Continu values
- continuValues += "TRUE";
-
- //Binf values
- binfValues += ((EquationContinuousDomain) factor.getDomain())
- .getValueForIdentifier(0.0);
-
- //Bsup values
- bsupValues += ((EquationContinuousDomain) factor.getDomain())
- .getValueForIdentifier(1.0);
- } else if (factor.getDomain() instanceof ContinuousDomain) {
- //Continu values, binf values, bsup values and discrete factors attributes
-
- nominalValues += getNominalValue(factor);
-
- //Continu values
- continuValues += "TRUE";
-
- //Binf values
-
binfValues += ((ContinuousDomain) factor.getDomain())
- .getMinBound();
+ .getCalculatorMinBound();
//Bsup values
bsupValues += ((ContinuousDomain) factor.getDomain())
- .getMaxBound();
+ .getCalculatorMaxBound();
} else {
- nominalValues += getNominalValue(factor);
+ nominalValues += factor.getNominalValue();
//Continu values
continuValues += "FALSE";
@@ -245,33 +194,6 @@
}
- protected String getNominalValue(Factor factor) {
- String result = null;
-
- Domain domain = factor.getDomain();
- if (domain instanceof MatrixContinuousDomain) {
- result = "1.0";
- }
- else {
- String path = factor.getPath();
- String topiaId = path.substring(0, path.lastIndexOf("#"));
- String propertyName=path.substring(path.lastIndexOf("#") + 1);
-
- try {
- TopiaEntity entity = context.findByTopiaId(topiaId);
- result = BeanUtils.getProperty(entity, propertyName);
- } catch (Exception ex) {
- if (log.isErrorEnabled()) {
- log.error("An error occurred while trying to get nominal value", ex);
- }
- }
- }
- if (log.isDebugEnabled()) {
- log.debug("Nominal value :" + result);
- }
- return result;
- }
-
protected String editRInstruction(String rCall){
JLabel label = new JLabel(
"Modifier le code R envoyé si vous le souhaitez");
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2011-06-06 14:14:32 UTC (rev 3349)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2011-06-06 15:12:08 UTC (rev 3350)
@@ -75,6 +75,11 @@
protected Domain domain;
/**
+ * Value that this factor got in the database
+ */
+ protected Object nominalValue;
+
+ /**
* Factor value.
*/
protected Object value;
@@ -201,6 +206,15 @@
this.path = path;
}
+ public Object getNominalValue() {
+ return nominalValue;
+ }
+
+ public void setNominalValue(Object nominalValue) {
+ this.nominalValue = nominalValue;
+ }
+
+
/**
* Accept a new visitor.
*
@@ -218,7 +232,7 @@
@Override
public Object clone() {
- Factor f = null;
+ Factor f;
try {
f = (Factor)super.clone();
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java 2011-06-06 14:14:32 UTC (rev 3349)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java 2011-06-06 15:12:08 UTC (rev 3350)
@@ -28,8 +28,6 @@
import java.io.File;
import java.util.List;
-import org.nuiton.topia.TopiaContext;
-
import fr.ifremer.isisfish.datastore.SimulationStorage;
/**
@@ -46,13 +44,6 @@
public interface SensitivityCalculator {
/**
- * Set topia context on current region to nominal value compute.
- *
- * @param context context
- */
- void setTopiaContext(TopiaContext context);
-
- /**
* Return calculator description.
*
* @return calculator description
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2011-06-06 14:14:32 UTC (rev 3349)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2011-06-06 15:12:08 UTC (rev 3350)
@@ -27,17 +27,25 @@
import fr.ifremer.isisfish.simulator.sensitivity.Domain;
import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor;
+import org.nuiton.math.matrix.MapFunction;
+import org.nuiton.math.matrix.MatrixND;
/**
- * Tous les domaines continues sont de deux formes (min/max ou pourcentage).
+ *
+ * All the continuous domains can be of 2 different types (min/max or
+ * percentage).
+ *
+ * A min/max domain can take 2 values : {@link #minBound} and {@link #maxBound}.
+ * A percentage domain got 2 values {@link #coefficient} and
+ * {@link #referenceValue} that are the basis to calculate the {@link #minBound}
+ * and {@link #maxBound} values.
+ *
+ * A continuous domain also got a cardinality, either filled in by the user or
+ * the sensitivity method if it manages it.
+ *
+ * To do sensitivity calculations, you MUST use {@link #getCalculatorMinBound()},
+ * {@link #getCalculatorMaxBound()}.
*
- * Un domaine min/max a deux valeurs : {@link #minBound} et {@link #maxBound}.
- * Un domaine pourcentage a deux autres valeurs {@link #coefficient} et
- * {@link #referenceValue}.
- *
- * Un domain continue a également une cardialité, soit renseigné directement
- * par l'utilisateur, soit par la methode d'AS (si elle le gere).
- *
* @author chatellier
* @version $Revision: 1.0 $
*
@@ -64,6 +72,9 @@
/** Cardinality */
protected int cardinality;
+ /** Flag to know the type of the domain **/
+ protected boolean percentageType;
+
/**
* Empty constructor.
*/
@@ -82,52 +93,85 @@
this.minBound = minBound;
this.maxBound = maxBound;
}
+
+ public boolean isPercentageType() {
+ return percentageType;
+ }
+
+ public void setPercentageType(boolean percentageType) {
+ this.percentageType = percentageType;
+ }
/**
- * Return minBound to use for sensitivity. This method can be overridden
- * and can return another value than {@link #minBound}.
+ * Return the minimum bound of the domain. Do not use this value for
+ * sensitivity calculation, prefer using {@link #getCalculatorMinBound}.
*
- * @return the minBound
+ * @return the minimum bound
*/
public Object getMinBound() {
- return getOriginalMinBound();
+ if (isPercentageType()) {
+ MatrixND temp = ((MatrixND) getReferenceValue()).copy();
+
+ // since 3.4.0.0, operator is always *
+ temp.map(new MapFunction() {
+ public double apply(double val) {
+ return (val + ((val * coefficient) * ((2 * getCalculatorMinBound() - 1))));
+ }
+ });
+ return temp;
+ } else {
+ return minBound;
+ }
}
/**
- * Return original domain min bound.
+ * Return the minimum bound for sensitivity calculators. It always returns 0.
*
- * @return the minBound
+ * @return the minimum bound for sensitivity analysis.
*/
- public final Object getOriginalMinBound() {
- return minBound;
+ public double getCalculatorMinBound() {
+ return 0;
}
/**
- * Set min value.
+ * Set the minimum bound of the domain.
*
- * @param minBound the minBound to set
+ * @param minBound the minimum bound.
*/
public void setMinBound(Object minBound) {
this.minBound = minBound;
}
/**
- * Return maxBound to use for sensitivity. This method can be overridden
- * and can return another value than {@link #maxBound}.
+ * Return the maximum bound of the domain. Do not use this value for
+ * sensitivity calculation, prefer using {@link #getCalculatorMaxBound}.
*
- * @return the maxBound
+ * @return the maximum bound
*/
public Object getMaxBound() {
- return getOriginalMaxBound();
+ if (isPercentageType()) {
+ MatrixND temp = ((MatrixND) getReferenceValue()).copy();
+
+ // since 3.4.0.0, operator is always *
+ temp.map(new MapFunction() {
+ public double apply(double val) {
+ return (val + ((val * coefficient) *
+ ((2 * getCalculatorMaxBound() - 1))));
+ }
+ });
+ return temp;
+ } else {
+ return maxBound;
+ }
}
/**
- * Return original domain max bound.
+ * Return the minimum bound for sensitivity calculators. It always returns 1.
*
- * @return the maxBound
+ * @return the maximum bound for sensitivity analysis.
*/
- public final Object getOriginalMaxBound() {
- return maxBound;
+ public double getCalculatorMaxBound() {
+ return 1;
}
/**
@@ -178,17 +222,18 @@
/**
* {@inheritDoc}.
- *
- * In continuous domain, just return identifier
*/
public Object getValueForIdentifier(Object identifier) {
- return identifier;
+ // since 3.4.0.0, operator is always *
+ Double result = ((Double)referenceValue + (((Double)referenceValue * coefficient)
+ * ((2 * (Double)identifier - 1))));
+ return result;
}
/**
* Accept a new visitor.
*
- * @param visitor
+ * @param visitor the visitor
*/
public void accept(DomainVisitor visitor) {
visitor.start(this);
@@ -207,7 +252,7 @@
/**
* Set cardinality
*
- * @param cardinality
+ * @param cardinality the domain cardinality
*/
public void setCardinality(int cardinality) {
this.cardinality = cardinality;
@@ -215,7 +260,7 @@
@Override
public ContinuousDomain clone() {
- ContinuousDomain cloned = null;
+ ContinuousDomain cloned;
try {
cloned = (ContinuousDomain)super.clone();
} catch (CloneNotSupportedException e) {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2011-06-06 14:14:32 UTC (rev 3349)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2011-06-06 15:12:08 UTC (rev 3350)
@@ -43,13 +43,6 @@
/** Variable name (must be java valid identifier) */
protected String variableName;
-
- /**
- * Value used to create the factor.
- *
- * Only used by sensitivity analysis scripts.
- */
- protected Double value;
/**
* Get variable name.
@@ -69,74 +62,13 @@
this.variableName = variableName;
}
- /**
- * {@inheritDoc}.
- *
- * In equation continuous domain, always return 0
- */
@Override
- public Object getMinBound() {
- return 0.0;
- }
-
- /**
- * {@inheritDoc}.
- *
- * In equation continuous domain, always return 1
- */
- @Override
- public Object getMaxBound() {
- return 1.0;
- }
-
- @Override
- public Object getValueForIdentifier(Object identifier) {
- return getValueForIdentifier((Double)identifier);
- }
-
- /**
- * In equation continuous domain, value appear in continuous domain values
- * only. Here : return identifier.
- *
- * @param identifier identifier
- * @return ?
- */
- public Double getValueForIdentifier(Double identifier) {
-
- this.value = identifier;
-
- Double doubleReference = (Double)referenceValue;
- // since 3.4.0.0, operator is always *
- Double result = ((Double) (doubleReference + ((doubleReference * coefficient) * ((2 * value - 1)))));
- return result;
- }
-
- /**
- * Get value used to create the equation.
- *
- * @return the value
- */
- public Double getValue() {
- return this.value;
- }
-
- /**
- * Set value used to create the equation.
- *
- * @param value the value to set
- */
- public void setValue(Double value) {
- this.value = value;
- }
-
- @Override
public EquationContinuousDomain clone() {
EquationContinuousDomain cloned = (EquationContinuousDomain)super.clone();
cloned.setCardinality(this.cardinality);
cloned.setMaxBound(this.maxBound);
cloned.setMinBound(this.minBound);
cloned.setCoefficient(this.coefficient);
- cloned.setValue(this.value);
cloned.setReferenceValue(this.referenceValue);
cloned.setVariableName(this.variableName);
return cloned;
@@ -146,7 +78,7 @@
public String toString() {
String result = "variableName=" + variableName +
" coefficient=" + coefficient + " referenceValue=" + referenceValue +
- " value=" + value;
+ " min=" + minBound + "max=" + maxBound;
return result;
}
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2011-06-06 14:14:32 UTC (rev 3349)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2011-06-06 15:12:08 UTC (rev 3350)
@@ -41,52 +41,7 @@
/** serialVersionUID. */
private static final long serialVersionUID = -2037768174807839046L;
- /**
- * Value used to create the matrix
- *
- * Only used by sensitivity analysis scripts.
- */
- protected double value;
-
- /**
- * Get matrix.
- *
- * @return the matrix
- */
- public MatrixND getMatrix() {
- return (MatrixND)referenceValue;
- }
-
- /**
- * Set matrix.
- *
- * @param matrix the matrix to set
- */
- public void setMatrix(MatrixND matrix) {
- this.referenceValue = matrix;
- }
-
- /**
- * {@inheritDoc}.
- *
- * In matrix continuous domain, always return 0.0
- */
@Override
- public Object getMinBound() {
- return 0.0;
- }
-
- /**
- * {@inheritDoc}.
- *
- * In matrix continuous domain, always return 1.0
- */
- @Override
- public Object getMaxBound() {
- return 1.0;
- }
-
- @Override
public Object getValueForIdentifier(Object identifier) {
return getValueForIdentifier((Double)identifier);
}
@@ -97,38 +52,18 @@
* @param identifier identifier
* @return a new computed matrix
*/
- public MatrixND getValueForIdentifier(Double identifier) {
+ public MatrixND getValueForIdentifier(final Double identifier) {
+ MatrixND temp = ((MatrixND)getReferenceValue()).copy();
- this.value = (Double)identifier;
- MatrixND temp = getMatrix().copy();
-
// since 3.4.0.0, operator is always *
temp.map(new MapFunction() {
public double apply(double val) {
- return (val + ((val * coefficient) * ((2 * value - 1))));
+ return (val + ((val * coefficient) * ((2 * identifier - 1))));
}
});
return temp;
}
- /**
- * Get value used to create the matrix.
- *
- * @return the value
- */
- public Double getValue() {
- return this.value;
- }
-
- /**
- * Set value used to create the matrix.
- *
- * @param value the value to set
- */
- public void setValue(Double value) {
- this.value = value;
- }
-
@Override
public MatrixContinuousDomain clone() {
MatrixContinuousDomain cloned = (MatrixContinuousDomain)super.clone();
@@ -136,27 +71,46 @@
}
/**
- * Get the minimum bound of the coefficient used to create the matrix. As
- * the {@link #getMinBound()} for use in R always return 0.
+ * {@inheritDoc}
*
- * @return the real minimum bound
+ * @return the minimum bound
*/
- public Double getRealMinBound() {
- // since 3.4.0.0, operator is always *
- Double result = (1.0 + ((1.0 * coefficient) * ((2 * 0.0 - 1))));
- return result;
+ public Object getMinBound() {
+
+ if (minBound == null) {
+ MatrixND temp = ((MatrixND) getReferenceValue()).copy();
+
+ // since 3.4.0.0, operator is always *
+ temp.map(new MapFunction() {
+ public double apply(double val) {
+ return (val + ((val * coefficient) * ((2 * getCalculatorMinBound() - 1))));
+ }
+ });
+ return temp;
+ } else {
+ return minBound;
+ }
}
/**
- * Get the maximal bound of the coefficient used to create the matrix. As
- * the {@link #getMaxBound()} for use in R always return 1.
+ * {@inheritDoc}
*
- * @return the real maximum bound
+ * @return the maximum bound
*/
- public Double getRealMaxBound() {
- // since 3.4.0.0, operator is always *
- Double result = (1.0 + ((1.0 * coefficient) * ((2 * 1.0 - 1))));
- return result;
-
+ public Object getMaxBound() {
+
+ if (maxBound == null) {
+ MatrixND temp = ((MatrixND) getReferenceValue()).copy();
+
+ // since 3.4.0.0, operator is always *
+ temp.map(new MapFunction() {
+ public double apply(double val) {
+ return (val + ((val * coefficient) * ((2 * getCalculatorMaxBound() - 1))));
+ }
+ });
+ return temp;
+ } else {
+ return maxBound;
+ }
}
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-06-06 14:14:32 UTC (rev 3349)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-06-06 15:12:08 UTC (rev 3350)
@@ -32,15 +32,15 @@
java.util.List
java.util.regex.Matcher
java.util.regex.Pattern
- javax.swing.table.AbstractTableModel
- javax.swing.table.DefaultTableModel
+ javax.swing.table.AbstractTableModel
+ javax.swing.table.DefaultTableModel
javax.swing.table.TableCellEditor
javax.swing.table.TableModel
javax.swing.JComboBox
javax.swing.DefaultCellEditor
javax.swing.event.CellEditorListener
- fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain
- org.apache.commons.lang.StringUtils
+ fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain
+ org.apache.commons.lang.StringUtils
</import>
<String id='text' javaBean='null'/>
@@ -138,13 +138,13 @@
} else {
referenceValueField.setText("");
}
- if (selectedDomain.getOriginalMinBound() != null) {
- minBoundField.setText(selectedDomain.getOriginalMinBound().toString());
+ if (selectedDomain.getMinBound() != null) {
+ minBoundField.setText(selectedDomain.getMinBound().toString());
} else {
minBoundField.setText("");
}
- if (selectedDomain.getOriginalMaxBound() != null) {
- maxBoundField.setText(selectedDomain.getOriginalMaxBound().toString());
+ if (selectedDomain.getMaxBound() != null) {
+ maxBoundField.setText(selectedDomain.getMaxBound().toString());
} else {
maxBoundField.setText("");
}
@@ -171,7 +171,7 @@
valid = false;
}
else if (domain.getCoefficient() == null) {
- valid = domain.getOriginalMinBound() != null && domain.getOriginalMaxBound() != null;
+ valid = domain.getMinBound() != null && domain.getMaxBound() != null;
}
else {
valid = domain.getReferenceValue() != null;
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-06-06 14:14:32 UTC (rev 3349)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-06-06 15:12:08 UTC (rev 3350)
@@ -618,7 +618,7 @@
* @return component copy
*/
public ContinuousPanelContainerUI getContinuousPanel(Object value, TopiaEntityContextable bean, String property) {
- ContinuousPanelContainerUI result = null;
+ ContinuousPanelContainerUI result;
if (value instanceof RangeOfValues) {
RangeOfValues rangeOfValues = (RangeOfValues)value;
@@ -627,11 +627,7 @@
String min = "0";
String max = "0";
if (values.matches("^\\ *[0-9]*\\ *\\-\\ *[0-9]*\\ *$")) {
- int first = 0;
- if (values.startsWith("-")) {
- first = 1;
- }
- first = values.indexOf("-");
+ int first = values.indexOf("-");
if (first != -1) {
min = values.substring(0, first);
max = values.substring(first + 1);
@@ -728,8 +724,8 @@
else {
// factor numerique continue (min/max)
// pas d'erreur sur 2 fois domain.getMinBound()
- MatrixND matrixMin = (MatrixND)domain.getOriginalMinBound();
- MatrixND matrixMax = (MatrixND)domain.getOriginalMaxBound();
+ MatrixND matrixMin = (MatrixND)domain.getMinBound();
+ MatrixND matrixMax = (MatrixND)domain.getMaxBound();
continuousPanel.initExisting(
matrixMin.clone(),
matrixMax.clone(),
@@ -752,10 +748,11 @@
else {
// factor numerique continue (min/max)
// pas d'erreur sur 2 fois domain.getMinBound()
+ // on initialise avec minBound comme valeur de référence.
continuousPanel.initExisting(
- String.valueOf(domain.getOriginalMinBound()),
- String.valueOf(domain.getOriginalMaxBound()),
- String.valueOf(domain.getOriginalMinBound()),
+ String.valueOf(domain.getMinBound()),
+ String.valueOf(domain.getMaxBound()),
+ String.valueOf(domain.getMinBound()),
"");
}
result = continuousPanel;
@@ -769,8 +766,8 @@
*
* @param factorWizardUI context for context value (RegionStorage)
* @param value type to get editor
- * @param factorPath for equation
- * @param context for equation
+ * @param factor
+ * @param domain
* @return component
*/
protected JComponent getEditorWithValue(FactorWizardUI factorWizardUI, Factor factor, Domain domain, Object value) {
@@ -991,7 +988,7 @@
try {
EquationContinuousPanelUI equationPanel = (EquationContinuousPanelUI) panel;
- TopiaEntityContextable bean = (TopiaEntityContextable)equationPanel.getBean();
+ TopiaEntityContextable bean = equationPanel.getBean();
TopiaContext topiaContext = bean.getTopiaContext();
String property = equationPanel.getBeanProperty();
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-06-06 14:14:32 UTC (rev 3349)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-06-06 15:12:08 UTC (rev 3350)
@@ -997,7 +997,7 @@
MatrixND referenceValue, Double coef, boolean exist) {
Factor f = new Factor(name);
MatrixContinuousDomain domain = new MatrixContinuousDomain();
- domain.setMatrix(referenceValue);
+ domain.setReferenceValue(referenceValue);
domain.setCoefficient(coef);
f.setComment(comment);
f.setDomain(domain);
@@ -1304,7 +1304,7 @@
selectedFactor.setPath(factorName);
MatrixContinuousDomain factorDomain = new MatrixContinuousDomain();
MatrixND populationEffectives = getSimulationParameter().getNumberOf(population);
- factorDomain.setMatrix(populationEffectives.copy());
+ factorDomain.setReferenceValue(populationEffectives.copy());
factorDomain.setCoefficient(0.0);
selectedFactor.setDomain(factorDomain);
}
Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties
===================================================================
--- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-06-06 14:14:32 UTC (rev 3349)
+++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-06-06 15:12:08 UTC (rev 3350)
@@ -141,6 +141,8 @@
isisfish.config.category.misc.description=Miscealenous
isisfish.config.category.officialvcs=Official VCS
isisfish.config.category.officialvcs.description=Official VCS repository
+isisfish.config.category.versioning=
+isisfish.config.category.versioning.description=
isisfish.config.database.lockmode.description=Database lock mode
isisfish.config.main.compileDirectory.description=Script compilation directory
isisfish.config.main.configFileName.description=Configuration filename
@@ -200,9 +202,12 @@
isisfish.config.vcs.hostName.description=Official VCS host name
isisfish.config.vcs.localCommunityDatabasePath.description=Community VCS local storage directory
isisfish.config.vcs.localDatabasePath.description=Official VCS local storage directory
+isisfish.config.vcs.noPassPhrase.description=
+isisfish.config.vcs.passphrase.description=
isisfish.config.vcs.protocol.description=Official VCS protocol
isisfish.config.vcs.remotePath.description=Official VCS remote path
isisfish.config.vcs.type.description=Official VCS type
+isisfish.config.vcs.useSshConnexion.description=
isisfish.config.vcs.userName.description=Official VCS user name
isisfish.config.vcs.userPassword.description=Official VCS password
isisfish.date.toString=%1$s %2$s
Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties
===================================================================
--- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-06-06 14:14:32 UTC (rev 3349)
+++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-06-06 15:12:08 UTC (rev 3350)
@@ -141,6 +141,8 @@
isisfish.config.category.misc.description=Divers
isisfish.config.category.officialvcs=VCS Officiel
isisfish.config.category.officialvcs.description=Dépôt contenant les scripts officiels
+isisfish.config.category.versioning=
+isisfish.config.category.versioning.description=
isisfish.config.database.lockmode.description=Méthode de vérouillage à utiliser pour la base de données
isisfish.config.main.compileDirectory.description=le répertoire où sont compilés les scripts
isisfish.config.main.configFileName.description=le fichier de configuration à utiliser
@@ -200,9 +202,12 @@
isisfish.config.vcs.hostName.description=le nom du serveur vcs à utiliser
isisfish.config.vcs.localCommunityDatabasePath.description=Dossier de stockage local du dépôt communauté
isisfish.config.vcs.localDatabasePath.description=Dossier de stockage local du dépôt officiel
+isisfish.config.vcs.noPassPhrase.description=
+isisfish.config.vcs.passphrase.description=
isisfish.config.vcs.protocol.description=le protocol pour acceder au serveur vcs
isisfish.config.vcs.remotePath.description=le chemin jusqu'au parent du module de données sur le serveur vcs
isisfish.config.vcs.type.description=le type de communication vcs utilisé
+isisfish.config.vcs.useSshConnexion.description=
isisfish.config.vcs.userName.description=le login de l'utilisateur sur le serveur vcs
isisfish.config.vcs.userPassword.description=le mot de passe de l'utilsateur sur le serveur vcs
isisfish.date.toString=%1$s %2$s
1
0