December 2013 - Isis-fish-commits - mailman.cloud.codelutin.com

Jenkins build is unstable: isis-fish #1990
by admin+hudson＠codelutin.com 14 Feb '14

14 Feb '14

See <http://ci.nuiton.org/jenkins/job/isis-fish/1990/>

1 11

Jenkins build became unstable: isis-fish » IsisFish #1988
by admin+hudson＠codelutin.com 14 Feb '14

14 Feb '14

See <http://ci.nuiton.org/jenkins/job/isis-fish/fr.ifremer$isis-fish/1988/>

1 13

r3878 - in trunk/src/main: java/fr/ifremer/isisfish java/fr/ifremer/isisfish/ui/input resources
by echatellier＠users.forge.codelutin.com 20 Dec '13

20 Dec '13

Author: echatellier Date: 2013-12-20 17:00:44 +0100 (Fri, 20 Dec 2013) New Revision: 3878 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3878 Log: fixes #4054: Ajouter la distribution de recrutement par zone et de distribution de reproduction en facteur Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx trunk/src/main/resources/sensitivity.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2013-12-12 14:00:40 UTC (rev 3877) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2013-12-20 16:00:44 UTC (rev 3878) @@ -117,7 +117,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(4, 2, 1, 2); + protected final static Version version = new Version(4, 2, 1, 3); protected final static Version majorVersion = new Version(version.getNumber(0)); protected final static Version databaseVersion = new Version( Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2013-12-12 14:00:40 UTC (rev 3877) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2013-12-20 16:00:44 UTC (rev 3878) @@ -192,7 +192,9 @@ <cell columns='3' fill='both' weightx='1.0' weighty='0.5'> <org.nuiton.math.matrix.gui.MatrixPanelEditor id='fieldPopulationMappingZoneReproZoneRecru' constructorParams='false' enabled='{isActive()}' - onMatrixChanged="populationMappingZoneReproZoneRecruMatrixChanged(event)" /> + onMatrixChanged="populationMappingZoneReproZoneRecruMatrixChanged(event)" + decorator='boxed' + _sensitivityBean='{fr.ifremer.isisfish.entities.Population.class}' _sensitivityMethod='"MappingZoneReproZoneRecru"' /> </cell> </row> </Table> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2013-12-12 14:00:40 UTC (rev 3877) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2013-12-20 16:00:44 UTC (rev 3878) @@ -43,6 +43,12 @@ getSaveVerifier().addCurrentPanel(popZones); }*/ + +@Override +public void setLayer(boolean active) { + super.setLayer(active); + popZones.setLayer(active); +} ]]> </script> <JPanel id='body'> @@ -50,8 +56,7 @@ <row> <cell columns="2" fill='both' weightx='1.0' weighty='1'> <PopulationZonesEditorUI id='popZones' constructorParams='this' - bean='{getBean()}' active='{isActive()}' decorator='boxed' - _sensitivityBean='{Population.class}' _sensitivityMethod='"MappingZoneReproZoneRecru"'/> + bean='{getBean()}' active='{isActive()}'/> </cell> </row> <row> Modified: trunk/src/main/resources/sensitivity.properties =================================================================== --- trunk/src/main/resources/sensitivity.properties 2013-12-12 14:00:40 UTC (rev 3877) +++ trunk/src/main/resources/sensitivity.properties 2013-12-20 16:00:44 UTC (rev 3878) @@ -42,6 +42,7 @@ Population.groupMin Population.growth Population.growthReverse +Population.mappingZoneReproZoneRecru Population.maturityOgiveEquation Population.meanWeight Population.monthGapBetweenReproRecrutement @@ -54,6 +55,7 @@ PopulationSeasonInfo.migrationEquation PopulationSeasonInfo.emigrationEquation PopulationSeasonInfo.immigrationEquation +PopulationSeasonInfo.reproductionDistribution Selectivity.equation SetOfVessels.fixedCosts SetOfVessels.numberOfVessels

1 0

r3877 - trunk
by maven-release＠users.forge.codelutin.com 12 Dec '13

12 Dec '13

Author: maven-release Date: 2013-12-12 15:00:40 +0100 (Thu, 12 Dec 2013) New Revision: 3877 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3877 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 14:00:26 UTC (rev 3876) +++ trunk/pom.xml 2013-12-12 14:00:40 UTC (rev 3877) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.2.1.2</version> + <version>4.2.1.3-SNAPSHOT</version>  <dependencies> @@ -739,9 +739,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.2.1.2</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.2.1.2</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.2.1.2</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> </scm> <repositories>

1 0

r3876 - in tags: . isis-fish-4.2.1.2
by maven-release＠users.forge.codelutin.com 12 Dec '13

12 Dec '13

Author: maven-release Date: 2013-12-12 15:00:26 +0100 (Thu, 12 Dec 2013) New Revision: 3876 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3876 Log: [maven-release-plugin] copy for tag isis-fish-4.2.1.2 Added: tags/isis-fish-4.2.1.2/ Property changes on: tags/isis-fish-4.2.1.2 ___________________________________________________________________ Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine Added: svn:mergeinfo + /branches/4.1:3601-3670

1 0

r3875 - trunk
by maven-release＠users.forge.codelutin.com 12 Dec '13

12 Dec '13

