Fix cyclelist. ALso fix the gradle build file.

Author: greatmazinger

cyclelist/build.gradle

@@ -9,9 +9,9 @@ sourceCompatibility = 1.6
 version = '0.1'
 jar {
     manifest {
-        attributes 'Implementation-Title': 'simplelist',
+        attributes 'Implementation-Title': 'cyclelist',
                    'Implementation-Version': version,
-                   'Main-Class': 'net.veroy.minibench.simplelist.SimpleList'
+                   'Main-Class': 'net.veroy.minibench.cyclelist.CycleList'
     }
 }
 

cyclelist/src/main/java/net/veroy/minibench/cyclelist/CycleList.java

@@ -28,7 +28,7 @@ private static int get_number_option(String arg)
     private static void create_list_sequential_node( MyLinkedList mylist,
                                                      int number )
     {
-        for (int i = 0; i < number; i++) {
+        for (int i = 1; i < (number+1); i++) {
             mylist.add(new Node(new Integer(i)));
         }
     }
@@ -38,7 +38,7 @@ private static void create_list_sequential_node( MyLinkedList mylist,
     public static void main( String[] args )
     {
         // Check for positional arguments
-        if (args.length != 2) {
+        if (args.length != 1) {
             print_help();
             System.exit(1);
         }
@@ -50,12 +50,17 @@ public static void main( String[] args )
         create_list_sequential_node( mylist,
                                      number );
         Integer total = 0;
-        while (!mylist.isEmpty()) {
-            // System.out.println(cur);
+        Integer count = 0;
+        mylist.resetCurrent();
+        boolean flag = mylist.moveNext();
+        while (flag) {
+            // DEBUG: System.out.println(" XXX:" + count);
             total += mylist.current.getValue();
-            mylist.next();
+            flag = mylist.moveNext();
+            count++;
         }
-        // System.out.println( "Total: " + total );
+        System.out.println( "Total: " + total );
+        System.out.println( "Count: " + count );
     }
 
     private static void print_help()

cyclelist/src/main/java/net/veroy/minibench/cyclelist/MyLinkedList.java

@@ -16,6 +16,8 @@ public class MyLinkedList
     public MyLinkedList()
     {
         // Always a cycle
+        this.head = new Node(0xdeadbeef);
+        this.end= new Node(0xbeefdead);
         this.head.setNext(end);
         this.end.setNext(head);
         this.current = head;
@@ -31,28 +33,44 @@ private boolean is_end( Node mynode )
         return (this.end == mynode);
     }
 
+    public boolean moveNext()
+    {
+        Node mynext = this.current.getNext();
+        assert( mynext != this.head );
+        if (mynext != this.end) {
+            this.current = mynext;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public void resetCurrent()
+    {
+        this.current = this.head;
+    }
+
     private boolean sanity_check()
     {
-        return (this.end.getNext() == this.head);
+        return ( (this.end.getNext() == this.head) &&
+                 (this.current != this.end) );
     }
 
     public void add( Node newnode )
     {
-        // Search for node that cycles back to head and add there.
-        Node prev = this.end;
-        Node current = this.head;
-        while (current.getNext() != this.end) {
-            prev = current;
-            current = current.getNext();
-        }
-        assert( current.getNext() == this.end );
-        prev = current;
+        // Add at current
+        Node oldnext = this.current.getNext();
         current.setNext( newnode );
-        newnode.setNext( this.end );
+        newnode.setNext( oldnext );
     }
 
     public boolean isEmpty()
     {
         return (this.head.getNext() == this.end);
     }
+
+    public boolean atEnd()
+    {
+        return (this.current.getNext() == this.end);
+    }
 }

cyclelist/src/main/java/net/veroy/minibench/cyclelist/Node.java

@@ -10,11 +10,9 @@ public class Node
     public Integer value;
     public Node next;
 
-    public Node( Integer new_number,
-                 Node next_node )
+    public Node( Integer new_number )
     {
         this.value = new_number;
-        this.next = next_node;
     }
 
     public void setNext( Node next_node )