From cfbe58352025747d35d286ee44479ac65bc24586 Mon Sep 17 00:00:00 2001 From: fc_botelho Date: Fri, 16 Sep 2005 02:53:07 +0000 Subject: [PATCH] vesion 0.4. It was included the bmz8 algorithm to generate mphfs for small set of keys (at most 256 keys), the vector adpter and some bugs have been corrected. --- configure.ac | 2 +- src/Makefile.am | 4 ++-- src/cmph.c | 32 +++++++++++++++++--------------- src/main.c | 4 ++-- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index f3b0bb1..31aa872 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.am) -AM_INIT_AUTOMAKE(cmph, 0.3) +AM_INIT_AUTOMAKE(cmph, 0.4) AM_CONFIG_HEADER(config.h) dnl Checks for programs. diff --git a/src/Makefile.am b/src/Makefile.am index 1d05357..4c01bc2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,8 +16,8 @@ libcmph_la_SOURCES = debug.h\ cmph_structs.h cmph_structs.c\ chm.h chm_structs.h chm.c\ bmz.h bmz_structs.h bmz.c\ - bmz8.h bmz8_structs.h bmz8.c\ - brz.h brz_structs.h brz.c + bmz8.h bmz8_structs.h bmz8.c +# brz.h brz_structs.h brz.c libcmph_la_LDFLAGS = -version-info 0:0:0 diff --git a/src/cmph.c b/src/cmph.c index 9f0b464..7b73341 100644 --- a/src/cmph.c +++ b/src/cmph.c @@ -3,7 +3,7 @@ #include "chm.h" #include "bmz.h" #include "bmz8.h" /* included -- Fabiano */ -#include "brz.h" /* included -- Fabiano */ +//#include "brz.h" /* included -- Fabiano */ #include #include @@ -159,7 +159,7 @@ void cmph_config_set_algo(cmph_config_t *mph, CMPH_ALGO algo) bmz8_config_destroy(mph); break; case CMPH_BRZ: - brz_config_destroy(mph); +// brz_config_destroy(mph); break; default: assert(0); @@ -176,7 +176,7 @@ void cmph_config_set_algo(cmph_config_t *mph, CMPH_ALGO algo) mph->data = bmz8_config_new(); break; case CMPH_BRZ: - mph->data = brz_config_new(); +// mph->data = brz_config_new(); break; default: assert(0); @@ -196,7 +196,7 @@ void cmph_config_set_tmp_dir(cmph_config_t *mph, cmph_uint8 *tmp_dir) case CMPH_BMZ8: /* included -- Fabiano */ break; case CMPH_BRZ: /* included -- Fabiano */ - brz_config_set_tmp_dir(mph, tmp_dir); +// brz_config_set_tmp_dir(mph, tmp_dir); break; default: assert(0); @@ -215,7 +215,7 @@ void cmph_config_set_memory_availability(cmph_config_t *mph, cmph_uint32 memory_ case CMPH_BMZ8: /* included -- Fabiano */ break; case CMPH_BRZ: /* included -- Fabiano */ - brz_config_set_memory_availability(mph, memory_availability); +// brz_config_set_memory_availability(mph, memory_availability); break; default: assert(0); @@ -238,7 +238,7 @@ void cmph_config_destroy(cmph_config_t *mph) bmz8_config_destroy(mph); break; case CMPH_BRZ: /* included -- Fabiano */ - brz_config_destroy(mph); +// brz_config_destroy(mph); break; default: assert(0); @@ -265,7 +265,7 @@ void cmph_config_set_hashfuncs(cmph_config_t *mph, CMPH_HASH *hashfuncs) bmz8_config_set_hashfuncs(mph, hashfuncs); break; case CMPH_BRZ: /* included -- Fabiano */ - brz_config_set_hashfuncs(mph, hashfuncs); +// brz_config_set_hashfuncs(mph, hashfuncs); break; default: break; @@ -302,9 +302,9 @@ cmph_t *cmph_new(cmph_config_t *mph) mphf = bmz8_new(mph, c); break; case CMPH_BRZ: /* included -- Fabiano */ - DEBUGP("Creating brz hash\n"); +/* DEBUGP("Creating brz hash\n"); if (c == 0) c = 1.15; - mphf = brz_new(mph, c); + mphf = brz_new(mph, c);*/ break; default: assert(0); @@ -323,7 +323,8 @@ int cmph_dump(cmph_t *mphf, FILE *f) case CMPH_BMZ8: /* included -- Fabiano */ return bmz8_dump(mphf, f); case CMPH_BRZ: /* included -- Fabiano */ - return brz_dump(mphf, f); + break; +/* return brz_dump(mphf, f);*/ default: assert(0); } @@ -352,8 +353,8 @@ cmph_t *cmph_load(FILE *f) bmz8_load(f, mphf); break; case CMPH_BRZ: /* included -- Fabiano */ - DEBUGP("Loading brz algorithm dependent parts\n"); - brz_load(f, mphf); +/* DEBUGP("Loading brz algorithm dependent parts\n"); + brz_load(f, mphf);*/ break; default: assert(0); @@ -377,8 +378,9 @@ cmph_uint32 cmph_search(cmph_t *mphf, const char *key, cmph_uint32 keylen) DEBUGP("bmz8 algorithm search\n"); return bmz8_search(mphf, key, keylen); case CMPH_BRZ: /* included -- Fabiano */ - DEBUGP("brz algorithm search\n"); - return brz_search(mphf, key, keylen); + break; +/* DEBUGP("brz algorithm search\n"); + return brz_search(mphf, key, keylen);*/ default: assert(0); } @@ -405,7 +407,7 @@ void cmph_destroy(cmph_t *mphf) bmz8_destroy(mphf); return; case CMPH_BRZ: /* included -- Fabiano */ - brz_destroy(mphf); +/* brz_destroy(mphf);*/ return; default: assert(0); diff --git a/src/main.c b/src/main.c index 5694108..701b997 100644 --- a/src/main.c +++ b/src/main.c @@ -143,9 +143,9 @@ int main(int argc, char **argv) break; } } - if (!valid) + if (!valid || mph_algo == CMPH_BRZ) { - fprintf(stderr, "Invalid mph algorithm: %s\n", optarg); + fprintf(stderr, "Invalid mph algorithm: %s. It is not available in version %s\n", optarg, VERSION); return -1; } }