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

r3430 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 29 Jun '11

29 Jun '11

Author: chatellier Date: 2011-06-29 08:34:30 +0000 (Wed, 29 Jun 2011) New Revision: 3430 Log: Update h2 Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2011-06-28 12:27:33 UTC (rev 3429) +++ isis-fish/trunk/pom.xml 2011-06-29 08:34:30 UTC (rev 3430) @@ -274,7 +274,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.155</version> + <version>1.3.157</version> <scope>compile</scope> </dependency>

1 0

r3429 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 28 Jun '11

28 Jun '11

Author: chatellier Date: 2011-06-28 12:27:33 +0000 (Tue, 28 Jun 2011) New Revision: 3429 Log: Update eugene/topia Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2011-06-22 14:47:43 UTC (rev 3428) +++ isis-fish/trunk/pom.xml 2011-06-28 12:27:33 UTC (rev 3429) @@ -519,8 +519,8 @@  <jaxxVersion>2.4.2</jaxxVersion> - <eugeneVersion>2.3.4</eugeneVersion> - <topiaVersion>2.6-SNAPSHOT</topiaVersion> + <eugeneVersion>2.3.5</eugeneVersion> + <topiaVersion>2.6</topiaVersion> <nuitonUtilsVersion>2.2</nuitonUtilsVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion>

1 0

r3428 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation
by chatellier＠users.labs.libre-entreprise.org 22 Jun '11

22 Jun '11

