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

r164 - in trunk/src: main/java/org/nuiton/j2r/types test/java/org/nuiton/j2r
by jcouteau＠users.nuiton.org 27 Nov '09

27 Nov '09

Author: jcouteau Date: 2009-11-27 15:08:08 +0100 (Fri, 27 Nov 2009) New Revision: 164 Modified: trunk/src/main/java/org/nuiton/j2r/types/RDataFrame.java trunk/src/test/java/org/nuiton/j2r/DataframeTest.java Log: Add a method to get the size of the dataframe and the test associated Modified: trunk/src/main/java/org/nuiton/j2r/types/RDataFrame.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/types/RDataFrame.java 2009-11-04 10:18:29 UTC (rev 163) +++ trunk/src/main/java/org/nuiton/j2r/types/RDataFrame.java 2009-11-27 14:08:08 UTC (rev 164) @@ -800,4 +800,11 @@ throw new RException("Not supported type"); } } + + public int[] dim() throws RException { + int x = (Integer)engine.eval("dim("+this.variable+")[1]"); + int y = (Integer)engine.eval("dim("+this.variable+")[2]"); + + return (new int[]{x,y}); + } } \ No newline at end of file Modified: trunk/src/test/java/org/nuiton/j2r/DataframeTest.java =================================================================== --- trunk/src/test/java/org/nuiton/j2r/DataframeTest.java 2009-11-04 10:18:29 UTC (rev 163) +++ trunk/src/test/java/org/nuiton/j2r/DataframeTest.java 2009-11-27 14:08:08 UTC (rev 164) @@ -1979,4 +1979,42 @@ engine.setAutoCommit(true); } + + public void testDim (){ + List<String> names = new ArrayList<String>(); + names.add("column1"); + names.add("column2"); + + List<String> rowNames = new ArrayList<String>(); + rowNames.add("row 1"); + rowNames.add("row 2"); + rowNames.add("row 3"); + + List<Double> column1 = new ArrayList<Double>(); + column1.add(3.0); + column1.add(4.5); + column1.add(0.01); + + List<Double> column2 = new ArrayList<Double>(); + column2.add(1.0); + column2.add(5555555555555555555555.0); + column2.add(3.0); + + List<List<? extends Object>> data = new ArrayList<List<? extends Object>>(); + data.add(column1); + data.add(column2); + + RDataFrame testDataFrame = new RDataFrame(engine); + try { + testDataFrame = new RDataFrame(engine, names, rowNames, data, + "test"); + + Assert.assertEquals(3,testDataFrame.dim()[1]); + Assert.assertEquals(2,testDataFrame.dim()[2]); + } catch (RException eee) { + Assert.fail(); + } + + + } }

1 0

r163 - trunk/src/site/rst
by jcouteau＠users.nuiton.org 04 Nov '09

04 Nov '09

Author: jcouteau Date: 2009-11-04 11:18:29 +0100 (Wed, 04 Nov 2009) New Revision: 163 Modified: trunk/src/site/rst/index.rst Log: Add argument to make tests pass in doc Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2009-11-04 10:11:56 UTC (rev 162) +++ trunk/src/site/rst/index.rst 2009-11-04 10:18:29 UTC (rev 163) @@ -5,3 +5,8 @@ La librairie LutinJ2R 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

1 0

r162 - trunk/src/test/java/org/nuiton/j2r
by jcouteau＠users.nuiton.org 04 Nov '09

04 Nov '09

Author: jcouteau Date: 2009-11-04 11:11:56 +0100 (Wed, 04 Nov 2009) New Revision: 162 Modified: trunk/src/test/java/org/nuiton/j2r/JNITest.java trunk/src/test/java/org/nuiton/j2r/NetTest.java Log: Fix tests (error message change in JRI version change) Modified: trunk/src/test/java/org/nuiton/j2r/JNITest.java =================================================================== --- trunk/src/test/java/org/nuiton/j2r/JNITest.java 2009-11-04 10:08:46 UTC (rev 161) +++ trunk/src/test/java/org/nuiton/j2r/JNITest.java 2009-11-04 10:11:56 UTC (rev 162) @@ -317,7 +317,7 @@ } catch (RException e) { log.info(e.getMessage()); Assert.assertTrue( - e.getMessage().contains("object \"b\" not found")); + e.getMessage().contains("object \'b\' not found")); } engine.clearSession(); @@ -327,7 +327,7 @@ Assert.fail("Exception should have been thrown at this point"); } catch (RException e) { Assert.assertTrue( - e.getMessage().contains("object \"a\" not found")); + e.getMessage().contains("object \'a\' not found")); } } Modified: trunk/src/test/java/org/nuiton/j2r/NetTest.java =================================================================== --- trunk/src/test/java/org/nuiton/j2r/NetTest.java 2009-11-04 10:08:46 UTC (rev 161) +++ trunk/src/test/java/org/nuiton/j2r/NetTest.java 2009-11-04 10:11:56 UTC (rev 162) @@ -337,7 +337,7 @@ } catch (RException e) { log.info(e.getMessage()); Assert.assertTrue( - e.getMessage().contains("objet \"b\" non trouvé")); + e.getMessage().contains("objet \'b\' introuvable")); } engine.clearSession(); @@ -346,7 +346,7 @@ Assert.fail("Exception should have been thrown at this point"); } catch (RException e) { Assert.assertTrue( - e.getMessage().contains("objet \"a\" non trouvé")); + e.getMessage().contains("objet \'a\' introuvable")); } } } // NetTest

1 0

r161 - in trunk/src/main/java/org/nuiton/j2r: jni net
by jcouteau＠users.nuiton.org 04 Nov '09

