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

r178 - in trunk/src/main: java/org/nuiton/j2r/types resources
by jcouteau＠users.nuiton.org 12 Jan '10

12 Jan '10

Author: jcouteau Date: 2010-01-12 09:57:00 +0100 (Tue, 12 Jan 2010) New Revision: 178 Modified: trunk/src/main/java/org/nuiton/j2r/types/RDataFrame.java trunk/src/main/resources/log4j.properties Log: Fix DataFrame getData bug Modified: trunk/src/main/java/org/nuiton/j2r/types/RDataFrame.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/types/RDataFrame.java 2010-01-10 23:37:57 UTC (rev 177) +++ trunk/src/main/java/org/nuiton/j2r/types/RDataFrame.java 2010-01-12 08:57:00 UTC (rev 178) @@ -42,12 +42,11 @@ public class RDataFrame extends REXPAbstract implements REXP { private Log log = LogFactory.getLog(RDataFrame.class); - - //TODO implement the logger use ! + //Vector containing the names of the rows of the data.frame vectors private List<String> rowNames; //Vector containing the vectors of the data.frame - private List<List<? extends Object>> data; + private List<List<?>> data; /** * Constructor @@ -58,7 +57,7 @@ super(); this.names = new ArrayList<String>(); this.rowNames = new ArrayList<String>(); - this.data = new ArrayList<List<? extends Object>>(); + this.data = new ArrayList<List<?>>(); this.variable = ""; this.engine = engine; this.attributes = new HashMap<String, Object>(); @@ -116,7 +115,7 @@ * initialize */ public RDataFrame(REngine engine, List<String> names, - List<String> rowNames, List<List<? extends Object>> data, + List<String> rowNames, List<List<?>> data, String variable) throws RException { super(); this.names = names; @@ -456,7 +455,7 @@ public Object get(int x, int y) throws RException { checkX(x); checkY(y); - if (engine.isAutoCommit()) { + if ((engine.isAutoCommit())&&(this.variable!=null)&&(!this.variable.isEmpty())) { Object returnObject = engine.eval(String.format( RInstructions.GET_DATAFRAME_ITEM, this.variable, y + 1, x + 1)); Modified: trunk/src/main/resources/log4j.properties =================================================================== --- trunk/src/main/resources/log4j.properties 2010-01-10 23:37:57 UTC (rev 177) +++ trunk/src/main/resources/log4j.properties 2010-01-12 08:57:00 UTC (rev 178) @@ -5,4 +5,4 @@ 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.codelutin.j2r=INFO +log4j.logger.org.nuiton.j2r=INFO

1 0

r177 - trunk
by tchemit＠users.nuiton.org 10 Jan '10

10 Jan '10

Author: tchemit Date: 2010-01-11 00:37:57 +0100 (Mon, 11 Jan 2010) New Revision: 177 Modified: trunk/pom.xml Log: use mavenpom4redmine Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-07 03:30:49 UTC (rev 176) +++ trunk/pom.xml 2010-01-10 23:37:57 UTC (rev 177) @@ -9,8 +9,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom</artifactId> - <version>1.1.4</version> + <artifactId>mavenpom4redmine</artifactId> + <version>2.0-SNAPSHOT</version> </parent> <artifactId>nuiton-j2r</artifactId>

1 0

r176 - trunk
by tchemit＠users.nuiton.org 07 Jan '10

07 Jan '10

Author: tchemit Date: 2010-01-07 04:30:49 +0100 (Thu, 07 Jan 2010) New Revision: 176 Modified: trunk/pom.xml Log: use mavenpom 1.1.4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-18 13:40:37 UTC (rev 175) +++ trunk/pom.xml 2010-01-07 03:30:49 UTC (rev 176) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.3</version> + <version>1.1.4</version> </parent> <artifactId>nuiton-j2r</artifactId>

1 0