Author: chatellier Date: 2011-06-22 14:47:43 +0000 (Wed, 22 Jun 2011) New Revision: 3428 Log: Fix equation package javadoc. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/EmigrationEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/ImmigrationEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/Language.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/MigrationEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowthReverse.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMeanWeight.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationPrice.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionRateEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SelectivityEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/TargetSpeciesTargetFactorEquation.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/EmigrationEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/EmigrationEquation.java 2011-06-22 14:18:06 UTC (rev 3427) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/EmigrationEquation.java 2011-06-22 14:47:43 UTC (rev 3428) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, 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 @@ -34,7 +34,7 @@ import fr.ifremer.isisfish.util.Args; /** - * EmigrationEquation.java + * Emigration equation. * * Created: 23 août 2006 12:06:02 * @@ -47,14 +47,16 @@ public interface EmigrationEquation { /** + * Compute emigration equation. * - * @param context + * @param context simulation context * @param N effectif de la population * @param pop la population pour lequel on souhaite le coffecient d'emigration * @param group le group pour lequel on souhaite le coffecient d'emigration * @param departureZone la zone de depart * @return la proportion d'individu a emigrer de la zone de depart * pour le groupe passé en argument + * @throws Exception */ @Args({"context", "N", "pop", "group", "departureZone"}) public double compute(SimulationContext context, Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/ImmigrationEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/ImmigrationEquation.java 2011-06-22 14:18:06 UTC (rev 3427) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/ImmigrationEquation.java 2011-06-22 14:47:43 UTC (rev 3428) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, 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 @@ -34,7 +34,7 @@ import fr.ifremer.isisfish.util.Args; /** - * ImmigrationEquation.java + * Immigration equation. * * Created: 23 août 2006 12:06:32 * @@ -47,14 +47,16 @@ public interface ImmigrationEquation { /** + * Compute immigration equation. * - * @param context + * @param context simulation context * @param N effectif de la population * @param pop la population pour lequel on souhaite le nombre d'immigration * @param group le group pour lequel on souhaite le nombre d'immigration * @param arrivalZone la zone d'arrivé de l'immigration * @return le nombre d'individu a immigrer dans la zone * d'arrivé pour le groupe passé en argument + * @throws Exception */ @Args({"context", "N", "pop", "group", "arrivalZone"}) public double compute(SimulationContext context, @@ -62,5 +64,3 @@ Zone arrivalZone) throws Exception; } - - Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/Language.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/Language.java 2011-06-22 14:18:06 UTC (rev 3427) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/Language.java 2011-06-22 14:47:43 UTC (rev 3428) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, 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 @@ -26,7 +26,7 @@ package fr.ifremer.isisfish.equation; /** - * Language.java + * Equation languages supported by IsisFish. * * Created: 23 août 2006 01:18:19 * @@ -37,8 +37,13 @@ * by : $Author$ */ public class Language { + + /** Java language. */ final static public String JAVA = "java"; + /** Bean shell language. */ final static public String BSH = "BSH"; + /** ECMAScript language. */ final static public String ECMASCRIPT = "ECMAScript"; + /** GROOVY language. */ final static public String GROOVY = "Groovy"; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/MigrationEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/MigrationEquation.java 2011-06-22 14:18:06 UTC (rev 3427) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/MigrationEquation.java 2011-06-22 14:47:43 UTC (rev 3428) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, 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 @@ -34,7 +34,7 @@ import fr.ifremer.isisfish.util.Args; /** - * MigrationEquation.java + * Migration equation. * * Created: 23 août 2006 12:05:14 * @@ -47,8 +47,9 @@ public interface MigrationEquation { /** + * Compute migration equation. * - * @param context + * @param context simulation context * @param N effectif de la population * @param pop la population pour lequel on souhaite le coffecient de migration * @param group le group pour lequel on souhaite le coffecient de migration @@ -56,6 +57,7 @@ * @param arrivalZone la zone d'arrivé de migration * @return la proportion d'individu a migrer de la zone de depart a la zone * d'arrivé pour le groupe passé en argument + * @throws Exception */ @Args({"context", "N", "pop", "group", "departureZone", "arrivalZone"}) public double compute(SimulationContext context, @@ -63,5 +65,3 @@ Zone departureZone, Zone arrivalZone) throws Exception; } - - Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java 2011-06-22 14:18:06 UTC (rev 3427) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java 2011-06-22 14:47:43 UTC (rev 3428) @@ -30,7 +30,7 @@ import fr.ifremer.isisfish.util.Args; /** - * PopulationGrowth.java + * Population's growth equation. * * Created: 4 juil. 2006 13:03:25 * @@ -43,15 +43,15 @@ public interface PopulationGrowth { /** + * Compute groth equation. * - * @param context + * @param context simulation context * @param age l'age du groupe en mois * @param group le groupe dont on souhaite avoir la longueur en fonction de l'age * @return equation result + * @throws Exception */ @Args({"context", "age", "group"}) public double compute(SimulationContext context, double age, PopulationGroup group) throws Exception; } - - Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowthReverse.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowthReverse.java 2011-06-22 14:18:06 UTC (rev 3427) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowthReverse.java 2011-06-22 14:47:43 UTC (rev 3428) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, 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 @@ -30,7 +30,7 @@ import fr.ifremer.isisfish.util.Args; /** - * PopulationGrowthReverse.java + * Population's growth reverse equation. * * Created: 23 août 2006 01:26:37 * @@ -43,15 +43,15 @@ public interface PopulationGrowthReverse { /** + * Compute growth reverse equation. * - * @param context + * @param context simulation context * @param length la longueur du groupe * @param group le groupe dont on souhaite avoir l'age en fonction de la longueur * @return l'age du groupe en mois + * @throws Exception */ @Args({"context", "length", "group"}) public double compute(SimulationContext context, double length, PopulationGroup group) throws Exception; } - - Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java 2011-06-22 14:18:06 UTC (rev 3427) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java 2011-06-22 14:47:43 UTC (rev 3428) @@ -46,6 +46,7 @@ * @param context simulation context * @param group le groupe dont on souhaite avoir l'ogive de maturité * @return l'ogive de maturite + * @throws Exception */ @Args({"context", "group"}) public double compute(SimulationContext context, PopulationGroup group) throws Exception; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMeanWeight.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMeanWeight.java 2011-06-22 14:18:06 UTC (rev 3427) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMeanWeight.java 2011-06-22 14:47:43 UTC (rev 3428) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, 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 @@ -30,7 +30,7 @@ import fr.ifremer.isisfish.util.Args; /** - * PopulationMeanWeight equation. + * Population mean weight equation. * * Created: 23 août 2006 11:14:46 * @@ -54,5 +54,3 @@ public double compute(SimulationContext context, PopulationGroup group) throws Exception; } - - Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java 2011-06-22 14:18:06 UTC (rev 3427) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java 2011-06-22 14:47:43 UTC (rev 3428) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, 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 @@ -32,7 +32,7 @@ import fr.ifremer.isisfish.util.Args; /** - * PopulationNaturalDeathRate.java + * Population natural death rate.java * * Created: 23 août 2006 11:13:57 * @@ -45,8 +45,9 @@ public interface PopulationNaturalDeathRate { /** + * Compute natural death rate. * - * @param context + * @param context simulation context * @param pop la population pour lequel il faut calculer la mortalité naturelle * @param group le groupe pour lequel il faut calculer la mortalité naturelle * null, si on souhaite la mortalité naturelle du group des naissances @@ -54,11 +55,10 @@ * seulement utilisé pour la mortalité naturelle du group des naissances, * sinon null * @return eqaution result + * @throws Exception */ @Args({"context", "pop", "group", "zone"}) public double compute(SimulationContext context, Population pop, PopulationGroup group, Zone zone) throws Exception; } - - Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationPrice.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationPrice.java 2011-06-22 14:18:06 UTC (rev 3427) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationPrice.java 2011-06-22 14:47:43 UTC (rev 3428) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, 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 @@ -30,7 +30,7 @@ import fr.ifremer.isisfish.util.Args; /** - * PopulationPrice.java + * Population price. * * Created: 23 août 2006 11:15:17 * @@ -43,14 +43,14 @@ public interface PopulationPrice { /** + * Compute price. * - * @param context + * @param context simulation context * @param group le groupe dont on souhaite le poids moyen * @return equation result + * @throws Exception */ @Args({"context", "group"}) public double compute(SimulationContext context, PopulationGroup group) throws Exception; } - - Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionEquation.java 2011-06-22 14:18:06 UTC (rev 3427) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionEquation.java 2011-06-22 14:47:43 UTC (rev 3428) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, 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 @@ -38,7 +38,7 @@ import fr.ifremer.isisfish.util.Args; /** - * PopulationReproductionEquation.java + * Population reproduction equation. * * Created: 23 août 2006 11:11:40 * @@ -51,9 +51,10 @@ public interface PopulationReproductionEquation { /** + * Compute reproduction equation. * - * @param context - * @param N Effectif courant de la population + * @param context simulation context + * @param N effectif courant de la population * @param pop population pour lequel on souhaite la matrice de reproduction * @param month le mois pour lequel on souhaite la matrice de reproduction * @param prepro le coefficient de reproduction de la population pour ce mois @@ -64,6 +65,7 @@ * d'un vecteur avec comme semantique la liste des zones de reproduction * @return la valeur retournée n'est pas utilisée, par exemple 'return 0;' * convient. + * @throws Exception */ @Args({"context", "N", "pop", "month", "prepro", "zoneRepro", "groups", "zones", "result"}) @ArgTypes({ @@ -82,5 +84,3 @@ MatrixND result) throws Exception; } - - Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionRateEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionRateEquation.java 2011-06-22 14:18:06 UTC (rev 3427) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionRateEquation.java 2011-06-22 14:47:43 UTC (rev 3428) @@ -45,13 +45,12 @@ /** * Compute reproduction rate. * - * @param context + * @param context simulation context * @param group le groupe dont on souhaite avoir le taux de reproduction * @return le taux de reproduction pour le groupe + * @throws Exception */ @Args({"context", "group"}) public double compute(SimulationContext context, PopulationGroup group) throws Exception; } - - Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SelectivityEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SelectivityEquation.java 2011-06-22 14:18:06 UTC (rev 3427) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SelectivityEquation.java 2011-06-22 14:47:43 UTC (rev 3428) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, 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 @@ -32,7 +32,7 @@ import fr.ifremer.isisfish.util.Args; /** - * SelectivityEquation.java + * Selectivity equation. * * Created: 23 août 2006 11:39:38 * @@ -45,17 +45,17 @@ public interface SelectivityEquation { /** + * Compute selectivity. * - * @param context - * @param pop La population pour lequel on souhaite la selectivite de l'engin + * @param context simulation context + * @param pop la population pour lequel on souhaite la selectivite de l'engin * @param group le group pour lequel on souhaite la selectivite de l'engin * @param metier le metier pour lequel on souhaite la selectivite de l'engin - * @return eqaution result + * @return equation result + * @throws Exception */ @Args({"context", "pop", "group", "metier"}) public double compute(SimulationContext context, Population pop, PopulationGroup group, Metier metier) throws Exception; } - - Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java 2011-06-22 14:18:06 UTC (rev 3427) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java 2011-06-22 14:47:43 UTC (rev 3428) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Benjamin Poussin, 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 @@ -31,7 +31,8 @@ import fr.ifremer.isisfish.util.Args; /** - * + * Set of vessel's technical efficiency equation. + * * @author poussin * @version $Revision$ * @@ -41,10 +42,13 @@ public interface SoVTechnicalEfficiencyEquation { /** - * @param context + * Compute technical efficiency. + * + * @param context simulation context * @param metier le metier pour lequel on demande le calcul * @param gear l'engin utilise par le metier * @return equation result + * @throws Exception */ @Args({"context", "metier", "gear"}) public double compute(SimulationContext context, Metier metier, Gear gear) throws Exception; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java 2011-06-22 14:18:06 UTC (rev 3427) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java 2011-06-22 14:47:43 UTC (rev 3428) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Benjamin Poussin, 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 @@ -31,7 +31,8 @@ import fr.ifremer.isisfish.util.Args; /** - * + * Strategy's inactivity equation. + * * @author poussin * @version $Revision$ * @@ -41,11 +42,13 @@ public interface StrategyInactivityEquation { /** + * Compute inactivity. * - * @param context + * @param context simulation context * @param month le mois courant de simulation * @param info l'objet associe a la strategie pour le mois courant * @return equation result + * @throws Exception */ @Args({"context", "month", "info"}) public double compute(SimulationContext context, Month month, StrategyMonthInfo info) throws Exception; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/TargetSpeciesTargetFactorEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/TargetSpeciesTargetFactorEquation.java 2011-06-22 14:18:06 UTC (rev 3427) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/TargetSpeciesTargetFactorEquation.java 2011-06-22 14:47:43 UTC (rev 3428) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, 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 @@ -32,7 +32,7 @@ import fr.ifremer.isisfish.util.Args; /** - * TargetSpeciesTargetFactorEquation.java + * Target species's target factor equation. * * Created: 23 août 2006 16:44:40 * @@ -45,13 +45,15 @@ public interface TargetSpeciesTargetFactorEquation { /** + * Compute target factor. * - * @param context + * @param context simulation context * @param group le group pour lequel on recherche le facteur de ciblage * @param species l'espece pour lequel on recherche le facteur de ciblage * @param infoMetier * @param primaryCatch * @return equation result + * @throws Exception */ @Args({"context", "group", "species", "infoMetier", "primaryCatch"}) public double compute(SimulationContext context, @@ -59,5 +61,3 @@ MetierSeasonInfo infoMetier, boolean primaryCatch) throws Exception; } - -

