remove perfect hash function stuff, add zip option to extract.cc

4 files changed, 0 insertions, 107 deletions

diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 17436263..59fb644d 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -70,7 +70,6 @@ set(utils_STAT_SRCS
     named_enum.h
     null_deleter.h
     null_traits.h
-    perfect_hash.h
     prob.h
     sampler.h
     semiring.h
diff --git a/utils/perfect_hash.cc b/utils/perfect_hash.cc
deleted file mode 100644
index 706e2741..00000000
--- a/utils/perfect_hash.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "config.h"
-
-#ifdef HAVE_CMPH
-
-#include "perfect_hash.h"
-
-#include <cstdio>
-#include <iostream>
-
-using namespace std;
-
-PerfectHashFunction::~PerfectHashFunction() {
-  cmph_destroy(mphf_);
-}
-
-PerfectHashFunction::PerfectHashFunction(const string& fname) {
-  FILE* f = fopen(fname.c_str(), "r");
-  if (!f) {
-    cerr << "Failed to open file " << fname << " for reading: cannot load hash function.\n";
-    abort();
-  }
-  mphf_ = cmph_load(f);
-  if (!mphf_) {
-    cerr << "cmph_load failed on " << fname << "!\n";
-    abort();
-  }
-}
-
-size_t PerfectHashFunction::operator()(const string& key) const {
-  return cmph_search(mphf_, &key[0], key.size());
-}
-
-size_t PerfectHashFunction::number_of_keys() const {
-  return cmph_size(mphf_);
-}
-
-#endif
diff --git a/utils/perfect_hash.h b/utils/perfect_hash.h
deleted file mode 100644
index 8c12c9f0..00000000
--- a/utils/perfect_hash.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef PERFECT_HASH_MAP_H_
-#define PERFECT_HASH_MAP_H_
-
-#include <vector>
-#include <boost/utility.hpp>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef HAVE_CMPH
-#include "cmph.h"
-#endif
-
-class PerfectHashFunction : boost::noncopyable {
- public:
-  explicit PerfectHashFunction(const std::string& fname);
-  ~PerfectHashFunction();
-  size_t operator()(const std::string& key) const;
-  size_t number_of_keys() const;
- private:
-#ifdef HAVE_CMPH
-  cmph_t *mphf_;
-#endif
-};
-
-#endif
diff --git a/utils/phmt.cc b/utils/phmt.cc
deleted file mode 100644
index b17febf6..00000000
--- a/utils/phmt.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifndef HAVE_CMPH
-int main() {
-  return 0;
-}
-#else
-
-#include <iostream>
-#include "weights.h"
-#include "fdict.h"
-
-using namespace std;
-
-int main(int argc, char** argv) {
-  if (argc != 2) { cerr << "Usage: " << argv[0] << " file.mphf\n"; return 1; }
-  FD::EnableHash(argv[1]);
-  cerr << "Number of keys: " << FD::NumFeats() << endl;
-  cerr << "LexFE = " << FD::Convert("LexFE") << endl;
-  cerr << "LexEF = " << FD::Convert("LexEF") << endl;
-  {
-    vector<weight_t> v(FD::NumFeats());
-    v[FD::Convert("LexFE")] = 1.0;
-    v[FD::Convert("LexEF")] = 0.5;
-    cerr << "Writing...\n";
-    Weights::WriteToFile("weights.bin", v);
-    cerr << "Done.\n";
-  }
-  {
-    vector<weight_t> v(FD::NumFeats());
-    cerr << "Reading...\n";
-    Weights::InitFromFile("weights.bin", &v);
-    cerr << "Done.\n";
-    assert(v[FD::Convert("LexFE")] == 1.0);
-    assert(v[FD::Convert("LexEF")] == 0.5);
-  }
-}
-
-#endif
-