Author: maven-release Date: 2013-12-12 15:00:02 +0100 (Thu, 12 Dec 2013) New Revision: 3875 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3875 Log: [maven-release-plugin] prepare release isis-fish-4.2.1.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 10:25:59 UTC (rev 3874) +++ trunk/pom.xml 2013-12-12 14:00:02 UTC (rev 3875) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.2.1.2-SNAPSHOT</version> + <version>4.2.1.2</version>  <dependencies> @@ -739,9 +739,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.2.1.2</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.2.1.2</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.2.1.2</url> </scm> <repositories>

1 0

r3874 - trunk
by echatellier＠users.forge.codelutin.com 12 Dec '13

12 Dec '13

Author: echatellier Date: 2013-12-12 11:25:59 +0100 (Thu, 12 Dec 2013) New Revision: 3874 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3874 Log: Update parent Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 10:20:46 UTC (rev 3873) +++ trunk/pom.xml 2013-12-12 10:25:59 UTC (rev 3874) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>4.3</version> + <version>4.4</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r3873 - trunk/src/main/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com 12 Dec '13

12 Dec '13

Author: echatellier Date: 2013-12-12 11:20:46 +0100 (Thu, 12 Dec 2013) New Revision: 3873 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3873 Log: Add license headers Modified: trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackend.java trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java Modified: trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackend.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackend.java 2013-12-12 10:17:26 UTC (rev 3872) +++ trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackend.java 2013-12-12 10:20:46 UTC (rev 3873) @@ -1,3 +1,28 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 Ifremer, Code Lutin, Benjamin Poussin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + package fr.ifremer.isisfish.util; import fr.ifremer.isisfish.types.TimeStep; Modified: trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java 2013-12-12 10:17:26 UTC (rev 3872) +++ trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java 2013-12-12 10:20:46 UTC (rev 3873) @@ -1,16 +1,35 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 Ifremer, Code Lutin, Benjamin Poussin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.isisfish.util; - import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.cache.Weigher; import fr.ifremer.isisfish.types.TimeStep; -import java.io.BufferedWriter; -import java.io.FileWriter; -import java.io.Writer; import java.util.Collection; import org.apache.commons.lang3.ClassUtils; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND;

1 0

r3872 - trunk/src/main/java/fr/ifremer/isisfish/util
by bpoussin＠users.forge.codelutin.com 12 Dec '13

12 Dec '13

Author: bpoussin Date: 2013-12-12 11:17:26 +0100 (Thu, 12 Dec 2013) New Revision: 3872 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3872 Log: prevent '/ by zero' and refuse to adjuste cache to 0. Modified: trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java Modified: trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java 2013-12-12 09:50:22 UTC (rev 3871) +++ trunk/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java 2013-12-12 10:17:26 UTC (rev 3872) @@ -197,28 +197,32 @@ * @param amount new size of cache in byte */ public void adjustedCache(long amount){ - // on estime le nombre d'entree necessaire pour ce volume de donnees - long bytePerStep = totalCached / Math.max(1, numberStepCached); - long entriesPerStep = numberCached / Math.max(1, numberStepCached); + if (amount == 0) { + log.info("Cache size not ajusted because 0 is not acceptable amount"); + } else { + // on estime le nombre d'entree necessaire pour ce volume de donnees + long bytePerStep = totalCached / Math.max(1, numberStepCached); + long entriesPerStep = numberCached / Math.max(1, numberStepCached); - long initialCapacity = amount * entriesPerStep / Math.max(1, bytePerStep); - long stepEquivalent = initialCapacity / entriesPerStep; + long initialCapacity = amount * entriesPerStep / Math.max(1, bytePerStep); + long stepEquivalent = initialCapacity / Math.max(1, entriesPerStep); - // use amount as new size for cache - // if this new size is less than maxCache, use it - // to keep more memory for JVM - sizeCache = Math.min(this.maxCache, amount); + // use amount as new size for cache + // if this new size is less than maxCache, use it + // to keep more memory for JVM + sizeCache = Math.min(this.maxCache, amount); + + CacheBuilder builder = CacheBuilder.newBuilder(); + builder.maximumWeight(sizeCache); + builder.weigher(isisWeigher); + if (initialCapacity > 0) { + builder.initialCapacity((int)initialCapacity); + } + cache = builder.build(); - CacheBuilder builder = CacheBuilder.newBuilder(); - builder.maximumWeight(sizeCache); - builder.weigher(isisWeigher); - if (initialCapacity > 0) { - builder.initialCapacity((int)initialCapacity); + log.info(String.format("Cache size ajusted to %s (equivalent to %s step need)", + StringUtil.convertMemory(sizeCache), stepEquivalent)); } - cache = builder.build(); - - log.info(String.format("Cache size ajusted to %s (equivalent to %s step need)", - StringUtil.convertMemory(sizeCache), stepEquivalent)); } /**

1 0

r3871 - trunk
by echatellier＠users.forge.codelutin.com 12 Dec '13

12 Dec '13

Author: echatellier Date: 2013-12-12 10:50:22 +0100 (Thu, 12 Dec 2013) New Revision: 3871 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3871 Log: Fix sun signatures Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-08 18:57:15 UTC (rev 3870) +++ trunk/pom.xml 2013-12-12 09:50:22 UTC (rev 3871) @@ -398,8 +398,6 @@ <version>15.0</version> </dependency> - -  <dependency> <groupId>junit</groupId> @@ -530,6 +528,8 @@ <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>Ifremer, Codelutin</license.organizationName> + <signatureArtifactId>java16-sun</signatureArtifactId> + <signatureVersion>1.9</signatureVersion>  <jaxxVersion>2.4.2</jaxxVersion>

1 0