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

r3843 - branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs
by echatellier＠users.forge.codelutin.com 23 Nov '13

23 Nov '13

Author: echatellier Date: 2013-11-23 22:48:39 +0100 (Sat, 23 Nov 2013) New Revision: 3843 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3843 Log: Remove empty exception message constr Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSException.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSException.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSException.java 2013-11-22 17:52:48 UTC (rev 3842) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSException.java 2013-11-23 21:48:39 UTC (rev 3843) @@ -38,10 +38,6 @@ private static final long serialVersionUID = -2665066202505740998L; - public VCSException() { - super(); - } - public VCSException(String message) { super(message); } @@ -49,9 +45,4 @@ public VCSException(String message, Throwable cause) { super(message, cause); } - - public VCSException(Throwable cause) { - super(cause); - } - }

1 0

r3842 - in branches/4.0.1/src: main/java/fr/ifremer/isisfish/simulator/sensitivity main/java/fr/ifremer/isisfish/simulator/sensitivity/domain test/java/fr/ifremer/isisfish/simulator/sensitivity test/resources/test-database/sensitivityanalysis
by jcouteau＠users.forge.codelutin.com 22 Nov '13

22 Nov '13

Author: jcouteau Date: 2013-11-22 18:52:48 +0100 (Fri, 22 Nov 2013) New Revision: 3842 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3842 Log: refs #725 : Prise en compte de la distribution dans les AS Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Fast.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Morris.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/OptimumLHS.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RandomLHS.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RegularExpandGrid.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RegularFractions.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Sobol.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2013-11-22 15:31:45 UTC (rev 3841) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2013-11-22 17:52:48 UTC (rev 3842) @@ -31,6 +31,7 @@ import java.io.IOException; import java.util.Collection; import java.util.List; +import java.util.Map; import javax.swing.Box; import javax.swing.JLabel; @@ -39,6 +40,7 @@ import javax.swing.JTextPane; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.j2r.REngine; @@ -396,6 +398,44 @@ return result; } + protected String getIsisFactorDistribution(List<Factor> factors){ + String isisFactorDistribution = "isis.factor.distribution<-" + + "data.frame(NomFacteur=c(%s)," + + "NomDistribution=c(%s)," + + "ParametreDistribution=c(%s))"; + + // Creating the vectors. + String distribution = ""; + String parameters = ""; + String factorNames = ""; + + for (int i = 0; i < factors.size(); i++) { + Factor factor = factors.get(i); + ContinuousDomain domain = (ContinuousDomain)factor.getDomain(); + if (i != 0) { + distribution += ","; + parameters += ","; + factorNames += ","; + } + + Distribution r_distribution = domain.getDistribution(); + + distribution += "\""+ r_distribution.getInstruction() +"\""; + parameters += "\"["; + + for (Map.Entry<String,Object> param:domain.getDistributionParameters().entrySet()){ + parameters += param.getKey() + "=" + param.getValue() + ";"; + } + + parameters = StringUtils.removeEnd(parameters, ";"); + parameters += "]\""; + + factorNames += "\"" + factor.getName() + "\""; + } + + return String.format(isisFactorDistribution, factorNames, distribution, parameters); + } + /** * * @param value Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2013-11-22 15:31:45 UTC (rev 3841) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2013-11-22 17:52:48 UTC (rev 3842) @@ -35,6 +35,9 @@ import fr.ifremer.isisfish.simulator.sensitivity.Distribution.DistributionParam; import fr.ifremer.isisfish.simulator.sensitivity.Domain; import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor; +import jdistlib.Uniform; +import jdistlib.rng.QMersenneTwister; +import jdistlib.rng.QRandomEngine; /** * All the continuous domains are based on distribution definition. @@ -165,17 +168,8 @@ @Override public Object getValueForIdentifier(Object identifier) { - Double result = 0d; + Double result = Uniform.quantile((Double)identifier,0,1, true,false); - /*if (isPercentageType()) { - // since 3.4.0.0, operator is always * - result = ((Double)referenceValue + (((Double)referenceValue * coefficient) - * ((2 * (Double)identifier - 1)))); - } else { - result = ((Double)identifier * ((Double)maxBound - (Double)minBound)) - + (Double)minBound; - }*/ - return result; } Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java 2013-11-22 15:31:45 UTC (rev 3841) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java 2013-11-22 17:52:48 UTC (rev 3842) @@ -27,6 +27,8 @@ import java.io.File; import java.io.IOException; +import fr.ifremer.isisfish.IsisFish; +import jdistlib.Uniform; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -97,6 +99,7 @@ protected Factor getContinuousDoubleUniformMMFactor() { // factor 1, min/max on int Factor factor1 = new Factor("test unifmm"); + factor1.setCardinality(2); ContinuousDomain domain1 = new ContinuousDomain(Distribution.QUNIFMM); domain1.addDistributionParam("min", 0.0); domain1.addDistributionParam("max", 2.0); @@ -108,6 +111,7 @@ protected Factor getContinuousDoubleUniformPcFactor() { // factor 1, min/max on int Factor factor2 = new Factor("test unifpc"); + factor2.setCardinality(2); ContinuousDomain domain2 = new ContinuousDomain(Distribution.QUNIFPC); domain2.addDistributionParam("reference", 40.0); domain2.addDistributionParam("coefficient", 0.05); @@ -195,12 +199,22 @@ // uniform min/max DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); - Assert.assertEquals(3, scenarii.getScenarios().size()); - + Assert.assertEquals(9, scenarii.getScenarios().size()); + // uniform pc designPlan = getDesignPlan(getContinuousDoubleUniformPcFactor(), getContinuousDoubleUniformPcFactor()); scenarii = script.compute(designPlan, simulationsDir); - Assert.assertEquals(3, scenarii.getScenarios().size()); + Assert.assertEquals(9, scenarii.getScenarios().size()); + + // check fail is discrete + designPlan = getDesignPlan(getDiscreteIntFactor(),getContinuousDoubleUniformMMFactor()); + try { + script.compute(designPlan, simulationsDir); + Assert.fail("Exception should have been thrown at this stage"); + } catch (SensitivityException eee){ + //do nothing + } + } /** @@ -230,8 +244,24 @@ SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("Fast").getNewSensitivityAnalysisInstance(); Assert.assertNotNull("Fast script not found in test data", script); + // uniform min/max DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); + Assert.assertEquals(40, scenarii.getScenarios().size()); + + // uniform pc + designPlan = getDesignPlan(getContinuousDoubleUniformPcFactor(), getContinuousDoubleUniformPcFactor()); + scenarii = script.compute(designPlan, simulationsDir); + Assert.assertEquals(40, scenarii.getScenarios().size()); + + // check fail is discrete + designPlan = getDesignPlan(getDiscreteIntFactor(),getContinuousDoubleUniformMMFactor()); + try { + script.compute(designPlan, simulationsDir); + Assert.fail("Exception should have been thrown at this stage"); + } catch (SensitivityException eee){ + //do nothing + } } @@ -246,8 +276,24 @@ SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("OptimumLHS").getNewSensitivityAnalysisInstance(); Assert.assertNotNull("OptimumLHS script not found in test data", script); + // uniform min/max DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); + Assert.assertEquals(10, scenarii.getScenarios().size()); + + // uniform pc + designPlan = getDesignPlan(getContinuousDoubleUniformPcFactor(), getContinuousDoubleUniformPcFactor()); + scenarii = script.compute(designPlan, simulationsDir); + Assert.assertEquals(10, scenarii.getScenarios().size()); + + // check fail is discrete + designPlan = getDesignPlan(getDiscreteIntFactor(),getContinuousDoubleUniformMMFactor()); + try { + script.compute(designPlan, simulationsDir); + Assert.fail("Exception should have been thrown at this stage"); + } catch (SensitivityException eee){ + //do nothing + } } @@ -262,8 +308,24 @@ SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("RandomLHS").getNewSensitivityAnalysisInstance(); Assert.assertNotNull("RandomLHS script not found in test data", script); + // uniform min/max DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); + Assert.assertEquals(10, scenarii.getScenarios().size()); + + // uniform pc + designPlan = getDesignPlan(getContinuousDoubleUniformPcFactor(), getContinuousDoubleUniformPcFactor()); + scenarii = script.compute(designPlan, simulationsDir); + Assert.assertEquals(10, scenarii.getScenarios().size()); + + // check fail is discrete + designPlan = getDesignPlan(getDiscreteIntFactor(),getContinuousDoubleUniformMMFactor()); + try { + script.compute(designPlan, simulationsDir); + Assert.fail("Exception should have been thrown at this stage"); + } catch (SensitivityException eee){ + //do nothing + } } @@ -292,10 +354,13 @@ @Test public void testRegularFractions() throws IsisFishException, SensitivityException { SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("RegularFractions").getNewSensitivityAnalysisInstance(); + SensitivityAnalysisStorage.setParameterValue(script,"pathToFunction", IsisFish.config.getDatabaseDirectory().getAbsolutePath() + "/sensitivityanalysis"); Assert.assertNotNull("RegularFractions script not found in test data", script); DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); + + System.out.println(); } @@ -320,5 +385,14 @@ scenarii = script.compute(designPlan, simulationsDir); Assert.assertEquals(80, scenarii.getScenarios().size()); + // check fail is discrete + designPlan = getDesignPlan(getDiscreteIntFactor(),getContinuousDoubleUniformMMFactor()); + try { + script.compute(designPlan, simulationsDir); + Assert.fail("Exception should have been thrown at this stage"); + } catch (SensitivityException eee){ + //do nothing + } + } } Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Fast.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Fast.java 2013-11-22 15:31:45 UTC (rev 3841) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Fast.java 2013-11-22 17:52:48 UTC (rev 3842) @@ -24,8 +24,10 @@ import java.io.File; import java.util.List; +import java.util.Map; import fr.ifremer.isisfish.simulator.sensitivity.*; +import org.apache.commons.lang3.StringUtils; import org.nuiton.j2r.REngine; import org.nuiton.j2r.RException; import org.nuiton.j2r.RProxy; @@ -138,33 +140,8 @@ nbExperiments = (Integer)engine.eval("dim(a$X)[1]"); - String factorDistribution = "isis.factor.distribution<-data.frame(" + - "NomFacteur=c(%s)," + - "NomDistribution=c(%s)," + - "ParametreDistribution=c(%s))"; + engine.voidEval(getIsisFactorDistribution(factors)); - // Creating the vectors. - String distribution = ""; - String parameters = ""; - String factorNames = ""; - - for (int i = 0; i < factorNumber; i++) { - Factor factor = factors.get(i); - ContinuousDomain domain = (ContinuousDomain) factor.getDomain(); - if (i != 0) { - distribution += ","; - parameters += ","; - factorNames += ","; - } - - distribution += "\"qunif\""; -// parameters += "\"[" + domain.getMinBound() + ";" + -// domain.getMaxBound() + "]\""; - factorNames += "\"" + factor.getName() + "\""; - } - engine.voidEval(String.format(factorDistribution, factorNames, - distribution, parameters)); - engine.voidEval("call<-a$call"); @@ -192,18 +169,7 @@ Scenario experimentScenario = new Scenario(); for (int i = 0; i < factorNumber; i++) { Factor factor = plan.getFactors().get(i); - Domain domain = factor.getDomain(); -// if ((domain instanceof MatrixContinuousDomain) -// || (domain instanceof EquationContinuousDomain)) { -// factor.setValueForIdentifier(dataFrame.get(i,j)); -// } else { -// ContinuousDomain continuousDomain = (ContinuousDomain)domain; -// Double min = continuousDomain.getCalculatorMinBound(); -// Double max = continuousDomain.getCalculatorMaxBound(); -// Double dFValue = (Double)dataFrame.get(i,j); -// Double value = min + (max - min) * dFValue; -// factor.setValueForIdentifier(value); -// } + factor.setValueForIdentifier(dataFrame.get(i,j)); experimentScenario.addFactor(factor); } thisExperimentScenarios.add(experimentScenario); Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Morris.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Morris.java 2013-11-22 15:31:45 UTC (rev 3841) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Morris.java 2013-11-22 17:52:48 UTC (rev 3842) @@ -108,8 +108,8 @@ gridJump += factor.getCardinality() / 2; - binf+= getMinBound(factor); - bsup+= getMaxBound(factor); + binf += 0; + bsup += 1; } String rInstruction = "a<-morris(model=NULL,factors=c(%s),r=%s," + Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/OptimumLHS.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/OptimumLHS.java 2013-11-22 15:31:45 UTC (rev 3841) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/OptimumLHS.java 2013-11-22 17:52:48 UTC (rev 3842) @@ -126,34 +126,7 @@ thisExperiment.setScenarios(thisExperimentScenarios); } - String isisFactorDistribution = "isis.factor.distribution<-" + - "data.frame(" + - "NomFacteur=c(%s)," + - "NomDistribution=c(%s)," + - "ParametreDistribution=c(%s))"; - - String distribution = ""; - String parameters = ""; - String factorNames = ""; - - for (int i = 0; i < factors.size(); i++) { - Factor tempFactor = factors.get(i); - ContinuousDomain domain = (ContinuousDomain) tempFactor.getDomain(); - if (i != 0) { - distribution += ","; - factorNames += ","; - parameters += ","; - } - - factorNames += "\"" + factors.get(i).getName() + "\""; - distribution += "\"qunif\""; - //add [min;max] to parameters -// parameters += "\"[" + domain.getMinBound() + ";" + -// domain.getMaxBound() + "]\""; - } - - engine.voidEval(String.format(isisFactorDistribution, factorNames, - distribution, parameters)); + engine.voidEval(getIsisFactorDistribution(factors)); engine.voidEval("call<-" + "\"x<-optimumLHS(" + "n=" + param_simulationNumber Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RandomLHS.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RandomLHS.java 2013-11-22 15:31:45 UTC (rev 3841) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RandomLHS.java 2013-11-22 17:52:48 UTC (rev 3842) @@ -122,35 +122,8 @@ thisExperiment.setScenarios(thisExperimentScenarios); } - String isisFactorDistribution = "isis.factor.distribution<-" + - "data.frame(" + - "NomFacteur=c(%s)," + - "NomDistribution=c(%s)," + - "ParametreDistribution=c(%s))"; + engine.voidEval(getIsisFactorDistribution(factors)); - String distribution = ""; - String parameters = ""; - String factorNames = ""; - - - //Create the strings for the isis.MethodExp instruction - for (int i = 0; i < factors.size(); i++) { - ContinuousDomain domain = (ContinuousDomain)factors.get(i).getDomain(); - if (i != 0) { - distribution += ","; //the distribution - factorNames += ","; //the factor names - parameters += ","; //the parameters - } - - factorNames += "\"" + factors.get(i).getName() + "\""; - distribution += "\"qunif\""; //all distributions are qunif -// double min = domain.getCalculatorMinBound(); -// double max = domain.getCalculatorMaxBound(); -// parameters += "\"[" + min + ";" + max + "]\""; - } - engine.voidEval(String.format(isisFactorDistribution, factorNames, - distribution, parameters)); - engine.voidEval("call<-" + "\"x<-randomLHS(" + param_simulationNumber + "," + factorNumber + ")\""); Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RegularExpandGrid.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RegularExpandGrid.java 2013-11-22 15:31:45 UTC (rev 3841) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RegularExpandGrid.java 2013-11-22 17:52:48 UTC (rev 3842) @@ -100,8 +100,8 @@ Domain domain = factor.getDomain(); if (domain instanceof ContinuousDomain) { - ContinuousDomain contDomain = (ContinuousDomain) domain; - int card = factor.getCardinality(); +// ContinuousDomain contDomain = (ContinuousDomain) domain; +// int card = factor.getCardinality(); // Double min = contDomain.getCalculatorMinBound(); // Double max = contDomain.getCalculatorMaxBound(); // Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RegularFractions.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RegularFractions.java 2013-11-22 15:31:45 UTC (rev 3841) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/RegularFractions.java 2013-11-22 17:52:48 UTC (rev 3842) @@ -91,7 +91,6 @@ //Create a string with all factors names for (int i = 0; i < factorNumber; i++) { - Domain domain = factors.get(i).getDomain(); if (i != 0) { factorNames += ","; } @@ -151,18 +150,7 @@ Scenario experimentScenario = new Scenario(); for (int i = 0; i < factors.size(); i++) { Factor factor = plan.getFactors().get(i); - Domain domain = factor.getDomain(); - Double dFValue = (Double)dataFrame.get(i,j); -// if ((domain instanceof MatrixContinuousDomain) -// || (domain instanceof EquationContinuousDomain)) { -// factor.setValueForIdentifier(dFValue); -// } else { -// ContinuousDomain contDomain = (ContinuousDomain)domain; -// Double max = contDomain.getCalculatorMaxBound(); -// Double min = contDomain.getCalculatorMinBound(); -// Double value = min + (max - min) * dFValue / (param_p - 1); -// factor.setValueForIdentifier(value); -// } + factor.setValueForIdentifier(dataFrame.get(i,j)); experimentScenario.addFactor(factor); } thisExperimentScenarios.add(experimentScenario); @@ -201,7 +189,7 @@ } engine.voidEval(dataframe); - engine.voidEval("isis.factor.distribution<-c(0.0)"); + engine.voidEval(getIsisFactorDistribution(factors)); engine.voidEval("isis.MethodExp<-list(" + "\"isis.factors\"=isis.factors," + Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Sobol.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Sobol.java 2013-11-22 15:31:45 UTC (rev 3841) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Sobol.java 2013-11-22 17:52:48 UTC (rev 3842) @@ -106,20 +106,7 @@ String x = "<-data.frame(matrix(c("; for (int i = 0; i < factorNumber; i++) { - Factor factor = factors.get(i); - ContinuousDomain domain = (ContinuousDomain)factor.getDomain(); - - Distribution r_distribution = domain.getDistribution(); - - x += r_distribution.getInstruction() +"("+param_n+","; - - for (Map.Entry<String,Object> param:domain.getDistributionParameters().entrySet()){ - x += param.getKey() + "=" + param.getValue() + ","; - } - - x = StringUtils.removeEnd(x, ","); - - x+= "),"; + x += "runif("+param_n+"),"; } x = StringUtils.removeEnd(x, ","); @@ -152,43 +139,8 @@ nbExperiments = dataFrame.dim()[0]; - String isisFactorDistribution = "isis.factor.distribution<-" + - "data.frame(NomFacteur=c(%s)," + - "NomDistribution=c(%s)," + - "ParametreDistribution=c(%s))"; + engine.voidEval(getIsisFactorDistribution(factors)); - // Creating the vectors. - String distribution = ""; - String parameters = ""; - String factorNames = ""; - - for (int i = 0; i < factorNumber; i++) { - Factor factor = factors.get(i); - ContinuousDomain domain = (ContinuousDomain)factor.getDomain(); - if (i != 0) { - distribution += ","; - parameters += ","; - factorNames += ","; - } - - Distribution r_distribution = domain.getDistribution(); - - distribution += "\""+ r_distribution.getInstruction() +"\""; - parameters += "\"["; - - for (Map.Entry<String,Object> param:domain.getDistributionParameters().entrySet()){ - parameters += param.getKey() + "=" + param.getValue() + ";"; - } - - parameters = StringUtils.removeEnd(parameters, ";"); - parameters += "]\""; - - factorNames += "\"" + factor.getName() + "\""; - } - - engine.voidEval(String.format(isisFactorDistribution, factorNames, - distribution, parameters)); - engine.voidEval("call<-a$call"); engine.voidEval("isis.MethodExp<-list(" +

