June 2010 - Nuiton-j2r-commits - mailman.cloud.codelutin.com

r221 - in trunk/src: main/java/org/nuiton/j2r test/java/org/nuiton/j2r
by jcouteau＠users.nuiton.org 28 Jun '10

28 Jun '10

Author: jcouteau Date: 2010-06-28 10:13:07 +0200 (Mon, 28 Jun 2010) New Revision: 221 Url: http://nuiton.org/repositories/revision/nuiton-j2r/221 Log: Add graphics generation 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 trunk/src/test/java/org/nuiton/j2r/JNITest.java trunk/src/test/java/org/nuiton/j2r/NetTest.java Modified: trunk/src/main/java/org/nuiton/j2r/REngine.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/REngine.java 2010-06-27 06:35:53 UTC (rev 220) +++ trunk/src/main/java/org/nuiton/j2r/REngine.java 2010-06-28 08:13:07 UTC (rev 221) @@ -288,4 +288,8 @@ * @throws RException */ void saveRData(String filename) throws RException; + + public void plot(String filename, String x, String y, String type, + String main, String sub, String xlab, String ylab, + String asp) throws RException; } //REngine Modified: trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java 2010-06-27 06:35:53 UTC (rev 220) +++ trunk/src/main/java/org/nuiton/j2r/REngineAbstract.java 2010-06-28 08:13:07 UTC (rev 221) @@ -325,4 +325,64 @@ public Boolean isAutoCommit() { return this.autocommit; } + + /** + * @param filename + * @param x + * @param y + * @param type + * @param main + * @param sub + * @param xlab + * @param ylab + * @param asp + */ + public void plot(String filename, String x, String y, String type, + String main, String sub, String xlab, String ylab, + String asp) throws RException { + + eval("jpeg(\"" + filename + ".jpg\")"); + + String Rinstruction = "plot("; + + if ((x != null) && (!x.isEmpty())) { + Rinstruction += x; + } else { + throw new IllegalArgumentException("x argument must be filled"); + } + + if ((y != null) && (!y.isEmpty())) { + Rinstruction += ",y=" + y; + } + + if (type != null) { + Rinstruction += ",type=\"" + type + "\""; + } + + if (main != null) { + Rinstruction += ",main=\"" + main + "\""; + } + + if (sub != null) { + Rinstruction += ",sub=\"" + sub + "\""; + } + + if (xlab != null) { + Rinstruction += ",xlab=\"" + xlab + "\""; + } + + if (ylab != null) { + Rinstruction += ",ylab=\"" + ylab + "\""; + } + + if (asp != null) { + Rinstruction += ",asp=" + asp + "\""; + } + + Rinstruction += ")"; + + eval(Rinstruction); + eval("dev.off()"); + + } } Modified: trunk/src/main/java/org/nuiton/j2r/RProxy.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/RProxy.java 2010-06-27 06:35:53 UTC (rev 220) +++ trunk/src/main/java/org/nuiton/j2r/RProxy.java 2010-06-28 08:13:07 UTC (rev 221) @@ -659,5 +659,15 @@ } engine.loadRData(filename); } + + @Override + public void plot(String filename, String x, String y, String type, String main, String sub, String xlab, String ylab, String asp) throws RException { + if (engine == null) { + log.fatal("The R Proxy is not initialized. An error probably " + + "occured during the initialization."); + } + engine.plot(filename, x, y, type, main, sub, xlab, ylab, asp); + } + } //RProxy Modified: trunk/src/test/java/org/nuiton/j2r/JNITest.java =================================================================== --- trunk/src/test/java/org/nuiton/j2r/JNITest.java 2010-06-27 06:35:53 UTC (rev 220) +++ trunk/src/test/java/org/nuiton/j2r/JNITest.java 2010-06-28 08:13:07 UTC (rev 221) @@ -41,8 +41,10 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.nuiton.j2r.jni.RJniEngine; import org.nuiton.j2r.types.RDataFrame; import org.nuiton.j2r.types.RList; +import org.rosuda.JRI.Rengine; import java.io.File; @@ -423,7 +425,14 @@ @Test public void testGraphics() throws Exception { - engine.eval("plot(seq(1,10))"); + + File workingDirectory = new File("/tmp"); + engine.setwd(workingDirectory); + + engine.plot("test","seq(1,10)",null,null,null,null,null,null,null); + File pictureFile = new File("/tmp/test.jpg"); + Assert.assertTrue(pictureFile.exists()); + //engine.eval("plot(seq(1,10))"); } } // JNITest Modified: trunk/src/test/java/org/nuiton/j2r/NetTest.java =================================================================== --- trunk/src/test/java/org/nuiton/j2r/NetTest.java 2010-06-27 06:35:53 UTC (rev 220) +++ trunk/src/test/java/org/nuiton/j2r/NetTest.java 2010-06-28 08:13:07 UTC (rev 221) @@ -383,7 +383,14 @@ @Test public void testGraphics() throws Exception { - engine.eval("plot(seq(1,10))"); + + File workingDirectory = new File("/tmp"); + engine.setwd(workingDirectory); + + engine.plot("test", "seq(1,10)", null, null, null, null, null, null, null); + File pictureFile = new File("/tmp/test.jpg"); + Assert.assertTrue(pictureFile.exists()); + //engine.eval("plot(seq(1,10))"); }

