X-Git-Url: http://nitlanguage.org

diff --git a/tests/bench_complex_sort.nit b/tests/bench_complex_sort.nit
index 1dac6e4..5d96859 100644
--- a/tests/bench_complex_sort.nit
+++ b/tests/bench_complex_sort.nit
@@ -21,30 +21,32 @@ interface Elt
 end
 
 class A
-special Elt
-	var _a: Int
+	super Elt
+	var a: Int
 	redef fun val1: Int do return _a
 
 	init(i: Int) do _a = i
+	redef fun to_s do return "Aa{a}"
 end
 
 class Elt2
-special Elt
-	var _b: Int
+	super Elt
+	var b: Int
 	redef fun val1: Int do return _b/2
 	redef fun val2: Int do return _b
 	init initelt2(i: Int) do _b = i
 end
 
 class B
-special Elt2
+	super Elt2
 	init(i: Int) do initelt2(i)
+	redef fun to_s do return "Bb{b}"
 end
 
 class C
-special Elt
-	var _c: Int
-	var _d: Int
+	super Elt
+	var c: Int
+	var d: Int
 	redef fun val1: Int do return _c end
 	redef fun val2: Int do return _d end
 
@@ -52,11 +54,12 @@ special Elt
 		_c = i
 		_d = j
 	end
+	redef fun to_s do return "Cc{c}d{d}"
 end
 
 class D
-special A
-special Elt2
+	super A
+	super Elt2
 	redef fun val1: Int do return _a end
 	redef fun val2: Int do return _b end
 
@@ -64,18 +67,21 @@ special Elt2
 		init(i)
 		initelt2(j)
 	end
+	redef fun to_s do return "Da{a}b{b}"
 end
 
 class E
-special Elt2
+	super Elt2
 	redef fun val1: Int do return 5 end
 
 	init(i: Int) do initelt2(i)
+	redef fun to_s do return "Eb{b}"
 end
 
-class EltSorter
-special AbstractSorter[Elt]
-	redef fun compare(a: Elt, b: Elt): Int
+class EltComparator
+	super Comparator
+	redef type COMPARED: Elt
+	redef fun compare(a, b)
 	do
 		if _is_val1 then
 			return a.val1 <=> b.val1
@@ -89,7 +95,7 @@ special AbstractSorter[Elt]
 		_is_val1 = not _is_val1
 	end
 	
-	var _is_val1: Bool = false
+	var is_val1: Bool = false
 
 	init do end
 end
@@ -110,7 +116,8 @@ do
 	end
 end
 
-var n = 100
+srand_from(0)
+var n = 20
 
 if not args.is_empty then
 	n = args.first.to_i
@@ -121,9 +128,12 @@ for i in [0..n[ do
 	array.push(generator)
 end
 
-var sorter = new EltSorter
+print array.join(", ")
+
+var comparator = new EltComparator
 for i in [0..n[ do
-	sorter.sort(array)
-	sorter.toggle
+	comparator.sort(array)
+	comparator.toggle
 end
 
+print array.join(", ")