1 0

r3427 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation
by chatellier＠users.labs.libre-entreprise.org 22 Jun '11

22 Jun '11

Author: chatellier Date: 2011-06-22 14:18:06 +0000 (Wed, 22 Jun 2011) New Revision: 3427 Log: Add maturity ogive and reproduction rate equation Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionRateEquation.java Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java 2011-06-22 14:18:06 UTC (rev 3427) @@ -0,0 +1,52 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.equation; + +import fr.ifremer.isisfish.entities.PopulationGroup; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.util.Args; + +/** + * Population's maturity ogive equation. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public interface PopulationMaturityOgiveEquation { + + /** + * Compute maturity ogive. + * + * @param context simulation context + * @param group le groupe dont on souhaite avoir l'ogive de maturité + * @return l'ogive de maturite + */ + @Args({"context", "group"}) + public double compute(SimulationContext context, PopulationGroup group) throws Exception; +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionRateEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionRateEquation.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionRateEquation.java 2011-06-22 14:18:06 UTC (rev 3427) @@ -0,0 +1,57 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 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-2.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.equation; + +import fr.ifremer.isisfish.entities.PopulationGroup; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.util.Args; + +/** + * Population's reproduction rate equation. + * + * Created: 23 août 2006 11:11:40 + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public interface PopulationReproductionRateEquation { + + /** + * Compute reproduction rate. + * + * @param context + * @param group le groupe dont on souhaite avoir le taux de reproduction + * @return le taux de reproduction pour le groupe + */ + @Args({"context", "group"}) + public double compute(SimulationContext context, PopulationGroup group) throws Exception; + +} + + Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionRateEquation.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r3426 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 20 Jun '11