2 1

r220 - trunk
by tchemit＠users.nuiton.org 27 Jun '10

27 Jun '10

Author: tchemit Date: 2010-06-27 08:35:53 +0200 (Sun, 27 Jun 2010) New Revision: 220 Url: http://nuiton.org/repositories/revision/nuiton-j2r/220 Log: Utilisation de mavenpom4redmine 2.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-19 18:56:30 UTC (rev 219) +++ trunk/pom.xml 2010-06-27 06:35:53 UTC (rev 220) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2</version> + <version>2.2.1</version> </parent> <artifactId>nuiton-j2r</artifactId>

1 0

r219 - trunk
by tchemit＠users.nuiton.org 19 Jun '10

19 Jun '10

Author: tchemit Date: 2010-06-19 20:56:30 +0200 (Sat, 19 Jun 2010) New Revision: 219 Url: http://nuiton.org/repositories/revision/nuiton-j2r/219 Log: Utilisation de mavenpom4redmine 2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-18 14:36:26 UTC (rev 218) +++ trunk/pom.xml 2010-06-19 18:56:30 UTC (rev 219) @@ -25,156 +25,202 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.1.5</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.2</version> + </parent> - <artifactId>nuiton-j2r</artifactId> - <version>1.0.2-SNAPSHOT</version> + <artifactId>nuiton-j2r</artifactId> + <version>1.0.2-SNAPSHOT</version> - <dependencies> + <dependencies> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> - <dependency> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>JRI</artifactId> - <version>0.8-4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>REngine</artifactId> - <version>${rengine.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>Rserve</artifactId> - <version>${rengine.version}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>JRI</artifactId> + <version>0.8-4</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>REngine</artifactId> + <version>${rengine.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>Rserve</artifactId> + <version>${rengine.version}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency> - </dependencies> + </dependencies> -  -  -  +  +  +  - <name>Nuiton Java-2-R library</name> - <description>Librairie permettant d'utiliser R en Java, que ce soit par le - Network ou en JNI. - </description> - <inceptionYear>2006</inceptionYear> - <url>http://maven-site.nuiton.org/${project.artifactId}</url> + <name>Nuiton Java-2-R library</name> + <description>Librairie permettant d'utiliser R en Java, que ce soit par le + Network ou en JNI. + </description> + <inceptionYear>2006</inceptionYear> + <url>http://maven-site.nuiton.org/${project.artifactId}</url> -  -  -  +  +  +  - <packaging>jar</packaging> + <packaging>jar</packaging> - <properties> + <properties> - <rengine.version>0.6-1</rengine.version> + <rengine.version>0.6-1</rengine.version> -  - <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> +  + <maven.test.failure.ignore>true</maven.test.failure.ignore> -  -  +  +  -  - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> +  + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - </properties> + </properties> - <build> + <build> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </pluginManagement> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrst.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> - </build> + </build> -  - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-j2r/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-j2r/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-j2r/trunk</url> - </scm> +  + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-j2r/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-j2r/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-j2r/trunk</url> + </scm> - <profiles> + <profiles> -  - <profile> - <id>release-assembly-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> +  + <profile> + <id>assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> - <plugins> + <plugins> -  - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-assemblies</id> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <configuration> - <attach>false</attach> - <descriptorRefs> - <descriptorRef>deps</descriptorRef> - <descriptorRef>full</descriptorRef> - </descriptorRefs> - </configuration> - </plugin> +  + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assemblies</id> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <attach>false</attach> + <descriptorRefs> + <descriptorRef>deps</descriptorRef> + <descriptorRef>full</descriptorRef> + </descriptorRefs> + </configuration> + </plugin> - </plugins> + </plugins> - </build> - </profile> - </profiles> + </build> + </profile> + <profile> + <id>central-safe</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <properties> + +  + <release.repository>${nuiton.central.release.repository}</release.repository> + + </properties> + + <build> + <defaultGoal>validate</defaultGoal> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>check-central-safe</id> + <inherited>true</inherited> + <goals> + <goal>check-auto-container</goal> + </goals> + <configuration> + <addMavenCentral>true</addMavenCentral> + <failIfNotSafe>true</failIfNotSafe> + <repositories> + <nuiton-central-releases> + http://nexus.nuiton.org/nexus/content/repositories/nuiton-central-releases + </nuiton-central-releases> + </repositories> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + </profiles> + </project>

