December 2009 - Nuiton-j2r-commits - mailman.cloud.codelutin.com

r175 - trunk
by tchemit＠users.nuiton.org 18 Dec '09

18 Dec '09

Author: tchemit Date: 2009-12-18 14:40:37 +0100 (Fri, 18 Dec 2009) New Revision: 175 Modified: trunk/pom.xml Log: use mavenpom 1.1.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-15 10:10:29 UTC (rev 174) +++ trunk/pom.xml 2009-12-18 13:40:37 UTC (rev 175) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.2</version> + <version>1.1.3</version> </parent> <artifactId>nuiton-j2r</artifactId>

1 0

r174 - trunk/src/main/java/org/nuiton/j2r
by jcouteau＠users.nuiton.org 15 Dec '09

15 Dec '09

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\")";

1 0

r173 - trunk/src/site/rst
by jcouteau＠users.nuiton.org 14 Dec '09

14 Dec '09

Author: jcouteau Date: 2009-12-14 14:55:42 +0100 (Mon, 14 Dec 2009) New Revision: 173 Modified: trunk/src/site/rst/index.rst Log: Modify rst so that it can build site Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2009-12-12 08:13:11 UTC (rev 172) +++ trunk/src/site/rst/index.rst 2009-12-14 13:55:42 UTC (rev 173) @@ -1,12 +1,10 @@ -======== -LutinJ2R -======== +========== +Nuiton-J2R +========== -La librairie LutinJ2R a pour but de fournir une passerrelle unifiée d'accès à R. +La librairie Nuiton-J2R a pour but de fournir une passerrelle unifiée d'accès à R. -Pour exécuter les tests, ne pas oublier l'argument suivant :: - - -DargLine="-Djava.library.path=/usr/local/lib" - -Il indique l'emplacement de la librairie libjri.so \ No newline at end of file +Pour exécuter les tests, ne pas oublier de lancer Rserve (R CMD Rserve) et +l'argument suivant : -DargLine="-Djava.library.path=/usr/local/lib" au lancement +du build. Il indique l'emplacement de la librairie libjri.so. \ No newline at end of file

1 0

r172 - trunk
by jcouteau＠users.nuiton.org 12 Dec '09

12 Dec '09

Author: jcouteau Date: 2009-12-12 09:13:11 +0100 (Sat, 12 Dec 2009) New Revision: 172 Modified: trunk/pom.xml Log: Switch to mavenpom 1.1.2 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-11 17:33:33 UTC (rev 171) +++ trunk/pom.xml 2009-12-12 08:13:11 UTC (rev 172) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.1</version> + <version>1.1.2</version> </parent> <artifactId>nuiton-j2r</artifactId>

1 0

r171 - trunk/src/main/java/org/nuiton/j2r
by jcouteau＠users.nuiton.org 11 Dec '09

11 Dec '09