20 Jun '11

Author: chatellier Date: 2011-06-20 10:21:42 +0000 (Mon, 20 Jun 2011) New Revision: 3426 Log: Merge error : readd set property methods Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2011-06-17 15:04:17 UTC (rev 3425) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2011-06-20 10:21:42 UTC (rev 3426) @@ -531,6 +531,19 @@ public abstract boolean isLibDebugLevel(); /** + * Permet d'ajouter des parametres directement à partir de leur + * representation chaine. + * + * A ne pas utiliser normalement, sert uniquement dans les prescripts des + * simulation des AS. + * + * @param key key + * @param value value + * @since 3.4.0.0 + */ + public void setProperty(String key, String value); + + /** * A copy instance of SimulationParameter. * * Warning, this is not a deep copy, already instancied objects are Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java 2011-06-17 15:04:17 UTC (rev 3425) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java 2011-06-20 10:21:42 UTC (rev 3426) @@ -846,6 +846,15 @@ } /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#isLibDebugLevel() + */ + @Override + public void setProperty(String key, String value) { + SimulationParameter param = getParam(); + param.setProperty(key, value); + } + + /* * @see fr.ifremer.isisfish.simulator.SimulationParameter#copy() */ @Override Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2011-06-17 15:04:17 UTC (rev 3425) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2011-06-20 10:21:42 UTC (rev 3426) @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Properties; -import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -70,7 +69,6 @@ import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.rule.RuleHelper; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator; -import fr.ifremer.isisfish.util.ConverterUtil; /** * Real {@link SimulationParameter} implementation. @@ -84,7 +82,7 @@ public class SimulationParameterImpl implements SimulationParameter { /** Logger for this class. */ - private static Log log = LogFactory.getLog(SimulationParameter.class); + private static Log log = LogFactory.getLog(SimulationParameterImpl.class); /** Remember last read properties. */ protected Properties propertiesParameters; @@ -1276,6 +1274,22 @@ return "debug".equals(getLibLogLevel()); } + /** + * Permet d'ajouter des parametres directement à partir de leur + * representation chaine. + * + * A ne pas utiliser normalement, sert uniquement dans les prescripts des + * simulation des AS. + * + * @param key key + * @param value value + * @since 3.4.0.0 + */ + @Override + public void setProperty(String key, String value) { + propertiesParameters.setProperty(key, value); + } + /* * @see fr.ifremer.isisfish.simulator.SimulationParameter#copy() */

