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

r4172 - trunk/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com Jan. 22, 2015

Jan. 22, 2015

Author: echatellier Date: 2015-01-22 16:59:18 +0000 (Thu, 22 Jan 2015) New Revision: 4172 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4172 Log: Happy new year ! Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2015-01-22 11:21:24 UTC (rev 4171) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2015-01-22 16:59:18 UTC (rev 4172) @@ -91,7 +91,7 @@ directory\ %s\ must\ be\ a\ directory= dlnorm= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2014. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Please, report any bug you can found.<html> +isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2015. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Please, report any bug you can found.<html> isisfish.about.licensetext=You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with ISIS-Fish. All rights reserved. No guarantees are provided for use of this program. isisfish.about.title=About ISIS-Fish... isisfish.advancedParameters.title=Advanced parameters Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-01-22 11:21:24 UTC (rev 4171) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-01-22 16:59:18 UTC (rev 4172) @@ -91,7 +91,7 @@ directory\ %s\ must\ be\ a\ directory= dlnorm= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2014. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Merci de rapporter les bugs.<html> +isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2015. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Merci de rapporter les bugs.<html> isisfish.about.licensetext=Vous pouvez modifier et redistribuer ce programme sous les conditions énoncées par la licence GNU GPL (version 2 ou ultérieure). Une copie de la licence GPL est dans le fichier « LICENSE.txt » fourni avec ISIS-Fish. Tous droits réservés. Aucune garantie n'est fournie pour l'utilisation de ce programme. isisfish.about.title=À propos de ISIS-Fish... isisfish.advancedParameters.title=Paramètres avancés

1 0

r4171 - in trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity: . domain
by echatellier＠users.forge.codelutin.com Jan. 22, 2015

Jan. 22, 2015

Author: echatellier Date: 2015-01-22 11:21:24 +0000 (Thu, 22 Jan 2015) New Revision: 4171 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4171 Log: refs #6525: add failing unit test Added: trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomainTest.java Added: trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomainTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomainTest.java (rev 0) +++ trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomainTest.java 2015-01-22 11:21:24 UTC (rev 4171) @@ -0,0 +1,25 @@ +package fr.ifremer.isisfish.simulator.sensitivity.domain; + +import org.junit.Assert; +import org.junit.Test; + +import fr.ifremer.isisfish.simulator.sensitivity.Distribution; + +public class ContinuousDomainTest { + + /** + * Test jdistlib pour verifier que les parametres sont bien compris en compte. + * + * Ici : valeurs négatives non gérées correctement (min > max). + */ + @Test + public void testJDistLib() { + + ContinuousDomain d = new ContinuousDomain(Distribution.QUNIFPC); + d.getDistributionParameters().put("reference", 0.83); + d.getDistributionParameters().put("coefficient", 0.5); + + Assert.assertEquals(-0.415, (Double)d.getValueForIdentifier(0.0), 0.0); + Assert.assertEquals(-1.162, (Double)d.getValueForIdentifier(0.9), 0.0); + } +} Property changes on: trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomainTest.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r4170 - in trunk/src/main: java/fr/ifremer/isisfish/simulator resources/templates/script
by echatellier＠users.forge.codelutin.com Jan. 5, 2015

Jan. 5, 2015

Author: echatellier Date: 2015-01-05 16:13:05 +0000 (Mon, 05 Jan 2015) New Revision: 4170 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4170 Log: Fix tests Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/Historic.java trunk/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContext.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContext.java trunk/src/main/resources/templates/script/exportStep.ftl Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/Historic.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/Historic.java 2015-01-05 16:12:42 UTC (rev 4169) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/Historic.java 2015-01-05 16:13:05 UTC (rev 4170) @@ -1,6 +1,28 @@ package fr.ifremer.isisfish.simulator; +/* + * #%L + * ISIS-Fish + * %% + * Copyright (C) 2014 - 2015 Ifremer, Codelutin + * %% + * 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% + */ + import fr.ifremer.isisfish.datastore.SimulationStorage; import java.util.ArrayList; import java.util.HashMap; Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContext.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContext.java 2015-01-05 16:12:42 UTC (rev 4169) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContext.java 2015-01-05 16:13:05 UTC (rev 4170) @@ -1,5 +1,27 @@ package fr.ifremer.isisfish.simulator; +/* + * #%L + * ISIS-Fish + * %% + * Copyright (C) 2014 - 2015 Ifremer, Codelutin + * %% + * 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% + */ + import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.sensitivity.Factor; import java.util.List; Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContext.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContext.java 2015-01-05 16:12:42 UTC (rev 4169) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContext.java 2015-01-05 16:13:05 UTC (rev 4170) @@ -1,5 +1,27 @@ package fr.ifremer.isisfish.simulator; +/* + * #%L + * ISIS-Fish + * %% + * Copyright (C) 2014 - 2015 Ifremer, Codelutin + * %% + * 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% + */ + import fr.ifremer.isisfish.datastore.SimulationStorage; /** Modified: trunk/src/main/resources/templates/script/exportStep.ftl =================================================================== --- trunk/src/main/resources/templates/script/exportStep.ftl 2015-01-05 16:12:42 UTC (rev 4169) +++ trunk/src/main/resources/templates/script/exportStep.ftl 2015-01-05 16:13:05 UTC (rev 4170) @@ -5,7 +5,7 @@ $Id: export.ftl 4156 2014-12-09 11:27:18Z echatellier $ $HeadURL: http://svn.forge.codelutin.com/svn/isis-fish/trunk/src/main/resources/templ… $ %% - Copyright (C) 2009 - 2014 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2014 - 2015 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -56,6 +56,7 @@ import fr.ifremer.isisfish.export.ExportStep; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.ResultStorage; +import fr.ifremer.isisfish.types.TimeStep; /** * ${name}.java

1 0

r4169 - trunk
by echatellier＠users.forge.codelutin.com Jan. 5, 2015

Jan. 5, 2015

Author: echatellier Date: 2015-01-05 16:12:42 +0000 (Mon, 05 Jan 2015) New Revision: 4169 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4169 Log: Update versions Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-12-24 16:39:29 UTC (rev 4168) +++ trunk/pom.xml 2015-01-05 16:12:42 UTC (rev 4169) @@ -199,7 +199,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-math3</artifactId> - <version>3.3</version> + <version>3.4</version> <scope>runtime</scope>  </dependency> @@ -218,7 +218,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.7</version> + <version>1.7.9</version> <scope>runtime</scope> </dependency> @@ -336,7 +336,7 @@ <dependency> <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.8.5</version> + <version>1.8.7</version> <scope>compile</scope> <exclusions> <exclusion> @@ -514,7 +514,7 @@ <signatureVersion>1.0</signatureVersion>  - <jaxxVersion>2.18</jaxxVersion> + <jaxxVersion>2.20</jaxxVersion> <eugeneVersion>2.13</eugeneVersion> <topiaVersion>2.9.3</topiaVersion> <hibernateVersion>4.3.7.Final</hibernateVersion>

1 0