Author: jcouteau Date: 2009-12-11 18:33:33 +0100 (Fri, 11 Dec 2009) New Revision: 171 Modified: trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java Log: Fix a load and save RData bug Modified: trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java 2009-12-10 15:31:51 UTC (rev 170) +++ trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java 2009-12-11 17:33:33 UTC (rev 171) @@ -59,7 +59,8 @@ @Override public void loadRData(File directory, String fileName) throws RException { setwd(directory); - voidEval(String.format(RInstructions.LOAD_RDATA_FILE, fileName)); + voidEval(String.format(RInstructions.LOAD_RDATA_FILE, + fileName + ".RData")); } /** @@ -72,7 +73,8 @@ */ @Override public void loadRData(String fileName) throws RException { - voidEval(String.format(RInstructions.LOAD_RDATA_FILE, fileName)); + voidEval(String.format(RInstructions.LOAD_RDATA_FILE, + fileName + ".RData")); } /**

1 0

r170 - trunk/src/main/java/org/nuiton/j2r
by jcouteau＠users.nuiton.org 10 Dec '09

10 Dec '09

Author: jcouteau Date: 2009-12-10 16:31:51 +0100 (Thu, 10 Dec 2009) New Revision: 170 Modified: trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java Log: Fix bug on saveRData Modified: trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java 2009-12-10 14:43:19 UTC (rev 169) +++ trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java 2009-12-10 15:31:51 UTC (rev 170) @@ -99,7 +99,8 @@ */ @Override public void saveRData(String filename) throws RException { - voidEval(String.format(RInstructions.SAVE_IMAGE_FILE,filename)); + voidEval(String.format(RInstructions.SAVE_IMAGE_FILE, + filename + ".RData")); } /** @@ -114,7 +115,8 @@ @Override public void saveRData(File directory, String fileName) throws RException { setwd(directory); - voidEval(String.format(RInstructions.SAVE_IMAGE_FILE,fileName)); + voidEval(String.format(RInstructions.SAVE_IMAGE_FILE, + fileName + ".RData")); } /**

1 0

r169 - trunk
by tchemit＠users.nuiton.org 10 Dec '09

10 Dec '09

Author: tchemit Date: 2009-12-10 15:43:19 +0100 (Thu, 10 Dec 2009) New Revision: 169 Modified: trunk/pom.xml Log: always use last version of mavenpom Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-10 14:39:28 UTC (rev 168) +++ trunk/pom.xml 2009-12-10 14:43:19 UTC (rev 169) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0</version> + <version>1.1.1</version> </parent> <artifactId>nuiton-j2r</artifactId>

1 0

r168 - in trunk: . src/main/java/org/nuiton/j2r
by jcouteau＠users.nuiton.org 10 Dec '09

10 Dec '09

Author: jcouteau Date: 2009-12-10 15:39:28 +0100 (Thu, 10 Dec 2009) New Revision: 168 Added: trunk/nb-configuration.xml trunk/nbactions.xml Modified: trunk/src/main/java/org/nuiton/j2r/REngine.java trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java trunk/src/main/java/org/nuiton/j2r/RProxy.java Log: Add a method to load data without changing the working directory Added: trunk/nb-configuration.xml =================================================================== --- trunk/nb-configuration.xml (rev 0) +++ trunk/nb-configuration.xml 2009-12-10 14:39:28 UTC (rev 168) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-shared-configuration> +  + <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1"> +  + <netbeans.compile.on.save>all</netbeans.compile.on.save> + </properties> +</project-shared-configuration> Added: trunk/nbactions.xml =================================================================== --- trunk/nbactions.xml (rev 0) +++ trunk/nbactions.xml 2009-12-10 14:39:28 UTC (rev 168) @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8"?> +<actions> + <action> + <actionName>run</actionName> + <goals> + <goal>process-classes</goal> + <goal>org.codehaus.mojo:exec-maven-plugin:1.1.1:exec</goal> + </goals> + <properties> + <exec.classpathScope>runtime</exec.classpathScope> + <exec.args>-Djava.library.path=/usr/local/lib -classpath %classpath ${packageClassName}</exec.args> + <exec.executable>java</exec.executable> + </properties> + </action> + <action> + <actionName>debug</actionName> + <goals> + <goal>process-classes</goal> + <goal>org.codehaus.mojo:exec-maven-plugin:1.1.1:exec</goal> + </goals> + <properties> + <exec.classpathScope>runtime</exec.classpathScope> + <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -Djava.library.path=/usr/local/lib -classpath %classpath ${packageClassName}</exec.args> + <jpda.listen>true</jpda.listen> + <exec.executable>java</exec.executable> + </properties> + </action> + <action> + <actionName>profile</actionName> + <goals> + <goal>process-classes</goal> + <goal>org.codehaus.mojo:exec-maven-plugin:1.1.1:exec</goal> + </goals> + <properties> + <exec.args>${profiler.args} -Djava.library.path=/usr/local/lib -classpath %classpath ${packageClassName}</exec.args> + <profiler.action>profile</profiler.action> + <exec.executable>${profiler.java}</exec.executable> + </properties> + </action> + <action> + <actionName>build</actionName> + <goals> + <goal>install</goal> + </goals> + <properties> + <java.library.path>/usr/local/lib</java.library.path> + </properties> + </action> + <action> + <actionName>test</actionName> + <goals> + <goal>test</goal> + </goals> + <properties> + <java.library.path>/usr/local/lib</java.library.path> + </properties> + </action> + </actions> Modified: trunk/src/main/java/org/nuiton/j2r/REngine.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/REngine.java 2009-12-10 14:25:47 UTC (rev 167) +++ trunk/src/main/java/org/nuiton/j2r/REngine.java 2009-12-10 14:39:28 UTC (rev 168) @@ -81,6 +81,15 @@ void loadRData(File directory) throws RException; /** + * Load filename.RData file located in current working directory + * + * @param filename + * name of the .RData file (will be followed by .RData) + * @throws RException + */ + void loadRData(String filename) throws RException; + + /** * Save the session in a .RData file in directory * * @param directory Modified: trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java 2009-12-10 14:25:47 UTC (rev 167) +++ trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java 2009-12-10 14:39:28 UTC (rev 168) @@ -63,6 +63,19 @@ } /** + * Load the "fileName.RData" file located in current working directory. + * + * @param fileName name of the file to load (will load the fileName.RData + * file) + * @throws org.nuiton.j2r.RException if an error occur while loading the R + * session file. + */ + @Override + public void loadRData(String fileName) throws RException { + voidEval(String.format(RInstructions.LOAD_RDATA_FILE, fileName)); + } + + /** * Save the session in a .RData file in directory * * @param directory Modified: trunk/src/main/java/org/nuiton/j2r/RProxy.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/RProxy.java 2009-12-10 14:25:47 UTC (rev 167) +++ trunk/src/main/java/org/nuiton/j2r/RProxy.java 2009-12-10 14:39:28 UTC (rev 168) @@ -625,5 +625,14 @@ } engine.saveRData(filename); } + + @Override + public void loadRData(String filename) throws RException { + if (engine == null) { + log.fatal("The R Proxy is not initialized. An error probably " + + "occured during the initialization."); + } + engine.loadRData(filename); + } } //RProxy

1 0

r167 - trunk
by jcouteau＠users.nuiton.org 10 Dec '09

10 Dec '09

Author: jcouteau Date: 2009-12-10 15:25:47 +0100 (Thu, 10 Dec 2009) New Revision: 167 Modified: trunk/pom.xml Log: Remove old dependency from POM Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-10 13:56:16 UTC (rev 166) +++ trunk/pom.xml 2009-12-10 14:25:47 UTC (rev 167) @@ -24,13 +24,6 @@ <version>1.1.1</version> </dependency> -  - <dependency> <groupId>org.nuiton.thirdparty</groupId> <artifactId>JRI</artifactId>

1 0

r166 - trunk/src/main/java/org/nuiton/j2r
by jcouteau＠users.nuiton.org 10 Dec '09

10 Dec '09

Author: jcouteau Date: 2009-12-10 14:56:16 +0100 (Thu, 10 Dec 2009) New Revision: 166 Modified: trunk/src/main/java/org/nuiton/j2r/REngine.java trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java trunk/src/main/java/org/nuiton/j2r/RProxy.java Log: Add method to save RData without changing the working directory Modified: trunk/src/main/java/org/nuiton/j2r/REngine.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/REngine.java 2009-12-08 16:43:01 UTC (rev 165) +++ trunk/src/main/java/org/nuiton/j2r/REngine.java 2009-12-10 13:56:16 UTC (rev 166) @@ -222,6 +222,7 @@ /** * Commit all the R instructions that have been stored and not commited yet. + * @throws RException */ void commit() throws RException; @@ -251,4 +252,13 @@ * session. */ void saveRData(File directory, String fileName) throws RException; + + /** + * Save a R session in a filename.RData file located in the current working + * directory + * + * @param filename + * @throws RException + */ + void saveRData(String filename) throws RException; } //REngine Modified: trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java 2009-12-08 16:43:01 UTC (rev 165) +++ trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java 2009-12-10 13:56:16 UTC (rev 166) @@ -77,6 +77,19 @@ } /** + * Save the session in a .RData file in current working directory + * + * @param filename + * the .RData filename (will be followed by .RData) + * @throws RException if an error occur while saving the R + * session. + */ + @Override + public void saveRData(String filename) throws RException { + voidEval(String.format(RInstructions.SAVE_IMAGE_FILE,filename)); + } + + /** * Save a R session in a fileName.RData file located in directory. * * @param directory where the ".RData" file will be located Modified: trunk/src/main/java/org/nuiton/j2r/RProxy.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/RProxy.java 2009-12-08 16:43:01 UTC (rev 165) +++ trunk/src/main/java/org/nuiton/j2r/RProxy.java 2009-12-10 13:56:16 UTC (rev 166) @@ -616,5 +616,14 @@ } engine.loadRData(directory, fileName); } + + @Override + public void saveRData(String filename) throws RException { + if (engine == null) { + log.fatal("The R Proxy is not initialized. An error probably " + + "occured during the initialization."); + } + engine.saveRData(filename); + } } //RProxy

1 0