1 0

r3425 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 17 Jun '11

17 Jun '11

Author: chatellier Date: 2011-06-17 15:04:17 +0000 (Fri, 17 Jun 2011) New Revision: 3425 Log: Back to previous release Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2011-06-17 14:53:50 UTC (rev 3424) +++ isis-fish/trunk/pom.xml 2011-06-17 15:04:17 UTC (rev 3425) @@ -523,7 +523,7 @@ <topiaVersion>2.6-SNAPSHOT</topiaVersion> <nuitonUtilsVersion>2.2</nuitonUtilsVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> - <nuitonWidgetsVersion>1.1.2-SNAPSHOT</nuitonWidgetsVersion> + <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> <aspectwerkzVersion>2.0</aspectwerkzVersion> <!-- jnlp (disabled until retested)

1 0

r3424 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: . util
by chatellier＠users.labs.libre-entreprise.org 17 Jun '11

17 Jun '11

Author: chatellier Date: 2011-06-17 14:53:50 +0000 (Fri, 17 Jun 2011) New Revision: 3424 Log: Ajout de l'impl?\195?\169mentation du mapper de semantique utilis?\195?\169 lors de l'import des matrices ND Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-06-17 14:39:00 UTC (rev 3423) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-06-17 14:53:50 UTC (rev 3424) @@ -50,6 +50,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.ClassPathI18nInitializer; +import org.nuiton.math.matrix.MatrixFactory; import org.nuiton.topia.TopiaException; import org.nuiton.util.FileUtil; import org.nuiton.util.Version; @@ -69,6 +70,7 @@ import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.ui.WelcomeUI; import fr.ifremer.isisfish.ui.util.ErrorHelper; +import fr.ifremer.isisfish.util.IsisMatrixSemanticMapper; import fr.ifremer.isisfish.vcs.VCS; import fr.ifremer.isisfish.vcs.VCSActionEvent; import fr.ifremer.isisfish.vcs.VCSException; @@ -122,7 +124,7 @@ // initVCS ask for passphrase, ui must be set before initLookAndFeel(); - + // static vcs init (needed for some actions) try { initVCS(); @@ -131,10 +133,13 @@ log.warn(_("Error during vcs initialisation"), eee); } + // nuiton matrix semantics mapper + MatrixFactory.setSemanticMapper(new IsisMatrixSemanticMapper()); + if (log.isInfoEnabled()) { log.info(_("isisfish.launching", config.getElapsedTimeAsString())); } - + // after init vcs and local data config.doAction(IsisConfig.STEP_AFTER_INIT_VCS); @@ -142,7 +147,7 @@ // action after ui launched config.doAction(IsisConfig.STEP_AFTER_UI); - + startCronService(); } Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java 2011-06-17 14:53:50 UTC (rev 3424) @@ -0,0 +1,100 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.util; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.math.matrix.SemanticMapper; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaDAO; + +import fr.ifremer.isisfish.IsisFishDAOHelper; +import fr.ifremer.isisfish.simulator.SimulationContext; + +/** + * Implementation du mapper de semantique pour Isis pour que l'import/export + * des matrices en N dimensions de nuiton matrix fonctionne. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class IsisMatrixSemanticMapper extends SemanticMapper { + + /** Logger for this class. */ + private static Log log = LogFactory.getLog(IsisMatrixSemanticMapper.class); + + /** + * Return class for type identified by typeName. + * + * For example : "Population" can return "fr.ifremer.entities.Population.class" + * + * Return {@code String} by default. + * + * @param typeName type to get class. + * @return type for typeId + */ + public Class getType(String typeName) { + + // In simulation context : + Class clazz = null; + try { + clazz = Class.forName("fr.ifremer.isisfish.entities." + typeName); + } catch (Exception ex) { + log.warn("Can't find class for " + typeName, ex); + clazz = String.class; + } + return clazz; + } + + /** + * Return value identified by valueId and type {@code type}. + * + * Return {@code valueId} by default; + * + * @param type + * @param valueId + * @return value identified by {valueId} + */ + public Object getValue(Class type, String valueId) { + + // In simulation context : + Object value = null; + try { + TopiaContext context = SimulationContext.get().getDB(); + TopiaDAO dao = IsisFishDAOHelper.getDAO(context, type); + value = dao.findByProperty("name", valueId); + } catch (Exception ex) { + log.warn("Can't get value for " + valueId, ex); + value = valueId; + } + return value; + + //return valueId; + } +} \ No newline at end of file Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r3423 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: entities ui/input ui/input/renderer
by chatellier＠users.labs.libre-entreprise.org 17 Jun '11