1 0

r3841 - branches/4.0.1
by echatellier＠users.forge.codelutin.com 22 Nov '13

22 Nov '13

Author: echatellier Date: 2013-11-22 16:31:45 +0100 (Fri, 22 Nov 2013) New Revision: 3841 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3841 Log: Add jdistlib Modified: branches/4.0.1/pom.xml Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2013-11-21 21:33:33 UTC (rev 3840) +++ branches/4.0.1/pom.xml 2013-11-22 15:31:45 UTC (rev 3841) @@ -308,6 +308,12 @@ <version>1.7.4</version> </dependency> + <dependency> + <groupId>net.sourceforge</groupId> + <artifactId>jdistlib</artifactId> + <version>0.0.7</version> + </dependency> +  <dependency> <groupId>ssj</groupId>

1 0

r3840 - in branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity: . domain
by echatellier＠users.forge.codelutin.com 21 Nov '13

21 Nov '13

Author: echatellier Date: 2013-11-21 22:33:33 +0100 (Thu, 21 Nov 2013) New Revision: 3840 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3840 Log: Uncomment setValueForIdentifier to fix compilation Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2013-11-21 21:33:12 UTC (rev 3839) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2013-11-21 21:33:33 UTC (rev 3840) @@ -52,13 +52,13 @@ */ public interface Domain extends Serializable, Cloneable { - /* + /** * Return value associated to identifier. * * @param identifier * @return found value or <tt>null</tt> if not found - * - Object getValueForIdentifier(Object identifier);*/ + */ + Object getValueForIdentifier(Object identifier); /** * Accept a new visitor. Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2013-11-21 21:33:12 UTC (rev 3839) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2013-11-21 21:33:33 UTC (rev 3840) @@ -200,15 +200,15 @@ this.value = value; } - /* + /** * Set value for label. * * @param valueIdentifier new value identifier to get - * + */ public void setValueForIdentifier(Object valueIdentifier) { identifier = valueIdentifier; value = domain.getValueForIdentifier(valueIdentifier); - }*/ + } /** * Get path. Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2013-11-21 21:33:12 UTC (rev 3839) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2013-11-21 21:33:33 UTC (rev 3840) @@ -286,18 +286,18 @@ return "FactorGroup(" + name + ")"; } - /* + /** * Set value for label. * * @param valueIdentifier new value identifier to get - * + */ @Override public void setValueForIdentifier(Object valueIdentifier) { identifier = valueIdentifier; for (Factor factor : factors) { factor.setValueForIdentifier(valueIdentifier); } - }*/ + } /** * Get the factor value for displaying (for example in R). Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2013-11-21 21:33:12 UTC (rev 3839) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2013-11-21 21:33:33 UTC (rev 3840) @@ -162,22 +162,22 @@ distributionParameters.put(name, value); } - /*@Override + @Override public Object getValueForIdentifier(Object identifier) { Double result = 0d; - if (isPercentageType()) { + /*if (isPercentageType()) { // since 3.4.0.0, operator is always * result = ((Double)referenceValue + (((Double)referenceValue * coefficient) * ((2 * (Double)identifier - 1)))); } else { result = ((Double)identifier * ((Double)maxBound - (Double)minBound)) + (Double)minBound; - } + }*/ return result; - }*/ + } /** * Accept a new visitor. Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2013-11-21 21:33:12 UTC (rev 3839) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2013-11-21 21:33:33 UTC (rev 3840) @@ -98,11 +98,11 @@ return values.size(); } - /* + /** * {@inheritDoc}. * * @throws IllegalArgumentException if identifier is not a valid key - * + */ public Object getValueForIdentifier(Object identifier) throws IllegalArgumentException { @@ -112,7 +112,7 @@ } return values.get(identifier); - }*/ + } /** * Accept a new visitor.

1 0

r3839 - branches/4.0.1/src/test/resources/test-database/sensitivityanalysis
by echatellier＠users.forge.codelutin.com 21 Nov '13

21 Nov '13

Author: echatellier Date: 2013-11-21 22:33:12 +0100 (Thu, 21 Nov 2013) New Revision: 3839 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3839 Log: Manage uniform distributions (MM et PC) Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Morris.java Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Morris.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Morris.java 2013-11-21 21:15:38 UTC (rev 3838) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/Morris.java 2013-11-21 21:33:12 UTC (rev 3839) @@ -94,7 +94,6 @@ String bsup = ""; for (int i = 0; i < factorNumber; i++) { Factor factor = factors.get(i); - ContinuousDomain domain = (ContinuousDomain) factor.getDomain(); if (i != 0) { factorNames += ","; levels += ","; @@ -109,10 +108,8 @@ gridJump += factor.getCardinality() / 2; - //binf += domain.getCalculatorMinBound(); - binf+=0; - bsup+=0; - //bsup += domain.getCalculatorMaxBound(); + binf+= getMinBound(factor); + bsup+= getMaxBound(factor); } String rInstruction = "a<-morris(model=NULL,factors=c(%s),r=%s," +

1 0

r3838 - branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity
by echatellier＠users.forge.codelutin.com 21 Nov '13

21 Nov '13

Author: echatellier Date: 2013-11-21 22:15:38 +0100 (Thu, 21 Nov 2013) New Revision: 3838 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3838 Log: Refactor test to allow better factor composition Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java 2013-11-18 09:38:27 UTC (rev 3837) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisTest.java 2013-11-21 21:15:38 UTC (rev 3838) @@ -78,55 +78,45 @@ simulationsDir = FileUtil.getTempDir("simulations"); } - /** - * Build a test design plan with continuous factors unsing uniform distribution. - * - * @return test design plan - */ - protected DesignPlan getPlanUniformDistrib() { - + protected DesignPlan getDesignPlan(Factor... factors) { DesignPlan result = new DesignPlan(); + for (Factor factor : factors) { + result.addFactor(factor); + } + return result; + } + protected FactorGroup getFactorGroup(String name, boolean continuous, Factor... factors) { + FactorGroup result = new FactorGroup(name, continuous); + for (Factor factor : factors) { + result.addFactor(factor); + } + return result; + } + + protected Factor getContinuousDoubleUniformMMFactor() { // factor 1, min/max on int - Factor factor1 = new Factor("testint"); + Factor factor1 = new Factor("test unifmm"); ContinuousDomain domain1 = new ContinuousDomain(Distribution.QUNIFMM); domain1.addDistributionParam("min", 0.0); domain1.addDistributionParam("max", 2.0); factor1.setDomain(domain1); factor1.setPath("org.nuiton.factor#1234567890#0.12242345354#name"); - result.addFactor(factor1); + return factor1; + } + protected Factor getContinuousDoubleUniformPcFactor() { // factor 1, min/max on int - Factor factor2 = new Factor("testint 2"); - ContinuousDomain domain2 = new ContinuousDomain(Distribution.QUNIFMM); - domain2.addDistributionParam("min", 40.0); - domain2.addDistributionParam("max", 50.0); + Factor factor2 = new Factor("test unifpc"); + ContinuousDomain domain2 = new ContinuousDomain(Distribution.QUNIFPC); + domain2.addDistributionParam("reference", 40.0); + domain2.addDistributionParam("coefficient", 0.05); factor2.setDomain(domain2); factor2.setPath("org.nuiton.factor#1234567890#0.12242345354#name"); - result.addFactor(factor2); - - return result; + return factor2; } - - /** - * Build a test design plan with continuous factors uning uniform distribution - * and matrix. - * - * @return test design plan - */ - protected DesignPlan getPlanUniformDistribMatrix() { - - DesignPlan result = new DesignPlan(); - // factor 1, min/max on int - Factor factor1 = new Factor("testint"); - ContinuousDomain domain1 = new ContinuousDomain(Distribution.QUNIFMM); - domain1.addDistributionParam("min", 0.0); - domain1.addDistributionParam("max", 2.0); - factor1.setDomain(domain1); - factor1.setPath("org.nuiton.factor#1234567890#0.12242345354#name"); - result.addFactor(factor1); - + protected Factor getContinuousMatrixUniformMMFactor() { // matrix 1 MatrixND matrix1 = MatrixFactory.getInstance().create("test1", new int[] { 3, 2 }, new String[] { "col1", "col2" }); @@ -138,112 +128,47 @@ matrix1.setValue(new int[] { 2, 1 }, -1); // factor - Factor factor2 = new Factor("testmatrix"); + Factor factor2 = new Factor("tes tmatrix unifpc"); ContinuousDomain domain2 = new ContinuousDomain(Distribution.QUNIFPC); domain2.addDistributionParam("reference", matrix1); domain2.addDistributionParam("coefficient", 0.1); factor2.setDomain(domain2); factor2.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); - result.addFactor(factor2); - - return result; + return factor2; } - - /** - * Build a test design plan with continuous factors uning uniform distribution - * and matrix. - * - * @return test design plan - */ - protected DesignPlan getPlanNormCauchyDistribMatrix() { - - DesignPlan result = new DesignPlan(); - + + protected Factor getContinuousDoubleCauchyFactor() { // factor 1, min/max on int - Factor factor1 = new Factor("testint"); - ContinuousDomain domain1 = new ContinuousDomain(Distribution.DCHISQ); - domain1.addDistributionParam("df", 1.0); - domain1.addDistributionParam("ncp", 3.0); - factor1.setDomain(domain1); - factor1.setPath("org.nuiton.factor#1234567890#0.12242345354#name"); - result.addFactor(factor1); - - // matrix 1 - MatrixND matrix1 = MatrixFactory.getInstance().create("test1", - new int[] { 3, 2 }, new String[] { "col1", "col2" }); - matrix1.setValue(new int[] { 0, 0 }, 1); - matrix1.setValue(new int[] { 0, 1 }, -14); - matrix1.setValue(new int[] { 1, 0 }, 21); - matrix1.setValue(new int[] { 1, 1 }, 2); - matrix1.setValue(new int[] { 2, 0 }, 3); - matrix1.setValue(new int[] { 2, 1 }, -1); - - // factor - Factor factor2 = new Factor("testmatrix"); - ContinuousDomain domain2 = new ContinuousDomain(Distribution.QUNIFMM); - domain2.addDistributionParam("min", matrix1); - domain2.addDistributionParam("max", matrix1); - factor2.setDomain(domain2); - factor2.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); - result.addFactor(factor2); - - return result; - } - - /** - * Build a test design plan with only continuous factors. - * - * @return test design plan - */ - protected DesignPlan getPlanNormCauchyDistrib() { - - DesignPlan result = new DesignPlan(); - - // factor 1, min/max on int - Factor factor1 = new Factor("lnorm"); - ContinuousDomain domain1 = new ContinuousDomain(Distribution.DLNORM); - domain1.addDistributionParam("meanlog", 0.0); - domain1.addDistributionParam("sdlog", 1.0); - factor1.setDomain(domain1); - factor1.setPath("org.nuiton.factor#1234567890#0.12242345354#name"); - result.addFactor(factor1); - - // factor 1, min/max on int - Factor factor2 = new Factor("cauchy"); + Factor factor2 = new Factor("test cauchy"); ContinuousDomain domain2 = new ContinuousDomain(Distribution.DCAUCHY); domain2.addDistributionParam("location", 0.0); domain2.addDistributionParam("scale", 1.0); factor2.setDomain(domain2); factor2.setPath("org.nuiton.factor#1234567890#0.12242345354#name"); - result.addFactor(factor2); - - return result; + return factor2; } - - protected DesignPlan getPlanDiscreteInt() { - DesignPlan result = new DesignPlan(); - + protected Factor getContinuousDoubleChisqFactor() { // factor 1, min/max on int - Factor factor1 = new Factor("lnorm"); - DiscreteDomain domain1 = new DiscreteDomain(); - Map<Object> obj = new Hash - domain1.setValues(values); - domain1.addDistributionParam("sdlog", 1.0); + Factor factor1 = new Factor("test dchisq"); + ContinuousDomain domain1 = new ContinuousDomain(Distribution.DCHISQ); + domain1.addDistributionParam("df", 1.0); + domain1.addDistributionParam("ncp", 3.0); factor1.setDomain(domain1); factor1.setPath("org.nuiton.factor#1234567890#0.12242345354#name"); - result.addFactor(factor1); + return factor1; + } + protected Factor getDiscreteIntFactor() { // factor 1, min/max on int - Factor factor2 = new Factor("cauchy"); - ContinuousDomain domain2 = new ContinuousDomain(Distribution.DCAUCHY); - domain2.addDistributionParam("location", 0.0); - domain2.addDistributionParam("scale", 1.0); - factor2.setDomain(domain2); - factor2.setPath("org.nuiton.factor#1234567890#0.12242345354#name"); - result.addFactor(factor2); - - return result; + Factor factor1 = new Factor("test int"); + DiscreteDomain domain1 = new DiscreteDomain(); + domain1.getValues().put("1", 42.0); + domain1.getValues().put("2", 43.0); + domain1.getValues().put("3", 44.0); + factor1.setDomain(domain1); + factor1.setPath("org.nuiton.factor#1234567890#0.12242345354#name"); + return factor1; } /** @@ -263,30 +188,21 @@ * @throws SensitivityException */ @Test - public void testMorrisUniform() throws IsisFishException, SensitivityException { + public void testMorris() throws IsisFishException, SensitivityException { SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("Morris").getNewSensitivityAnalysisInstance(); Assert.assertNotNull("Morris script not found in test data", script); - DesignPlan designPlan = getPlanUniformDistrib(); + // uniform min/max + DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); Assert.assertEquals(3, scenarii.getScenarios().size()); + + // uniform pc + designPlan = getDesignPlan(getContinuousDoubleUniformPcFactor(), getContinuousDoubleUniformPcFactor()); + scenarii = script.compute(designPlan, simulationsDir); + Assert.assertEquals(3, scenarii.getScenarios().size()); } - - /** - * Test de génération des scenarios via la methode Morris. - * - * @throws IsisFishException - * @throws SensitivityException - */ - @Test(expected=SensitivityException.class) - public void testMorrisNorm() throws IsisFishException, SensitivityException { - SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("Morris").getNewSensitivityAnalysisInstance(); - Assert.assertNotNull("Morris script not found in test data", script); - DesignPlan designPlan = getPlanNormCauchyDistrib(); - script.compute(designPlan, simulationsDir); - } - /** * Test de génération des scenarios via la methode DOptimal. * @@ -298,7 +214,7 @@ SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("DOptimal").getNewSensitivityAnalysisInstance(); Assert.assertNotNull("DOptimal script not found in test data", script); - DesignPlan designPlan = getPlanUniformDistrib(); + DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); } @@ -314,7 +230,7 @@ SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("Fast").getNewSensitivityAnalysisInstance(); Assert.assertNotNull("Fast script not found in test data", script); - DesignPlan designPlan = getPlanUniformDistrib(); + DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); } @@ -330,7 +246,7 @@ SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("OptimumLHS").getNewSensitivityAnalysisInstance(); Assert.assertNotNull("OptimumLHS script not found in test data", script); - DesignPlan designPlan = getPlanUniformDistrib(); + DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); } @@ -346,7 +262,7 @@ SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("RandomLHS").getNewSensitivityAnalysisInstance(); Assert.assertNotNull("RandomLHS script not found in test data", script); - DesignPlan designPlan = getPlanUniformDistrib(); + DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); } @@ -362,7 +278,7 @@ SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("RegularExpandGrid").getNewSensitivityAnalysisInstance(); Assert.assertNotNull("RegularExpandGrid script not found in test data", script); - DesignPlan designPlan = getPlanUniformDistrib(); + DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); } @@ -378,7 +294,7 @@ SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("RegularFractions").getNewSensitivityAnalysisInstance(); Assert.assertNotNull("RegularFractions script not found in test data", script); - DesignPlan designPlan = getPlanUniformDistrib(); + DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); } @@ -394,14 +310,14 @@ SensitivityAnalysis script = SensitivityAnalysisStorage.getSensitivityAnalysis("Sobol").getNewSensitivityAnalysisInstance(); Assert.assertNotNull("Sobol script not found in test data", script); - DesignPlan designPlan = getPlanUniformDistrib(); + // sobol avec uniform MM + DesignPlan designPlan = getDesignPlan(getContinuousDoubleUniformMMFactor(), getContinuousDoubleUniformMMFactor()); SensitivityScenarios scenarii = script.compute(designPlan, simulationsDir); - Assert.assertEquals(80, scenarii.getScenarios().size()); - designPlan = getPlanNormCauchyDistrib(); + // sobol avec cauchy/chisq + designPlan = getDesignPlan(getContinuousDoubleCauchyFactor(), getContinuousDoubleChisqFactor()); scenarii = script.compute(designPlan, simulationsDir); - Assert.assertEquals(80, scenarii.getScenarios().size()); }

1 0

r3837 - trunk/src/main/java/fr/ifremer/isisfish
by echatellier＠users.forge.codelutin.com 18 Nov '13

18 Nov '13

Author: echatellier Date: 2013-11-18 10:38:27 +0100 (Mon, 18 Nov 2013) New Revision: 3837 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3837 Log: Update version Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2013-11-18 09:37:32 UTC (rev 3836) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2013-11-18 09:38:27 UTC (rev 3837) @@ -115,7 +115,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(4, 2, 1, 1); + protected final static Version version = new Version(4, 2, 1, 2); protected final static Version majorVersion = new Version(version.getNumber(0)); protected final static Version databaseVersion = new Version(

1 0

r3836 - trunk/src/main/java/fr/ifremer/isisfish/equation
by echatellier＠users.forge.codelutin.com 18 Nov '13

18 Nov '13

Author: echatellier Date: 2013-11-18 10:37:32 +0100 (Mon, 18 Nov 2013) New Revision: 3836 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3836 Log: Fix doc Modified: trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java Modified: trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java 2013-11-18 09:37:20 UTC (rev 3835) +++ trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java 2013-11-18 09:37:32 UTC (rev 3836) @@ -43,7 +43,7 @@ public interface PopulationGrowth { /** - * Compute groth equation. + * Compute growth equation. * * @param context simulation context * @param age l'age du groupe en mois

1 0

r3835 - trunk/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com 18 Nov '13

18 Nov '13

Author: echatellier Date: 2013-11-18 10:37:20 +0100 (Mon, 18 Nov 2013) New Revision: 3835 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3835 Log: Regenerate i18n Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2013-11-18 09:37:02 UTC (rev 3834) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2013-11-18 09:37:20 UTC (rev 3835) @@ -1,3 +1,4 @@ += Add\ to\ default\ queue= Analyse\ plan\ error,\ too\ many\ simulation\ for\ %s\ \:\ %s= Can't\ add\ result\ '%1$s'\ at\ date\ %2$s=Can't add result '%1$s' at date %2$s

1 0

r3834 - trunk
by echatellier＠users.forge.codelutin.com 18 Nov '13

18 Nov '13

Author: echatellier Date: 2013-11-18 10:37:02 +0100 (Mon, 18 Nov 2013) New Revision: 3834 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3834 Log: Update super pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-14 21:01:30 UTC (rev 3833) +++ trunk/pom.xml 2013-11-18 09:37:02 UTC (rev 3834) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.3</version> + <version>4.3</version> </parent> <groupId>fr.ifremer</groupId>

1 0