Author: jcouteau Date: 2009-12-15 11:10:29 +0100 (Tue, 15 Dec 2009) New Revision: 174 Modified: trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java trunk/src/main/java/org/nuiton/j2r/RInstructions.java Log: fix load and save data bug Modified: trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java 2009-12-14 13:55:42 UTC (rev 173) +++ trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java 2009-12-15 10:10:29 UTC (rev 174) @@ -59,8 +59,7 @@ @Override public void loadRData(File directory, String fileName) throws RException { setwd(directory); - voidEval(String.format(RInstructions.LOAD_RDATA_FILE, - fileName + ".RData")); + voidEval(String.format(RInstructions.LOAD_RDATA_FILE, fileName)); } /** @@ -73,8 +72,7 @@ */ @Override public void loadRData(String fileName) throws RException { - voidEval(String.format(RInstructions.LOAD_RDATA_FILE, - fileName + ".RData")); + voidEval(String.format(RInstructions.LOAD_RDATA_FILE, fileName)); } /** @@ -101,8 +99,7 @@ */ @Override public void saveRData(String filename) throws RException { - voidEval(String.format(RInstructions.SAVE_IMAGE_FILE, - filename + ".RData")); + voidEval(String.format(RInstructions.SAVE_IMAGE_FILE, filename)); } /** @@ -117,8 +114,7 @@ @Override public void saveRData(File directory, String fileName) throws RException { setwd(directory); - voidEval(String.format(RInstructions.SAVE_IMAGE_FILE, - fileName + ".RData")); + voidEval(String.format(RInstructions.SAVE_IMAGE_FILE, fileName)); } /** Modified: trunk/src/main/java/org/nuiton/j2r/RInstructions.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/RInstructions.java 2009-12-14 13:55:42 UTC (rev 173) +++ trunk/src/main/java/org/nuiton/j2r/RInstructions.java 2009-12-15 10:10:29 UTC (rev 174) @@ -15,7 +15,7 @@ */ String LOAD_RDATA_FILE = "load(\"%s.RData\")"; String SAVE_IMAGE = "save.image()"; - String SAVE_IMAGE_FILE = "save.image(file=\"%s\")"; + String SAVE_IMAGE_FILE = "save.image(file=\"%s.RData\")"; String SET_WORKING_DIRECTORY = "setwd(\"%s\")"; String GET_WORKING_DIRECTORY = "getwd()"; String DPUT = "dput(%s,file=\"%s\")";