May 2009 - Isis-fish-data-commits - mailman.cloud.codelutin.com

r144 - trunk/sensitivity
by jcouteau＠users.labs.libre-entreprise.org May 15, 2009

May 15, 2009

Author: jcouteau Date: 2009-05-15 13:00:50 +0000 (Fri, 15 May 2009) New Revision: 144 Modified: trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java trunk/sensitivity/SensitivityCalculatorRFast.java trunk/sensitivity/SensitivityCalculatorRFrF2.java trunk/sensitivity/SensitivityCalculatorRMorris.java trunk/sensitivity/SensitivityCalculatorROptimumLHS.java trunk/sensitivity/SensitivityCalculatorRRandomLHS.java trunk/sensitivity/SensitivityCalculatorRSobol.java trunk/sensitivity/SensitivityCalculatorRegularFractions.java Log: Adapt R scripts to windows file system Modified: trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2009-05-14 14:25:53 UTC (rev 143) +++ trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2009-05-15 13:00:50 UTC (rev 144) @@ -146,8 +146,12 @@ try { //Set working directory to get Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); //Get Isis R session log.info("load(\".RData\")"); @@ -256,10 +260,12 @@ log.info("Message sent to R : " + rInstruction); // Set output directory - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + "\")"); log.info("Message sent to R : " + "setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + + "\")"); // Export the data.frame object for the second run in a .expandgrid file engine.voidEval("write.csv(data,file=\".expandgrid.csv\")"); @@ -304,8 +310,12 @@ engine.voidEval("names(isis.simule)<-isis.factors[[1]]"); //Set working directory to save Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); // Save Isis R session log.info("save.image()"); @@ -328,18 +338,24 @@ try { //Set working directory to get Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); //Get Isis R session log.info("load(\".RData\")"); engine.voidEval("load(\".RData\")"); // Set output directory - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + "\")"); log.info("Message sent to R : setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + + "\")"); //Get back the scenarios engine.voidEval("factors<-read.csv(\".expandgrid.csv\")"); @@ -471,10 +487,12 @@ /*Set the export directory *Export directory is the first simulation export directory. */ - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() - + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", + "/") + "\")"); log.info("Message sent to R : setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", + "/") + "\")"); //Save the results with the scenarios. engine.voidEval("write.csv(dataforaov,\"" @@ -550,8 +568,12 @@ engine.voidEval(String.format(renameIsisMethodExp, simulationName)); //Set working directory to save Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); // Save Isis R session log.info("save.image()"); Modified: trunk/sensitivity/SensitivityCalculatorRFast.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRFast.java 2009-05-14 14:25:53 UTC (rev 143) +++ trunk/sensitivity/SensitivityCalculatorRFast.java 2009-05-15 13:00:50 UTC (rev 144) @@ -138,8 +138,12 @@ try { //Set working directory to get Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); //Get Isis R session log.info("load(\".RData\")"); @@ -172,10 +176,12 @@ log.info("Message sent to R" + rInstruction); // Set output directory - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + "\")"); log.info("Message sent to R" + "setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + + "\")"); // Export the fast99 object for the second run in a .fast99 file engine.voidEval("dput(a,file=\".fast99\")"); @@ -275,8 +281,12 @@ engine.voidEval("names(isis.simule)<-isis.factors[[1]]"); //Set working directory to save Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); // Save Isis R session log.info("save.image()"); @@ -326,8 +336,12 @@ try { //Set working directory to get Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); //Get Isis R session log.info("load(\".RData\")"); @@ -340,10 +354,12 @@ log.info("Message sent to R : " + "library(sensitivity)"); //Set the working directory (for import and exports) - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + "\")"); log.info("Message sent to R : " + "setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + + "\")"); // Export the morris object for the second run in a .morris file engine.voidEval("a<-dget(\".fast99\")"); @@ -444,10 +460,12 @@ + "dfresults=data.frame(a$X,results)"); //Set working directory - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() - + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", + "/") + "\")"); log.info("Message sent to R : setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", + "/") + "\")"); // Get the factornames object in the .factornames file engine.voidEval("factornames<-dget(\".factornames\")"); @@ -550,8 +568,12 @@ engine.voidEval(String.format(renameIsisMethodExp, simulationName)); //Set working directory to save Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); // Save Isis R session log.info("save.image()"); Modified: trunk/sensitivity/SensitivityCalculatorRFrF2.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRFrF2.java 2009-05-14 14:25:53 UTC (rev 143) +++ trunk/sensitivity/SensitivityCalculatorRFrF2.java 2009-05-15 13:00:50 UTC (rev 144) @@ -95,10 +95,12 @@ log.info("Message sent to R : " + "library(FrF2)"); //Set the working directory (for import and exports) - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + "\")"); log.info("Message sent to R : " + "setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + + "\")"); String rInstruction = "a<-FrF2(nfactors=" + factorNumber + ",resolution=" + param_resolution + ")"; @@ -264,10 +266,12 @@ log.info("Message sent to R : " + data); // Set output directory - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + "\")"); log.info("Message sent to R : " + "setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + + "\")"); // Export the scenario matrix for the second run in a .FrF2.csv file engine.voidEval("write.csv(data,file=\".FrF2.csv\")"); @@ -299,10 +303,12 @@ log.info("Message sent to R : " + "library(FrF2)"); // Set output directory - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() - + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", + "/") + "\")"); log.info("Message sent to R : setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", + "/") + "\")"); //Get back the FrF2 object engine.voidEval("a<-dget(\".FrF2\")"); @@ -457,10 +463,12 @@ /*Set the export directory *Export directory is the first simulation export directory. */ - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() - + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", + "/") + "\")"); log.info("Message sent to R : setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", + "/") + "\")"); //Set dataforaov names engine Modified: trunk/sensitivity/SensitivityCalculatorRMorris.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRMorris.java 2009-05-14 14:25:53 UTC (rev 143) +++ trunk/sensitivity/SensitivityCalculatorRMorris.java 2009-05-15 13:00:50 UTC (rev 144) @@ -162,8 +162,12 @@ REngine engine = new RProxy(); try { //Set working directory to get Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); //Get Isis R session log.info("load(\".RData\")"); @@ -186,10 +190,12 @@ log.info("Message sent to R : " + rCall); // Set output directory - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + "\")"); log.info("Message sent to R : " + "setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + + "\")"); // Export the morris object for the second run in a .morris file engine.voidEval("dput(a,file=\".morris\")"); @@ -263,8 +269,12 @@ engine.voidEval("names(isis.simule)<-isis.factors[[1]]"); //Set working directory to save Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); // Save Isis R session log.info("save.image()"); @@ -312,8 +322,12 @@ try { //Set working directory to get Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); //Get Isis R session log.info("load(\".RData\")"); @@ -326,10 +340,12 @@ log.info("Message sent to R : " + "library(sensitivity)"); //Set the working directory (for import and exports) - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + "\")"); log.info("Message sent to R : " + "setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + + "\")"); // Export the morris object for the second run in a .morris file engine.voidEval("a<-dget(\".morris\")"); @@ -344,23 +360,24 @@ .eval("length(a$X)/length(a$factors)")).intValue(); log.info("Message sent to R : " + "length(a$X)/length(a$factors)"); - SimulationParameter param = simulationStorages.get(0).getParameter(); + SimulationParameter param = simulationStorages.get(0) + .getParameter(); int sensitivityNumber = param.getSensitivityExport().size(); for (int k = 0; k < sensitivityNumber; k++) { // Creates the R expression to import results in R - String name = param.getSensitivityExport().get(k).getExportFilename(); + String name = param.getSensitivityExport().get(k) + .getExportFilename(); String rInstruction = name + "<-c("; for (int l = 0; l < scenariosNumber; l++) { File importFile = new File(simulationStorages.get(l) .getDirectory().toString() + File.separator - + SimulationStorage.RESULT_EXPORT_DIRECTORY, - param.getSensitivityExport().get(k) - .getExportFilename() - + param.getSensitivityExport().get(k) - .getExtensionFilename()); + + SimulationStorage.RESULT_EXPORT_DIRECTORY, param + .getSensitivityExport().get(k).getExportFilename() + + param.getSensitivityExport().get(k) + .getExtensionFilename()); String simulResult = FileUtil.readAsString(importFile); double simulationResult = Double.valueOf(simulResult); if (l < simulationStorages.size() - 1) { @@ -397,7 +414,8 @@ for (int k = 0; k < sensitivityNumber; k++) { // Creates the R expression to import results in R - String name = param.getSensitivityExport().get(k).getExportFilename(); + String name = param.getSensitivityExport().get(k) + .getExportFilename(); //Compute results engine.voidEval("tell(a,y=" + name + ")"); @@ -454,10 +472,12 @@ + "names(dfresults)<-resultsnames"); //Set working directory - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() - + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", + "/") + "\")"); log.info("Message sent to R : setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", + "/") + "\")"); //Export sensitivity indices engine.voidEval("write.csv(df,\"" @@ -520,8 +540,12 @@ engine.voidEval(String.format(renameIsisMethodExp, simulationName)); //Set working directory to save Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); // Save Isis R session log.info("save.image()"); Modified: trunk/sensitivity/SensitivityCalculatorROptimumLHS.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorROptimumLHS.java 2009-05-14 14:25:53 UTC (rev 143) +++ trunk/sensitivity/SensitivityCalculatorROptimumLHS.java 2009-05-15 13:00:50 UTC (rev 144) @@ -125,8 +125,12 @@ try { //Set working directory to get Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); //Get Isis R session log.info("load(\".RData\")"); @@ -362,10 +366,12 @@ log.info("Message sent to R" + rInstruction); // Set output directory - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + "\")"); log.info("Message sent to R : " + "setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + + "\")"); // Export the scenario matrix for the second run in a .optimumlhs.csv file engine.voidEval("write.csv(data,file=\".optimumlhs.csv\")"); @@ -378,8 +384,12 @@ + "dput(factornames,file=\".factornames\")"); //Set working directory to save Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); // Save Isis R session log.info("save.image()"); @@ -413,18 +423,24 @@ try { //Set working directory to get Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); //Get Isis R session log.info("load(\".RData\")"); engine.voidEval("load(\".RData\")"); // Set output directory - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + "\")"); log.info("Message sent to R : setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + + "\")"); //Get back the scenarios engine.voidEval("factors<-read.csv(\".optimumlhs.csv\")"); @@ -581,10 +597,12 @@ /*Set the export directory *Export directory is the first simulation export directory. */ - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() - + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", + "/") + "\")"); log.info("Message sent to R : setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", + "/") + "\")"); //Save the results with the scenarios. engine.voidEval("write.csv(dataforaov,\"" @@ -660,8 +678,12 @@ engine.voidEval(String.format(renameIsisMethodExp, simulationName)); //Set working directory to save Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); // Save Isis R session log.info("save.image()"); Modified: trunk/sensitivity/SensitivityCalculatorRRandomLHS.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRRandomLHS.java 2009-05-14 14:25:53 UTC (rev 143) +++ trunk/sensitivity/SensitivityCalculatorRRandomLHS.java 2009-05-15 13:00:50 UTC (rev 144) @@ -113,16 +113,24 @@ try { //Set working directory to get Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); //Get Isis R session log.info("load(\".RData\")"); engine.voidEval("load(\".RData\")"); //Set working directory for other results - log.info("setwd(\"" + outputdirectory + "\")"); - engine.voidEval("setwd(\"" + outputdirectory + "\")"); + log.info("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + + "\")"); //Load the lhs library engine.voidEval("library(lhs)"); @@ -343,10 +351,12 @@ log.info("Message sent to R" + rInstruction); // Set output directory - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + "\")"); log.info("Message sent to R : " + "setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + + "\")"); // Export the scenario matrix for the second run in a .randomlhs.csv file engine.voidEval("write.csv(data,file=\".randomlhs.csv\")"); @@ -359,8 +369,12 @@ + "dput(factornames,file=\".factornames\")"); //Set working directory to save Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); // Save Isis R session log.info("save.image()"); @@ -387,18 +401,24 @@ try { //Set working directory to get Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); //Get Isis R session log.info("load(\".RData\")"); engine.voidEval("load(\".RData\")"); // Set output directory - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + "\")"); log.info("Message sent to R : setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + + "\")"); //Get back the scenarios engine.voidEval("factors<-read.csv(\".randomlhs.csv\")"); @@ -552,10 +572,12 @@ /*Set the export directory *Export directory is the first simulation export directory. */ - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() - + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", + "/") + "\")"); log.info("Message sent to R : setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", + "/") + "\")"); //Save the results with the scenarios. engine.voidEval("write.csv(dataforaov,\"" @@ -631,8 +653,12 @@ engine.voidEval(String.format(renameIsisMethodExp, simulationName)); //Set working directory to save Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); // Save Isis R session log.info("save.image()"); Modified: trunk/sensitivity/SensitivityCalculatorRSobol.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRSobol.java 2009-05-14 14:25:53 UTC (rev 143) +++ trunk/sensitivity/SensitivityCalculatorRSobol.java 2009-05-15 13:00:50 UTC (rev 144) @@ -136,8 +136,12 @@ try { //Set working directory to get Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); //Get Isis R session log.info("load(\".RData\")"); @@ -147,10 +151,12 @@ log.info("Message sent to R : " + "library(sensitivity)"); //Set the working directory (for import and exports) - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + "\")"); log.info("Message sent to R : " + "setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + + "\")"); engine.voidEval("X1<-data.frame(matrix(runif(" + factorNumber + "*" + param_n + "),nrow=" + param_n + "))"); @@ -274,8 +280,12 @@ engine.voidEval("names(isis.simule)<-isis.factors[[1]]"); //Set working directory to save Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); // Save Isis R session log.info("save.image()"); @@ -323,8 +333,12 @@ try { //Set working directory to get Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); //Get Isis R session log.info("load(\".RData\")"); @@ -337,10 +351,12 @@ log.info("Message sent to R : " + "library(sensitivity)"); //Set the working directory (for import and exports) - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + "\")"); log.info("Message sent to R : " + "setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + + "\")"); // Get the .X1 file engine.voidEval("X1<-dget(\".X1\")"); @@ -456,10 +472,12 @@ + "dfresults=data.frame(a$X,results)"); //Set working directory - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() - + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", + "/") + "\")"); log.info("Message sent to R : setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", + "/") + "\")"); //Export V engine.voidEval("write.csv(a$V,\"" @@ -539,8 +557,12 @@ engine.voidEval(String.format(renameIsisMethodExp, simulationName)); //Set working directory to save Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); // Save Isis R session log.info("save.image()"); Modified: trunk/sensitivity/SensitivityCalculatorRegularFractions.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRegularFractions.java 2009-05-14 14:25:53 UTC (rev 143) +++ trunk/sensitivity/SensitivityCalculatorRegularFractions.java 2009-05-15 13:00:50 UTC (rev 144) @@ -105,17 +105,22 @@ try { //Set working directory to get Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); //Get Isis R session log.info("load(\".RData\")"); engine.voidEval("load(\".RData\")"); //Set the working directory (to import the R function) - engine.voidEval("setwd(\"" + param_pathToFunction + "\")"); - log.info("Message sent to R : " + "setwd(\"" + param_pathToFunction - + "\")"); + engine.voidEval("setwd(\"" + + param_pathToFunction.replaceAll("\\\\", "/") + "\")"); + log.info("Message sent to R : " + "setwd(\"" + + param_pathToFunction.replaceAll("\\\\", "/") + "\")"); //Import the function log.info("source(\"regularfractions.R\")"); @@ -159,10 +164,12 @@ log.info("Message sent to R : " + rCall); // Set output directory - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + "\")"); log.info("Message sent to R : " + "setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + + "\")"); // Export the morris object for the second run in a .morris file engine.voidEval("dput(x,file=\".regularfractions\")"); @@ -327,8 +334,12 @@ log.info("Message sent to R : write.csv(data,file=\".data.csv\")"); //Set working directory to save Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); // Save Isis R session log.info("save.image()"); @@ -352,18 +363,24 @@ try { //Set working directory to get Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); //Get Isis R session log.info("load(\".RData\")"); engine.voidEval("load(\".RData\")"); // Set output directory - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + "\")"); log.info("Message sent to R : setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", "/") + + "\")"); // Get the regularfractions object from the .regularfractions file engine.voidEval("x<-dget(\".regularfractions\")"); @@ -432,7 +449,8 @@ for (int k = 0; k < sensitivityNumber; k++) { // Creates the R expression to import results in R - String name = param.getSensitivityExport().get(k).getExportFilename(); + String name = param.getSensitivityExport().get(k) + .getExportFilename(); //Create the dataforaov data.frame String dataframe = "dataforaov<-data.frame(factors," + name @@ -511,10 +529,12 @@ /*Set the export directory *Export directory is the first simulation export directory. */ - engine.voidEval("setwd(\"" + outputdirectory.getAbsolutePath() - + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getAbsolutePath().replaceAll("\\\\", + "/") + "\")"); log.info("Message sent to R : setwd(\"" - + outputdirectory.getAbsolutePath() + "\")"); + + outputdirectory.getAbsolutePath().replaceAll("\\\\", + "/") + "\")"); //Save the results with the scenarios. engine.voidEval("write.csv(dataforaov,\"" @@ -539,10 +559,13 @@ log .info("Message sent to R : " + "isis.methodAnalyse<-list(\"isis.factors\"=isis.factors,\"isis.factor.distribution\"=isis.factor.distribution,\"isis.simule\"=isis.simule,call_method=\"" - + aovCall + "\"" + ",\"analysis_result\"=aovresult)"); + + aovCall + "\"" + + ",\"analysis_result\"=aovresult)"); engine .voidEval("isis.methodAnalyse<-list(\"isis.factors\"=isis.factors,\"isis.factor.distribution\"=isis.factor.distribution,\"isis.simule\"=isis.simule,call_method=\"" - + aovCall + "\"" + ",\"analysis_result\"=aovresult)"); + + aovCall + + "\"" + + ",\"analysis_result\"=aovresult)"); log .info("Message sent to R : " @@ -590,8 +613,12 @@ engine.voidEval(String.format(renameIsisMethodExp, simulationName)); //Set working directory to save Isis R session - log.info("setwd(\"" + outputdirectory.getParent() + "\")"); - engine.voidEval("setwd(\"" + outputdirectory.getParent() + "\")"); + log.info("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); + engine.voidEval("setwd(\"" + + outputdirectory.getParent().replaceAll("\\\\", "/") + + "\")"); // Save Isis R session log.info("save.image()");

1 0

r143 - trunk/sensitivity
by jcouteau＠users.labs.libre-entreprise.org May 14, 2009

May 14, 2009

Author: jcouteau Date: 2009-05-14 14:25:53 +0000 (Thu, 14 May 2009) New Revision: 143 Modified: trunk/sensitivity/SensitivityCalculatorRFast.java Log: Display an error message in case of NaN values in R fast object. Modified: trunk/sensitivity/SensitivityCalculatorRFast.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRFast.java 2009-05-14 07:40:17 UTC (rev 142) +++ trunk/sensitivity/SensitivityCalculatorRFast.java 2009-05-14 14:25:53 UTC (rev 143) @@ -106,10 +106,9 @@ JOptionPane .showMessageDialog( null, - "Error", factors.get(i).getName() + " has a discrete domain, this is not acceptable for this method.", - JOptionPane.ERROR_MESSAGE); + "Error", JOptionPane.ERROR_MESSAGE); return null; } } @@ -194,6 +193,18 @@ * dataframeVector.get(0).asDoubleArray().length]; for (int i = 0; i < dataframeVector.size(); i++) { for (int j = 0; j < dataframeVector.get(0).asDoubleArray().length; j++) { + if (String.valueOf( + dataframeVector.get(i).asDoubleArray()[j]) + .toString().equals("NaN")) { + log + .error("Wrong parameters for the fast method, non-numeric values were generated"); + JOptionPane + .showMessageDialog( + null, + "The parameters for this method need to be changed, non-numeric values where generated (you may want to increase the n parameter)", + "Error", JOptionPane.ERROR_MESSAGE); + return null; + } dataframe[i * dataframeVector.get(0).asDoubleArray().length + j] = dataframeVector.get(i).asDoubleArray()[j]; }

1 0

r142 - trunk/sensitivity
by jcouteau＠users.labs.libre-entreprise.org May 14, 2009

May 14, 2009

Author: jcouteau Date: 2009-05-14 07:40:17 +0000 (Thu, 14 May 2009) New Revision: 142 Modified: trunk/sensitivity/SensitivityCalculatorRegularFractions.java Log: Adding name of the sensitivity result in R object Modified: trunk/sensitivity/SensitivityCalculatorRegularFractions.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRegularFractions.java 2009-05-11 13:51:57 UTC (rev 141) +++ trunk/sensitivity/SensitivityCalculatorRegularFractions.java 2009-05-14 07:40:17 UTC (rev 142) @@ -539,10 +539,10 @@ log .info("Message sent to R : " + "isis.methodAnalyse<-list(\"isis.factors\"=isis.factors,\"isis.factor.distribution\"=isis.factor.distribution,\"isis.simule\"=isis.simule,call_method=\"" - + aovCall + "\"" + ",aovresult)"); + + aovCall + "\"" + ",\"analysis_result\"=aovresult)"); engine .voidEval("isis.methodAnalyse<-list(\"isis.factors\"=isis.factors,\"isis.factor.distribution\"=isis.factor.distribution,\"isis.simule\"=isis.simule,call_method=\"" - + aovCall + "\"" + ",aovresult)"); + + aovCall + "\"" + ",\"analysis_result\"=aovresult)"); log .info("Message sent to R : "

1 0

r141 - trunk/scripts
by jcouteau＠users.labs.libre-entreprise.org May 11, 2009

May 11, 2009

Author: jcouteau Date: 2009-05-11 13:51:57 +0000 (Mon, 11 May 2009) New Revision: 141 Modified: trunk/scripts/SiMatrix.java Log: Back to normal (matrixCatchWeightPerStrategyMetPerZonePop well calculated) Modified: trunk/scripts/SiMatrix.java =================================================================== --- trunk/scripts/SiMatrix.java 2009-05-11 09:53:41 UTC (rev 140) +++ trunk/scripts/SiMatrix.java 2009-05-11 13:51:57 UTC (rev 141) @@ -251,7 +251,7 @@ List<PopulationGroup> groups = pop.getPopulationGroup(); MatrixND result = matrixCatchPerStrategyMetPerZoneMet.copy(); - result.setName(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + result.setName(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_MET); for (PopulationGroup group : groups) { MatrixND sub = result.getSubMatrix(2, group, 1); @@ -282,7 +282,7 @@ .getSemantics(4)); MatrixND result = MatrixFactory.getInstance().create( - ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_POP, + ResultName.MATRIX_CATCH_PER_STRATEGY_MET_PER_ZONE_MET, new List[] { strategies, metiers, groups, zones }, new String[] { n_("Strategies"), n_("Metiers"), n_("Groups"), n_("Zones") }); @@ -344,7 +344,7 @@ List<PopulationGroup> groups = pop.getPopulationGroup(); MatrixND result = matrixCatchPerStrategyMetPerZonePop.copy(); - result.setName(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + result.setName(ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); for (PopulationGroup group : groups) { MatrixND sub = result.getSubMatrix(2, group, 1);

1 0

r140 - trunk/sensitivity
by jcouteau＠users.labs.libre-entreprise.org May 11, 2009

May 11, 2009

Author: jcouteau Date: 2009-05-11 09:53:41 +0000 (Mon, 11 May 2009) New Revision: 140 Modified: trunk/sensitivity/SensitivityCalculatorRegularFractions.java Log: Fix bug when not full run of regularfractions Modified: trunk/sensitivity/SensitivityCalculatorRegularFractions.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRegularFractions.java 2009-05-07 20:20:50 UTC (rev 139) +++ trunk/sensitivity/SensitivityCalculatorRegularFractions.java 2009-05-11 09:53:41 UTC (rev 140) @@ -175,12 +175,12 @@ + "dput(factornames,file=\".factornames\")"); // Get back experiment plan - dataframeplan = (double[]) engine.eval("x$plan"); - log.info("Message sent to R : " + "x$plan"); + dataframeplan = (double[]) engine.eval("x[[1]]"); + log.info("Message sent to R : " + "x[[1]]"); //Get back the simulation number - log.info("length(x[,1])"); - int simulationNumber = (Integer) engine.eval("length(x$plan[,1])"); + log.info("length(x[[1]][,1])"); + int simulationNumber = (Integer) engine.eval("length(x[[1]][,1])"); // Transform the result from R in a matrix MatrixND morris = MatrixFactory.getInstance().create(dataframeplan,

1 0

r139 - trunk/exports
by chatellier＠users.labs.libre-entreprise.org May 7, 2009

May 7, 2009

Author: chatellier Date: 2009-05-07 20:20:50 +0000 (Thu, 07 May 2009) New Revision: 139 Added: trunk/exports/GrossValueOfLandingsOtherSpecies.java Log: Add export Added: trunk/exports/GrossValueOfLandingsOtherSpecies.java =================================================================== --- trunk/exports/GrossValueOfLandingsOtherSpecies.java (rev 0) +++ trunk/exports/GrossValueOfLandingsOtherSpecies.java 2009-05-07 20:20:50 UTC (rev 139) @@ -0,0 +1,98 @@ +package exports; + +import static org.codelutin.i18n.I18n._; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.Writer; + +import org.codelutin.math.matrix.*; + +import scripts.ResultName; + +import fr.ifremer.isisfish.entities.*; +import fr.ifremer.isisfish.export.Export; +import fr.ifremer.isisfish.types.Date; +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.datastore.ResultStorage; + +import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) + +/** + * VesselMargin.java + * + * Created: 23 novembre 2006 + * + * @author anonymous <anonymous(a)labs.libre-entreprise.org> + * @version $Revision: 1.3 $ + * + * Last update: $Date: 2007-05-24 09:30:07 $ + * by : $Author: bpoussin $ + */ + @Doc(value="do the doc of class VesselMargin") +public class GrossValueOfLandingsOtherSpecies implements Export { + + /** to use log facility, just put in your code: log.info("..."); */ + static private Log log = LogFactory.getLog(GrossValueOfLandingsOtherSpecies.class); + + protected String [] necessaryResult = { + ResultName.MATRIX_GROSS_VALUE_OF_LANDINGS_OTHER_SPECIES_PER_STRATEGY_MET + }; + + public String[] getNecessaryResult() { + return this.necessaryResult; + } + + public String getExportFilename() { + return "GrossValueOfLandingsOtherSpecies"; + } + + public String getExtensionFilename() { + return ".csv"; + } + + public String getDescription() { + return _("cvs out strategy;date;value"); + } + + public void export(SimulationStorage simulation, Writer out) throws Exception { + MatrixND mat = simulation.getResultStorage().getMatrix(ResultName.MATRIX_GROSS_VALUE_OF_LANDINGS_OTHER_SPECIES_PER_STRATEGY_MET); + for (MatrixIterator i=mat.iterator(); i.hasNext();) { + i.next(); + Object [] sems = i.getSemanticsCoordinates(); + Date date = (Date)sems[0]; + Strategy str = (Strategy)sems[1]; + Metier met = (Metier) sems[2]; + double val = i.getValue(); + out.write(str.getName() +";"+met.getName() +";"+ date.getDate() +";"+ val +"\n"); + } + /* +var Parametre=sim.getParametre(); +var PDate=Packages.fr.ifremer.nodb.Date; +var finsimu=resultats.getLastDate().getDate(); + + +var result=""; +writeln("debut export vesselmargin"); +var dateexport=new Packages.java.util.Date(); +var formatteur= new Packages.java.text.SimpleDateFormat(); +writeln("heure de debut: "+formatteur.format(dateexport)); + + +for (var idate=0;idate<=finsimu;idate++){ + var date=new PDate(idate); + var matrice=resultats.getMatrix(date, "matriceVesselMarginOverVariableCostsPerStrategyPerVessel"); + for(var iiterateur=matrice.iterator(); iiterateur.next();){ + var coordonnees=iiterateur.getSemanticsCoordinates(); + var str=coordonnees[0]; + result+=str.getName()+";"+idate+";"+iiterateur.getValue()+"\n"; + } +} +writeln("fin export vesselmargin"); + +return ""+result; +*/ + } + +}

1 0

r138 - in trunk: scripts simulators
by chatellier＠users.labs.libre-entreprise.org May 7, 2009

May 7, 2009

Author: chatellier Date: 2009-05-07 20:14:16 +0000 (Thu, 07 May 2009) New Revision: 138 Modified: trunk/scripts/SiMatrix.java trunk/simulators/DefaultSimulator.java Log: Re ajout de effort nominal matrix Modified: trunk/scripts/SiMatrix.java =================================================================== --- trunk/scripts/SiMatrix.java 2009-05-07 17:07:20 UTC (rev 137) +++ trunk/scripts/SiMatrix.java 2009-05-07 20:14:16 UTC (rev 138) @@ -1226,6 +1226,66 @@ * @param date * @return */ + private double effortNominalPerStrategyMet(Strategy str, Metier metier, Date date) { + Month month = date.getMonth(); + StrategyMonthInfo smi = str.getStrategyMonthInfo(month); + + double propSetOfVessels = str.getProportionSetOfVessels(); + int nbOfVessels = str.getSetOfVessels().getNumberOfVessels(); + double propStrMet = smi.getProportionMetier(metier); + double effortNominalPerVessel = effortNominalPerStrategyPerVessel(str, metier, date); + + if(log.isDebugEnabled()) { + log.debug( + " strategy=" + str + + " metier=" + metier + + " propSetOfVessels=" + propSetOfVessels + + " nbOfVessels=" + nbOfVessels + + " propStrMet=" + propStrMet + + " effortPerVessel=" + effortNominalPerVessel + ); + } + + double result = propSetOfVessels * nbOfVessels * propStrMet * effortNominalPerVessel; + + return result; + } + + /** + * @param str + * @param metier + * @param date + * @return + */ + private double effortNominalPerStrategyPerVessel(Strategy str, Metier metier, Date date) { + Month month = date.getMonth(); + StrategyMonthInfo smi = str.getStrategyMonthInfo(month); + double nbTrips = smi.getNumberOfTrips(); + double fishingTime = fishingTimePerTrip(str, metier, date); + + + if(log.isDebugEnabled()) { + log.debug( + " strategy=" + str + + " metier=" + metier + + " nbTrips=" + nbTrips + + " fishingTime=" + fishingTime + + ); + } + // nominal timeAtSea = nbTrips * fishingTime; + // + double result = nbTrips * fishingTime; + + return result; + } + + /** + * @param str + * @param metier + * @param date + * @return + */ private double effortPerStrategyMet(Strategy str, Metier metier, Date date) { Month month = date.getMonth(); StrategyMonthInfo smi = str.getStrategyMonthInfo(month); @@ -1812,4 +1872,39 @@ return result; } +/////////////////////////////////////////////////////////////////////////// + // + // + // + /////////////////////////////////////////////////////////////////////////// + public MatrixND matrixEffortNominalPerStrategyMet(Date date) throws TopiaException { + + List<Strategy> strategies = getStrategies(date); + List<Metier> metiers = getMetiers(date); + + MatrixND result = MatrixFactory.getInstance().create( + ResultName.MATRIX_EFFORT_NOMINAL_PER_STRATEGY_MET, + new List[]{strategies, metiers}, + new String[]{n_("Strategies"), n_("Metiers")}); + + for (int s=0; s < strategies.size(); s++) { + Strategy str = strategies.get(s); + metiers = getMetiers(str, date); + for (int m=0; m < metiers.size(); m++) { + Metier metier = metiers.get(m); + double value = effortNominalPerStrategyMet(str, metier, date); + result.setValue(str, metier, value); + } + } + +// for(Strategy str : strategies){ +// List<Metier> metierStr = getMetiers(str, date); +// for(Metier metier : metierStr) { +// double val = effortPerStrategyMet(str, metier, date); // rem perf: effortPerStrategyMet a deja ete calculé +// result.setValue(str, metier, val); +// } +// } + + return result; + } } Modified: trunk/simulators/DefaultSimulator.java =================================================================== --- trunk/simulators/DefaultSimulator.java 2009-05-07 17:07:20 UTC (rev 137) +++ trunk/simulators/DefaultSimulator.java 2009-05-07 20:14:16 UTC (rev 138) @@ -225,6 +225,11 @@ resManager.addResult(date, effortPerStrategyMet); } + if (resManager.isEnabled(ResultName.MATRIX_EFFORT_NOMINAL_PER_STRATEGY_MET)) { + MatrixND effortNominalPerStrategyMet = siMatrix.matrixEffortNominalPerStrategyMet(date); + resManager.addResult(date, effortNominalPerStrategyMet); + } + if (resManager .isEnabled(ResultName.MATRIX_STD_TRAVEL_EFFORT_PER_STRATEGY_MET)) { MatrixND stdTravelEffortPerStrategyMet = siMatrix

1 0

r137 - trunk/sensitivity
by jcouteau＠users.labs.libre-entreprise.org May 7, 2009

May 7, 2009

Author: jcouteau Date: 2009-05-07 17:07:20 +0000 (Thu, 07 May 2009) New Revision: 137 Modified: trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java trunk/sensitivity/SensitivityCalculatorRFast.java trunk/sensitivity/SensitivityCalculatorRFrF2.java trunk/sensitivity/SensitivityCalculatorRMorris.java trunk/sensitivity/SensitivityCalculatorROptimumLHS.java trunk/sensitivity/SensitivityCalculatorRRandomLHS.java trunk/sensitivity/SensitivityCalculatorRSobol.java trunk/sensitivity/SensitivityCalculatorRegularFractions.java Log: Sensitivity analysis (second pass) use less memory. Modified: trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2009-05-07 16:40:51 UTC (rev 136) +++ trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2009-05-07 17:07:20 UTC (rev 137) @@ -28,6 +28,7 @@ import org.codelutin.util.FileUtil; import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.sensitivity.AbstractSensitivityCalculator; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; import fr.ifremer.isisfish.simulator.sensitivity.Factor; @@ -114,7 +115,7 @@ Double value = min + ((max - min) / (card - 1) * rest); if ((factor.getDomain() instanceof MatrixContinuousDomain) || (factor.getDomain() instanceof EquationContinuousDomain)) { - factor.setValueForIdentifier(value.toString()); + factor.setValueForIdentifier(value); } else { factor.setValueForIdentifier(value); } @@ -354,39 +355,39 @@ int factorNumber = ((Double) engine.eval("length(factors)-1")) .intValue(); - int sensitivityNumber = simulationStorages.get(0).getParameter() - .getSensitivityExport().size(); + SimulationParameter param = simulationStorages.get(0) + .getParameter(); + int sensitivityNumber = param.getSensitivityExport().size(); for (int k = 0; k < sensitivityNumber; k++) { - String name = simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k).getExportFilename(); - - //Create the results vectors - String result = name + "<-c("; + // Creates the R expression to import results in R + String name = param.getSensitivityExport().get(k) + .getExportFilename(); + String rInstruction = name + "<-c("; for (int l = 0; l < simulationStorages.size(); l++) { File importFile = new File(simulationStorages.get(l) .getDirectory().toString() + File.separator - + SimulationStorage.RESULT_EXPORT_DIRECTORY, - simulationStorages.get(l).getParameter() - .getSensitivityExport().get(k) - .getExportFilename() - + simulationStorages.get(l).getParameter() - .getSensitivityExport().get(k) - .getExtensionFilename()); + + SimulationStorage.RESULT_EXPORT_DIRECTORY, param + .getSensitivityExport().get(k).getExportFilename() + + param.getSensitivityExport().get(k) + .getExtensionFilename()); String simulResult = FileUtil.readAsString(importFile); double simulationResult = Double.valueOf(simulResult); if (l < simulationStorages.size() - 1) { - result = result + simulationResult + ","; + rInstruction = rInstruction + simulationResult + ","; } else { - result = result + simulationResult; + rInstruction = rInstruction + simulationResult; } } - result = result + ")"; - engine.voidEval(result); - log.info("Message sent to R : " + result); + rInstruction = rInstruction + ")"; + log.info("Message sent to R : " + rInstruction); + + // Send the simulation results + engine.voidEval(rInstruction); + //Put results in isis.simule engine.voidEval("isis.simule<-data.frame(isis.simule," + name + ")"); @@ -477,23 +478,19 @@ //Save the results with the scenarios. engine.voidEval("write.csv(dataforaov,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_Results.csv\")"); log.info("Message sent to R : write.csv(dataforaov,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_Results.csv\")"); //Save the sensitivity indices engine.voidEval("write.csv(exportsensitivity,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_SensitivityIndices.csv\")"); log.info("Message sent to R : write.csv(exportsensitivity,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_SensitivityIndices.csv\")"); //FIXME export through java to enable export when using Rserve (when distant Rserve). Modified: trunk/sensitivity/SensitivityCalculatorRFast.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRFast.java 2009-05-07 16:40:51 UTC (rev 136) +++ trunk/sensitivity/SensitivityCalculatorRFast.java 2009-05-07 17:07:20 UTC (rev 137) @@ -39,6 +39,7 @@ import org.rosuda.JRI.REXP; import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.sensitivity.AbstractSensitivityCalculator; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; import fr.ifremer.isisfish.simulator.sensitivity.Domain; @@ -197,7 +198,7 @@ + j] = dataframeVector.get(i).asDoubleArray()[j]; } } - + log.info("Message sent to R" + "a$X"); if (log.isDebugEnabled()) { @@ -287,8 +288,8 @@ Factor factor = plan.getFactors().get(i); if ((factor.getDomain() instanceof MatrixContinuousDomain) || (factor.getDomain() instanceof EquationContinuousDomain)) { - factor.setValueForIdentifier(Double.valueOf( - fast.getValue(new int[] { i, j })).toString()); + factor.setValueForIdentifier(fast + .getValue(new int[] { i, j })); } else { Double value = (Double) ((ContinuousDomain) factor .getDomain()).getMinBound() @@ -346,26 +347,24 @@ int scenariosNumber = (Integer) engine.eval("length(a$X[,1])"); log.info("Message sent to R : " + "length(a$X[,1])"); - int sensitivityNumber = simulationStorages.get(0).getParameter() - .getSensitivityExport().size(); + SimulationParameter param = simulationStorages.get(0) + .getParameter(); + int sensitivityNumber = param.getSensitivityExport().size(); for (int k = 0; k < sensitivityNumber; k++) { // Creates the R expression to import results in R - String name = simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k).getExportFilename(); + String name = param.getSensitivityExport().get(k) + .getExportFilename(); String rInstruction = name + "<-c("; for (int l = 0; l < scenariosNumber; l++) { File importFile = new File(simulationStorages.get(l) .getDirectory().toString() + File.separator - + SimulationStorage.RESULT_EXPORT_DIRECTORY, - simulationStorages.get(l).getParameter() - .getSensitivityExport().get(k) - .getExportFilename() - + simulationStorages.get(l).getParameter() - .getSensitivityExport().get(k) - .getExtensionFilename()); + + SimulationStorage.RESULT_EXPORT_DIRECTORY, param + .getSensitivityExport().get(k).getExportFilename() + + param.getSensitivityExport().get(k) + .getExtensionFilename()); String simulResult = FileUtil.readAsString(importFile); double simulationResult = Double.valueOf(simulResult); if (l < simulationStorages.size() - 1) { @@ -381,6 +380,9 @@ // Send the simulation results engine.voidEval(rInstruction); + // Send the simulation results + engine.voidEval(rInstruction); + //Put results in isis.simule engine.voidEval("isis.simule<-data.frame(isis.simule," + name + ")"); @@ -403,8 +405,8 @@ for (int k = 0; k < sensitivityNumber; k++) { // Creates the R expression to import results in R - String name = simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k).getExportFilename(); + String name = param.getSensitivityExport().get(k) + .getExportFilename(); //Compute results engine.voidEval("tell(a,y=" + name + ")"); @@ -447,13 +449,11 @@ //Export V engine.voidEval("write.csv(a$V,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_V.csv\")"); log.info("Message sent to R : " + "write.csv(a$V,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_V.csv\")"); //Set D1 names @@ -462,13 +462,11 @@ //Export D1 engine.voidEval("write.csv(a$D1,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_D1.csv\")"); log.info("Message sent to R : " + "write.csv(a$D1,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_D1.csv\")"); //Set Dt names @@ -477,13 +475,11 @@ //Export Dt engine.voidEval("write.csv(a$Dt,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_Dt.csv\")"); log.info("Message sent to R : " + "write.csv(a$Dt,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_Dt.csv\")"); //Set dfresults names engine.voidEval("resultsnames<-c(factornames,\"Result\")"); @@ -495,13 +491,11 @@ //Export results engine.voidEval("write.csv(dfresults,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_Results.csv\")"); log.info("Message sent to R : " + "write.csv(results,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_Results.csv\")"); //FIXME export through java to enable export when using Rserve Modified: trunk/sensitivity/SensitivityCalculatorRFrF2.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRFrF2.java 2009-05-07 16:40:51 UTC (rev 136) +++ trunk/sensitivity/SensitivityCalculatorRFrF2.java 2009-05-07 17:07:20 UTC (rev 137) @@ -31,6 +31,7 @@ import org.codelutin.util.FileUtil; import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.sensitivity.AbstractSensitivityCalculator; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; import fr.ifremer.isisfish.simulator.sensitivity.Factor; @@ -162,13 +163,11 @@ if ((factor.getDomain() instanceof MatrixContinuousDomain) || (factor.getDomain() instanceof EquationContinuousDomain)) { if (frf2.getValue(new int[] { i, j }) == -1) { - factor.setValueForIdentifier(Double.valueOf(0) - .toString()); + factor.setValueForIdentifier(0); } if (frf2.getValue(new int[] { i, j }) == 1) { - factor.setValueForIdentifier(Double.valueOf(1) - .toString()); + factor.setValueForIdentifier(1); } } else { if (frf2.getValue(new int[] { i, j }) == -1) { @@ -290,8 +289,9 @@ REngine engine = new RProxy(); try { - int sensitivityNumber = simulationStorages.get(0).getParameter() - .getSensitivityExport().size(); + SimulationParameter param = simulationStorages.get(0) + .getParameter(); + int sensitivityNumber = param.getSensitivityExport().size(); for (int k = 0; k < sensitivityNumber; k++) { @@ -322,31 +322,33 @@ int factorNumber = ((Double) engine.eval("length(factors)-1")) .intValue(); - //Create the results vectors - String result = "result<-c("; + // Creates the R expression to import results in R + String name = param.getSensitivityExport().get(k) + .getExportFilename(); + String rInstruction = name + "<-c("; for (int l = 0; l < simulationStorages.size(); l++) { File importFile = new File(simulationStorages.get(l) .getDirectory().toString() + File.separator - + SimulationStorage.RESULT_EXPORT_DIRECTORY, - simulationStorages.get(l).getParameter() - .getSensitivityExport().get(k) - .getExportFilename() - + simulationStorages.get(l).getParameter() - .getSensitivityExport().get(k) - .getExtensionFilename()); + + SimulationStorage.RESULT_EXPORT_DIRECTORY, param + .getSensitivityExport().get(k).getExportFilename() + + param.getSensitivityExport().get(k) + .getExtensionFilename()); String simulResult = FileUtil.readAsString(importFile); double simulationResult = Double.valueOf(simulResult); if (l < simulationStorages.size() - 1) { - result = result + simulationResult + ","; + rInstruction = rInstruction + simulationResult + ","; } else { - result = result + simulationResult; + rInstruction = rInstruction + simulationResult; } } - result = result + ")"; - engine.voidEval(result); - log.info("Message sent to R : " + result); + rInstruction = rInstruction + ")"; + log.info("Message sent to R : " + rInstruction); + + // Send the simulation results + engine.voidEval(rInstruction); + //Create the dataforaov data.frame String dataframe = "dataforaov<-data.frame(factors,result=result)"; engine.voidEval(dataframe); @@ -472,23 +474,19 @@ //Save the results with the scenarios. engine.voidEval("write.csv(dataforaov,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_Results.csv\")"); log.info("Message sent to R : write.csv(dataforaov,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_Results.csv\")"); //Save the sensitivity indices engine.voidEval("write.csv(exportsensitivity,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_SensitivityIndices.csv\")"); log.info("Message sent to R : write.csv(exportsensitivity,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_SensitivityIndices.csv\")"); //FIXME export through java to enable export when using Rserve (when distant Rserve). Modified: trunk/sensitivity/SensitivityCalculatorRMorris.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRMorris.java 2009-05-07 16:40:51 UTC (rev 136) +++ trunk/sensitivity/SensitivityCalculatorRMorris.java 2009-05-07 17:07:20 UTC (rev 137) @@ -37,6 +37,7 @@ import org.codelutin.util.FileUtil; import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.sensitivity.AbstractSensitivityCalculator; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; import fr.ifremer.isisfish.simulator.sensitivity.Domain; @@ -343,25 +344,22 @@ .eval("length(a$X)/length(a$factors)")).intValue(); log.info("Message sent to R : " + "length(a$X)/length(a$factors)"); - int sensitivityNumber = simulationStorages.get(0).getParameter() - .getSensitivityExport().size(); + SimulationParameter param = simulationStorages.get(0).getParameter(); + int sensitivityNumber = param.getSensitivityExport().size(); for (int k = 0; k < sensitivityNumber; k++) { // Creates the R expression to import results in R - String name = simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k).getExportFilename(); + String name = param.getSensitivityExport().get(k).getExportFilename(); String rInstruction = name + "<-c("; for (int l = 0; l < scenariosNumber; l++) { File importFile = new File(simulationStorages.get(l) .getDirectory().toString() + File.separator + SimulationStorage.RESULT_EXPORT_DIRECTORY, - simulationStorages.get(l).getParameter() - .getSensitivityExport().get(k) + param.getSensitivityExport().get(k) .getExportFilename() - + simulationStorages.get(l).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExtensionFilename()); String simulResult = FileUtil.readAsString(importFile); double simulationResult = Double.valueOf(simulResult); @@ -391,18 +389,15 @@ + "attr(isis.simule,\"nomModel\")<-\"isis-fish-externe-R\""); engine .voidEval("attr(isis.simule,\"nomModel\")<-\"isis-fish-externe-R\""); - - log - .info("Message sent to R : " + + log.info("Message sent to R : " + "attr(isis.simule,\"call\")<-isis.MethodExp$call"); - engine - .voidEval("attr(isis.simule,\"call\")<-isis.MethodExp$call"); + engine.voidEval("attr(isis.simule,\"call\")<-isis.MethodExp$call"); for (int k = 0; k < sensitivityNumber; k++) { // Creates the R expression to import results in R - String name = simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k).getExportFilename(); + String name = param.getSensitivityExport().get(k).getExportFilename(); //Compute results engine.voidEval("tell(a,y=" + name + ")"); @@ -466,26 +461,22 @@ //Export sensitivity indices engine.voidEval("write.csv(df,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_SensitivityIndices.csv\")"); log.info("Message sent to R : " + "write.csv(df,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_SensitivityIndices.csv\")"); //Export results engine.voidEval("write.csv(dfresults,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_Results.csv\")"); log.info("Message sent to R : " + "write.csv(results,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_Results.csv\")"); //FIXME export through java to enable export when using Rserve Modified: trunk/sensitivity/SensitivityCalculatorROptimumLHS.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorROptimumLHS.java 2009-05-07 16:40:51 UTC (rev 136) +++ trunk/sensitivity/SensitivityCalculatorROptimumLHS.java 2009-05-07 17:07:20 UTC (rev 137) @@ -36,6 +36,7 @@ import org.codelutin.util.FileUtil; import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.sensitivity.AbstractSensitivityCalculator; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; import fr.ifremer.isisfish.simulator.sensitivity.Domain; @@ -182,10 +183,8 @@ Factor factor = plan.getFactors().get(i); if ((factor.getDomain() instanceof MatrixContinuousDomain) || (factor.getDomain() instanceof EquationContinuousDomain)) { - factor - .setValueForIdentifier(Double.valueOf( - morris.getValue(new int[] { i, j })) - .toString()); + factor.setValueForIdentifier(morris.getValue(new int[] { + i, j })); } else { Double value = (Double) ((ContinuousDomain) factor .getDomain()).getMinBound() @@ -445,29 +444,27 @@ param_simulationNumber = (Integer) (engine .eval("length(factors[,1])")); - int sensitivityNumber = simulationStorages.get(0).getParameter() - .getSensitivityExport().size(); + SimulationParameter param = simulationStorages.get(0) + .getParameter(); + int sensitivityNumber = param.getSensitivityExport().size(); for (int k = 0; k < sensitivityNumber; k++) { // Creates the R expression to import results in R - String name = simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k).getExportFilename(); + String name = param.getSensitivityExport().get(k) + .getExportFilename(); String rInstruction = name + "<-c("; for (int l = 0; l < param_simulationNumber; l++) { File importFile = new File(simulationStorages.get(l) .getDirectory().toString() + File.separator - + SimulationStorage.RESULT_EXPORT_DIRECTORY, - simulationStorages.get(l).getParameter() - .getSensitivityExport().get(k) - .getExportFilename() - + simulationStorages.get(l).getParameter() - .getSensitivityExport().get(k) - .getExtensionFilename()); + + SimulationStorage.RESULT_EXPORT_DIRECTORY, param + .getSensitivityExport().get(k).getExportFilename() + + param.getSensitivityExport().get(k) + .getExtensionFilename()); String simulResult = FileUtil.readAsString(importFile); double simulationResult = Double.valueOf(simulResult); - if (l < param_simulationNumber - 1) { + if (l < simulationStorages.size() - 1) { rInstruction = rInstruction + simulationResult + ","; } else { rInstruction = rInstruction + simulationResult; @@ -480,6 +477,9 @@ // Send the simulation results engine.voidEval(rInstruction); + // Send the simulation results + engine.voidEval(rInstruction); + //Put results in isis.simule engine.voidEval("isis.simule<-data.frame(isis.simule," + name + ")"); @@ -501,8 +501,8 @@ for (int k = 0; k < sensitivityNumber; k++) { // Creates the R expression to import results in R - String name = simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k).getExportFilename(); + String name = param.getSensitivityExport().get(k) + .getExportFilename(); //Create the dataforaov data.frame String dataframe = "dataforaov<-data.frame(factors," + name @@ -588,23 +588,19 @@ //Save the results with the scenarios. engine.voidEval("write.csv(dataforaov,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_Results.csv\")"); log.info("Message sent to R : write.csv(dataforaov,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_Results.csv\")"); //Save the sensitivity indices engine.voidEval("write.csv(exportsensitivity,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_SensitivityIndices.csv\")"); log.info("Message sent to R : write.csv(exportsensitivity,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_SensitivityIndices.csv\")"); //FIXME export through java to enable export when using Rserve (when distant Rserve). Modified: trunk/sensitivity/SensitivityCalculatorRRandomLHS.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRRandomLHS.java 2009-05-07 16:40:51 UTC (rev 136) +++ trunk/sensitivity/SensitivityCalculatorRRandomLHS.java 2009-05-07 17:07:20 UTC (rev 137) @@ -36,6 +36,7 @@ import org.codelutin.util.FileUtil; import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.sensitivity.AbstractSensitivityCalculator; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; import fr.ifremer.isisfish.simulator.sensitivity.Domain; @@ -118,8 +119,8 @@ //Get Isis R session log.info("load(\".RData\")"); engine.voidEval("load(\".RData\")"); - - //Set working directory for other results + + //Set working directory for other results log.info("setwd(\"" + outputdirectory + "\")"); engine.voidEval("setwd(\"" + outputdirectory + "\")"); @@ -129,8 +130,9 @@ //Create the scenarios String rInstruction = "x<-randomLHS(%s,%s)"; - String rCall = String.format(rInstruction,param_simulationNumber,factornumber); - + String rCall = String.format(rInstruction, param_simulationNumber, + factornumber); + if (param_modifR) { JLabel label = new JLabel( "Modifier le code R envoyé si vous le souhaitez"); @@ -147,7 +149,7 @@ JOptionPane.QUESTION_MESSAGE); rCall = text.getText(); } - + engine.voidEval(rCall); log.info("Message sent to R : " + rCall); @@ -166,8 +168,8 @@ Factor factor = plan.getFactors().get(i); if ((factor.getDomain() instanceof MatrixContinuousDomain) || (factor.getDomain() instanceof EquationContinuousDomain)) { - factor - .setValueForIdentifier(morris.getValue(new int[] { i, j })); + factor.setValueForIdentifier(morris.getValue(new int[] { + i, j })); } else { Double value = (Double) ((ContinuousDomain) factor .getDomain()).getMinBound() @@ -411,33 +413,32 @@ //Get back the factors number int factorNumber = ((Double) engine.eval("length(factors)-1")) .intValue(); - - //Get back the simulation number - param_simulationNumber = (Integer)(engine.eval("length(factors[,1])")); - int sensitivityNumber = simulationStorages.get(0).getParameter() - .getSensitivityExport().size(); + //Get back the simulation number + param_simulationNumber = (Integer) (engine + .eval("length(factors[,1])")); + SimulationParameter param = simulationStorages.get(0) + .getParameter(); + int sensitivityNumber = param.getSensitivityExport().size(); + for (int k = 0; k < sensitivityNumber; k++) { - // Creates the R expression to import results in R - String name = simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k).getExportFilename(); + // Creates the R expression to import results in R + String name = param.getSensitivityExport().get(k) + .getExportFilename(); String rInstruction = name + "<-c("; - for (int l = 0; l < param_simulationNumber; l++) { + for (int l = 0; l < simulationStorages.size(); l++) { File importFile = new File(simulationStorages.get(l) .getDirectory().toString() + File.separator - + SimulationStorage.RESULT_EXPORT_DIRECTORY, - simulationStorages.get(l).getParameter() - .getSensitivityExport().get(k) - .getExportFilename() - + simulationStorages.get(l).getParameter() - .getSensitivityExport().get(k) - .getExtensionFilename()); + + SimulationStorage.RESULT_EXPORT_DIRECTORY, param + .getSensitivityExport().get(k).getExportFilename() + + param.getSensitivityExport().get(k) + .getExtensionFilename()); String simulResult = FileUtil.readAsString(importFile); double simulationResult = Double.valueOf(simulResult); - if (l < param_simulationNumber - 1) { + if (l < simulationStorages.size() - 1) { rInstruction = rInstruction + simulationResult + ","; } else { rInstruction = rInstruction + simulationResult; @@ -471,8 +472,8 @@ for (int k = 0; k < sensitivityNumber; k++) { // Creates the R expression to import results in R - String name = simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k).getExportFilename(); + String name = param.getSensitivityExport().get(k) + .getExportFilename(); //Create the dataforaov data.frame String dataframe = "dataforaov<-data.frame(factors," + name @@ -558,23 +559,19 @@ //Save the results with the scenarios. engine.voidEval("write.csv(dataforaov,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_Results.csv\")"); log.info("Message sent to R : write.csv(dataforaov,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_Results.csv\")"); //Save the sensitivity indices engine.voidEval("write.csv(exportsensitivity,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_SensitivityIndices.csv\")"); log.info("Message sent to R : write.csv(exportsensitivity,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_SensitivityIndices.csv\")"); //FIXME export through java to enable export when using Rserve (when distant Rserve). Modified: trunk/sensitivity/SensitivityCalculatorRSobol.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRSobol.java 2009-05-07 16:40:51 UTC (rev 136) +++ trunk/sensitivity/SensitivityCalculatorRSobol.java 2009-05-07 17:07:20 UTC (rev 137) @@ -38,6 +38,7 @@ import org.rosuda.JRI.REXP; import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.sensitivity.AbstractSensitivityCalculator; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; import fr.ifremer.isisfish.simulator.sensitivity.Domain; @@ -295,8 +296,8 @@ Factor factor = plan.getFactors().get(i); if ((factor.getDomain() instanceof MatrixContinuousDomain) || (factor.getDomain() instanceof EquationContinuousDomain)) { - factor.setValueForIdentifier(Double.valueOf( - fast.getValue(new int[] { i, j })).toString()); + factor.setValueForIdentifier(fast + .getValue(new int[] { i, j })); } else { Double value = (Double) ((ContinuousDomain) factor .getDomain()).getMinBound() @@ -370,26 +371,24 @@ int scenariosNumber = (Integer) engine.eval("length(a$X[,1])"); log.info("Message sent to R : " + "length(a$X[,1])"); - int sensitivityNumber = simulationStorages.get(0).getParameter() - .getSensitivityExport().size(); + SimulationParameter param = simulationStorages.get(0) + .getParameter(); + int sensitivityNumber = param.getSensitivityExport().size(); for (int k = 0; k < sensitivityNumber; k++) { // Creates the R expression to import results in R - String name = simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k).getExportFilename(); + String name = param.getSensitivityExport().get(k) + .getExportFilename(); String rInstruction = name + "<-c("; for (int l = 0; l < scenariosNumber; l++) { File importFile = new File(simulationStorages.get(l) .getDirectory().toString() + File.separator - + SimulationStorage.RESULT_EXPORT_DIRECTORY, - simulationStorages.get(l).getParameter() - .getSensitivityExport().get(k) - .getExportFilename() - + simulationStorages.get(l).getParameter() - .getSensitivityExport().get(k) - .getExtensionFilename()); + + SimulationStorage.RESULT_EXPORT_DIRECTORY, param + .getSensitivityExport().get(k).getExportFilename() + + param.getSensitivityExport().get(k) + .getExtensionFilename()); String simulResult = FileUtil.readAsString(importFile); double simulationResult = Double.valueOf(simulResult); if (l < simulationStorages.size() - 1) { @@ -405,6 +404,9 @@ // Send the simulation results engine.voidEval(rInstruction); + // Send the simulation results + engine.voidEval(rInstruction); + //Put results in isis.simule engine.voidEval("isis.simule<-data.frame(isis.simule," + name + ")"); @@ -426,8 +428,8 @@ for (int k = 0; k < sensitivityNumber; k++) { // Creates the R expression to import results in R - String name = simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k).getExportFilename(); + String name = param.getSensitivityExport().get(k) + .getExportFilename(); //Compute results engine.voidEval("tell(a,y=" + name + ")"); @@ -461,47 +463,39 @@ //Export V engine.voidEval("write.csv(a$V,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_SensitivityIndices.csv\")"); log.info("Message sent to R : " + "write.csv(a$V,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_V.csv\")"); //Export DD engine.voidEval("write.csv(a$D,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_D.csv\")"); log.info("Message sent to R : " + "write.csv(a$D,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_D.csv\")"); //Export S engine.voidEval("write.csv(a$S,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_S.csv\")"); log.info("Message sent to R : " + "write.csv(a$S,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_S.csv\")"); //Export results engine.voidEval("write.csv(dfresults,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_Results.csv\")"); log.info("Message sent to R : " + "write.csv(results,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_Results.csv\")"); //FIXME export through java to enable export when using Rserve Modified: trunk/sensitivity/SensitivityCalculatorRegularFractions.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRegularFractions.java 2009-05-07 16:40:51 UTC (rev 136) +++ trunk/sensitivity/SensitivityCalculatorRegularFractions.java 2009-05-07 17:07:20 UTC (rev 137) @@ -19,6 +19,7 @@ import org.codelutin.util.FileUtil; import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.sensitivity.AbstractSensitivityCalculator; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; import fr.ifremer.isisfish.simulator.sensitivity.Domain; @@ -381,39 +382,39 @@ int factorNumber = ((Double) engine.eval("length(factors)-1")) .intValue(); - int sensitivityNumber = simulationStorages.get(0).getParameter() - .getSensitivityExport().size(); + SimulationParameter param = simulationStorages.get(0) + .getParameter(); + int sensitivityNumber = param.getSensitivityExport().size(); for (int k = 0; k < sensitivityNumber; k++) { - String name = simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k).getExportFilename(); - - //Create the results vectors - String result = name + "<-c("; + // Creates the R expression to import results in R + String name = param.getSensitivityExport().get(k) + .getExportFilename(); + String rInstruction = name + "<-c("; for (int l = 0; l < simulationStorages.size(); l++) { File importFile = new File(simulationStorages.get(l) .getDirectory().toString() + File.separator - + SimulationStorage.RESULT_EXPORT_DIRECTORY, - simulationStorages.get(l).getParameter() - .getSensitivityExport().get(k) - .getExportFilename() - + simulationStorages.get(l).getParameter() - .getSensitivityExport().get(k) - .getExtensionFilename()); + + SimulationStorage.RESULT_EXPORT_DIRECTORY, param + .getSensitivityExport().get(k).getExportFilename() + + param.getSensitivityExport().get(k) + .getExtensionFilename()); String simulResult = FileUtil.readAsString(importFile); double simulationResult = Double.valueOf(simulResult); if (l < simulationStorages.size() - 1) { - result = result + simulationResult + ","; + rInstruction = rInstruction + simulationResult + ","; } else { - result = result + simulationResult; + rInstruction = rInstruction + simulationResult; } } - result = result + ")"; - engine.voidEval(result); - log.info("Message sent to R : " + result); + rInstruction = rInstruction + ")"; + log.info("Message sent to R : " + rInstruction); + + // Send the simulation results + engine.voidEval(rInstruction); + //Put results in isis.simule engine.voidEval("isis.simule<-data.frame(isis.simule," + name + ")"); @@ -431,8 +432,7 @@ for (int k = 0; k < sensitivityNumber; k++) { // Creates the R expression to import results in R - String name = simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k).getExportFilename(); + String name = param.getSensitivityExport().get(k).getExportFilename(); //Create the dataforaov data.frame String dataframe = "dataforaov<-data.frame(factors," + name @@ -518,23 +518,19 @@ //Save the results with the scenarios. engine.voidEval("write.csv(dataforaov,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_Results.csv\")"); log.info("Message sent to R : write.csv(dataforaov,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_Results.csv\")"); //Save the sensitivity indices engine.voidEval("write.csv(exportsensitivity,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_SensitivityIndices.csv\")"); log.info("Message sent to R : write.csv(exportsensitivity,\"" - + simulationStorages.get(0).getParameter() - .getSensitivityExport().get(k) + + param.getSensitivityExport().get(k) .getExportFilename() + "_SensitivityIndices.csv\")"); //FIXME export through java to enable export when using Rserve (when distant Rserve).

1 0

r136 - trunk/exports
by jcouteau＠users.labs.libre-entreprise.org May 7, 2009

May 7, 2009

Author: jcouteau Date: 2009-05-07 16:40:51 +0000 (Thu, 07 May 2009) New Revision: 136 Modified: trunk/exports/SensitivityCapturesWeightReferenceY7.java trunk/exports/SensitivityCapturesWeightRelativeReferenceY10.java trunk/exports/SensitivityCapturesWeightRelativeY4.java trunk/exports/SensitivityCapturesWeightY1.java Log: Fix captures weight export Modified: trunk/exports/SensitivityCapturesWeightReferenceY7.java =================================================================== --- trunk/exports/SensitivityCapturesWeightReferenceY7.java 2009-05-07 12:41:53 UTC (rev 135) +++ trunk/exports/SensitivityCapturesWeightReferenceY7.java 2009-05-07 16:40:51 UTC (rev 136) @@ -24,7 +24,7 @@ static private Log log = LogFactory .getLog(SensitivityCapturesWeightReferenceY7.class); - protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET }; + protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP }; @Doc("Population") public Population param_pop; @@ -53,7 +53,7 @@ .getMatrix( new Date(lastDate.getDate() - i), pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); capturesWeight += matlastdate.sumAll(); //Get the reference captures Weight of each month of the last year @@ -62,7 +62,7 @@ MatrixND matlastdatereference = referenceResultStorage .getMatrix( new Date(lastDate.getDate() - i), - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP + " " + pop, tx); capturesWeightReference += matlastdatereference.sumAll(); tx.commitTransaction(); Modified: trunk/exports/SensitivityCapturesWeightRelativeReferenceY10.java =================================================================== --- trunk/exports/SensitivityCapturesWeightRelativeReferenceY10.java 2009-05-07 12:41:53 UTC (rev 135) +++ trunk/exports/SensitivityCapturesWeightRelativeReferenceY10.java 2009-05-07 16:40:51 UTC (rev 136) @@ -25,7 +25,7 @@ static private Log log = LogFactory .getLog(SensitivityCapturesWeightRelativeReferenceY10.class); - protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET }; + protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP }; @Doc("Population") public Population param_pop; @@ -56,7 +56,7 @@ .getMatrix( new Date(lastDate.getDate() - i), pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); capturesWeight += matlastdate.sumAll(); //Get the captures Weight of each month of the first year @@ -64,7 +64,7 @@ .getMatrix( new Date(i), pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); capturesWeightfirst += matfirstdate.sumAll(); //Get the reference captures Weight of each month of the last year Modified: trunk/exports/SensitivityCapturesWeightRelativeY4.java =================================================================== --- trunk/exports/SensitivityCapturesWeightRelativeY4.java 2009-05-07 12:41:53 UTC (rev 135) +++ trunk/exports/SensitivityCapturesWeightRelativeY4.java 2009-05-07 16:40:51 UTC (rev 136) @@ -23,7 +23,7 @@ static private Log log = LogFactory .getLog(SensitivityCapturesWeightRelativeY4.class); - protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET }; + protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP }; @Doc("Population") public Population param_pop; @@ -45,7 +45,7 @@ .getMatrix( new Date(lastDate.getDate() - i), pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); capturesWeight += matlastdate.sumAll(); //Get the captures Weight of each month of the first year @@ -53,7 +53,7 @@ .getMatrix( new Date(i), pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); capturesWeightfirst += matfirstdate.sumAll(); } Modified: trunk/exports/SensitivityCapturesWeightY1.java =================================================================== --- trunk/exports/SensitivityCapturesWeightY1.java 2009-05-07 12:41:53 UTC (rev 135) +++ trunk/exports/SensitivityCapturesWeightY1.java 2009-05-07 16:40:51 UTC (rev 136) @@ -23,7 +23,7 @@ static private Log log = LogFactory .getLog(SensitivityCapturesWeightY1.class); - protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET }; + protected String[] necessaryResult = { ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP }; @Doc("Population") public Population param_pop; @@ -44,7 +44,7 @@ .getMatrix( new Date(lastDate.getDate() - i), pop, - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET_PER_ZONE_POP); capturesWeight += matlastdate.sumAll(); }

1 0

r135 - in trunk: exports scripts
by jcouteau＠users.labs.libre-entreprise.org May 7, 2009

May 7, 2009

Author: jcouteau Date: 2009-05-07 12:41:53 +0000 (Thu, 07 May 2009) New Revision: 135 Modified: trunk/exports/RejetsNombre.java trunk/scripts/GravityModel.java trunk/scripts/SiMatrix.java Log: Fix 3 wrong files Modified: trunk/exports/RejetsNombre.java =================================================================== --- trunk/exports/RejetsNombre.java 2009-05-07 12:27:08 UTC (rev 134) +++ trunk/exports/RejetsNombre.java 2009-05-07 12:41:53 UTC (rev 135) @@ -61,7 +61,7 @@ for (Date date = new Date(0); !date.after(lastDate); date = date .next()) { MatrixND mat = simulation.getResultStorage().getMatrix(date, - pop, ResultName.MATRIX_DISCARDS_PER_STR_MET); + pop, ResultName.MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP); if (mat != null) { // can be null if simulation is stopped before last year simulation mat = mat.sumOverDim(0); //sum on strategy for (MatrixIterator i = mat.iterator(); i.hasNext();) { Modified: trunk/scripts/GravityModel.java =================================================================== --- trunk/scripts/GravityModel.java 2009-05-07 12:27:08 UTC (rev 134) +++ trunk/scripts/GravityModel.java 2009-05-07 12:41:53 UTC (rev 135) @@ -652,7 +652,7 @@ private double getDiscardsWeightPerStrMet(Strategy str, Metier metier, PopulationGroup group, Zone zone, Date date) { MatrixND mat = resultManager.getMatrix(date, group.getPopulation(), - ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET); + ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP); double result = 0; if (mat != null) { result = mat.getValue(str, metier, group, zone); Modified: trunk/scripts/SiMatrix.java =================================================================== --- trunk/scripts/SiMatrix.java 2009-05-07 12:27:08 UTC (rev 134) +++ trunk/scripts/SiMatrix.java 2009-05-07 12:41:53 UTC (rev 135) @@ -1801,7 +1801,7 @@ List<PopulationGroup> groups = pop.getPopulationGroup(); MatrixND result = matrixDiscardPerStrategyMetPerZonePop.copy(); - result.setName(ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET); + result.setName(ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP); for (PopulationGroup group : groups) { MatrixND sub = result.getSubMatrix(2, group, 1);

1 0