From 41f8d214380d6d0fde8989721faa3255bc9c37ab Mon Sep 17 00:00:00 2001 From: bdemsky Date: Wed, 21 Oct 2009 01:52:21 +0000 Subject: [PATCH] working version --- .../SingleTM/Genome/ByteString.java | 4 +++- .../src/Benchmarks/SingleTM/Genome/Table.java | 19 +++++-------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/Robust/src/Benchmarks/SingleTM/Genome/ByteString.java b/Robust/src/Benchmarks/SingleTM/Genome/ByteString.java index 7f956af2..d8f0c783 100644 --- a/Robust/src/Benchmarks/SingleTM/Genome/ByteString.java +++ b/Robust/src/Benchmarks/SingleTM/Genome/ByteString.java @@ -165,7 +165,9 @@ public class ByteString { byte c = value[index+off]; hash = c + (hash << 6) + (hash << 16) - hash; } - cachedHashcode=hash<0?-hash:hash; + if (hash<0) + hash=-hash; + cachedHashcode=hash; return hash; } diff --git a/Robust/src/Benchmarks/SingleTM/Genome/Table.java b/Robust/src/Benchmarks/SingleTM/Genome/Table.java index 653728f7..f7c7674d 100644 --- a/Robust/src/Benchmarks/SingleTM/Genome/Table.java +++ b/Robust/src/Benchmarks/SingleTM/Genome/Table.java @@ -1,5 +1,4 @@ public class Table { - LinkedList buckets[]; int numBucket; @@ -10,16 +9,11 @@ public class Table { * ============================================================================= */ Table (int myNumBucket) { - - int i; - buckets = new LinkedList[myNumBucket]; - for(i = 0; i < myNumBucket; i++) { + for(int i = 0; i < myNumBucket; i++) { buckets[i] = new LinkedList(); } - numBucket = myNumBucket; - } @@ -29,8 +23,8 @@ public class Table { * ============================================================================= */ boolean table_insert (int hash, Object dataPtr) { - int i = (int)(hash % numBucket); - if(i < 0) i *= -1; + int i = hash % numBucket; + if (i<0) i=-i; if(buckets[i].contains(dataPtr)) { return false; } @@ -44,16 +38,13 @@ public class Table { * ============================================================================= */ boolean table_remove (int hash, Object dataPtr) { - - int i = (int)(hash % numBucket); + int i = (hash % numBucket); + if (i<0) i=-i; boolean tempbool = buckets[i].contains(dataPtr); if (tempbool) { buckets[i].remove(dataPtr); return true; } - return false; - } - } -- 2.34.1