From 4edc14d5bec71d157e5acc267152349ac2d6032b Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Tue, 20 Oct 2009 01:18:57 +0000
Subject: [PATCH] seems correct now

---
 Robust/src/Benchmarks/SingleTM/Yada/bytereader.java | 10 +---------
 Robust/src/Benchmarks/SingleTM/Yada/coordinate.java |  2 +-
 Robust/src/Benchmarks/SingleTM/Yada/element.java    |  2 +-
 Robust/src/Benchmarks/SingleTM/Yada/heap.java       |  1 +
 Robust/src/Benchmarks/SingleTM/Yada/region.java     |  3 ++-
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/Robust/src/Benchmarks/SingleTM/Yada/bytereader.java b/Robust/src/Benchmarks/SingleTM/Yada/bytereader.java
index 7ef01b3f..2ffb1d93 100644
--- 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 8a9da311..18a7a300 100644
--- 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 dcb3d837..4f11239c 100644
--- 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 0c40d14d..7a52d865 100644
--- 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 c8947569..acfcd9ec 100644
--- 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,
-- 
2.34.1