1 0

r218 - in trunk: . src/test/java/org/nuiton/j2r
by jcouteau＠users.nuiton.org 18 Jun '10

18 Jun '10

Author: jcouteau Date: 2010-06-18 16:36:26 +0200 (Fri, 18 Jun 2010) New Revision: 218 Url: http://nuiton.org/repositories/revision/nuiton-j2r/218 Log: Update to JRI 0.8-4 Add test for graphics Modified: trunk/pom.xml trunk/src/test/java/org/nuiton/j2r/JNITest.java trunk/src/test/java/org/nuiton/j2r/NetTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-16 13:46:50 UTC (rev 217) +++ trunk/pom.xml 2010-06-18 14:36:26 UTC (rev 218) @@ -51,7 +51,7 @@ <dependency> <groupId>org.nuiton.thirdparty</groupId> <artifactId>JRI</artifactId> - <version>0.8-2</version> + <version>0.8-4</version> <scope>compile</scope> </dependency> <dependency> Modified: trunk/src/test/java/org/nuiton/j2r/JNITest.java =================================================================== --- trunk/src/test/java/org/nuiton/j2r/JNITest.java 2010-06-16 13:46:50 UTC (rev 217) +++ trunk/src/test/java/org/nuiton/j2r/JNITest.java 2010-06-18 14:36:26 UTC (rev 218) @@ -420,4 +420,10 @@ double d = (Double)engine.evalScript("t<-sin(0)\nt"); Assert.assertEquals(0.0,d,0.001); } + + @Test + public void testGraphics() throws Exception { + engine.eval("plot(seq(1,10))"); + } + } // JNITest Modified: trunk/src/test/java/org/nuiton/j2r/NetTest.java =================================================================== --- trunk/src/test/java/org/nuiton/j2r/NetTest.java 2010-06-16 13:46:50 UTC (rev 217) +++ trunk/src/test/java/org/nuiton/j2r/NetTest.java 2010-06-18 14:36:26 UTC (rev 218) @@ -8,16 +8,16 @@ * Copyright (C) 2006 - 2010 CodeLutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% @@ -381,5 +381,10 @@ Assert.assertEquals(0.0, d, 0.001); } + @Test + public void testGraphics() throws Exception { + engine.eval("plot(seq(1,10))"); + } + } // NetTest

1 0

r217 - in trunk/src: main/java/org/nuiton/j2r main/java/org/nuiton/j2r/jni main/java/org/nuiton/j2r/net test test/java/org/nuiton/j2r test/resources
by jcouteau＠users.nuiton.org 16 Jun '10

16 Jun '10

