Author: jcouteau Date: 2009-04-22 14:33:10 +0000 (Wed, 22 Apr 2009) New Revision: 118 Modified: trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java trunk/sensitivity/SensitivityCalculatorRegularFractions.java Log: Changing attributes instruction in R Modified: trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2009-04-21 12:27:21 UTC (rev 117) +++ trunk/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2009-04-22 14:33:10 UTC (rev 118) @@ -284,9 +284,9 @@ log .info("Message sent to R : " - + "attributes(isis.MethodExp)<-list(nomModel=\"isis-fish-externe-R\")"); + + "attr(isis.MethodExp,\"nomModel\")<-\"isis-fish-externe-R\""); engine - .voidEval("attributes(isis.MethodExp)<-list(nomModel=\"isis-fish-externe-R\")"); + .voidEval("attr(isis.MethodExp,\"nomModel\")<-\"isis-fish-externe-R\""); //Create isis.Simule log.info("Message sent to R : " + "isis.simule<-data.frame(data)"); @@ -294,9 +294,9 @@ log .info("Message sent to R : " - + "attributes(isis.simule)<-list(nomModel=\"isis-fish-externe-R\")"); + + "attr(isis.simule,\"nomModel\")<-\"isis-fish-externe-R\""); engine - .voidEval("attributes(isis.simule)<-list(nomModel=\"isis-fish-externe-R\")"); + .voidEval("attr(isis.simule,\"nomModel\")<-\"isis-fish-externe-R\""); log.info("Message sent to R : " + "names(isis.simule)<-isis.factors[[1]]"); @@ -394,13 +394,6 @@ + "isis.simule<-data.frame(isis.simule," + name + ")"); } - //adding attribute to isis.Simule - log - .info("Message sent to R : " - + "attributes(isis.simule)<-list(nomModel=\"isis-fish-externe-R\")"); - engine - .voidEval("attributes(isis.simule)<-list(nomModel=\"isis-fish-externe-R\")"); - for (int k = 0; k < sensitivityNumber; k++) { // Creates the R expression to import results in R @@ -521,6 +514,12 @@ .voidEval("isis.methodAnalyse<-list(\"isis.factors\"=isis.factors,\"isis.factor.distribution\"=isis.factor.distribution,\"isis.simule\"=isis.simule,call_method=\"" + aovCall + "\"" + ",aovresult)"); + log + .info("Message sent to R : " + + "attr(isis.methodAnalyse,\"nomModel\")<-\"isis-fish-externe-R\""); + engine + .voidEval("attr(isis.methodAnalyse,\"nomModel\")<-\"isis-fish-externe-R\""); + String renameIsisMethodAnalyse = "%s.isis.methodAnalyse<-isis.methodAnalyse"; String simulationName = simulationStorages.get(0).getName() .replaceAll("-", ""); Modified: trunk/sensitivity/SensitivityCalculatorRegularFractions.java =================================================================== --- trunk/sensitivity/SensitivityCalculatorRegularFractions.java 2009-04-21 12:27:21 UTC (rev 117) +++ trunk/sensitivity/SensitivityCalculatorRegularFractions.java 2009-04-22 14:33:10 UTC (rev 118) @@ -303,9 +303,9 @@ log .info("Message sent to R : " - + "attributes(isis.MethodExp)<-list(nomModel=\"isis-fish-externe-R\")"); + + "attr(isis.MethodExp,\"nomModel\")<-\"isis-fish-externe-R\""); engine - .voidEval("attributes(isis.MethodExp)<-list(nomModel=\"isis-fish-externe-R\")"); + .voidEval("attr(isis.MethodExp,\"nomModel\")<-\"isis-fish-externe-R\""); //Create isis.Simule log.info("Message sent to R : " + "isis.simule<-data.frame(data)"); @@ -313,20 +313,18 @@ log .info("Message sent to R : " - + "attributes(isis.simule)<-list(nomModel=\"isis-fish-externe-R\")"); + + "attr(isis.simule,\"nomModel\")<-\"isis-fish-externe-R\""); engine - .voidEval("attributes(isis.simule)<-list(nomModel=\"isis-fish-externe-R\")"); + .voidEval("attr(isis.simule,\"nomModel\")<-\"isis-fish-externe-R\""); log.info("Message sent to R : " + "names(isis.simule)<-isis.factors[[1]]"); engine.voidEval("names(isis.simule)<-isis.factors[[1]]"); - - // Export the data.frame object for the second run in a .expandgrid file + + // Export the data.frame object for the second run in a .expandgrid file engine.voidEval("write.csv(data,file=\".data.csv\")"); - log - .info("Message sent to R : write.csv(data,file=\".data.csv\")"); + 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() + "\")"); @@ -374,11 +372,10 @@ engine.voidEval("factornames<-dget(\".factornames\")"); log.info("Message sent to R : " + "factornames<-dget(\".factornames\")"); - - //Get back the scenarios + + //Get back the scenarios engine.voidEval("factors<-read.csv(\".data.csv\")"); - log - .info("Message sent to R : factors<-read.csv(\".data.csv\")"); + log.info("Message sent to R : factors<-read.csv(\".data.csv\")"); //Get back the factors number int factorNumber = ((Double) engine.eval("length(factors)-1")) @@ -427,9 +424,9 @@ //adding attribute to isis.Simule log .info("Message sent to R : " - + "attributes(isis.simule)<-list(nomModel=\"isis-fish-externe-R\")"); + + "attr(isis.simule,\"nomModel\")<-\"isis-fish-externe-R\""); engine - .voidEval("attributes(isis.simule)<-list(nomModel=\"isis-fish-externe-R\")"); + .voidEval("attr(isis.simule,\"nomModel\")<-\"isis-fish-externe-R\""); for (int k = 0; k < sensitivityNumber; k++) { @@ -551,6 +548,12 @@ .voidEval("isis.methodAnalyse<-list(\"isis.factors\"=isis.factors,\"isis.factor.distribution\"=isis.factor.distribution,\"isis.simule\"=isis.simule,call_method=\"" + aovCall + "\"" + ",aovresult)"); + log + .info("Message sent to R : " + + "attr(isis.methodAnalyse,\"nomModel\")<-\"isis-fish-externe-R\""); + engine + .voidEval("attr(isis.methodAnalyse,\"nomModel\")<-\"isis-fish-externe-R\""); + String renameIsisMethodAnalyse = "%s.isis.methodAnalyse<-isis.methodAnalyse"; String simulationName = simulationStorages.get(0).getName() .replaceAll("-", "");