04 Nov '09

Author: jcouteau Date: 2009-11-04 11:08:46 +0100 (Wed, 04 Nov 2009) New Revision: 161 Modified: trunk/src/main/java/org/nuiton/j2r/jni/RJniEngine.java trunk/src/main/java/org/nuiton/j2r/net/RNetEngine.java Log: Remove useless casts Modified: trunk/src/main/java/org/nuiton/j2r/jni/RJniEngine.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/jni/RJniEngine.java 2009-11-04 10:08:19 UTC (rev 160) +++ trunk/src/main/java/org/nuiton/j2r/jni/RJniEngine.java 2009-11-04 10:08:46 UTC (rev 161) @@ -156,7 +156,7 @@ result = (Integer) rexp.asInt(); break; case REXP.XT_ARRAY_INT: - int[] array = (int[]) rexp.asIntArray(); + int[] array = rexp.asIntArray(); Integer[] bigArray = new Integer[array.length]; for (int i = 0; i < array.length; i++) { bigArray[i] = (Integer) array[i]; @@ -169,7 +169,7 @@ break; case REXP.XT_ARRAY_DOUBLE: //if double array, return the rexp as double array. - double[] doublearray = (double[]) rexp.asDoubleArray(); + double[] doublearray = rexp.asDoubleArray(); Double[] bigdoublearray = new Double[doublearray.length]; for (int i = 0; i < doublearray.length; i++) { bigdoublearray[i] = (Double) doublearray[i]; @@ -268,7 +268,7 @@ for (int i = 0; i < dataList.keys().length; i++) { //for each object of the list, convert it to java. REXP tempREXP = dataList.at(i); - Object convertedREXP = (Object) convertResult( + Object convertedREXP = convertResult( tempREXP); //add this object to the data list. data.add(convertedREXP); Modified: trunk/src/main/java/org/nuiton/j2r/net/RNetEngine.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/net/RNetEngine.java 2009-11-04 10:08:19 UTC (rev 160) +++ trunk/src/main/java/org/nuiton/j2r/net/RNetEngine.java 2009-11-04 10:08:46 UTC (rev 161) @@ -195,7 +195,7 @@ if (rexp.isInteger()) { //true if rexp is an integer or an integer array. //get rexp as an integer array - int[] array = (int[]) rexp.asIntegers(); + int[] array = rexp.asIntegers(); Integer[] bigArray = new Integer[array.length]; for (int i = 0; i < array.length; i++) { bigArray[i] = (Integer) array[i]; @@ -212,7 +212,7 @@ } else if (rexp.isNumeric()) { //true if rexp is a double or a double array. //get rexp as a double array - double[] doublearray = (double[]) rexp.asDoubles(); + double[] doublearray = rexp.asDoubles(); Double[] bigDoubleArray = new Double[doublearray.length]; for (int i = 0; i < doublearray.length; i++) { bigDoubleArray[i] = (Double) doublearray[i]; @@ -290,8 +290,7 @@ //for each vector, create a list and fill it with the //content of the vector. REXP tempREXP = dataList.at(i); - Object convertedREXP = (Object) convertResult( - tempREXP); + Object convertedREXP = convertResult(tempREXP); //add this list to the data list. data.add(convertedREXP);

1 0

r160 - trunk/src/test/java/org/nuiton/j2r
by jcouteau＠users.nuiton.org 04 Nov '09

04 Nov '09

Author: jcouteau Date: 2009-11-04 11:08:19 +0100 (Wed, 04 Nov 2009) New Revision: 160 Modified: trunk/src/test/java/org/nuiton/j2r/JNITest.java Log: Fix test (error message changed in jri version change) Modified: trunk/src/test/java/org/nuiton/j2r/JNITest.java =================================================================== --- trunk/src/test/java/org/nuiton/j2r/JNITest.java 2009-11-02 03:46:19 UTC (rev 159) +++ trunk/src/test/java/org/nuiton/j2r/JNITest.java 2009-11-04 10:08:19 UTC (rev 160) @@ -259,7 +259,7 @@ } catch (RException re) { System.out.println(re.getMessage()); Assert.assertTrue( - re.getMessage().contains("object \"a\" not found")); + re.getMessage().contains("object \'a\' not found")); } }

1 0

r159 - trunk
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 04:46:19 +0100 (Mon, 02 Nov 2009) New Revision: 159 Modified: trunk/pom.xml Log: use mavenpom 1.1.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 03:37:13 UTC (rev 158) +++ trunk/pom.xml 2009-11-02 03:46:19 UTC (rev 159) @@ -1,6 +1,6 @@ +<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"> -<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>  @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </parent> <artifactId>nuiton-j2r</artifactId> @@ -23,14 +23,14 @@ <artifactId>commons-logging</artifactId> <version>1.1.1</version> </dependency> - +  - + <dependency> <groupId>org.nuiton.thirdparty</groupId> <artifactId>JRI</artifactId> @@ -70,7 +70,7 @@ </description> <inceptionYear>2006</inceptionYear> <url>http://maven-site.nuiton.org/${project.artifactId}</url> - +    @@ -109,7 +109,7 @@ </plugin> </plugins> </pluginManagement> - + </build>  @@ -118,7 +118,7 @@ <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> <profile> <id>release-profile</id>

1 0

r158 - trunk
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 04:37:13 +0100 (Mon, 02 Nov 2009) New Revision: 158 Modified: trunk/ Log: svn ignore idea files Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target .classpath .project .settings lutinj2r.iml lutinj2r.ipr + target .classpath .project .settings *.iml *.ipr

1 0