Author: jcouteau Date: 2010-06-16 15:46:50 +0200 (Wed, 16 Jun 2010) New Revision: 217 Url: http://nuiton.org/repositories/revision/nuiton-j2r/217 Log: #686 : Impossible to submit a multiline R script Added: trunk/src/test/resources/ trunk/src/test/resources/log4j.properties Modified: trunk/src/main/java/org/nuiton/j2r/REngine.java trunk/src/main/java/org/nuiton/j2r/RProxy.java trunk/src/main/java/org/nuiton/j2r/jni/RJniEngine.java trunk/src/main/java/org/nuiton/j2r/net/RNetEngine.java trunk/src/test/java/org/nuiton/j2r/JNITest.java trunk/src/test/java/org/nuiton/j2r/NetTest.java Modified: trunk/src/main/java/org/nuiton/j2r/REngine.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/REngine.java 2010-06-02 10:28:51 UTC (rev 216) +++ trunk/src/main/java/org/nuiton/j2r/REngine.java 2010-06-16 13:46:50 UTC (rev 217) @@ -73,6 +73,16 @@ void voidEval(String expr) throws RException; /** + * Evaluate the multi-line expression given in parameter in R. + * + * @param expr the multi-line expression to evaluate. + * @return the value returned by the expression. + * @throws RException if an error occur while trying to evaluate the + * expression. + */ + Object evalScript(String expr) throws RException; + + /** * End the engine use. * * @throws RException Modified: trunk/src/main/java/org/nuiton/j2r/RProxy.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/RProxy.java 2010-06-02 10:28:51 UTC (rev 216) +++ trunk/src/main/java/org/nuiton/j2r/RProxy.java 2010-06-16 13:46:50 UTC (rev 217) @@ -163,6 +163,23 @@ } /** + * Send a R multi-line instruction to the engine and get the result back. + * + * @param expr the R instruction to send. + * @return the result of the R instruction. + * @see REngine#eval(String) + */ + @Override + public Object evalScript(String expr) throws RException { + if (engine == null) { + log.fatal("The R Proxy is not initialized. An error probably " + + "occured during the initialization."); + return null; + } + return engine.evalScript(expr); + } + + /** * Get back the R engine type options to initialize the REngine. * * @see REngine#init() Modified: trunk/src/main/java/org/nuiton/j2r/jni/RJniEngine.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/jni/RJniEngine.java 2010-06-02 10:28:51 UTC (rev 216) +++ trunk/src/main/java/org/nuiton/j2r/jni/RJniEngine.java 2010-06-16 13:46:50 UTC (rev 217) @@ -139,6 +139,18 @@ } /** + * Evaluate a R multi-line expression in R and get back the result. + * + * @param expr the R expression to evaluate. + * @return the result of the R expression. + * @see org.nuiton.j2r.REngine#eval(java.lang.String) + */ + @Override + public Object evalScript(String expr) throws RException { + return eval("{" + expr + "}\n"); + } + + /** * Convert the result from an R expression to a java object. * * @param rexp the R expression to convert. Modified: trunk/src/main/java/org/nuiton/j2r/net/RNetEngine.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/net/RNetEngine.java 2010-06-02 10:28:51 UTC (rev 216) +++ trunk/src/main/java/org/nuiton/j2r/net/RNetEngine.java 2010-06-16 13:46:50 UTC (rev 217) @@ -178,6 +178,18 @@ } /** + * Evaluate a R multi-line expression in R and get back the result. + * + * @param expr the R expression to evaluate. + * @return the result of the R expression. + * @see org.nuiton.j2r.REngine#eval(java.lang.String) + */ + @Override + public Object evalScript(String expr) throws RException { + return eval("{" + expr + "}\n"); + } + + /** * Method to convert a R expression to Java. * * @param rexp the R expression to convert. Modified: trunk/src/test/java/org/nuiton/j2r/JNITest.java =================================================================== --- trunk/src/test/java/org/nuiton/j2r/JNITest.java 2010-06-02 10:28:51 UTC (rev 216) +++ trunk/src/test/java/org/nuiton/j2r/JNITest.java 2010-06-16 13:46:50 UTC (rev 217) @@ -414,4 +414,10 @@ Assert.assertEquals("b", b.get(1)); } + + @Test + public void testScripts() throws Exception { + double d = (Double)engine.evalScript("t<-sin(0)\nt"); + Assert.assertEquals(0.0,d,0.001); + } } // JNITest Modified: trunk/src/test/java/org/nuiton/j2r/NetTest.java =================================================================== --- trunk/src/test/java/org/nuiton/j2r/NetTest.java 2010-06-02 10:28:51 UTC (rev 216) +++ trunk/src/test/java/org/nuiton/j2r/NetTest.java 2010-06-16 13:46:50 UTC (rev 217) @@ -374,4 +374,12 @@ Assert.assertEquals("a", b.get(1)); } + + @Test + public void testScripts() throws Exception { + double d = (Double) engine.evalScript("t<-sin(0)\nt"); + Assert.assertEquals(0.0, d, 0.001); + } + + } // NetTest Added: trunk/src/test/resources/log4j.properties =================================================================== --- trunk/src/test/resources/log4j.properties (rev 0) +++ trunk/src/test/resources/log4j.properties 2010-06-16 13:46:50 UTC (rev 217) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=DEBUG, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.nuiton.j2r=DEBUG

1 0

r216 - trunk
by tchemit＠users.nuiton.org 02 Jun '10

02 Jun '10

Author: tchemit Date: 2010-06-02 12:28:51 +0200 (Wed, 02 Jun 2010) New Revision: 216 Url: http://nuiton.org/repositories/revision/nuiton-j2r/216 Log: Utilisation de mavenpom4redmine 2.1.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-14 09:23:03 UTC (rev 215) +++ trunk/pom.xml 2010-06-02 10:28:51 UTC (rev 216) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.1.4</version> + <version>2.1.5</version> </parent> <artifactId>nuiton-j2r</artifactId>

1 0