seems correct now

diff --git a/Robust/src/Benchmarks/SingleTM/Yada/bytereader.java b/Robust/src/Benchmarks/SingleTM/Yada/bytereader.java
index 7ef01b3f4eb2b5a47286a88a745868e2acfe5a3a..2ffb1d93b7702f755d571f022b9c72595b5af005 100644 (file)
--- a/Robust/src/Benchmarks/SingleTM/Yada/bytereader.java
+++ b/Robust/src/Benchmarks/SingleTM/Yada/bytereader.java
@@ -61,15 +61,7 @@ public class bytereader {
   public double getDouble() {
     getBytes();
     boolean negative=false;
-    double value=0;
-    for(;start<end;start++) {
-      if (curbuffer[start]>='0'&&curbuffer[start]<='9')
-       value=value*((double)10.0)+((double)(curbuffer[start]-'0'));
-      else if (curbuffer[start]=='-')
-       negative=true;
-    }
-    if (negative)
-      value=-value;
+    double value=Double.nativeparsedouble(curbuffer, start, end-start);
     return value;
   }
 

diff --git a/Robust/src/Benchmarks/SingleTM/Yada/coordinate.java b/Robust/src/Benchmarks/SingleTM/Yada/coordinate.java
index 8a9da311354e2d4f427de89ebe96a294bfa46009..18a7a30086807417786130cbb7b25d1a397afddd 100644 (file)
--- a/Robust/src/Benchmarks/SingleTM/Yada/coordinate.java
+++ b/Robust/src/Benchmarks/SingleTM/Yada/coordinate.java
@@ -146,7 +146,7 @@ public class coordinate {
  * =============================================================================
  */
   void coordinate_print() {
-    System.out.println("("+x+", "+y+")");
+    System.out.print("("+x+", "+y+")");
   }
 }
 /* =============================================================================

diff --git a/Robust/src/Benchmarks/SingleTM/Yada/element.java b/Robust/src/Benchmarks/SingleTM/Yada/element.java
index dcb3d837d326cd4f3dfa5f812492385bc8cbb248..4f11239cead35b7ad68f78a1f580a0258552fabe 100644 (file)
--- a/Robust/src/Benchmarks/SingleTM/Yada/element.java
+++ b/Robust/src/Benchmarks/SingleTM/Yada/element.java
@@ -625,7 +625,7 @@ static int element_compare (element aElementPtr, element bElementPtr) {
   void element_print() {
     for (int c = 0; c < numCoordinate; c++) {
       coordinates[c].coordinate_print();
-      System.out.println(" ");
+      System.out.print(" ");
     }
   }
   

diff --git a/Robust/src/Benchmarks/SingleTM/Yada/heap.java b/Robust/src/Benchmarks/SingleTM/Yada/heap.java
index 0c40d14d73de367594af3f1dcc08e50c806c4cd7..7a52d8659bf2f1f48fb7a91fa33291c3ac3fa2cf 100644 (file)
--- a/Robust/src/Benchmarks/SingleTM/Yada/heap.java
+++ b/Robust/src/Benchmarks/SingleTM/Yada/heap.java
@@ -216,6 +216,7 @@ public class heap {
     if (bElementPtr.encroachedEdgePtr!=null) {
       return -1;
     }
+    return 0;
   }
 
   public void printHeap() {

diff --git a/Robust/src/Benchmarks/SingleTM/Yada/region.java b/Robust/src/Benchmarks/SingleTM/Yada/region.java
index c8947569dd3a3ebca273a3819faa27ff4042a29c..acfcd9ecb7292c79e0d42ce19700933c23fd84f9 100644 (file)
--- a/Robust/src/Benchmarks/SingleTM/Yada/region.java
+++ b/Robust/src/Benchmarks/SingleTM/Yada/region.java
@@ -168,6 +168,7 @@ public class region {
     it=borderListPtr.head;
     while (it.nextPtr!=null) {
       coordinate coordinates[]=new coordinate[3];
+      it=it.nextPtr;
       edge borderEdgePtr = (edge)it.dataPtr;
       yada.Assert(borderEdgePtr!=null);
       coordinates[0] = centerCoordinate;
@@ -268,7 +269,7 @@ public class region {
     elementPtr.element_isGarbage(); /* so we can detect conflicts */
     
     while (true) {
-      edgeMapPtr = new avltree(1);
+      edgeMapPtr = new avltree(0);
       yada.Assert(edgeMapPtr!=null);
       encroachElementPtr = TMgrowRegion(elementPtr,
                                        this,