February 2011 - Isis-fish-commits - mailman.cloud.codelutin.com

r3147 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check
by chatellier＠users.labs.libre-entreprise.org 21 Feb '11

21 Feb '11

Author: chatellier Date: 2011-02-21 08:44:07 +0000 (Mon, 21 Feb 2011) New Revision: 3147 Log: Add fixme Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2011-02-16 22:04:43 UTC (rev 3146) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2011-02-21 08:44:07 UTC (rev 3147) @@ -187,7 +187,7 @@ } return result; } - + static public double sumMatrix(MatrixND mat) { double result = 0; for (MatrixIterator i = mat.iterator(); i.next();) { @@ -202,6 +202,9 @@ check(infoSaisonPop, "Emigration", infoSaisonPop.getEmigrationEquation(), result); check(infoSaisonPop, "ImmigrationEquation", infoSaisonPop.getImmigrationEquation(), result); } else { + + // FIXME chatellier 20110221 NPE in getMigrationMatrix() + // with null zones or populations if (isEmptyMatrix(infoSaisonPop.getMigrationMatrix())) { result.addInfo(infoSaisonPop, _("isisfish.error.empty.migration")); } else if(isNullMatrix(infoSaisonPop.getMigrationMatrix())) { @@ -348,7 +351,8 @@ check(pop, "MeanWeight", pop.getMeanWeight(), result); check(pop, "ReproductionEquation", pop.getReproductionEquation(), result); check(pop, "NaturalDeathRate", pop.getNaturalDeathRate(), result); - + + // FIXME chatellier 20110221 NPE pop.getRecruitmentDistribution() if (sumMatrix(pop.getRecruitmentDistribution()) != 1) { result.addWarning(pop, _("isisfish.error.invalid.distribution.recruitment")); }

1 0

r3146 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org 16 Feb '11

16 Feb '11

Author: tchemit Date: 2011-02-16 22:04:43 +0000 (Wed, 16 Feb 2011) New Revision: 3146 Log: Update mavenpom4labs to 2.5.1. Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2011-02-10 15:59:51 UTC (rev 3145) +++ isis-fish/trunk/pom.xml 2011-02-16 22:04:43 UTC (rev 3146) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.5</version> + <version>2.5.1</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r3145 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org 10 Feb '11

10 Feb '11

Author: tchemit Date: 2011-02-10 15:59:51 +0000 (Thu, 10 Feb 2011) New Revision: 3145 Log: Update mavenpom4labs to 2.5. Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2011-02-09 09:08:27 UTC (rev 3144) +++ isis-fish/trunk/pom.xml 2011-02-10 15:59:51 UTC (rev 3145) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.4.4</version> + <version>2.5</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r3144 - isis-fish/trunk/src/main/assembly
by chatellier＠users.labs.libre-entreprise.org 09 Feb '11

09 Feb '11

Author: chatellier Date: 2011-02-09 09:08:27 +0000 (Wed, 09 Feb 2011) New Revision: 3144 Log: Fix "$@", should be $* Modified: isis-fish/trunk/src/main/assembly/isisfish.sh isis-fish/trunk/src/main/assembly/isisfish64.sh Modified: isis-fish/trunk/src/main/assembly/isisfish.sh =================================================================== --- isis-fish/trunk/src/main/assembly/isisfish.sh 2011-02-09 08:24:55 UTC (rev 3143) +++ isis-fish/trunk/src/main/assembly/isisfish.sh 2011-02-09 09:08:27 UTC (rev 3144) @@ -3,4 +3,4 @@ MEMORY="-Xmx1024M" JRIARGS="-Djava.library.path=jri -DR.type=jni" -java $MEMORY $JRIARGS -jar ${project.build.finalName}.${project.packaging} "$@" &> debug.txt +java $MEMORY $JRIARGS -jar ${project.build.finalName}.${project.packaging} $* &> debug.txt Modified: isis-fish/trunk/src/main/assembly/isisfish64.sh =================================================================== --- isis-fish/trunk/src/main/assembly/isisfish64.sh 2011-02-09 08:24:55 UTC (rev 3143) +++ isis-fish/trunk/src/main/assembly/isisfish64.sh 2011-02-09 09:08:27 UTC (rev 3144) @@ -3,4 +3,4 @@ MEMORY="-Xmx1024M" JRIARGS="-Djava.library.path=jri64 -DR.type=jni" -java $MEMORY $JRIARGS -jar ${project.build.finalName}.${project.packaging} "$@" &> debug.txt +java $MEMORY $JRIARGS -jar ${project.build.finalName}.${project.packaging} $* &> debug.txt

1 0

r3143 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org 09 Feb '11

09 Feb '11

Author: tchemit Date: 2011-02-09 08:24:55 +0000 (Wed, 09 Feb 2011) New Revision: 3143 Log: Update mavenpom4labs to 2.4.4. Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2011-01-28 11:36:30 UTC (rev 3142) +++ isis-fish/trunk/pom.xml 2011-02-09 08:24:55 UTC (rev 3143) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.4.1</version> + <version>2.4.4</version> </parent> <groupId>fr.ifremer</groupId>

1 0