Fixed RStringVector#toFactorVector() method

pmml-rexp/src/main/java/org/jpmml/rexp/RStringVector.java

@@ -19,6 +19,7 @@
 package org.jpmml.rexp;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -93,9 +94,11 @@ public RFactorVector toFactorVector(List<String> levels){
 			})
 			.toArray();
 
-		RPair attributes = new RPair(new RString("levels"), new RStringVector(levels, null), null);
+		RFactorVector result = new RFactorVector(levelValues, null);
+		result.addAttribute("class", new RStringVector(Arrays.asList("factor"), null));
+		result.addAttribute("levels", new RStringVector(levels, null));
 
-		return new RFactorVector(levelValues, attributes);
+		return result;
 	}
 
 	@Override

pmml-rexp/src/test/R/serialize.R

@@ -12,6 +12,12 @@ print(attributes(integerVec))
 
 storeRds(integerVec, "IntegerVector")
 
+stringVec = c("alpha", "beta", "gamma")
+print(stringVec)
+print(attributes(stringVec))
+
+storeRds(stringVec, "StringVector")
+
 factorVec = factor(c("alpha", "beta", "gamma"))
 print(attributes(factorVec))
 

pmml-rexp/src/test/java/org/jpmml/rexp/SerializeTest.java

@@ -49,6 +49,19 @@ public void rdsIntegerVector() throws IOException {
 		checkIntegerVector(rdsClone(integerVec, true));
 	}
 
+	@Test
+	public void rdsStringVector() throws IOException {
+		RStringVector stringVec = (RStringVector)unserialize("StringVector");
+
+		checkStringVector(rdsClone(stringVec));
+		checkStringVector(rdsClone(stringVec, true));
+
+		RFactorVector factorVec = stringVec.toFactorVector();
+
+		checkFactorVector(rdsClone(factorVec));
+		checkFactorVector(rdsClone(factorVec, true));
+	}
+
 	@Test
 	public void rdsFactorVector() throws IOException {
 		RFactorVector factorVec = (RFactorVector)unserialize("FactorVector");
@@ -89,6 +102,14 @@ private void checkIntegerVector(RIntegerVector integerVec){
 		assertEquals(Arrays.asList(null, null), integerVec.getValues());
 	}
 
+	static
+	private void checkStringVector(RStringVector stringVec){
+		assertNull(stringVec.getAttributes());
+
+		assertEquals(3, stringVec.size());
+		assertEquals(Arrays.asList("alpha", "beta", "gamma"), stringVec.getValues());
+	}
+
 	static
 	private void checkFactorVector(RFactorVector factorVec){
 		assertTrue(factorVec.hasAttribute("class"));