Author: jcouteau Date: 2009-12-15 10:07:24 +0000 (Tue, 15 Dec 2009) New Revision: 2834 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java Log: clean code using new nuiton-j2r features Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2009-12-14 18:24:08 UTC (rev 2833) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2009-12-15 10:07:24 UTC (rev 2834) @@ -164,34 +164,26 @@ REngine engine = new RProxy(); //clear the engine (to be sure it's empty) - log.info("rm(list=ls())"); - engine.voidEval("rm(list=ls())"); + engine.clearSession(); Rcall = String.format(nomFacteur, factorNames); - log.info(Rcall); engine.voidEval(Rcall); Rcall = String.format(nominal, nominalValues); - log.info(Rcall); engine.voidEval(Rcall); Rcall = String.format(continu, continuValues); - log.info(Rcall); engine.voidEval(Rcall); Rcall = String.format(binf, binfValues); - log.info(Rcall); engine.voidEval(Rcall); Rcall = String.format(bsup, bsupValues); - log.info(Rcall); engine.voidEval(Rcall); - log.info(isisfactors); engine.voidEval(isisfactors); Rcall = String.format(attribute, "nomModel", "isis-fish-externeR"); - log.info(Rcall); engine.voidEval(Rcall); for (int i = 0; i < factors.size(); i++) { @@ -210,23 +202,14 @@ Rcall = String.format(attribute, factor.getName(), attributeValues); - log.info(Rcall); engine.voidEval(Rcall); } } - //Set working directory to save the Isis R session - log.info("setwd(\"" - + outputdirectory.getParent().replaceAll("\\\\", "/") - + "\")"); - engine.voidEval("setwd(\"" - + outputdirectory.getParent().replaceAll("\\\\", "/") - + "\")"); + //Save the Isis R session + engine.saveRData(outputdirectory.getParentFile(), + outputdirectory.getName()); - log.info("save.image(file=\"" + outputdirectory.getName() + ".RData\")"); - engine.voidEval("save.image(file=\"" + outputdirectory.getName() - + ".RData\")"); - } catch (RException eee) { if (log.isErrorEnabled()) { log.error("R evaluation failed", eee);