OverviewFilesCommitsIssuesDocsReleasesPeers

opencog-CompactHash commits / 519938b

More merges of hash factory versions
519938b753b27092c653bbae8d33341e788a2e3d
by brobey <brobey@lanl.gov> · 2015-11-07T00:30:24.000Z

Changed files (2) +34 -68

HashFactory/HashFactory.c +32 -64
……@@ -1007,14 +1007,12 @@ int intintIdentityPerfectHash_SetupTable(intintHash_Table * table) {
10071007 (intintIdentityPerfectHash_Bucket *) & table->
10081008 tableData[sizeof(intintIdentityPerfectHash_TableData)];
10091009 if (intintHash_GetTableType(table) & ~HASH_SENTINEL_PERFECT_HASHES) {
1010 int index;
1011 for (index = 0;
1010 for (int index = 0;
10121011 index <
10131012 ((intintIdentityPerfectHash_TableData *) table->
10141013 tableData)->numBuckets; index++) {
10151014 buckets[index].key = HASH_BUCKET_STATUS_EMPTY;
1016 }
1017 }
1015 }}
10181016 exitCode = HASH_EXIT_CODE_NORMAL;
10191017 return exitCode;
10201018}
……@@ -1023,14 +1021,12 @@ int intintIdentityPerfectHash_EmptyTable(intintHash_Table * table) {
10231021 intintIdentityPerfectHash_Bucket *buckets =
10241022 (intintIdentityPerfectHash_Bucket *) & table->
10251023 tableData[sizeof(intintIdentityPerfectHash_TableData)];
1026 int index;
1027 for (index = 0;
1024 for (int index = 0;
10281025 index <
10291026 ((intintIdentityPerfectHash_TableData *) table->tableData)->
10301027 numBuckets; index++) {
10311028 buckets[index].key = HASH_BUCKET_STATUS_EMPTY;
1032 }
1033 exitCode = HASH_EXIT_CODE_NORMAL;
1029 } exitCode = HASH_EXIT_CODE_NORMAL;
10341030 return exitCode;
10351031}
10361032int intintIdentityPerfectHash_InnerQuerySingle(char *tableData, int key,
……@@ -1780,14 +1776,12 @@ int intintIdentityPerfectOpenMPHash_SetupTable(intintHash_Table * table) {
17801776 (intintIdentityPerfectOpenMPHash_Bucket *) & table->
17811777 tableData[sizeof(intintIdentityPerfectOpenMPHash_TableData)];
17821778 if (intintHash_GetTableType(table) & ~HASH_SENTINEL_PERFECT_HASHES) {
1783 int index;
1784 for (index = 0;
1779 for (int index = 0;
17851780 index <
17861781 ((intintIdentityPerfectOpenMPHash_TableData *) table->
17871782 tableData)->numBuckets; index++) {
17881783 buckets[index].key = HASH_BUCKET_STATUS_EMPTY;
1789 }
1790 }
1784 }}
17911785 exitCode = HASH_EXIT_CODE_NORMAL;
17921786 return exitCode;
17931787}
……@@ -1796,14 +1790,12 @@ int intintIdentityPerfectOpenMPHash_EmptyTable(intintHash_Table * table) {
17961790 intintIdentityPerfectOpenMPHash_Bucket *buckets =
17971791 (intintIdentityPerfectOpenMPHash_Bucket *) & table->
17981792 tableData[sizeof(intintIdentityPerfectOpenMPHash_TableData)];
1799 int index;
1800 for (index = 0;
1793 for (int index = 0;
18011794 index <
18021795 ((intintIdentityPerfectOpenMPHash_TableData *) table->tableData)->
18031796 numBuckets; index++) {
18041797 buckets[index].key = HASH_BUCKET_STATUS_EMPTY;
1805 }
1806 exitCode = HASH_EXIT_CODE_NORMAL;
1798 } exitCode = HASH_EXIT_CODE_NORMAL;
18071799 return exitCode;
18081800}
18091801int intintIdentityPerfectOpenMPHash_InnerQuerySingle(char *tableData, int key,
……@@ -2146,16 +2138,14 @@ int intintIdentitySentinelPerfectHash_SetupTable(intintHash_Table * table) {
21462138 (intintIdentitySentinelPerfectHash_Bucket *) & table->
21472139 tableData[sizeof(intintIdentitySentinelPerfectHash_TableData)];
21482140 if (intintHash_GetTableType(table) & ~HASH_SENTINEL_PERFECT_HASHES) {
2149 int index;
2150 for (index = 0;
2141 for (int index = 0;
21512142 index <
21522143 ((intintIdentitySentinelPerfectHash_TableData *) table->
21532144 tableData)->numBuckets; index++) {
21542145 buckets[index].value =
21552146 ((intintIdentitySentinelPerfectHash_TableData *)
21562147 table->tableData)->emptyValue;
2157 }
2158 }
2148 }}
21592149 exitCode = HASH_EXIT_CODE_NORMAL;
21602150 return exitCode;
21612151}
……@@ -2164,16 +2154,14 @@ int intintIdentitySentinelPerfectHash_EmptyTable(intintHash_Table * table) {
21642154 intintIdentitySentinelPerfectHash_Bucket *buckets =
21652155 (intintIdentitySentinelPerfectHash_Bucket *) & table->
21662156 tableData[sizeof(intintIdentitySentinelPerfectHash_TableData)];
2167 int index;
2168 for (index = 0;
2157 for (int index = 0;
21692158 index <
21702159 ((intintIdentitySentinelPerfectHash_TableData *) table->
21712160 tableData)->numBuckets; index++) {
21722161 buckets[index].value =
21732162 ((intintIdentitySentinelPerfectHash_TableData *) table->
21742163 tableData)->emptyValue;
2175 }
2176 exitCode = HASH_EXIT_CODE_NORMAL;
2164 } exitCode = HASH_EXIT_CODE_NORMAL;
21772165 return exitCode;
21782166}
21792167int intintIdentitySentinelPerfectHash_InnerQuerySingle(char *tableData, int key,
……@@ -2944,16 +2932,14 @@ int intintIdentitySentinelPerfectOpenMPHash_SetupTable(intintHash_Table * table)
29442932 tableData[sizeof
29452933 (intintIdentitySentinelPerfectOpenMPHash_TableData)];
29462934 if (intintHash_GetTableType(table) & ~HASH_SENTINEL_PERFECT_HASHES) {
2947 int index;
2948 for (index = 0;
2935 for (int index = 0;
29492936 index <
29502937 ((intintIdentitySentinelPerfectOpenMPHash_TableData *)
29512938 table->tableData)->numBuckets; index++) {
29522939 buckets[index].value =
29532940 ((intintIdentitySentinelPerfectOpenMPHash_TableData
29542941 *) table->tableData)->emptyValue;
2955 }
2956 }
2942 }}
29572943 exitCode = HASH_EXIT_CODE_NORMAL;
29582944 return exitCode;
29592945}
……@@ -2963,16 +2949,14 @@ int intintIdentitySentinelPerfectOpenMPHash_EmptyTable(intintHash_Table * table)
29632949 (intintIdentitySentinelPerfectOpenMPHash_Bucket *) & table->
29642950 tableData[sizeof
29652951 (intintIdentitySentinelPerfectOpenMPHash_TableData)];
2966 int index;
2967 for (index = 0;
2952 for (int index = 0;
29682953 index <
29692954 ((intintIdentitySentinelPerfectOpenMPHash_TableData *) table->
29702955 tableData)->numBuckets; index++) {
29712956 buckets[index].value =
29722957 ((intintIdentitySentinelPerfectOpenMPHash_TableData *)
29732958 table->tableData)->emptyValue;
2974 }
2975 exitCode = HASH_EXIT_CODE_NORMAL;
2959 } exitCode = HASH_EXIT_CODE_NORMAL;
29762960 return exitCode;
29772961}
29782962int intintIdentitySentinelPerfectOpenMPHash_InnerQuerySingle(char *tableData,
……@@ -3316,14 +3300,12 @@ int intintLCGLinearOpenCompactHash_SetupTable(intintHash_Table * table) {
33163300 (intintLCGLinearOpenCompactHash_Bucket *) & table->
33173301 tableData[sizeof(intintLCGLinearOpenCompactHash_TableData)];
33183302 if (intintHash_GetTableType(table) & ~HASH_SENTINEL_PERFECT_HASHES) {
3319 int index;
3320 for (index = 0;
3303 for (int index = 0;
33213304 index <
33223305 ((intintLCGLinearOpenCompactHash_TableData *) table->
33233306 tableData)->numBuckets; index++) {
33243307 buckets[index].key = HASH_BUCKET_STATUS_EMPTY;
3325 }
3326 }
3308 }}
33273309 exitCode = HASH_EXIT_CODE_NORMAL;
33283310 return exitCode;
33293311}
……@@ -3332,14 +3314,12 @@ int intintLCGLinearOpenCompactHash_EmptyTable(intintHash_Table * table) {
33323314 intintLCGLinearOpenCompactHash_Bucket *buckets =
33333315 (intintLCGLinearOpenCompactHash_Bucket *) & table->
33343316 tableData[sizeof(intintLCGLinearOpenCompactHash_TableData)];
3335 int index;
3336 for (index = 0;
3317 for (int index = 0;
33373318 index <
33383319 ((intintLCGLinearOpenCompactHash_TableData *) table->tableData)->
33393320 numBuckets; index++) {
33403321 buckets[index].key = HASH_BUCKET_STATUS_EMPTY;
3341 }
3342 exitCode = HASH_EXIT_CODE_NORMAL;
3322 } exitCode = HASH_EXIT_CODE_NORMAL;
33433323 return exitCode;
33443324}
33453325int intintLCGLinearOpenCompactHash_InnerQuerySingle(char *tableData, int key,
……@@ -4214,14 +4194,12 @@ int intintLCGLinearOpenCompactOpenMPHash_SetupTable(intintHash_Table * table) {
42144194 (intintLCGLinearOpenCompactOpenMPHash_Bucket *) & table->
42154195 tableData[sizeof(intintLCGLinearOpenCompactOpenMPHash_TableData)];
42164196 if (intintHash_GetTableType(table) & ~HASH_SENTINEL_PERFECT_HASHES) {
4217 int index;
4218 for (index = 0;
4197 for (int index = 0;
42194198 index <
42204199 ((intintLCGLinearOpenCompactOpenMPHash_TableData *) table->
42214200 tableData)->numBuckets; index++) {
42224201 buckets[index].key = HASH_BUCKET_STATUS_EMPTY;
4223 }
4224 }
4202 }}
42254203 exitCode = HASH_EXIT_CODE_NORMAL;
42264204 return exitCode;
42274205}
……@@ -4230,14 +4208,12 @@ int intintLCGLinearOpenCompactOpenMPHash_EmptyTable(intintHash_Table * table) {
42304208 intintLCGLinearOpenCompactOpenMPHash_Bucket *buckets =
42314209 (intintLCGLinearOpenCompactOpenMPHash_Bucket *) & table->
42324210 tableData[sizeof(intintLCGLinearOpenCompactOpenMPHash_TableData)];
4233 int index;
4234 for (index = 0;
4211 for (int index = 0;
42354212 index <
42364213 ((intintLCGLinearOpenCompactOpenMPHash_TableData *) table->
42374214 tableData)->numBuckets; index++) {
42384215 buckets[index].key = HASH_BUCKET_STATUS_EMPTY;
4239 }
4240 exitCode = HASH_EXIT_CODE_NORMAL;
4216 } exitCode = HASH_EXIT_CODE_NORMAL;
42414217 return exitCode;
42424218}
42434219int intintLCGLinearOpenCompactOpenMPHash_InnerQuerySingle(char *tableData,
……@@ -4684,14 +4660,12 @@ int intintLCGQuadraticOpenCompactHash_SetupTable(intintHash_Table * table) {
46844660 (intintLCGQuadraticOpenCompactHash_Bucket *) & table->
46854661 tableData[sizeof(intintLCGQuadraticOpenCompactHash_TableData)];
46864662 if (intintHash_GetTableType(table) & ~HASH_SENTINEL_PERFECT_HASHES) {
4687 int index;
4688 for (index = 0;
4663 for (int index = 0;
46894664 index <
46904665 ((intintLCGQuadraticOpenCompactHash_TableData *) table->
46914666 tableData)->numBuckets; index++) {
46924667 buckets[index].key = HASH_BUCKET_STATUS_EMPTY;
4693 }
4694 }
4668 }}
46954669 exitCode = HASH_EXIT_CODE_NORMAL;
46964670 return exitCode;
46974671}
……@@ -4700,14 +4674,12 @@ int intintLCGQuadraticOpenCompactHash_EmptyTable(intintHash_Table * table) {
47004674 intintLCGQuadraticOpenCompactHash_Bucket *buckets =
47014675 (intintLCGQuadraticOpenCompactHash_Bucket *) & table->
47024676 tableData[sizeof(intintLCGQuadraticOpenCompactHash_TableData)];
4703 int index;
4704 for (index = 0;
4677 for (int index = 0;
47054678 index <
47064679 ((intintLCGQuadraticOpenCompactHash_TableData *) table->
47074680 tableData)->numBuckets; index++) {
47084681 buckets[index].key = HASH_BUCKET_STATUS_EMPTY;
4709 }
4710 exitCode = HASH_EXIT_CODE_NORMAL;
4682 } exitCode = HASH_EXIT_CODE_NORMAL;
47114683 return exitCode;
47124684}
47134685int intintLCGQuadraticOpenCompactHash_InnerQuerySingle(char *tableData, int key,
……@@ -5626,14 +5598,12 @@ int intintLCGQuadraticOpenCompactOpenMPHash_SetupTable(intintHash_Table * table)
56265598 tableData[sizeof
56275599 (intintLCGQuadraticOpenCompactOpenMPHash_TableData)];
56285600 if (intintHash_GetTableType(table) & ~HASH_SENTINEL_PERFECT_HASHES) {
5629 int index;
5630 for (index = 0;
5601 for (int index = 0;
56315602 index <
56325603 ((intintLCGQuadraticOpenCompactOpenMPHash_TableData *)
56335604 table->tableData)->numBuckets; index++) {
56345605 buckets[index].key = HASH_BUCKET_STATUS_EMPTY;
5635 }
5636 }
5606 }}
56375607 exitCode = HASH_EXIT_CODE_NORMAL;
56385608 return exitCode;
56395609}
……@@ -5643,14 +5613,12 @@ int intintLCGQuadraticOpenCompactOpenMPHash_EmptyTable(intintHash_Table * table)
56435613 (intintLCGQuadraticOpenCompactOpenMPHash_Bucket *) & table->
56445614 tableData[sizeof
56455615 (intintLCGQuadraticOpenCompactOpenMPHash_TableData)];
5646 int index;
5647 for (index = 0;
5616 for (int index = 0;
56485617 index <
56495618 ((intintLCGQuadraticOpenCompactOpenMPHash_TableData *) table->
56505619 tableData)->numBuckets; index++) {
56515620 buckets[index].key = HASH_BUCKET_STATUS_EMPTY;
5652 }
5653 exitCode = HASH_EXIT_CODE_NORMAL;
5621 } exitCode = HASH_EXIT_CODE_NORMAL;
56545622 return exitCode;
56555623}
56565624int intintLCGQuadraticOpenCompactOpenMPHash_InnerQuerySingle(char *tableData,
HashFactory/baseHash.cm +2 -4
……@@ -268,8 +268,7 @@
268268#define HASH_SETUP_EXP(NAME, MODIFIER, INNER_EMPTY_EXP)\
269269 NAME##MODIFIER##Hash_Bucket *buckets = (NAME##MODIFIER##Hash_Bucket*)&table->tableData[sizeof(NAME##MODIFIER##Hash_TableData)];\
270270 if (intintHash_GetTableType(table) & ~HASH_SENTINEL_PERFECT_HASHES) {\
271 int index;\
272 for(index = 0; index < ((NAME##MODIFIER##Hash_TableData*)table->tableData)->numBuckets; index++){\
271 for(int index = 0; index < ((NAME##MODIFIER##Hash_TableData*)table->tableData)->numBuckets; index++){\
273272 INNER_EMPTY_EXP\
274273 }\
275274 }\
……@@ -278,8 +277,7 @@
278277
279278#define HASH_EMPTY_EXP(NAME, MODIFIER, INNER_EMPTY_EXP)\
280279 NAME##MODIFIER##Hash_Bucket *buckets = (NAME##MODIFIER##Hash_Bucket*)&table->tableData[sizeof(NAME##MODIFIER##Hash_TableData)];\
281 int index;\
282 for(index = 0; index < ((NAME##MODIFIER##Hash_TableData*)table->tableData)->numBuckets; index++){\
280 for(int index = 0; index < ((NAME##MODIFIER##Hash_TableData*)table->tableData)->numBuckets; index++){\
283281 INNER_EMPTY_EXP\
284282 }\
285283 exitCode = HASH_EXIT_CODE_NORMAL;\