17 Jun '11

Author: chatellier Date: 2011-06-17 14:39:00 +0000 (Fri, 17 Jun 2011) New Revision: 3423 Log: Simplification d'un toString pour que le nom de facteur soit moins ... hardcore. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/package-info.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/renderer/TripTypeListRenderer.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java 2011-06-17 14:23:45 UTC (rev 3422) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java 2011-06-17 14:39:00 UTC (rev 3423) @@ -66,8 +66,7 @@ */ @Override public String toString() { - String result = getName() + "(" + getTripDuration() + ":" - + getMinTimeBetweenTrip() + ")"; + String result = getName(); return result; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/package-info.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/package-info.java 2011-06-17 14:23:45 UTC (rev 3422) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/package-info.java 2011-06-17 14:39:00 UTC (rev 3423) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 1999 - 2010 CodeLutin + * Copyright (C) 1999 - 2011 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 @@ -24,6 +24,11 @@ */ /** * Entité metier d'IsisFish. + * + * Les {@code toString()} des entités doivent rester simple car ils sont + * utilisé comme nom par default lors de la mise en facteur. + * + * Pour le reste dans les UIs, utilisez des renderers specifiques. */ package fr.ifremer.isisfish.entities; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2011-06-17 14:23:45 UTC (rev 3422) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2011-06-17 14:39:00 UTC (rev 3423) @@ -110,6 +110,7 @@ <cell columns='2' fill='horizontal' weightx='1.0'> <JComboBox id="fieldStrategyMonthInfoTripType" onActionPerformed='getStrategyMonthInfo().setTripType((TripType)fieldStrategyMonthInfoTripType.getSelectedItem())' + renderer='{new fr.ifremer.isisfish.ui.input.renderer.TripTypeListRenderer(true)}' enabled='{isActive()}' decorator='boxed'/> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/renderer/TripTypeListRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/renderer/TripTypeListRenderer.java 2011-06-17 14:23:45 UTC (rev 3422) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/renderer/TripTypeListRenderer.java 2011-06-17 14:39:00 UTC (rev 3423) @@ -47,6 +47,17 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1113492654780402245L; + /** Append trip type details. */ + protected boolean appendDetails; + + public TripTypeListRenderer() { + this(false); + } + + public TripTypeListRenderer(boolean appendDetails) { + this.appendDetails = appendDetails; + } + /* * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) */ @@ -60,7 +71,12 @@ index, isSelected, cellHasFocus); TripType tripType = (TripType) value; - c.setText(tripType.getName()); + if (appendDetails) { + c.setText(tripType.getName() + "(" + tripType.getTripDuration() + ":" + + tripType.getMinTimeBetweenTrip() + ")"); + } else { + c.setText(tripType.getName()); + } return c; }

