testing unique

romainfrancois · romainfrancois · commit cdb0b59e13f9 · 2009-10-10T16:39:16.000Z
git-svn-id: svn://svn.rforge.net/rJava/trunk@471 634b503b-a89c-4e0f-88f7-82c2bf7838a2
diff --git a/man/jrectRef-class.Rd b/man/jrectRef-class.Rd
@@ -172,6 +172,19 @@ dim( xj ) <- NULL
 stopifnot( xj@jsig == "[Ljava/lang/String;" )
 stopifnot( dim( xj ) == 30L )
 
+# test unique
+x <- .jarray( rep( 1:2, each = 5 ) )
+xu <- unique( x )
+stopifnot( dim(xu) == 2L )
+
+p1 <- .jnew( "java/awt/Point" )
+p2 <- .jnew( "java/awt/Point" )
+x <- .jarray( list( p1, p2 ) )
+xu <- unique( x )
+stopifnot( dim( xu ) == 1L )
+
+
+
 }
 }
 \keyword{classes}
diff --git a/src/java/RJavaArrayTools.java b/src/java/RJavaArrayTools.java
@@ -304,6 +304,8 @@ public static Object get( Object array, int position ) throws NotAnArrayExceptio
 	// }}}
 
 	// {{{ unique
+	// TODO: cannot use LinkedHashSet because it first was introduced in 1.4 
+	//       and code in this area needs to work on 1.2 jvm
 	public static Object[] unique( Object[] array ){
 		int n = array.length ;
 		boolean[] unique = new boolean[ array.length ];
@@ -330,9 +332,11 @@ public static Object[] unique( Object[] array ){
 				}
 			}
 		}
-		
-		return res.toArray(); 
-		
+		// build the array using newInstance so that it has the same
+		// component type as the original array and not just Object
+		Object[] res_array = (Object[])Array.newInstance( array.getClass().getComponentType(), res.size() ) ;
+		res.toArray( res_array ); 
+		return res_array ;
 	}
 	// }}}
 	

Original file line number	Diff line number	Diff line change
`@@ -304,6 +304,8 @@ public static Object get( Object array, int position ) throws NotAnArrayExceptio`
`304`	`304`	`// }}}`
`305`	`305`
`306`	`306`	`// {{{ unique`
	`307`	`+ // TODO: cannot use LinkedHashSet because it first was introduced in 1.4`
	`308`	`+ // and code in this area needs to work on 1.2 jvm`
`307`	`309`	`public static Object[] unique( Object[] array ){`
`308`	`310`	`int n = array.length ;`
`309`	`311`	`boolean[] unique = new boolean[ array.length ];`
`@@ -330,9 +332,11 @@ public static Object[] unique( Object[] array ){`
`330`	`332`	`}`
`331`	`333`	`}`
`332`	`334`	`}`
`333`		`-`
`334`		`- return res.toArray();`
`335`		`-`
	`335`	`+ // build the array using newInstance so that it has the same`
	`336`	`+ // component type as the original array and not just Object`
	`337`	`+ Object[] res_array = (Object[])Array.newInstance( array.getClass().getComponentType(), res.size() ) ;`
	`338`	`+ res.toArray( res_array );`
	`339`	`+ return res_array ;`
`336`	`340`	`}`
`337`	`341`	`// }}}`
`338`	`342`