|
Line 0
Link Here
|
|
|
1 |
--- I2Ohash/src/util.c.orig 2013-03-04 21:21:54.000000000 -0500 |
| 2 |
+++ I2Ohash/src/util.c 2012-10-06 08:28:37.000000000 -0500 |
| 3 |
@@ -39,8 +39,9 @@ |
| 4 |
*/ |
| 5 |
loc1 = (key1 + 1) % hashtable->nlist ; |
| 6 |
loc2 = (key2 + 1) % hashtable->nlist ; |
| 7 |
-long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; |
| 8 |
-loc =(int) loc3; |
| 9 |
+/*loc = (loc1*loc2) % hashtable->nlist ;*/ |
| 10 |
+long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; |
| 11 |
+loc=(int)loc3; |
| 12 |
#if MYDEBUG > 0 |
| 13 |
fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ; |
| 14 |
fflush(stdout) ; |
| 15 |
@@ -51,7 +52,7 @@ |
| 16 |
-------------------------------------------------------- |
| 17 |
*/ |
| 18 |
#if MYDEBUG > 0 |
| 19 |
-fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ; |
| 20 |
+fprintf(stdout, "\n hashtable->freeI2OP = %p", hashtable->freeI2OP) ; |
| 21 |
fflush(stdout) ; |
| 22 |
#endif |
| 23 |
if ( (i2op = hashtable->freeI2OP) == NULL ) { |
| 24 |
@@ -159,10 +160,11 @@ |
| 25 |
#endif |
| 26 |
loc1 = (key1 + 1) % hashtable->nlist ; |
| 27 |
loc2 = (key2 + 1) % hashtable->nlist ; |
| 28 |
-long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; |
| 29 |
-loc =(int) loc3; |
| 30 |
+/*loc = (loc1*loc2) % hashtable->nlist ;*/ |
| 31 |
+long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; |
| 32 |
+loc=(int)loc3; |
| 33 |
#if MYDEBUG > 0 |
| 34 |
-fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ; |
| 35 |
+fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ; |
| 36 |
fflush(stdout) ; |
| 37 |
#endif |
| 38 |
/* |
| 39 |
@@ -231,7 +233,9 @@ |
| 40 |
} |
| 41 |
loc1 = (key1 + 1) % hashtable->nlist ; |
| 42 |
loc2 = (key2 + 1) % hashtable->nlist ; |
| 43 |
-loc = (loc1*loc2) % hashtable->nlist ; |
| 44 |
+/*loc = (loc1*loc2) % hashtable->nlist ;*/ |
| 45 |
+long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ; |
| 46 |
+loc=(int)loc3; |
| 47 |
/* |
| 48 |
--------------------------------------------------- |
| 49 |
find the location of the first (key1,key2,*) triple |