Author: echatellier Date: 2012-10-30 15:48:28 +0100 (Tue, 30 Oct 2012) New Revision: 302 Url: http://forge.codelutin.com/repositories/revision/isis-fish-data/302 Log: Update versions Modified: branches/4.1/pom.xml branches/4.1/sensitivityanalysis/SensitivityCalculatorRSobol.java branches/4.1/simulators/DefaultSimulator.java Modified: branches/4.1/pom.xml =================================================================== --- branches/4.1/pom.xml 2012-10-23 09:27:41 UTC (rev 301) +++ branches/4.1/pom.xml 2012-10-30 14:48:28 UTC (rev 302) @@ -14,7 +14,7 @@ <packaging>jar</packaging> <!--Version --> - <version>4.1.1</version> + <version>4.2.2</version> <!--Description --> <description>Data for Isis-fish</description> @@ -74,7 +74,7 @@ <dependency> <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.1.1.0-SNAPSHOT</version> + <version>4.2.2.0-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> Modified: branches/4.1/sensitivityanalysis/SensitivityCalculatorRSobol.java =================================================================== --- branches/4.1/sensitivityanalysis/SensitivityCalculatorRSobol.java 2012-10-23 09:27:41 UTC (rev 301) +++ branches/4.1/sensitivityanalysis/SensitivityCalculatorRSobol.java 2012-10-30 14:48:28 UTC (rev 302) @@ -107,6 +107,9 @@ engine.voidEval("library(sensitivity)"); + // sobol ne supporte pas directement la distribution + // mais il est possible de creer deux dataframe parametres de sobol + // qui sont calcules suivant une distribution engine.voidEval("X1<-data.frame(matrix(runif(" + factorNumber + "*" + param_n + "),nrow=" + param_n + "))"); engine.voidEval("X2<-data.frame(matrix(runif(" + factorNumber + "*" Modified: branches/4.1/simulators/DefaultSimulator.java =================================================================== --- branches/4.1/simulators/DefaultSimulator.java 2012-10-23 09:27:41 UTC (rev 301) +++ branches/4.1/simulators/DefaultSimulator.java 2012-10-30 14:48:28 UTC (rev 302) @@ -23,6 +23,7 @@ package simulators; import fr.ifremer.isisfish.IsisFishException; +import fr.ifremer.isisfish.aspect.Cache; import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.entities.Population;