1 0

r3422 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 17 Jun '11

17 Jun '11

Author: chatellier Date: 2011-06-17 14:23:45 +0000 (Fri, 17 Jun 2011) New Revision: 3422 Log: Fix la mise en facteur des elements de type "TimeUnit" Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-06-17 13:57:16 UTC (rev 3421) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-06-17 14:23:45 UTC (rev 3422) @@ -72,6 +72,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.types.RangeOfValues; +import fr.ifremer.isisfish.types.TimeUnit; import fr.ifremer.isisfish.ui.SimulationUI; import fr.ifremer.isisfish.ui.input.InputAction; import fr.ifremer.isisfish.ui.input.InputContentUI; @@ -587,6 +588,8 @@ if (rangeOfValues.getType().equals("Float")) { result = true; } + } else if (value instanceof TimeUnit) { + result = true; } else if (value instanceof String) { // todo fix string value :( result = true; @@ -658,6 +661,12 @@ MatrixContinuousPanelUI matrixPanel = new MatrixContinuousPanelUI(); matrixPanel.init(matrix.clone(), matrix.clone(), matrix.clone(), null); result = matrixPanel; + } else if (value instanceof TimeUnit) { + TimeUnit timeUnit = (TimeUnit)value; + DefaultContinuousPanelUI ui = new DefaultContinuousPanelUI(); + ui.init(String.valueOf(timeUnit.getTime()), String.valueOf(timeUnit.getTime()), + String.valueOf(timeUnit.getTime()), null); + result = ui; } else { DefaultContinuousPanelUI ui = new DefaultContinuousPanelUI(); ui.init(String.valueOf(value), String.valueOf(value), String.valueOf(value), null); @@ -830,6 +839,10 @@ } // TODO path with no # (normalement pas possible pour les equations) } + else if (value instanceof TimeUnit) { + result = new JTextField(); + ((JTextField)result).setText(String.valueOf(((TimeUnit)value).getTime())); + } else if (value instanceof String) { // valeur nom typées ??? result = new JTextField(); @@ -877,6 +890,9 @@ } else if (value instanceof RangeOfValues) { RangeOfValues rangeOfValues = (RangeOfValues)value; result = new JTextField(rangeOfValues.getValues()); + } else if (value instanceof TimeUnit) { + TimeUnit timeUnit = (TimeUnit)value; + result = new JTextField(String.valueOf(timeUnit.getTime())); } else if (value instanceof Equation) { Equation equation = (Equation)value; // fill component

1 0

r3421 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 17 Jun '11

17 Jun '11

Author: chatellier Date: 2011-06-17 13:57:16 +0000 (Fri, 17 Jun 2011) New Revision: 3421 Log: Update changelog Modified: isis-fish/trunk/changelog.txt Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2011-06-17 13:55:14 UTC (rev 3420) +++ isis-fish/trunk/changelog.txt 2011-06-17 13:57:16 UTC (rev 3421) @@ -1,5 +1,6 @@ isis-fish (3.4.0.0) test; urgency=low + * Sensitivity calculator parameters are not lost anymore * Add new community repository with commit access for users * Remove maturity group unique constraints * Add view to test R configuration @@ -12,8 +13,8 @@ * Modify parameters interface to prepare factorizable values (population/rule) * Factor, DesignPlan, Scenario and Domain are no longer generics * Use new Jaxx tree api - * Update i18n to 2.3.1 - * Update to topia 2.5.3 + * Update i18n to 2.4 + * Update to topia 2.6 * Update to Jaxx 2.4 * Update to rSyntaxTextArea 1.5.0 * Update to svnkit 1.3.5

1 0