diff options
| author | redpony <redpony@ec762483-ff6d-05da-a07a-a48fb63a330f> | 2010-08-11 02:37:10 +0000 |
|---|---|---|
| committer | redpony <redpony@ec762483-ff6d-05da-a07a-a48fb63a330f> | 2010-08-11 02:37:10 +0000 |
| commit | 80686d4e567bae579ea39e009826a2de92cd4ace (patch) | |
| tree | c3c35fcba57dde423a248f38aa121ad197c79734 /decoder | |
| parent | 3c85c407c333899f6b4bc26632d312b8e568b638 (diff) | |
major refactor, break bad circular deps
git-svn-id: https://ws10smt.googlecode.com/svn/trunk@509 ec762483-ff6d-05da-a07a-a48fb63a330f
Diffstat (limited to 'decoder')
52 files changed, 29 insertions, 3906 deletions
diff --git a/decoder/Makefile.am b/decoder/Makefile.am index 68a7d765..f514b340 100644 --- a/decoder/Makefile.am +++ b/decoder/Makefile.am @@ -2,24 +2,16 @@ bin_PROGRAMS = cdec if HAVE_GTEST noinst_PROGRAMS = \ - dict_test \ - weights_test \ trule_test \ hg_test \ ff_test \ - logval_test \ parser_test \ - grammar_test \ - small_vector_test + grammar_test endif -cdec_SOURCES = cdec.cc forest_writer.cc maxtrans_blunsom.cc cdec_ff.cc timing_stats.cc -small_vector_test_SOURCES = small_vector_test.cc -small_vector_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a +cdec_SOURCES = cdec.cc forest_writer.cc maxtrans_blunsom.cc cdec_ff.cc parser_test_SOURCES = parser_test.cc parser_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a -dict_test_SOURCES = dict_test.cc -dict_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a ff_test_SOURCES = ff_test.cc ff_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a grammar_test_SOURCES = grammar_test.cc @@ -28,15 +20,12 @@ hg_test_SOURCES = hg_test.cc hg_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a trule_test_SOURCES = trule_test.cc trule_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a -weights_test_SOURCES = weights_test.cc -weights_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a -logval_test_SOURCES = logval_test.cc -logval_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) -LDADD = libcdec.a +LDADD = libcdec.a ../mteval/libmteval.a ../utils/libutils.a -AM_CPPFLAGS = -W -Wall -Wno-sign-compare $(GTEST_CPPFLAGS) -I.. -AM_LDFLAGS = -lz +AM_CPPFLAGS = -W -Wall -Wno-sign-compare $(GTEST_CPPFLAGS) -I.. -I../mteval -I../utils + +AM_LDFLAGS = ../utils/libutils.a -lz rule_lexer.cc: rule_lexer.l $(LEX) -s -CF -8 -o$@ $< @@ -49,7 +38,6 @@ libcdec_a_SOURCES = \ rule_lexer.cc \ fst_translator.cc \ csplit.cc \ - dict.cc \ translator.cc \ scfg_translator.cc \ hg.cc \ @@ -58,17 +46,10 @@ libcdec_a_SOURCES = \ viterbi.cc \ lattice.cc \ aligner.cc \ - gzstream.cc \ apply_models.cc \ earley_composer.cc \ phrasetable_fst.cc \ - sparse_vector.cc \ trule.cc \ - filelib.cc \ - stringlib.cc \ - fdict.cc \ - tdict.cc \ - weights.cc \ ttables.cc \ ff.cc \ ff_lm.cc \ @@ -78,12 +59,6 @@ libcdec_a_SOURCES = \ ff_tagger.cc \ ff_bleu.cc \ ff_factory.cc \ - ../vest/scorer.cc \ - ../vest/ter.cc \ - ../vest/aer_scorer.cc \ - ../vest/comb_scorer.cc \ - ../vest/error_surface.cc \ - ../vest/viterbi_envelope.cc \ freqdict.cc \ lexalign.cc \ lextrans.cc \ diff --git a/decoder/aligner.cc b/decoder/aligner.cc index b089f52e..92431be4 100644 --- a/decoder/aligner.cc +++ b/decoder/aligner.cc @@ -5,81 +5,11 @@ #include "sentence_metadata.h" #include "inside_outside.h" #include "viterbi.h" +#include "alignment_pharaoh.h" #include <set> using namespace std; -static bool is_digit(char x) { return x >= '0' && x <= '9'; } - -boost::shared_ptr<Array2D<bool> > AlignerTools::ReadPharaohAlignmentGrid(const string& al) { - int max_x = 0; - int max_y = 0; - int i = 0; - size_t pos = al.rfind(" ||| "); - if (pos != string::npos) { i = pos + 5; } - while (i < al.size()) { - if (al[i] == '\n' || al[i] == '\r') break; - int x = 0; - while(i < al.size() && is_digit(al[i])) { - x *= 10; - x += al[i] - '0'; - ++i; - } - if (x > max_x) max_x = x; - assert(i < al.size()); - if(al[i] != '-') { - cerr << "BAD ALIGNMENT: " << al << endl; - abort(); - } - ++i; - int y = 0; - while(i < al.size() && is_digit(al[i])) { - y *= 10; - y += al[i] - '0'; - ++i; - } - if (y > max_y) max_y = y; - while(i < al.size() && al[i] == ' ') { ++i; } - } - - boost::shared_ptr<Array2D<bool> > grid(new Array2D<bool>(max_x + 1, max_y + 1)); - i = 0; - if (pos != string::npos) { i = pos + 5; } - while (i < al.size()) { - if (al[i] == '\n' || al[i] == '\r') break; - int x = 0; - while(i < al.size() && is_digit(al[i])) { - x *= 10; - x += al[i] - '0'; - ++i; - } - assert(i < al.size()); - assert(al[i] == '-'); - ++i; - int y = 0; - while(i < al.size() && is_digit(al[i])) { - y *= 10; - y += al[i] - '0'; - ++i; - } - (*grid)(x, y) = true; - while(i < al.size() && al[i] == ' ') { ++i; } - } - // cerr << *grid << endl; - return grid; -} - -void AlignerTools::SerializePharaohFormat(const Array2D<bool>& alignment, ostream* out) { - bool need_space = false; - for (int i = 0; i < alignment.width(); ++i) - for (int j = 0; j < alignment.height(); ++j) - if (alignment(i,j)) { - if (need_space) (*out) << ' '; else need_space = true; - (*out) << i << '-' << j; - } - (*out) << endl; -} - // used with lexical models since they may not fully generate the // source string void SourceEdgeCoveragesUsingParseIndices(const Hypergraph& g, @@ -317,6 +247,6 @@ void AlignerTools::WriteAlignment(const Lattice& src_lattice, cerr << grid << endl; } (*out) << TD::GetString(src_sent) << " ||| " << TD::GetString(trg_sent) << " ||| "; - SerializePharaohFormat(grid, out); + AlignmentPharaoh::SerializePharaohFormat(grid, out); }; diff --git a/decoder/aligner.h b/decoder/aligner.h index cd159119..a088ba6c 100644 --- a/decoder/aligner.h +++ b/decoder/aligner.h @@ -10,8 +10,6 @@ class Hypergraph; class SentenceMetadata; struct AlignerTools { - static boost::shared_ptr<Array2D<bool> > ReadPharaohAlignmentGrid(const std::string& al); - static void SerializePharaohFormat(const Array2D<bool>& alignment, std::ostream* out); // assumption: g contains derivations of input/ref and // ONLY input/ref. diff --git a/decoder/array2d.h b/decoder/array2d.h deleted file mode 100644 index e63eda0d..00000000 --- a/decoder/array2d.h +++ /dev/null @@ -1,172 +0,0 @@ -#ifndef ARRAY2D_H_ -#define ARRAY2D_H_ - -#include <iostream> -#include <algorithm> -#include <cassert> -#include <vector> -#include <string> - -template<typename T> -class Array2D { - public: - typedef typename std::vector<T>::reference reference; - typedef typename std::vector<T>::const_reference const_reference; - typedef typename std::vector<T>::iterator iterator; - typedef typename std::vector<T>::const_iterator const_iterator; - Array2D() : width_(0), height_(0) {} - Array2D(int w, int h, const T& d = T()) : - width_(w), height_(h), data_(w*h, d) {} - Array2D(const Array2D& rhs) : - width_(rhs.width_), height_(rhs.height_), data_(rhs.data_) {} - bool empty() const { return data_.empty(); } - void resize(int w, int h, const T& d = T()) { - data_.resize(w * h, d); - width_ = w; - height_ = h; - } - const Array2D& operator=(const Array2D& rhs) { - data_ = rhs.data_; - width_ = rhs.width_; - height_ = rhs.height_; - return *this; - } - void fill(const T& v) { data_.assign(data_.size(), v); } - int width() const { return width_; } - int height() const { return height_; } - reference operator()(int i, int j) { - return data_[offset(i, j)]; - } - void clear() { data_.clear(); width_=0; height_=0; } - const_reference operator()(int i, int j) const { - return data_[offset(i, j)]; - } - iterator begin_col(int j) { - return data_.begin() + offset(0,j); - } - const_iterator begin_col(int j) const { - return data_.begin() + offset(0,j); - } - iterator end_col(int j) { - return data_.begin() + offset(0,j) + width_; - } - const_iterator end_col(int j) const { - return data_.begin() + offset(0,j) + width_; - } - iterator end() { return data_.end(); } - const_iterator end() const { return data_.end(); } - const Array2D<T>& operator*=(const T& x) { - std::transform(data_.begin(), data_.end(), data_.begin(), - std::bind2nd(std::multiplies<T>(), x)); - } - const Array2D<T>& operator/=(const T& x) { - std::transform(data_.begin(), data_.end(), data_.begin(), - std::bind2nd(std::divides<T>(), x)); - } - const Array2D<T>& operator+=(const Array2D<T>& m) { - std::transform(m.data_.begin(), m.data_.end(), data_.begin(), data_.begin(), std::plus<T>()); - } - const Array2D<T>& operator-=(const Array2D<T>& m) { - std::transform(m.data_.begin(), m.data_.end(), data_.begin(), data_.begin(), std::minus<T>()); - } - - private: - inline int offset(int i, int j) const { - assert(i<width_); - assert(j<height_); - return i + j * width_; - } - - int width_; - int height_; - - std::vector<T> data_; -}; - -template <typename T> -Array2D<T> operator*(const Array2D<T>& l, const T& scalar) { - Array2D<T> res(l); - res *= scalar; - return res; -} - -template <typename T> -Array2D<T> operator*(const T& scalar, const Array2D<T>& l) { - Array2D<T> res(l); - res *= scalar; - return res; -} - -template <typename T> -Array2D<T> operator/(const Array2D<T>& l, const T& scalar) { - Array2D<T> res(l); - res /= scalar; - return res; -} - -template <typename T> -Array2D<T> operator+(const Array2D<T>& l, const Array2D<T>& r) { - Array2D<T> res(l); - res += r; - return res; -} - -template <typename T> -Array2D<T> operator-(const Array2D<T>& l, const Array2D<T>& r) { - Array2D<T> res(l); - res -= r; - return res; -} - -template <typename T> -inline std::ostream& operator<<(std::ostream& os, const Array2D<T>& m) { - for (int i=0; i<m.width(); ++i) { - for (int j=0; j<m.height(); ++j) - os << '\t' << m(i,j); - os << '\n'; - } - return os; -} - -inline std::ostream& operator<<(std::ostream& os, const Array2D<bool>& m) { - os << ' '; - for (int j=0; j<m.height(); ++j) - os << (j%10); - os << "\n"; - for (int i=0; i<m.width(); ++i) { - os << (i%10); - for (int j=0; j<m.height(); ++j) - os << (m(i,j) ? '*' : '.'); - os << (i%10) << "\n"; - } - os << ' '; - for (int j=0; j<m.height(); ++j) - os << (j%10); - os << "\n"; - return os; -} - -inline std::ostream& operator<<(std::ostream& os, const Array2D<std::vector<bool> >& m) { - os << ' '; - for (int j=0; j<m.height(); ++j) - os << (j%10) << "\t"; - os << "\n"; - for (int i=0; i<m.width(); ++i) { - os << (i%10); - for (int j=0; j<m.height(); ++j) { - const std::vector<bool>& ar = m(i,j); - for (int k=0; k<ar.size(); ++k) - os << (ar[k] ? '*' : '.'); - } - os << "\t"; - os << (i%10) << "\n"; - } - os << ' '; - for (int j=0; j<m.height(); ++j) - os << (j%10) << "\t"; - os << "\n"; - return os; -} - -#endif - diff --git a/decoder/cdec.cc b/decoder/cdec.cc index 8c4a25e0..3633febd 100644 --- a/decoder/cdec.cc +++ b/decoder/cdec.cc @@ -34,7 +34,7 @@ #include "inside_outside.h" #include "exp_semiring.h" #include "sentence_metadata.h" -#include "../vest/scorer.h" +#include "scorer.h" #include "apply_fsa_models.h" #include "program_options.h" #include "cfg_options.h" @@ -59,6 +59,15 @@ void ShowBanner() { cerr << "cdec v1.0 (c) 2009-2010 by Chris Dyer\n"; } +void ParseTranslatorInputLattice(const string& line, string* input, Lattice* ref) { + string sref; + ParseTranslatorInput(line, input, &sref); + if (sref.size() > 0) { + assert(ref); + LatticeTools::ConvertTextOrPLF(sref, ref); + } +} + void ConvertSV(const SparseVector<prob_t>& src, SparseVector<double>* trg) { for (SparseVector<prob_t>::const_iterator it = src.begin(); it != src.end(); ++it) trg->set_value(it->first, it->second); diff --git a/decoder/dict.cc b/decoder/dict.cc deleted file mode 100644 index 2d6986c8..00000000 --- a/decoder/dict.cc +++ /dev/null @@ -1,27 +0,0 @@ -#include "dict.h" - -#include <string> -#include <vector> - -void TokenizeStringSeparator( - const std::string& str, - const std::string& separator, - std::vector<std::string>* tokens) { - - size_t pos = 0; - std::string::size_type nextPos = str.find(separator, pos); - - while (nextPos != std::string::npos) { - tokens->push_back(str.substr(pos, nextPos - pos)); - pos = nextPos + separator.size(); - nextPos = str.find(separator, pos); - } - tokens->push_back(str.substr(pos, nextPos - pos)); -} - - -void Dict::AsVector(const WordID& id, std::vector<std::string>* results) const { - results->clear(); - TokenizeStringSeparator(Convert(id), " ||| ", results); -} - diff --git a/decoder/dict.h b/decoder/dict.h deleted file mode 100644 index 348a97e3..00000000 --- a/decoder/dict.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef DICT_H_ -#define DICT_H_ - - -#include <cassert> -#include <cstring> - -#include <string> -#include <vector> -#include "hash.h" -#include "wordid.h" - -class Dict { - typedef - HASH_MAP<std::string, WordID, boost::hash<std::string> > Map; - public: - Dict() : b0_("<bad0>") { - HASH_MAP_EMPTY(d_,"<bad1>"); - words_.reserve(1000); - } - - inline int max() const { return words_.size(); } - - inline WordID Convert(const std::string& word, bool frozen = false) { - Map::iterator i = d_.find(word); - if (i == d_.end()) { - if (frozen) - return 0; - words_.push_back(word); - d_[word] = words_.size(); - return words_.size(); - } else { - return i->second; - } - } - - inline WordID Convert(const std::vector<std::string>& words, bool frozen = false) - { return Convert(toString(words), frozen); } - - static inline std::string toString(const std::vector<std::string>& words) { - std::string word= ""; - for (std::vector<std::string>::const_iterator it=words.begin(); - it != words.end(); ++it) { - if (it != words.begin()) word += " ||| "; - word += *it; - } - return word; - } - - inline const std::string& Convert(const WordID& id) const { - if (id == 0) return b0_; - assert(id <= (int)words_.size()); - return words_[id-1]; - } - - void AsVector(const WordID& id, std::vector<std::string>* results) const; - - void clear() { words_.clear(); d_.clear(); } - - private: - const std::string b0_; - std::vector<std::string> words_; - Map d_; -}; - -#endif diff --git a/decoder/dict_test.cc b/decoder/dict_test.cc deleted file mode 100644 index 694877fa..00000000 --- a/decoder/dict_test.cc +++ /dev/null @@ -1,50 +0,0 @@ -#include "dict.h" - -#include "fdict.h" - -#include <iostream> -#include <gtest/gtest.h> -#include <cassert> -#include "filelib.h" - -#include "tdict.h" - -using namespace std; - -class DTest : public testing::Test { - public: - DTest() {} - protected: - virtual void SetUp() { } - virtual void TearDown() { } -}; - -TEST_F(DTest, Convert) { - Dict d; - WordID a = d.Convert("foo"); - WordID b = d.Convert("bar"); - std::string x = "foo"; - WordID c = d.Convert(x); - EXPECT_NE(a, b); - EXPECT_EQ(a, c); - EXPECT_EQ(d.Convert(a), "foo"); - EXPECT_EQ(d.Convert(b), "bar"); -} - -TEST_F(DTest, FDictTest) { - int fid = FD::Convert("First"); - EXPECT_GT(fid, 0); - EXPECT_EQ(FD::Convert(fid), "First"); - string x = FD::Escape("="); - cerr << x << endl; - EXPECT_NE(x, "="); - x = FD::Escape(";"); - cerr << x << endl; - EXPECT_NE(x, ";"); -} - -int main(int argc, char** argv) { - testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} - diff --git a/decoder/fdict.cc b/decoder/fdict.cc deleted file mode 100644 index baa0b552..00000000 --- a/decoder/fdict.cc +++ /dev/null @@ -1,143 +0,0 @@ -#include "fdict.h" -#include "stdlib.h" -//for malloc (need on cygwin); todo <cstdlib> and std::malloc -#include <string> -#include <sstream> - -using namespace std; - -Dict FD::dict_; -bool FD::frozen_ = false; - -std::string FD::Convert(std::vector<WordID> const& v) { - return Convert(&*v.begin(),&*v.end()); -} - -std::string FD::Convert(WordID const *b,WordID const* e) { - ostringstream o; - for (WordID const* i=b;i<e;++i) { - if (i>b) o << ' '; - o << FD::Convert(*i); - } - return o.str(); -} - -static int HexPairValue(const char * code) { - int value = 0; - const char * pch = code; - for (;;) { - int digit = *pch++; - if (digit >= '0' && digit <= '9') { - value += digit - '0'; - } - else if (digit >= 'A' && digit <= 'F') { - value += digit - 'A' + 10; - } - else if (digit >= 'a' && digit <= 'f') { - value += digit - 'a' + 10; - } - else { - return -1; - } - if (pch == code + 2) - return value; - value <<= 4; - } -} - -int UrlDecode(const char *source, char *dest) -{ - char * start = dest; - - while (*source) { - switch (*source) { - case '+': - *(dest++) = ' '; - break; - case '%': - if (source[1] && source[2]) { - int value = HexPairValue(source + 1); - if (value >= 0) { - *(dest++) = value; - source += 2; - } - else { - *dest++ = '?'; - } - } - else { - *dest++ = '?'; - } - break; - default: - *dest++ = *source; - } - source++; - } - - *dest = 0; - return dest - start; -} - -int UrlEncode(const char *source, char *dest, unsigned max) { - static const char *digits = "0123456789ABCDEF"; - unsigned char ch; - unsigned len = 0; - char *start = dest; - - while (len < max - 4 && *source) - { - ch = (unsigned char)*source; - if (*source == ' ') { - *dest++ = '+'; - } - else if (strchr("=:;,_| %", ch)) { - *dest++ = '%'; - *dest++ = digits[(ch >> 4) & 0x0F]; - *dest++ = digits[ ch & 0x0F]; - } - else { - *dest++ = *source; - } - source++; - } - *dest = 0; - return start - dest; -} - -std::string UrlDecodeString(const std::string & encoded) { - const char * sz_encoded = encoded.c_str(); - size_t needed_length = encoded.length(); - for (const char * pch = sz_encoded; *pch; pch++) { - if (*pch == '%') - needed_length += 2; - } - needed_length += 10; - char stackalloc[64]; - char * buf = needed_length > sizeof(stackalloc)/sizeof(*stackalloc) ? - (char *)malloc(needed_length) : stackalloc; - UrlDecode(encoded.c_str(), buf); - std::string result(buf); - if (buf != stackalloc) { - free(buf); - } - return result; -} - -std::string UrlEncodeString(const std::string & decoded) { - size_t needed_length = decoded.length() * 3 + 3; - char stackalloc[64]; - char * buf = needed_length > sizeof(stackalloc)/sizeof(*stackalloc) ? - (char *)malloc(needed_length) : stackalloc; - UrlEncode(decoded.c_str(), buf, needed_length); - std::string result(buf); - if (buf != stackalloc) { - free(buf); - } - return result; -} - -string FD::Escape(const string& s) { - return UrlEncodeString(s); -} - diff --git a/decoder/fdict.h b/decoder/fdict.h deleted file mode 100644 index f9673023..00000000 --- a/decoder/fdict.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef _FDICT_H_ -#define _FDICT_H_ - -#include <string> -#include <vector> -#include "dict.h" - -struct FD { - // once the FD is frozen, new features not already in the - // dictionary will return 0 - static void Freeze() { - frozen_ = true; - } - static inline int NumFeats() { - return dict_.max() + 1; - } - static inline WordID Convert(const std::string& s) { - return dict_.Convert(s, frozen_); - } - static inline const std::string& Convert(const WordID& w) { - return dict_.Convert(w); - } - static std::string Convert(WordID const *i,WordID const* e); - static std::string Convert(std::vector<WordID> const& v); - - // Escape any string to a form that can be used as the name - // of a weight in a weights file - static std::string Escape(const std::string& s); - static Dict dict_; - private: - static bool frozen_; -}; - -#endif diff --git a/decoder/feature_vector.h b/decoder/feature_vector.h deleted file mode 100755 index be378a6a..00000000 --- a/decoder/feature_vector.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _FEATURE_VECTOR_H_ -#define _FEATURE_VECTOR_H_ - -#include <vector> -#include "sparse_vector.h" -#include "fdict.h" - -typedef double Featval; -typedef SparseVectorList<Featval> FeatureVectorList; -typedef SparseVector<Featval> FeatureVector; -typedef SparseVector<Featval> WeightVector; -typedef std::vector<Featval> DenseWeightVector; - -inline void sparse_to_dense(WeightVector const& wv,DenseWeightVector *dv) { - wv.init_vector(dv); -} - -#endif diff --git a/decoder/ff_bleu.cc b/decoder/ff_bleu.cc index 77989331..aa4e6d85 100644 --- a/decoder/ff_bleu.cc +++ b/decoder/ff_bleu.cc @@ -18,7 +18,7 @@ char const* bleu_usage_verbose="Uses feature id 0! Make sure there are no other #include "hg.h" #include "stringlib.h" #include "sentence_metadata.h" -#include "../vest/scorer.h" +#include "scorer.h" using namespace std; diff --git a/decoder/ff_lm.cc b/decoder/ff_lm.cc index f3e65cb7..a9929253 100644 --- a/decoder/ff_lm.cc +++ b/decoder/ff_lm.cc @@ -728,7 +728,7 @@ LanguageModelRandLM::LanguageModelRandLM(const string& param) : filename = argv[0]; } } - set_order(order); +// set_order(order); int cache_MB = 200; // increase cache size randlm::RandLM* rlm = randlm::RandLM::initRandLM(filename, order, cache_MB); assert(rlm != NULL); diff --git a/decoder/ff_wordalign.cc b/decoder/ff_wordalign.cc index 0ba2bf92..087bff0c 100644 --- a/decoder/ff_wordalign.cc +++ b/decoder/ff_wordalign.cc @@ -5,6 +5,7 @@ #include <string> #include <cmath> +#include "alignment_pharaoh.h" #include "stringlib.h" #include "sentence_metadata.h" #include "hg.h" @@ -354,7 +355,7 @@ AlignerResults::AlignerResults(const std::string& param) : getline(in, line); if (!in) break; ++lc; - is_aligned_.push_back(AlignerTools::ReadPharaohAlignmentGrid(line)); + is_aligned_.push_back(AlignmentPharaoh::ReadPharaohAlignmentGrid(line)); } cerr << " Loaded " << lc << " refs\n"; } diff --git a/decoder/filelib.cc b/decoder/filelib.cc deleted file mode 100644 index 79ad2847..00000000 --- a/decoder/filelib.cc +++ /dev/null @@ -1,22 +0,0 @@ -#include "filelib.h" - -#include <unistd.h> -#include <sys/stat.h> - -using namespace std; - -bool FileExists(const std::string& fn) { - struct stat info; - int s = stat(fn.c_str(), &info); - return (s==0); -} - -bool DirectoryExists(const string& dir) { - if (access(dir.c_str(),0) == 0) { - struct stat status; - stat(dir.c_str(), &status); - if (status.st_mode & S_IFDIR) return true; - } - return false; -} - diff --git a/decoder/filelib.h b/decoder/filelib.h deleted file mode 100644 index b9fef9a7..00000000 --- a/decoder/filelib.h +++ /dev/null @@ -1,106 +0,0 @@ -#ifndef _FILELIB_H_ -#define _FILELIB_H_ - -#include <cassert> -#include <string> -#include <iostream> -#include <cstdlib> -#include <boost/shared_ptr.hpp> -#include <stdexcept> -#include "gzstream.h" -#include "null_deleter.h" - -bool FileExists(const std::string& file_name); -bool DirectoryExists(const std::string& dir_name); - -// reads from standard in if filename is - -// uncompresses if file ends with .gz -// otherwise, reads from a normal file - -template <class Stream> -struct BaseFile { - typedef Stream S; - typedef boost::shared_ptr<Stream> PS; - void Reset() { - ps_.reset(); - } - bool is_null() const { return !ps_; } - operator bool() const { - return ps_; - } - S* stream() { return ps_.get(); } - S* operator->() { return ps_.get(); } // compat with old ReadFile * -> new Readfile. remove? - S &operator *() const { return get(); } - S &get() const { return *ps_; } - bool is_std() { - return filename_=="-"; - } - std::string filename_; -protected: - void error(std::string const& reason,std::string const& filename) { - throw std::runtime_error("File "+filename+" - "+reason); - } - - PS ps_; - static bool EndsWith(const std::string& f, const std::string& suf) { - return (f.size() > suf.size()) && (f.rfind(suf) == f.size() - suf.size()); - } -}; - -class ReadFile : public BaseFile<std::istream> { - public: - ReadFile() { } - explicit ReadFile(const std::string& filename) { - Init(filename); - } - void Init(const std::string& filename) { - filename_=filename; - if (is_std()) { - ps_=PS(&std::cin,null_deleter()); - } else { - if (!FileExists(filename)) { - std::cerr << "File does not exist: " << filename << std::endl; - error(filename," couldn't read nonexistant file."); - abort(); - } - char const* file=filename_.c_str(); // just in case the gzstream keeps using the filename for longer than the constructor, e.g. inflateReset2. warning in valgrind that I'm hoping will disappear - it makes no sense. - ps_=PS(EndsWith(filename, ".gz") ? - static_cast<std::istream*>(new igzstream(file)) : - static_cast<std::istream*>(new std::ifstream(file))); - if (!*ps_) { - std::cerr << "Failed to open " << filename << std::endl; - error(filename," open for reading failed."); - abort(); - } - } - } - -}; - -class WriteFile : public BaseFile<std::ostream> { - public: - WriteFile() {} - explicit WriteFile(std::string const& filename) { Init(filename); } - void Init(const std::string& filename) { - filename_=filename; - if (is_std()) { - ps_=PS(&std::cout,null_deleter()); - } else { - char const* file=filename_.c_str(); // just in case the gzstream keeps using the filename for longer than the constructor, e.g. inflateReset2. warning in valgrind that I'm hoping will disappear - it makes no sense. - ps_=PS(EndsWith(filename, ".gz") ? - static_cast<std::ostream*>(new ogzstream(file)) : - static_cast<std::ostream*>(new std::ofstream(file))); - if (!*ps_) { - std::cerr << "Failed to open " << filename << std::endl; - error(filename," open for writing failed."); - abort(); - } - } - } - ~WriteFile() { - if (ps_) - get() << std::flush; - } -}; - -#endif diff --git a/decoder/gzstream.cc b/decoder/gzstream.cc deleted file mode 100644 index 88cd1bd2..00000000 --- a/decoder/gzstream.cc +++ /dev/null @@ -1,182 +0,0 @@ -// ============================================================================ -// gzstream, C++ iostream classes wrapping the zlib compression library. -// Copyright (C) 2001 Deepak Bandyopadhyay, Lutz Kettner -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// ============================================================================ -// -// File : gzstream.C -// Revision : $Revision: 1.7 $ -// Revision_date : $Date: 2003/01/08 14:41:27 $ -// Author(s) : Deepak Bandyopadhyay, Lutz Kettner -// -// Standard streambuf implementation following Nicolai Josuttis, "The -// Standard C++ Library". -// ============================================================================ - -#include <gzstream.h> -#include <iostream> -#include <cstring> // for memcpy -#include <stdexcept> - -#ifdef GZSTREAM_NAMESPACE -namespace GZSTREAM_NAMESPACE { -#endif - -// ---------------------------------------------------------------------------- -// Internal classes to implement gzstream. See header file for user classes. -// ---------------------------------------------------------------------------- - -// -------------------------------------- -// class gzstreambuf: -// -------------------------------------- - -gzstreambuf* gzstreambuf::open( const char* name, int open_mode) { - if ( is_open()) - return (gzstreambuf*)0; - mode = open_mode; - // no append nor read/write mode - if ((mode & std::ios::ate) || (mode & std::ios::app) - || ((mode & std::ios::in) && (mode & std::ios::out))) - return (gzstreambuf*)0; - const int Nmode=10; - char fmode[Nmode]; - char* fmodeptr = fmode; - if ( mode & std::ios::in) - *fmodeptr++ = 'r'; - else if ( mode & std::ios::out) - *fmodeptr++ = 'w'; - *fmodeptr++ = 'b'; - while (fmodeptr<fmode+Nmode) // hopefully wil help valgrind - *fmodeptr++ = '\0'; - file = gzopen( name, fmode); - if (!file) handle_gzerror(); - if (file == 0) - return (gzstreambuf*)0; - opened = 1; - return this; -} - -gzstreambuf * gzstreambuf::close() { - if ( is_open()) { - sync(); - opened = 0; - if ( gzclose( file) == Z_OK) - return this; - else - handle_gzerror(); - } - return (gzstreambuf*)0; -} - -void gzstreambuf::handle_gzerror() { - int errnum; - const char *errmsg=gzerror(file,&errnum); - if (errnum==Z_DATA_ERROR) errmsg="CRC error reading gzip"; - throw std::runtime_error(std::string("gzstreambuf error: ")+errmsg); -} - -int gzstreambuf::underflow() { // used for input buffer only - if ( gptr() && ( gptr() < egptr())) - return * reinterpret_cast<unsigned char *>( gptr()); - - if ( ! (mode & std::ios::in) || ! opened) - return EOF; - // Josuttis' implementation of inbuf - int n_putback = gptr() - eback(); - if ( n_putback > 4) - n_putback = 4; - std::memcpy( buffer + (4 - n_putback), gptr() - n_putback, n_putback); - - int num = gzread( file, buffer+4, bufferSize-4); - if (num <= 0) // ERROR or EOF - { - if (gzeof(file)) - return EOF; - handle_gzerror(); - } - - // reset buffer pointers - setg( buffer + (4 - n_putback), // beginning of putback area - buffer + 4, // read position - buffer + 4 + num); // end of buffer - - // return next character - return * reinterpret_cast<unsigned char *>( gptr()); -} - -int gzstreambuf::flush_buffer() { - // Separate the writing of the buffer from overflow() and - // sync() operation. - int w = pptr() - pbase(); - if ( gzwrite( file, pbase(), w) != w) - handle_gzerror(); - pbump( -w); - return w; -} - -int gzstreambuf::overflow( int c) { // used for output buffer only - if ( ! ( mode & std::ios::out) || ! opened) - return EOF; - if (c != EOF) { - *pptr() = c; - pbump(1); - } - if ( flush_buffer() == EOF) - return EOF; - return c; -} - -int gzstreambuf::sync() { - // Changed to use flush_buffer() instead of overflow( EOF) - // which caused improper behavior with std::endl and flush(), - // bug reported by Vincent Ricard. - if ( pptr() && pptr() > pbase()) { - if ( flush_buffer() == EOF) - return -1; - } - return 0; -} - -// -------------------------------------- -// class gzstreambase: -// -------------------------------------- - -gzstreambase::gzstreambase( const char* name, int mode) { - init( &buf); - open( name, mode); -} - -gzstreambase::~gzstreambase() { - buf.close(); -} - -void gzstreambase::open( const char* name, int open_mode) { - if ( ! buf.open( name, open_mode)) - clear( rdstate() | std::ios::badbit); -} - -void gzstreambase::close() { - if ( buf.is_open()) - if ( ! buf.close()) - clear( rdstate() | std::ios::badbit); -} - -#ifdef GZSTREAM_NAMESPACE -} // namespace GZSTREAM_NAMESPACE -#endif - -// ============================================================================ -// EOF // diff --git a/decoder/gzstream.h b/decoder/gzstream.h deleted file mode 100644 index a7effd90..00000000 --- a/decoder/gzstream.h +++ /dev/null @@ -1,127 +0,0 @@ -// ============================================================================ -// gzstream, C++ iostream classes wrapping the zlib compression library. -// Copyright (C) 2001 Deepak Bandyopadhyay, Lutz Kettner -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// ============================================================================ -// -// File : gzstream.h -// Revision : $Revision: 1.5 $ -// Revision_date : $Date: 2002/04/26 23:30:15 $ -// Author(s) : Deepak Bandyopadhyay, Lutz Kettner -// -// Standard streambuf implementation following Nicolai Josuttis, "The -// Standard C++ Library". -// ============================================================================ - -#ifndef GZSTREAM_H -#define GZSTREAM_H 1 - -// standard C++ with new header file names and std:: namespace -#include <iostream> -#include <fstream> -#include <zlib.h> - -#ifdef GZSTREAM_NAMESPACE -namespace GZSTREAM_NAMESPACE { -#endif - -// ---------------------------------------------------------------------------- -// Internal classes to implement gzstream. See below for user classes. -// ---------------------------------------------------------------------------- - -class gzstreambuf : public std::streambuf { -private: - static const int bufferSize = 47+(1024*256); // size of data buff - // totals 512 bytes under g++ for igzstream at the end. - - gzFile file; // file handle for compressed file - char buffer[bufferSize]; // data buffer - char opened; // open/close state of stream - int mode; // I/O mode - - int flush_buffer(); - void handle_gzerror(); // throws exception -public: -#if defined(_WIN32) && !defined(CYGWIN) && !defined(EOF) - enum { - EOF = -1 - }; -#endif - gzstreambuf() : opened(0) { - setp( buffer, buffer + (bufferSize-1)); - setg( buffer + 4, // beginning of putback area - buffer + 4, // read position - buffer + 4); // end position - // ASSERT: both input & output capabilities will not be used together - } - int is_open() { return opened; } - gzstreambuf* open( const char* name, int open_mode); - gzstreambuf* close(); - ~gzstreambuf() { close(); } - - virtual int overflow( int c = EOF); - virtual int underflow(); - virtual int sync(); -}; - -class gzstreambase : virtual public std::ios { -protected: - gzstreambuf buf; -public: - gzstreambase() { init(&buf); } - gzstreambase( const char* name, int open_mode); - ~gzstreambase(); - void open( const char* name, int open_mode); - void close(); - gzstreambuf* rdbuf() { return &buf; } -}; - -// ---------------------------------------------------------------------------- -// User classes. Use igzstream and ogzstream analogously to ifstream and -// ofstream respectively. They read and write files based on the gz* -// function interface of the zlib. Files are compatible with gzip compression. -// ---------------------------------------------------------------------------- - -class igzstream : public gzstreambase, public std::istream { -public: - igzstream() : std::istream( &buf) {} - igzstream( const char* name, int open_mode = std::ios::in) - : gzstreambase( name, std::ios::in | open_mode), std::istream( &buf) {} - gzstreambuf* rdbuf() { return gzstreambase::rdbuf(); } - void open( const char* name, int open_mode = std::ios::in) { - gzstreambase::open( name, open_mode); - } -}; - -class ogzstream : public gzstreambase, public std::ostream { -public: - ogzstream() : std::ostream( &buf) {} - ogzstream( const char* name, int mode = std::ios::out) - : gzstreambase( name, mode), std::ostream( &buf) {} - gzstreambuf* rdbuf() { return gzstreambase::rdbuf(); } - void open( const char* name, int open_mode = std::ios::out) { - gzstreambase::open( name, open_mode); - } -}; - -#ifdef GZSTREAM_NAMESPACE -} // namespace GZSTREAM_NAMESPACE -#endif - -#endif // GZSTREAM_H -// ============================================================================ -// EOF // - diff --git a/decoder/hash.h b/decoder/hash.h deleted file mode 100755 index 3a60a429..00000000 --- a/decoder/hash.h +++ /dev/null @@ -1,54 +0,0 @@ -#ifndef CDEC_HASH_H -#define CDEC_HASH_H - -#include "murmur_hash.h" - -#include "config.h" -#ifdef HAVE_SPARSEHASH -# include <google/dense_hash_map> -# define HASH_MAP google::dense_hash_map -# define HASH_MAP_RESERVED(h,empty,deleted) do { h.set_empty_key(empty); h.set_deleted_key(deleted); } while(0) -# define HASH_MAP_EMPTY(h,empty) do { h.set_empty_key(empty); } while(0) -#else -# include <tr1/unordered_map> -# define HASH_MAP std::tr1::unordered_map -# define HASH_MAP_RESERVED(h,empty,deleted) -# define HASH_MAP_EMPTY(h,empty) -#endif - -#include <boost/functional/hash.hpp> - -// assumes C is POD -template <class C> -struct murmur_hash -{ - typedef MurmurInt return_type; - typedef C /*const&*/ argument_type; - return_type operator()(argument_type const& c) const { - return MurmurHash((void*)&c,sizeof(c)); - } -}; - -// murmur_hash_array isn't std guaranteed safe (you need to use string::data()) -template <> -struct murmur_hash<std::string> -{ - typedef MurmurInt return_type; - typedef std::string /*const&*/ argument_type; - return_type operator()(argument_type const& c) const { - return MurmurHash(c.data(),c.size()); - } -}; - -// uses begin(),size() assuming contiguous layout and POD -template <class C> -struct murmur_hash_array -{ - typedef MurmurInt return_type; - typedef C /*const&*/ argument_type; - return_type operator()(argument_type const& c) const { - return MurmurHash(&*c.begin(),c.size()*sizeof(*c.begin())); - } -}; - -#endif diff --git a/decoder/have_64_bits.h b/decoder/have_64_bits.h deleted file mode 100755 index d1e6064f..00000000 --- a/decoder/have_64_bits.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef HAVE_64_BITS_H -#define HAVE_64_BITS_H - -#include <stdint.h> - -#undef HAVE_64_BITS - -#if INTPTR_MAX == INT32_MAX -# define HAVE_64_BITS 0 -#elif INTPTR_MAX >= INT64_MAX -# define HAVE_64_BITS 1 -#else -# error "couldn't tell if HAVE_64_BITS from INTPTR_MAX INT32_MAX INT64_MAX" -#endif - - -#endif diff --git a/decoder/hg.h b/decoder/hg.h index d5c8e197..e9510997 100644 --- a/decoder/hg.h +++ b/decoder/hg.h @@ -102,6 +102,8 @@ public: void copy_info(Edge const& o) { #if USE_INFO_EDGE set_info(o.info_.str()); // by convention, each person putting info here starts with a separator (e.g. space). it's empty if nobody put any info there. +#else + (void) o; #endif } void copy_pod(Edge const& o) { @@ -142,7 +144,7 @@ public: #else std::string info() const { return std::string(); } void reset_info() { } - void set_info(std::string const& s) { } + void set_info(std::string const& ) { } #endif void show(std::ostream &o,unsigned mask=SPAN|RULE) const { o<<'{'; diff --git a/decoder/hg_io.cc b/decoder/hg_io.cc index 52a8565a..1af8261e 100644 --- a/decoder/hg_io.cc +++ b/decoder/hg_io.cc @@ -622,56 +622,3 @@ void HypergraphIO::WriteAsCFG(const Hypergraph& hg) { } } -namespace B64 { - -static const char cb64[]="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -static const char cd64[]="|$$$}rstuvwxyz{$$$$$$$>?@ABCDEFGHIJKLMNOPQRSTUVW$$$$$$XYZ[\\]^_`abcdefghijklmnopq"; - -static void encodeblock(const unsigned char* in, ostream* os, int len) { - char out[4]; - out[0] = cb64[ in[0] >> 2 ]; - out[1] = cb64[ ((in[0] & 0x03) << 4) | ((in[1] & 0xf0) >> 4) ]; - out[2] = (len > 1 ? cb64[ ((in[1] & 0x0f) << 2) | ((in[2] & 0xc0) >> 6) ] : '='); - out[3] = (len > 2 ? cb64[ in[2] & 0x3f ] : '='); - os->write(out, 4); -} - -void b64encode(const char* data, const size_t size, ostream* out) { - size_t cur = 0; - while(cur < size) { - int len = min(static_cast<size_t>(3), size - cur); - encodeblock(reinterpret_cast<const unsigned char*>(&data[cur]), out, len); - cur += len; - } -} - -static void decodeblock(const unsigned char* in, unsigned char* out) { - out[0] = (unsigned char ) (in[0] << 2 | in[1] >> 4); - out[1] = (unsigned char ) (in[1] << 4 | in[2] >> 2); - out[2] = (unsigned char ) (((in[2] << 6) & 0xc0) | in[3]); -} - -bool b64decode(const unsigned char* data, const size_t insize, char* out, const size_t outsize) { - size_t cur = 0; - size_t ocur = 0; - unsigned char in[4]; - while(cur < insize) { - assert(ocur < outsize); - for (int i = 0; i < 4; ++i) { - unsigned char v = data[cur]; - v = (unsigned char) ((v < 43 || v > 122) ? '\0' : cd64[ v - 43 ]); - if (!v) { - cerr << "B64 decode error at offset " << cur << " offending character: " << (int)data[cur] << endl; - return false; - } - v = (unsigned char) ((v == '$') ? '\0' : v - 61); - if (v) in[i] = v - 1; else in[i] = 0; - ++cur; - } - decodeblock(in, reinterpret_cast<unsigned char*>(&out[ocur])); - ocur += 3; - } - return true; -} -} - diff --git a/decoder/hg_io.h b/decoder/hg_io.h index b6a176ab..082489d8 100644 --- a/decoder/hg_io.h +++ b/decoder/hg_io.h @@ -31,9 +31,4 @@ struct HypergraphIO { static std::string Escape(const std::string& s); // PLF helper }; -namespace B64 { - bool b64decode(const unsigned char* data, const size_t insize, char* out, const size_t outsize); - void b64encode(const char* data, const size_t size, std::ostream* out); -} - #endif diff --git a/decoder/int_or_pointer.h b/decoder/int_or_pointer.h deleted file mode 100755 index 4b6a9e4a..00000000 --- a/decoder/int_or_pointer.h +++ /dev/null @@ -1,70 +0,0 @@ -#ifndef INT_OR_POINTER_H -#define INT_OR_POINTER_H - -// if you ever wanted to store a discriminated union of pointer/integer without an extra boolean flag, this will do it, assuming your pointers are never odd. - -// check lsb for expected tag? -#ifndef IOP_CHECK_LSB -# define IOP_CHECK_LSB 1 -#endif -#if IOP_CHECK_LSB -# define iop_assert(x) assert(x) -#else -# define iop_assert(x) -#endif - -#include <assert.h> -#include <iostream> - -template <class Pointed=void,class Int=size_t> -struct IntOrPointer { - typedef Pointed pointed_type; - typedef Int integer_type; - typedef Pointed *value_type; - typedef IntOrPointer<Pointed,Int> self_type; - IntOrPointer(int j) { *this=j; } - IntOrPointer(size_t j) { *this=j; } - IntOrPointer(value_type v) { *this=v; } - bool is_integer() const { return i&1; } - bool is_pointer() const { return !(i&1); } - value_type & pointer() { return p; } - const value_type & pointer() const { iop_assert(is_pointer()); return p; } - integer_type integer() const { iop_assert(is_integer()); return i >> 1; } - void set_integer(Int j) { i=2*j+1; } - void set_pointer(value_type p_) { p=p_;iop_assert(is_pointer()); } - void operator=(unsigned j) { i = 2*(integer_type)j+1; } - void operator=(int j) { i = 2*(integer_type)j+1; } - template <class C> - void operator=(C j) { i = 2*(integer_type)j+1; } - void operator=(value_type v) { p=v; } - IntOrPointer() {} - IntOrPointer(const self_type &s) : p(s.p) {} - void operator=(const self_type &s) { p=s.p; } - template <class C> - bool operator ==(C* v) const { return p==v; } - template <class C> - bool operator ==(const C* v) const { return p==v; } - template <class C> - bool operator ==(C j) const { return integer() == j; } - bool operator ==(self_type s) const { return p==s.p; } - bool operator !=(self_type s) const { return p!=s.p; } - template <class O> void print(O&o) const - { - if (is_integer()) - o << integer(); - else { - o << "0x" << std::hex << (size_t)pointer() << std::dec; - } - } - friend inline std::ostream& operator<<(std::ostream &o,self_type const& s) { - s.print(o); return o; - } -protected: - union { - value_type p; // must be even (guaranteed unless you're pointing at packed chars) - integer_type i; // stored as 2*data+1, so only has half the range (one less bit) of a normal integer_type - }; -}; - - -#endif diff --git a/decoder/intrusive_refcount.hpp b/decoder/intrusive_refcount.hpp deleted file mode 100755 index 4a4b0187..00000000 --- a/decoder/intrusive_refcount.hpp +++ /dev/null @@ -1,84 +0,0 @@ -#ifndef GRAEHL__SHARED__INTRUSIVE_REFCOUNT_HPP -#define GRAEHL__SHARED__INTRUSIVE_REFCOUNT_HPP - -#include <boost/intrusive_ptr.hpp> -#include <boost/noncopyable.hpp> -#include <boost/detail/atomic_count.hpp> -#include <cassert> - -/** usage: - struct mine : public boost::instrusive_refcount<mine> {}; - - boost::intrusive_ptr<mine> p(new mine()); -*/ - -namespace boost { -// note: the free functions need to be in boost namespace, OR namespace of involved type. this is the only way to do it. - -template <class T> -class intrusive_refcount; - -template <class T> -class atomic_intrusive_refcount; - -template<class T> -void intrusive_ptr_add_ref(intrusive_refcount<T>* ptr) -{ - ++(ptr->refs); -} - -template<class T> -void intrusive_ptr_release(intrusive_refcount<T>* ptr) -{ - if (!--(ptr->refs)) delete static_cast<T*>(ptr); -} - - -//WARNING: only 2^32 (unsigned) refs allowed. hope that's ok :) -template<class T> -class intrusive_refcount : boost::noncopyable -{ - protected: -// typedef intrusive_refcount<T> pointed_type; - friend void intrusive_ptr_add_ref<T>(intrusive_refcount<T>* ptr); - friend void intrusive_ptr_release<T>(intrusive_refcount<T>* ptr); -// friend class intrusive_ptr<T>; - - intrusive_refcount(): refs(0) {} - ~intrusive_refcount() { assert(refs==0); } - -private: - unsigned refs; -}; - - -template<class T> -void intrusive_ptr_add_ref(atomic_intrusive_refcount<T>* ptr) -{ - ++(ptr->refs); -} - -template<class T> -void intrusive_ptr_release(atomic_intrusive_refcount<T>* ptr) -{ - if(!--(ptr->refs)) delete static_cast<T*>(ptr); -} - -template<class T> -class atomic_intrusive_refcount : boost::noncopyable -{ - protected: - friend void intrusive_ptr_add_ref<T>(atomic_intrusive_refcount<T>* ptr); - friend void intrusive_ptr_release<T>(atomic_intrusive_refcount<T>* ptr); - - atomic_intrusive_refcount(): refs(0) {} - ~atomic_intrusive_refcount() { assert(refs==0); } - -private: - boost::detail::atomic_count refs; -}; - -} - - -#endif diff --git a/decoder/logval.h b/decoder/logval.h deleted file mode 100644 index 37f14ae5..00000000 --- a/decoder/logval.h +++ /dev/null @@ -1,174 +0,0 @@ -#ifndef LOGVAL_H_ -#define LOGVAL_H_ - -#define LOGVAL_CHECK_NEG false - -#include <iostream> -#include <cstdlib> -#include <cmath> -#include <limits> - -template <typename T> -class LogVal { - public: - LogVal() : s_(), v_(-std::numeric_limits<T>::infinity()) {} - explicit LogVal(double x) : s_(std::signbit(x)), v_(s_ ? std::log(-x) : std::log(x)) {} - LogVal(int x) : s_(x<0), v_(s_ ? std::log(-x) : std::log(x)) {} - LogVal(unsigned x) : s_(0), v_(std::log(x)) { } - LogVal(double lnx,bool sign) : s_(sign),v_(lnx) {} - static LogVal<T> exp(T lnx) { return LogVal(lnx,false); } - - static LogVal<T> One() { return LogVal(1); } - static LogVal<T> Zero() { return LogVal(); } - static LogVal<T> e() { return LogVal(1,false); } - void logeq(const T& v) { s_ = false; v_ = v; } - - LogVal& operator+=(const LogVal& a) { - if (a.v_ == -std::numeric_limits<T>::infinity()) return *this; - if (a.s_ == s_) { - if (a.v_ < v_) { - v_ = v_ + log1p(std::exp(a.v_ - v_)); - } else { - v_ = a.v_ + log1p(std::exp(v_ - a.v_)); - } - } else { - if (a.v_ < v_) { - v_ = v_ + log1p(-std::exp(a.v_ - v_)); - } else { - v_ = a.v_ + log1p(-std::exp(v_ - a.v_)); - s_ = !s_; - } - } - return *this; - } - - LogVal& operator*=(const LogVal& a) { - s_ = (s_ != a.s_); - v_ += a.v_; - return *this; - } - - LogVal& operator/=(const LogVal& a) { - s_ = (s_ != a.s_); - v_ -= a.v_; - return *this; - } - - LogVal& operator-=(const LogVal& a) { - LogVal b = a; - b.invert(); - return *this += b; - } - - // LogVal(fabs(log(x)),x.s_) - friend LogVal abslog(LogVal x) { - if (x.v_<0) x.v_=-x.v_; - return x; - } - - LogVal& poweq(const T& power) { -#if LOGVAL_CHECK_NEG - if (s_) { - std::cerr << "poweq(T) not implemented when s_ is true\n"; - std::abort(); - } else -#endif - v_ *= power; - return *this; - } - - void invert() { s_ = !s_; } - - LogVal pow(const T& power) const { - LogVal res = *this; - res.poweq(power); - return res; - } - - LogVal root(const T& root) const { - return pow(1/root); - } - - operator T() const { - if (s_) return -std::exp(v_); else return std::exp(v_); - } - - bool s_; - T v_; -}; - -// copy elision - as opposed to explicit copy of LogVal<T> const& o1, we should be able to construct Logval r=a+(b+c) as a single result in place in r. todo: return std::move(o1) - C++0x -template<typename T> -LogVal<T> operator+(LogVal<T> o1, const LogVal<T>& o2) { - o1 += o2; - return o1; -} - -template<typename T> -LogVal<T> operator*(LogVal<T> o1, const LogVal<T>& o2) { - o1 *= o2; - return o1; -} - -template<typename T> -LogVal<T> operator/(LogVal<T> o1, const LogVal<T>& o2) { - o1 /= o2; - return o1; -} - -template<typename T> -LogVal<T> operator-(LogVal<T> o1, const LogVal<T>& o2) { - o1 -= o2; - return o1; -} - -template<typename T> -T log(const LogVal<T>& o) { -#ifdef LOGVAL_CHECK_NEG - if (o.s_) return log(-1.0); -#endif - return o.v_; -} - -template <typename T> -LogVal<T> pow(const LogVal<T>& b, const T& e) { - return b.pow(e); -} - -template <typename T> -bool operator<(const LogVal<T>& lhs, const LogVal<T>& rhs) { - if (lhs.s_ == rhs.s_) { - return (lhs.v_ < rhs.v_); - } else { - return lhs.s_ > rhs.s_; - } -} - -#if 0 -template <typename T> -bool operator<=(const LogVal<T>& lhs, const LogVal<T>& rhs) { - return (lhs.v_ <= rhs.v_); -} - -template <typename T> -bool operator>(const LogVal<T>& lhs, const LogVal<T>& rhs) { - return (lhs.v_ > rhs.v_); -} - -template <typename T> -bool operator>=(const LogVal<T>& lhs, const LogVal<T>& rhs) { - return (lhs.v_ >= rhs.v_); -} -#endif - -template <typename T> -bool operator==(const LogVal<T>& lhs, const LogVal<T>& rhs) { - return (lhs.v_ == rhs.v_) && (lhs.s_ == rhs.s_); -} - -template <typename T> -bool operator!=(const LogVal<T>& lhs, const LogVal<T>& rhs) { - return !(lhs == rhs); -} - -#endif diff --git a/decoder/logval_test.cc b/decoder/logval_test.cc deleted file mode 100644 index 1a23177d..00000000 --- a/decoder/logval_test.cc +++ /dev/null @@ -1,73 +0,0 @@ -#include "logval.h" - -#include <gtest/gtest.h> -#include <iostream> - -class LogValTest : public testing::Test { - protected: - virtual void SetUp() { } - virtual void TearDown() { } -}; - -using namespace std; - -TEST_F(LogValTest,Order) { - LogVal<double> a(-0.3); - LogVal<double> b(0.3); - LogVal<double> c(2.4); - EXPECT_LT(a,b); - EXPECT_LT(b,c); - EXPECT_LT(a,c); - EXPECT_FALSE(b < a); - EXPECT_FALSE(c < a); - EXPECT_FALSE(c < b); - EXPECT_FALSE(c < c); - EXPECT_FALSE(b < b); - EXPECT_FALSE(a < a); -} - -TEST_F(LogValTest,Invert) { - LogVal<double> x(-2.4); - LogVal<double> y(2.4); - y.invert(); - EXPECT_FLOAT_EQ(x,y); -} - -TEST_F(LogValTest,Minus) { - LogVal<double> x(12); - LogVal<double> y(2); - LogVal<double> z1 = x - y; - LogVal<double> z2 = x; - z2 -= y; - EXPECT_FLOAT_EQ(z1, z2); - EXPECT_FLOAT_EQ(z1, 10.0); - EXPECT_FLOAT_EQ(y - x, -10.0); -} - -TEST_F(LogValTest,TestOps) { - LogVal<double> x(-12.12); - LogVal<double> y(x); - cerr << x << endl; - cerr << (x*y) << endl; - cerr << (x*y + x) << endl; - cerr << (x + x*y) << endl; - cerr << log1p(-0.5) << endl; - LogVal<double> aa(0.2); - LogVal<double> bb(-0.3); - cerr << (aa + bb) << endl; - cerr << (bb + aa) << endl; - EXPECT_FLOAT_EQ((aa + bb), (bb + aa)); - EXPECT_FLOAT_EQ((aa + bb), -0.1); -} - -TEST_F(LogValTest,TestSizes) { - cerr << sizeof(LogVal<double>) << endl; - cerr << sizeof(LogVal<float>) << endl; - cerr << sizeof(void*) << endl; -} - -int main(int argc, char** argv) { - testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} - diff --git a/decoder/murmur_hash.h b/decoder/murmur_hash.h deleted file mode 100755 index 8dbd7807..00000000 --- a/decoder/murmur_hash.h +++ /dev/null @@ -1,186 +0,0 @@ -#ifndef _MURMUR_HASH_H_ -#define _MURMUR_HASH_H_ - -//NOTE: quite fast, nice collision properties, but endian dependent hash values - -#include "have_64_bits.h" -typedef uintptr_t MurmurInt; - -// MurmurHash2, by Austin Appleby - -static const uint32_t DEFAULT_SEED=2654435769U; - -#if HAVE_64_BITS -//MurmurInt MurmurHash(void const *key, int len, uint32_t seed=DEFAULT_SEED); - -inline uint64_t MurmurHash64( const void * key, int len, unsigned int seed=DEFAULT_SEED ) -{ - const uint64_t m = 0xc6a4a7935bd1e995; - const int r = 47; - - uint64_t h = seed ^ (len * m); - - const uint64_t * data = (const uint64_t *)key; - const uint64_t * end = data + (len/8); - - while(data != end) - { - uint64_t k = *data++; - - k *= m; - k ^= k >> r; - k *= m; - - h ^= k; - h *= m; - } - - const unsigned char * data2 = (const unsigned char*)data; - - switch(len & 7) - { - case 7: h ^= uint64_t(data2[6]) << 48; - case 6: h ^= uint64_t(data2[5]) << 40; - case 5: h ^= uint64_t(data2[4]) << 32; - case 4: h ^= uint64_t(data2[3]) << 24; - case 3: h ^= uint64_t(data2[2]) << 16; - case 2: h ^= uint64_t(data2[1]) << 8; - case 1: h ^= uint64_t(data2[0]); - h *= m; - }; - - h ^= h >> r; - h *= m; - h ^= h >> r; - - return h; -} - -inline uint32_t MurmurHash32(void const *key, int len, uint32_t seed=DEFAULT_SEED) -{ - return (uint32_t) MurmurHash64(key,len,seed); -} - -inline MurmurInt MurmurHash(void const *key, int len, uint32_t seed=DEFAULT_SEED) -{ - return MurmurHash64(key,len,seed); -} - -#else -// 32-bit - -// Note - This code makes a few assumptions about how your machine behaves - -// 1. We can read a 4-byte value from any address without crashing -// 2. sizeof(int) == 4 -inline uint32_t MurmurHash32 ( const void * key, int len, uint32_t seed=DEFAULT_SEED) -{ - // 'm' and 'r' are mixing constants generated offline. - // They're not really 'magic', they just happen to work well. - - const uint32_t m = 0x5bd1e995; - const int r = 24; - - // Initialize the hash to a 'random' value - - uint32_t h = seed ^ len; - - // Mix 4 bytes at a time into the hash - - const unsigned char * data = (const unsigned char *)key; - - while(len >= 4) - { - uint32_t k = *(uint32_t *)data; - - k *= m; - k ^= k >> r; - k *= m; - - h *= m; - h ^= k; - - data += 4; - len -= 4; - } - - // Handle the last few bytes of the input array - - switch(len) - { - case 3: h ^= data[2] << 16; - case 2: h ^= data[1] << 8; - case 1: h ^= data[0]; - h *= m; - }; - - // Do a few final mixes of the hash to ensure the last few - // bytes are well-incorporated. - - h ^= h >> 13; - h *= m; - h ^= h >> 15; - - return h; -} - -inline MurmurInt MurmurHash ( const void * key, int len, uint32_t seed=DEFAULT_SEED) { - return MurmurHash32(key,len,seed); -} - -// 64-bit hash for 32-bit platforms - -inline uint64_t MurmurHash64 ( const void * key, int len, uint32_t seed=DEFAULT_SEED) -{ - const uint32_t m = 0x5bd1e995; - const int r = 24; - - uint32_t h1 = seed ^ len; - uint32_t h2 = 0; - - const uint32_t * data = (const uint32_t *)key; - - while(len >= 8) - { - uint32_t k1 = *data++; - k1 *= m; k1 ^= k1 >> r; k1 *= m; - h1 *= m; h1 ^= k1; - len -= 4; - - uint32_t k2 = *data++; - k2 *= m; k2 ^= k2 >> r; k2 *= m; - h2 *= m; h2 ^= k2; - len -= 4; - } - - if(len >= 4) - { - uint32_t k1 = *data++; - k1 *= m; k1 ^= k1 >> r; k1 *= m; - h1 *= m; h1 ^= k1; - len -= 4; - } - - switch(len) - { - case 3: h2 ^= ((unsigned char*)data)[2] << 16; - case 2: h2 ^= ((unsigned char*)data)[1] << 8; - case 1: h2 ^= ((unsigned char*)data)[0]; - h2 *= m; - }; - - h1 ^= h2 >> 18; h1 *= m; - h2 ^= h1 >> 22; h2 *= m; - h1 ^= h2 >> 17; h1 *= m; - h2 ^= h1 >> 19; h2 *= m; - - uint64_t h = h1; - - h = (h << 32) | h2; - - return h; -} - -#endif -//32bit - -#endif diff --git a/decoder/null_deleter.h b/decoder/null_deleter.h deleted file mode 100755 index 082ab453..00000000 --- a/decoder/null_deleter.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef NULL_DELETER_H -#define NULL_DELETER_H - -struct null_deleter { - void operator()(void*) const {} - void operator()(void const*) const {} -}; - -#endif diff --git a/decoder/oracle_bleu.h b/decoder/oracle_bleu.h index 81a584a7..145c84d1 100755 --- a/decoder/oracle_bleu.h +++ b/decoder/oracle_bleu.h @@ -9,7 +9,7 @@ #include <vector> #include <boost/program_options.hpp> #include <boost/program_options/variables_map.hpp> -#include "../vest/scorer.h" +#include "scorer.h" #include "hg.h" #include "ff_factory.h" #include "ff_bleu.h" diff --git a/decoder/phrasebased_translator.cc b/decoder/phrasebased_translator.cc index 726b3f9a..d65e44d1 100644 --- a/decoder/phrasebased_translator.cc +++ b/decoder/phrasebased_translator.cc @@ -68,7 +68,6 @@ struct PhraseBasedTranslatorImpl { PhraseBasedTranslatorImpl(const boost::program_options::variables_map& conf) : add_pass_through_rules(conf.count("add_pass_through_rules")), max_distortion(conf["pb_max_distortion"].as<int>()), - kSOURCE_RULE(new TRule("[X] ||| [X,1] ||| [X,1]", true)), kCONCAT_RULE(new TRule("[X] ||| [X,1] [X,2] ||| [X,1] [X,2]", true)), kNT_TYPE(TD::Convert("X") * -1) { assert(max_distortion >= 0); @@ -141,6 +140,8 @@ struct PhraseBasedTranslatorImpl { for (int i = 0; i < phrases.size(); ++i) { Hypergraph::Edge* edge = minus_lm_forest->AddEdge(phrases[i], Hypergraph::TailNodeVector()); edge->feature_values_ = edge->rule_->scores_; + edge->i_ = s.i; + edge->j_ = s.j; minus_lm_forest->ConnectEdgeToHeadNode(edge->id_, phrase_head_index); } CoverageNodeMap::iterator cit = c.find(s.coverage); @@ -189,7 +190,6 @@ struct PhraseBasedTranslatorImpl { const bool add_pass_through_rules; const int max_distortion; - TRulePtr kSOURCE_RULE; const TRulePtr kCONCAT_RULE; const WordID kNT_TYPE; boost::shared_ptr<FSTNode> fst; diff --git a/decoder/prob.h b/decoder/prob.h deleted file mode 100644 index bc297870..00000000 --- a/decoder/prob.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _PROB_H_ -#define _PROB_H_ - -#include "logval.h" - -typedef LogVal<double> prob_t; - -#endif diff --git a/decoder/sampler.h b/decoder/sampler.h deleted file mode 100644 index 5fef45d0..00000000 --- a/decoder/sampler.h +++ /dev/null @@ -1,147 +0,0 @@ -#ifndef SAMPLER_H_ -#define SAMPLER_H_ - -#include <algorithm> -#include <functional> -#include <numeric> -#include <iostream> -#include <fstream> -#include <vector> -#include <ctime> - -#include <boost/random/mersenne_twister.hpp> -#include <boost/random/uniform_real.hpp> -#include <boost/random/variate_generator.hpp> -#include <boost/random/normal_distribution.hpp> -#include <boost/random/poisson_distribution.hpp> -#include <boost/random/uniform_int.hpp> - -#include "prob.h" - -struct SampleSet; - -template <typename RNG> -struct RandomNumberGenerator { - static uint32_t GetTrulyRandomSeed() { - uint32_t seed; - std::ifstream r("/dev/urandom"); - if (r) { - r.read((char*)&seed,sizeof(uint32_t)); - } - if (r.fail() || !r) { - std::cerr << "Warning: could not read from /dev/urandom. Seeding from clock" << std::endl; - seed = std::time(NULL); - } - std::cerr << "Seeding random number sequence to " << seed << std::endl; - return seed; - } - - RandomNumberGenerator() : m_dist(0,1), m_generator(), m_random(m_generator,m_dist) { - uint32_t seed = GetTrulyRandomSeed(); - m_generator.seed(seed); - } - explicit RandomNumberGenerator(uint32_t seed) : m_dist(0,1), m_generator(), m_random(m_generator,m_dist) { - if (!seed) seed = GetTrulyRandomSeed(); - m_generator.seed(seed); - } - - size_t SelectSample(const prob_t& a, const prob_t& b, double T = 1.0) { - if (T == 1.0) { - if (this->next() > (a / (a + b))) return 1; else return 0; - } else { - assert(!"not implemented"); - } - } - - // T is the annealing temperature, if desired - size_t SelectSample(const SampleSet& ss, double T = 1.0); - - // draw a value from U(0,1) - double next() {return m_random();} - - // draw a value from N(mean,var) - double NextNormal(double mean, double var) { - return boost::normal_distribution<double>(mean, var)(m_random); - } - - // draw a value from a Poisson distribution - // lambda must be greater than 0 - int NextPoisson(int lambda) { - return boost::poisson_distribution<int>(lambda)(m_random); - } - - bool AcceptMetropolisHastings(const prob_t& p_cur, - const prob_t& p_prev, - const prob_t& q_cur, - const prob_t& q_prev) { - const prob_t a = (p_cur / p_prev) * (q_prev / q_cur); - if (log(a) >= 0.0) return true; - return (prob_t(this->next()) < a); - } - - RNG &gen() { return m_generator; } - typedef boost::variate_generator<RNG&, boost::uniform_int<> > IntRNG; - IntRNG inclusive(int low,int high_incl) { - assert(high_incl>=low); - return IntRNG(m_generator,boost::uniform_int<>(low,high_incl)); - } - - private: - boost::uniform_real<> m_dist; - RNG m_generator; - boost::variate_generator<RNG&, boost::uniform_real<> > m_random; -}; - -typedef RandomNumberGenerator<boost::mt19937> MT19937; - -class SampleSet { - public: - const prob_t& operator[](int i) const { return m_scores[i]; } - prob_t& operator[](int i) { return m_scores[i]; } - bool empty() const { return m_scores.empty(); } - void add(const prob_t& s) { m_scores.push_back(s); } - void clear() { m_scores.clear(); } - size_t size() const { return m_scores.size(); } - void resize(int size) { m_scores.resize(size); } - std::vector<prob_t> m_scores; -}; - -template <typename RNG> -size_t RandomNumberGenerator<RNG>::SelectSample(const SampleSet& ss, double T) { - assert(T > 0.0); - assert(ss.m_scores.size() > 0); - if (ss.m_scores.size() == 1) return 0; - const prob_t annealing_factor(1.0 / T); - const bool anneal = (annealing_factor != prob_t::One()); - prob_t sum = prob_t::Zero(); - if (anneal) { - for (int i = 0; i < ss.m_scores.size(); ++i) - sum += ss.m_scores[i].pow(annealing_factor); // p^(1/T) - } else { - sum = std::accumulate(ss.m_scores.begin(), ss.m_scores.end(), prob_t::Zero()); - } - //for (size_t i = 0; i < ss.m_scores.size(); ++i) std::cerr << ss.m_scores[i] << ","; - //std::cerr << std::endl; - - prob_t random(this->next()); // random number between 0 and 1 - random *= sum; // scale with normalization factor - //std::cerr << "Random number " << random << std::endl; - - //now figure out which sample - size_t position = 1; - sum = ss.m_scores[0]; - if (anneal) { - sum.poweq(annealing_factor); - for (; position < ss.m_scores.size() && sum < random; ++position) - sum += ss.m_scores[position].pow(annealing_factor); - } else { - for (; position < ss.m_scores.size() && sum < random; ++position) - sum += ss.m_scores[position]; - } - //std::cout << "random: " << random << " sample: " << position << std::endl; - //std::cerr << "Sample: " << position-1 << std::endl; - //exit(1); - return position-1; -} - -#endif diff --git a/decoder/sentence_metadata.h b/decoder/sentence_metadata.h index 21be9b21..593019c8 100644 --- a/decoder/sentence_metadata.h +++ b/decoder/sentence_metadata.h @@ -3,7 +3,7 @@ #include <cassert> #include "lattice.h" -#include "../vest/scorer.h" +#include "scorer.h" struct SentenceMetadata { SentenceMetadata(int id, const Lattice& ref) : diff --git a/decoder/small_vector.h b/decoder/small_vector.h deleted file mode 100644 index 25c52359..00000000 --- a/decoder/small_vector.h +++ /dev/null @@ -1,265 +0,0 @@ -#ifndef _SMALL_VECTOR_H_ -#define _SMALL_VECTOR_H_ - -/* REQUIRES that T is POD (can be memcpy). won't work (yet) due to union with SMALL_VECTOR_POD==0 - may be possible to handle movable types that have ctor/dtor, by using explicit allocation, ctor/dtor calls. but for now JUST USE THIS FOR no-meaningful ctor/dtor POD types. - - stores small element (<=SV_MAX items) vectors inline. recommend SV_MAX=sizeof(T)/sizeof(T*)>1?sizeof(T)/sizeof(T*):1. may not work if SV_MAX==0. - */ - -#define SMALL_VECTOR_POD 1 - -#include <streambuf> // std::max - where to get this? -#include <cstring> -#include <cassert> -#include <stdint.h> -#include <new> -#include <stdint.h> -//sizeof(T)/sizeof(T*)>1?sizeof(T)/sizeof(T*):1 - -template <class T,int SV_MAX=2> -class SmallVector { -// typedef unsigned short uint16_t; - public: - typedef SmallVector<T,SV_MAX> Self; - SmallVector() : size_(0) {} - - typedef T const* const_iterator; - typedef T* iterator; - typedef T value_type; - typedef T &reference; - typedef T const& const_reference; - - T *begin() { return size_>SV_MAX?data_.ptr:data_.vals; } - T const* begin() const { return const_cast<Self*>(this)->begin(); } - T *end() { return begin()+size_; } - T const* end() const { return begin()+size_; } - - explicit SmallVector(size_t s) : size_(s) { - assert(s < 0xA000); - if (s <= SV_MAX) { - for (int i = 0; i < s; ++i) new(&data_.vals[i]) T(); - } else { - capacity_ = s; - size_ = s; - data_.ptr = new T[s]; // TODO: replace this with allocator or ::operator new(sizeof(T)*s) everywhere - for (int i = 0; i < size_; ++i) new(&data_.ptr[i]) T(); - } - } - - SmallVector(size_t s, T const& v) : size_(s) { - assert(s < 0xA000); - if (s <= SV_MAX) { - for (int i = 0; i < s; ++i) data_.vals[i] = v; - } else { - capacity_ = s; - size_ = s; - data_.ptr = new T[s]; - for (int i = 0; i < size_; ++i) data_.ptr[i] = v; - } - } - - SmallVector(const Self& o) : size_(o.size_) { - if (size_ <= SV_MAX) { - std::memcpy(data_.vals,o.data_.vals,size_*sizeof(T)); -// for (int i = 0; i < size_; ++i) data_.vals[i] = o.data_.vals[i]; - } else { - capacity_ = size_ = o.size_; - data_.ptr = new T[capacity_]; - std::memcpy(data_.ptr, o.data_.ptr, size_ * sizeof(T)); - } - } - - const Self& operator=(const Self& o) { - if (size_ <= SV_MAX) { - if (o.size_ <= SV_MAX) { - size_ = o.size_; - for (int i = 0; i < SV_MAX; ++i) data_.vals[i] = o.data_.vals[i]; - } else { - capacity_ = size_ = o.size_; - data_.ptr = new T[capacity_]; - std::memcpy(data_.ptr, o.data_.ptr, size_ * sizeof(T)); - } - } else { - if (o.size_ <= SV_MAX) { - delete[] data_.ptr; - size_ = o.size_; - for (int i = 0; i < size_; ++i) data_.vals[i] = o.data_.vals[i]; - } else { - if (capacity_ < o.size_) { - delete[] data_.ptr; - capacity_ = o.size_; - data_.ptr = new T[capacity_]; - } - size_ = o.size_; - for (int i = 0; i < size_; ++i) - data_.ptr[i] = o.data_.ptr[i]; - } - } - return *this; - } - - ~SmallVector() { - if (size_ <= SV_MAX) { - // skip if pod? yes, we required pod anyway. no need to destruct -#if !SMALL_VECTOR_POD - for (int i=0;i<size_;++i) data_.vals[i].~T(); -#endif - } else - delete[] data_.ptr; - } - - void clear() { - if (size_ > SV_MAX) { - delete[] data_.ptr; - } - size_ = 0; - } - - bool empty() const { return size_ == 0; } - size_t size() const { return size_; } - - inline void ensure_capacity(uint16_t min_size) { - assert(min_size > SV_MAX); - if (min_size < capacity_) return; - uint16_t new_cap = std::max(static_cast<uint16_t>(capacity_ << 1), min_size); - T* tmp = new T[new_cap]; - std::memcpy(tmp, data_.ptr, capacity_ * sizeof(T)); - delete[] data_.ptr; - data_.ptr = tmp; - capacity_ = new_cap; - } - -private: - inline void copy_vals_to_ptr() { - capacity_ = SV_MAX * 2; - T* tmp = new T[capacity_]; - for (int i = 0; i < SV_MAX; ++i) tmp[i] = data_.vals[i]; - data_.ptr = tmp; - } - inline void ptr_to_small() { - assert(size_<=SV_MAX); - int *tmp=data_.ptr; - for (int i=0;i<size_;++i) - data_.vals[i]=tmp[i]; - delete[] tmp; - } - -public: - - inline void push_back(T const& v) { - if (size_ < SV_MAX) { - data_.vals[size_] = v; - ++size_; - return; - } else if (size_ == SV_MAX) { - copy_vals_to_ptr(); - } else if (size_ == capacity_) { - ensure_capacity(size_ + 1); - } - data_.ptr[size_] = v; - ++size_; - } - - T& back() { return this->operator[](size_ - 1); } - const T& back() const { return this->operator[](size_ - 1); } - T& front() { return this->operator[](0); } - const T& front() const { return this->operator[](0); } - - void pop_back() { - assert(size_>0); - --size_; - if (size_==SV_MAX) - ptr_to_small(); - } - - void compact() { - compact(size_); - } - - // size must be <= size_ - TODO: test - void compact(uint16_t size) { - assert(size<=size_); - if (size_>SV_MAX) { - size_=size; - if (size<=SV_MAX) - ptr_to_small(); - } else - size_=size; - } - - void resize(size_t s, int v = 0) { - if (s <= SV_MAX) { - if (size_ > SV_MAX) { - T *tmp=data_.ptr; - for (int i = 0; i < s; ++i) data_.vals[i] = tmp[i]; - delete[] tmp; - size_ = s; - return; - } - if (s <= size_) { - size_ = s; - return; - } else { - for (int i = size_; i < s; ++i) - data_.vals[i] = v; - size_ = s; - return; - } - } else { - if (size_ <= SV_MAX) - copy_vals_to_ptr(); - if (s > capacity_) - ensure_capacity(s); - if (s > size_) { - for (int i = size_; i < s; ++i) - data_.ptr[i] = v; - } - size_ = s; - } - } - - T& operator[](size_t i) { - if (size_ <= SV_MAX) return data_.vals[i]; - return data_.ptr[i]; - } - - const T& operator[](size_t i) const { - if (size_ <= SV_MAX) return data_.vals[i]; - return data_.ptr[i]; - } - - bool operator==(const Self& o) const { - if (size_ != o.size_) return false; - if (size_ <= SV_MAX) { - for (size_t i = 0; i < size_; ++i) - if (data_.vals[i] != o.data_.vals[i]) return false; - return true; - } else { - for (size_t i = 0; i < size_; ++i) - if (data_.ptr[i] != o.data_.ptr[i]) return false; - return true; - } - } - - friend bool operator!=(const Self& a, const Self& b) { - return !(a==b); - } - - private: - union StorageType { - T vals[SV_MAX]; - T* ptr; - }; - StorageType data_; - uint16_t size_; - uint16_t capacity_; // only defined when size_ > __SV_MAX_STATIC -}; - -typedef SmallVector<int,2> SmallVectorInt; - -template <class T,int N> -void memcpy(void *out,SmallVector<T,N> const& v) { - std::memcpy(out,v.begin(),v.size()*sizeof(T)); -} - -#endif diff --git a/decoder/small_vector_test.cc b/decoder/small_vector_test.cc deleted file mode 100644 index d1d8dcab..00000000 --- a/decoder/small_vector_test.cc +++ /dev/null @@ -1,129 +0,0 @@ -#include "small_vector.h" - -#include <gtest/gtest.h> -#include <iostream> -#include <cassert> -#include <vector> - -using namespace std; - -class SVTest : public testing::Test { - protected: - virtual void SetUp() { } - virtual void TearDown() { } -}; - -TEST_F(SVTest, LargerThan2) { - SmallVectorInt v; - SmallVectorInt v2; - v.push_back(0); - v.push_back(1); - v.push_back(2); - assert(v.size() == 3); - assert(v[2] == 2); - assert(v[1] == 1); - assert(v[0] == 0); - v2 = v; - SmallVectorInt copy(v); - assert(copy.size() == 3); - assert(copy[0] == 0); - assert(copy[1] == 1); - assert(copy[2] == 2); - assert(copy == v2); - copy[1] = 99; - assert(copy != v2); - assert(v2.size() == 3); - assert(v2[2] == 2); - assert(v2[1] == 1); - assert(v2[0] == 0); - v2[0] = -2; - v2[1] = -1; - v2[2] = 0; - assert(v2[2] == 0); - assert(v2[1] == -1); - assert(v2[0] == -2); - SmallVectorInt v3(1,1); - assert(v3[0] == 1); - v2 = v3; - assert(v2.size() == 1); - assert(v2[0] == 1); - SmallVectorInt v4(10, 1); - assert(v4.size() == 10); - assert(v4[5] == 1); - assert(v4[9] == 1); - v4 = v; - assert(v4.size() == 3); - assert(v4[2] == 2); - assert(v4[1] == 1); - assert(v4[0] == 0); - SmallVectorInt v5(10, 2); - assert(v5.size() == 10); - assert(v5[7] == 2); - assert(v5[0] == 2); - assert(v.size() == 3); - v = v5; - assert(v.size() == 10); - assert(v[2] == 2); - assert(v[9] == 2); - SmallVectorInt cc; - for (int i = 0; i < 33; ++i) - cc.push_back(i); - for (int i = 0; i < 33; ++i) - assert(cc[i] == i); - cc.resize(20); - assert(cc.size() == 20); - for (int i = 0; i < 20; ++i) - assert(cc[i] == i); - cc[0]=-1; - cc.resize(1, 999); - assert(cc.size() == 1); - assert(cc[0] == -1); - cc.resize(99, 99); - for (int i = 1; i < 99; ++i) { - cerr << i << " " << cc[i] << endl; - assert(cc[i] == 99); - } - cc.clear(); - assert(cc.size() == 0); -} - -TEST_F(SVTest, Small) { - SmallVectorInt v; - SmallVectorInt v1(1,0); - SmallVectorInt v2(2,10); - SmallVectorInt v1a(2,0); - EXPECT_TRUE(v1 != v1a); - EXPECT_TRUE(v1 == v1); - EXPECT_EQ(v1[0], 0); - EXPECT_EQ(v2[1], 10); - EXPECT_EQ(v2[0], 10); - ++v2[1]; - --v2[0]; - EXPECT_EQ(v2[0], 9); - EXPECT_EQ(v2[1], 11); - SmallVectorInt v3(v2); - assert(v3[0] == 9); - assert(v3[1] == 11); - assert(!v3.empty()); - assert(v3.size() == 2); - v3.clear(); - assert(v3.empty()); - assert(v3.size() == 0); - assert(v3 != v2); - assert(v2 != v3); - v3 = v2; - assert(v3 == v2); - assert(v2 == v3); - assert(v3[0] == 9); - assert(v3[1] == 11); - assert(!v3.empty()); - assert(v3.size() == 2); - cerr << sizeof(SmallVectorInt) << endl; - cerr << sizeof(vector<int>) << endl; -} - -int main(int argc, char** argv) { - testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} - diff --git a/decoder/sparse_vector.cc b/decoder/sparse_vector.cc deleted file mode 100644 index 4035b9ef..00000000 --- a/decoder/sparse_vector.cc +++ /dev/null @@ -1,98 +0,0 @@ -#include "sparse_vector.h" - -#include <iostream> -#include <cstring> - -#include "hg_io.h" - -using namespace std; - -namespace B64 { - -void Encode(double objective, const SparseVector<double>& v, ostream* out) { - const int num_feats = v.num_active(); - size_t tot_size = 0; - const size_t off_objective = tot_size; - tot_size += sizeof(double); // objective - const size_t off_num_feats = tot_size; - tot_size += sizeof(int); // num_feats - const size_t off_data = tot_size; - tot_size += sizeof(unsigned char) * num_feats; // lengths of feature names; - typedef SparseVector<double>::const_iterator const_iterator; - for (const_iterator it = v.begin(); it != v.end(); ++it) - tot_size += FD::Convert(it->first).size(); // feature names; - tot_size += sizeof(double) * num_feats; // gradient - const size_t off_magic = tot_size; - tot_size += 4; // magic - - // size_t b64_size = tot_size * 4 / 3; - // cerr << "Sparse vector binary size: " << tot_size << " (b64 size=" << b64_size << ")\n"; - char* data = new char[tot_size]; - *reinterpret_cast<double*>(&data[off_objective]) = objective; - *reinterpret_cast<int*>(&data[off_num_feats]) = num_feats; - char* cur = &data[off_data]; - assert(cur - data == off_data); - for (const_iterator it = v.begin(); it != v.end(); ++it) { - const string& fname = FD::Convert(it->first); - *cur++ = static_cast<char>(fname.size()); // name len - memcpy(cur, &fname[0], fname.size()); - cur += fname.size(); - *reinterpret_cast<double*>(cur) = it->second; - cur += sizeof(double); - } - assert(cur - data == off_magic); - *reinterpret_cast<unsigned int*>(cur) = 0xBAABABBAu; - cur += sizeof(unsigned int); - assert(cur - data == tot_size); - b64encode(data, tot_size, out); - delete[] data; -} - -bool Decode(double* objective, SparseVector<double>* v, const char* in, size_t size) { - v->clear(); - if (size % 4 != 0) { - cerr << "B64 error - line % 4 != 0\n"; - return false; - } - const size_t decoded_size = size * 3 / 4 - sizeof(unsigned int); - const size_t buf_size = decoded_size + sizeof(unsigned int); - if (decoded_size < 6) { cerr << "SparseVector decoding error: too short!\n"; return false; } - char* data = new char[buf_size]; - if (!b64decode(reinterpret_cast<const unsigned char*>(in), size, data, buf_size)) { - delete[] data; - return false; - } - size_t cur = 0; - *objective = *reinterpret_cast<double*>(data); - cur += sizeof(double); - const int num_feats = *reinterpret_cast<int*>(&data[cur]); - cur += sizeof(int); - int fc = 0; - while(fc < num_feats && cur < decoded_size) { - ++fc; - const int fname_len = data[cur++]; - assert(fname_len > 0); - assert(fname_len < 256); - string fname(fname_len, '\0'); - memcpy(&fname[0], &data[cur], fname_len); - cur += fname_len; - const double val = *reinterpret_cast<double*>(&data[cur]); - cur += sizeof(double); - int fid = FD::Convert(fname); - v->set_value(fid, val); - } - if(num_feats != fc) { - cerr << "Expected " << num_feats << " but only decoded " << fc << "!\n"; - delete[] data; - return false; - } - if (*reinterpret_cast<unsigned int*>(&data[cur]) != 0xBAABABBAu) { - cerr << "SparseVector decodeding error : magic does not match!\n"; - delete[] data; - return false; - } - delete[] data; - return true; -} - -} diff --git a/decoder/sparse_vector.h b/decoder/sparse_vector.h deleted file mode 100644 index 207489c5..00000000 --- a/decoder/sparse_vector.h +++ /dev/null @@ -1,512 +0,0 @@ -#ifndef _SPARSE_VECTOR_H_ -#define _SPARSE_VECTOR_H_ - -//#define SPARSE_VECTOR_HASH - -#ifdef SPARSE_VECTOR_HASH -#include "hash.h" -# define SPARSE_VECTOR_MAP HASH_MAP -# define SPARSE_VECTOR_MAP_RESERVED(h,empty,deleted) HASH_MAP_RESERVED(h,empty,deleted) -#else -# define SPARSE_VECTOR_MAP std::map -# define SPARSE_VECTOR_MAP_RESERVED(h,empty,deleted) -#endif -/* - use SparseVectorList (pair smallvector) for feat funcs / hypergraphs (you rarely need random access; just append a feature to the list) -*/ -/* hack: index 0 never gets printed because cdyer is creative and efficient. features which have no weight got feature dict id 0, see, and the models all clobered that value. nobody wants to see it. except that vlad is also creative and efficient and stored the oracle bleu there. */ -/* NOTE: zero vals may or may not be dropped from map (sparse, but not guaranteed to be so). - - I rely on !v the same as !((bool)v) the same as v==0 and v() same as v(0). - - one exception: - - a local: - T sum = 0; - is used instead of - T sum; - - because T may be a primitive type, and - - T sum(); - - is parsed as a function decl :( - - the alternative T sum=T() is also be reasonable. i've switched to that. -*/ - -// this is a modified version of code originally written -// by Phil Blunsom - -#include <iostream> -#include <map> -#include <tr1/unordered_map> -#include <vector> -#include <valarray> - -#include "fdict.h" -#include "small_vector.h" - -template <class T> -inline T & extend_vector(std::vector<T> &v,int i) { - if (i>=v.size()) - v.resize(i+1); - return v[i]; -} - -template <typename T> -class SparseVector { - void init_reserved() { - SPARSE_VECTOR_MAP_RESERVED(values_,-1,-2); - } -public: - T const& get_singleton() const { - assert(values_.size()==1); - return values_.begin()->second; - } - - typedef SparseVector<T> Self; - typedef SPARSE_VECTOR_MAP<int, T> MapType; - typedef typename MapType::const_iterator const_iterator; - SparseVector() { - init_reserved(); - } - explicit SparseVector(std::vector<T> const& v) { - init_reserved(); - typename MapType::iterator p=values_.begin(); - const T z=0; - for (unsigned i=0;i<v.size();++i) { - T const& t=v[i]; - if (t!=z) - p=values_.insert(p,typename MapType::value_type(i,t)); //hint makes insertion faster - } - } - - - void init_vector(std::vector<T> *vp) const { - init_vector(*vp); - } - - void init_vector(std::vector<T> &v) const { - v.clear(); - for (const_iterator i=values_.begin(),e=values_.end();i!=e;++i) - extend_vector(v,i->first)=i->second; - } - - void set_new_value(int index, T const& val) { - assert(values_.find(index)==values_.end()); - values_[index]=val; - } - - - // warning: exploits the fact that 0 values are always removed from map. change this if you change that. - bool nonzero(int index) const { - typename MapType::const_iterator found = values_.find(index); - return found==values_.end() || !found->second; - } - - - T get(int index) const { - typename MapType::const_iterator found = values_.find(index); - return found==values_.end()?T():found->second; - } - - T value(int i) const { return get(i); } - - // same as above but may add a 0 entry. TODO: check that people relying on no entry use get - T & operator[](int index){ - return values_[index]; - } - - inline void set_value(int index, const T &value) { - values_[index] = value; - } - - inline void maybe_add(int index, const T& value) { - if (value) add_value(index,value); - } - - T& add_value(int index, const T &value) { -#if 1 - return values_[index]+=value; -#else - // this is not really going to be any faster, and we already rely on default init = 0 init - std::pair<typename MapType::iterator,bool> art=values_.insert(std::make_pair(index,value)); - T &val=art.first->second; - if (!art.second) val += value; // already existed - return val; -#endif - } - - - void store(std::valarray<T>* target) const { - (*target) *= 0; - for (typename MapType::const_iterator - it = values_.begin(); it != values_.end(); ++it) { - if (it->first >= target->size()) break; - (*target)[it->first] = it->second; - } - } - - int max_index() const { - if (empty()) return 0; - typename MapType::const_iterator found =values_.end(); - --found; - return found->first; - } - - // dot product with a unit vector of the same length - // as the sparse vector - T dot() const { - T sum = T(); - for (typename MapType::const_iterator - it = values_.begin(); it != values_.end(); ++it) - sum += it->second; - return sum; - } - - template<typename S> - S cosine_sim(const SparseVector<S> &vec) const { - return dot(vec)/(l2norm()*vec.l2norm()); - } - - // if values are binary, gives |A intersect B|/|A union B| - template<typename S> - S tanimoto_coef(const SparseVector<S> &vec) const { - S dp=dot(vec); - return dp/(l2norm_sq()+vec.l2norm_sq()-dp); - } - - template<typename S> - S dot(const SparseVector<S> &vec) const { - S sum = S(); - for (typename MapType::const_iterator - it = values_.begin(); it != values_.end(); ++it) - { - typename MapType::const_iterator - found = vec.values_.find(it->first); - if (found != vec.values_.end()) - sum += it->second * found->second; - } - return sum; - } - - template<typename S> - S dot(const std::vector<S> &vec) const { - S sum = S(); - for (typename MapType::const_iterator - it = values_.begin(); it != values_.end(); ++it) - { - if (it->first < static_cast<int>(vec.size())) - sum += it->second * vec[it->first]; - } - return sum; - } - - template<typename S> - S dot(const S *vec) const { - // this is not range checked! - S sum = S(); - for (typename MapType::const_iterator - it = values_.begin(); it != values_.end(); ++it) - sum += it->second * vec[it->first]; - std::cout << "dot(*vec) " << sum << std::endl; - return sum; - } - - T l1norm() const { - T sum = T(); - for (typename MapType::const_iterator - it = values_.begin(); it != values_.end(); ++it) - sum += fabs(it->second); - return sum; - } - - T l2norm_sq() const { - T sum = T(); - for (typename MapType::const_iterator - it = values_.begin(); it != values_.end(); ++it) - sum += it->second * it->second; - return sum; - } - - T l2norm() const { - return sqrt(l2norm_sq()); - } - - void erase(int key) { - values_.erase(key); -/* typename MapType::iterator found = values_.find(key); - if (found!=values_end()) - values_.erase(found);*/ - } - - template <class T2> - void set_from(SparseVector<T2> const& other) { - for (typename MapType::const_iterator - it = other.values_.begin(); it != other.values_.end(); ++it) - { - values_[it->first]=it->second; - } - } - - SparseVector<T> &operator+=(const SparseVector<T> &other) { - for (typename MapType::const_iterator - it = other.values_.begin(); it != other.values_.end(); ++it) - { -// T v = - (values_[it->first] += it->second); -// if (!v) values_.erase(it->first); - } - return *this; - } - - SparseVector<T> &operator-=(const SparseVector<T> &other) { - for (typename MapType::const_iterator - it = other.values_.begin(); it != other.values_.end(); ++it) - { -// T v = - (values_[it->first] -= it->second); -// if (!v) values_.erase(it->first); - } - return *this; - } - - friend SparseVector<T> operator -(SparseVector<T> x,SparseVector<T> const& y) { - x-=y; - return x; - } - friend SparseVector<T> operator +(SparseVector<T> x,SparseVector<T> const& y) { - x+=y; - return x; - } - -private: - // DEPRECATED: becuase 0 values are dropped from the map, this doesn't even make sense if you have a fully populated (not really sparse re: what you'll ever use) vector - SparseVector<T> &operator-=(T const& x) { - for (typename MapType::iterator - it = values_.begin(); it != values_.end(); ++it) - it->second -= x; - return *this; - } - - SparseVector<T> &operator+=(T const& x) { - for (typename MapType::iterator - it = values_.begin(); it != values_.end(); ++it) - it->second += x; - return *this; - } -public: - SparseVector<T> &operator/=(const T &x) { - for (typename MapType::iterator - it = values_.begin(); it != values_.end(); ++it) - it->second /= x; - return *this; - } - - SparseVector<T> &operator*=(const T& x) { - for (typename MapType::iterator - it = values_.begin(); it != values_.end(); ++it) - it->second *= x; - return *this; - } - - SparseVector<T> operator+(T const& x) const { - SparseVector<T> result = *this; - return result += x; - } - - SparseVector<T> operator-(T const& x) const { - SparseVector<T> result = *this; - return result -= x; - } - - SparseVector<T> operator/(T const& x) const { - SparseVector<T> result = *this; - return result /= x; - } - - std::ostream &operator<<(std::ostream& out) const { - Write(true, &out); - return out; - } - - void Write(const bool with_semi, std::ostream* os) const { - bool first = true; - for (typename MapType::const_iterator - it = values_.begin(); it != values_.end(); ++it) { - // by definition feature id 0 is a dummy value - if (!it->first) continue; - if (with_semi) { - (*os) << (first ? "" : ";") - << FD::Convert(it->first) << '=' << it->second; - } else { - (*os) << (first ? "" : " ") - << FD::Convert(it->first) << '=' << it->second; - } - first = false; - } - } - - bool operator==(Self const & other) const { - return size()==other.size() && contains_keys_of(other) && other.contains_i(*this); - } - - bool contains(Self const &o) const { - return size()>o.size() && contains(o); - } - - bool at_equals(int i,T const& val) const { - const_iterator it=values_.find(i); - if (it==values_.end()) return !val; - return it->second==val; - } - - bool contains_i(Self const& o) const { - for (typename MapType::const_iterator i=o.begin(),e=o.end();i!=e;++i) - if (!at_equals(i->first,i->second)) - return false; - return true; - } - - bool contains_keys_of(Self const& o) const { - for (typename MapType::const_iterator i=o.begin(),e=o.end();i!=e;++i) - if (values_.find(i)==values_.end()) - return false; - return true; - } - -#ifndef SPARSE_VECTOR_HASH - bool operator<(const SparseVector<T> &other) const { - typename MapType::const_iterator it = values_.begin(); - typename MapType::const_iterator other_it = other.values_.begin(); - - for (; it != values_.end() && other_it != other.values_.end(); ++it, ++other_it) - { - if (it->first < other_it->first) return true; - if (it->first > other_it->first) return false; - if (it->second < other_it->second) return true; - if (it->second > other_it->second) return false; - } - return values_.size() < other.values_.size(); - } -#endif - - int size() const { return values_.size(); } - - int num_active() const { return values_.size(); } - bool empty() const { return values_.empty(); } - - const_iterator begin() const { return values_.begin(); } - const_iterator end() const { return values_.end(); } - - void clear() { - values_.clear(); - } - - void swap(SparseVector<T>& other) { - values_.swap(other.values_); - } - -private: - MapType values_; -}; - -//like a pair but can live in a union, because it lacks default+copy ctors, dtor. -template <class T> -struct feature_val { - int fid; - T val; -}; - -template <class T> -inline feature_val<T> featval(int fid,T const &val) { - feature_val<T> f; - f.fid=fid; - f.val=val; - return f; -} - - -// doesn't support fast indexing directly -template <class T> -class SparseVectorList { - typedef feature_val<T> Pair; - typedef SmallVector<Pair,1> List; - typedef typename List::const_iterator const_iterator; - SparseVectorList() { } - template <class I> - SparseVectorList(I i,I const& end) { - int c=0; - for (;i<end;++i,++c) { - if (*i) - p.push_back(featval(c,*i)); - } - p.compact(); - } - explicit SparseVectorList(std::vector<T> const& v) { - for (unsigned i=0;i<v.size();++i) { - T const& t=v[i]; - if (t) - p.push_back(featval(i,t)); - } - p.compact(); - } - // unlike SparseVector, this doesn't overwrite - but conversion to SparseVector will use last value, which is the same - void set_value(int i,T const& val) { - p.push_back(Pair(i,val)); - } - void overlay(SparseVector<T> *to) const { - for (int i=0;i<p.size();++i) - to->set_value(p[i].fid,p[i].val); - } - void copy_to(SparseVector<T> *to) const { - to->clear(); - overlay(to); - } - SparseVector<T> sparse() const { - SparseVector<T> r; - copy_to(r); - return r; - } -private: - List p; -}; - -template <typename T> -SparseVector<T> operator+(const SparseVector<T>& a, const SparseVector<T>& b) { - SparseVector<T> result = a; - return result += b; -} - -template <typename T> -SparseVector<T> operator*(const SparseVector<T>& a, const double& b) { - SparseVector<T> result = a; - return result *= b; -} - -template <typename T> -SparseVector<T> operator*(const SparseVector<T>& a, const T& b) { - SparseVector<T> result = a; - return result *= b; -} - -template <typename T> -SparseVector<T> operator*(const double& a, const SparseVector<T>& b) { - SparseVector<T> result = b; - return result *= a; -} - -template <typename T> -std::ostream &operator<<(std::ostream &out, const SparseVector<T> &vec) -{ - return vec.operator<<(out); -} - -namespace B64 { - void Encode(double objective, const SparseVector<double>& v, std::ostream* out); - // returns false if failed to decode - bool Decode(double* objective, SparseVector<double>* v, const char* data, size_t size); -} - -#endif diff --git a/decoder/static_utoa.h b/decoder/static_utoa.h deleted file mode 100755 index fe5f6d92..00000000 --- a/decoder/static_utoa.h +++ /dev/null @@ -1,115 +0,0 @@ -#ifndef STATIC_UTOA_H -#define STATIC_UTOA_H - -#include "threadlocal.h" - - -#include <string> -#include <cstring> - -#define DIGIT_LOOKUP_TABLE 0 - -namespace { -THREADLOCAL char utoa_buf[] = "01234567890123456789"; // to put end of string character at buf[20] -const unsigned utoa_bufsize=sizeof(utoa_buf); -const unsigned utoa_bufsizem1=utoa_bufsize-1; -#ifdef DIGIT_LOOKUP_TABLE -char digits[] = "0123456789"; -#endif -} - -inline char digit_to_char(int d) { - return -#ifdef DIGIT_LOOKUP_TABLE - digits[d]; -#else - '0'+d; -#endif -} - -// returns n in string [return,num); *num=0 yourself before calling if you want a c_str -inline char *utoa(char *num,unsigned n) { - if ( !n ) { - *--num='0'; - } else { - unsigned rem; - // 3digit lookup table, divide by 1000 faster? - while ( n ) { -#if 1 - rem = n; - n /= 10; - rem -= 10*n; // maybe this is faster than mod because we are already dividing -#else - rem = n%10; // would optimizer combine these together? - n = n/10; -#endif - *--num = digit_to_char(rem); - } - } - return num; -} - -inline char *static_utoa(unsigned n) { - return utoa(utoa_buf+utoa_bufsizem1,n); -} - -//returns position of '\0' terminating number written starting at to -inline char* append_utoa(char *to,unsigned n) { - char *s=static_utoa(n); - int ns=(utoa_buf+utoa_bufsize)-s; - std::memcpy(to,s,ns); - return to+ns; -} - -// so named to avoid gcc segfault when named itoa -inline char *itoa(char *p,int n) { - if (n<0) { - p=utoa(p,-n); // TODO: check that (unsigned)(-INT_MIN) == 0x1000000 in 2s complement and not == 0 - *--p='-'; - return p; - } else - return utoa(p,n); -} - -inline char *static_itoa(int n) { - return itoa(utoa_buf+utoa_bufsizem1,n); -} - - -inline std::string utos(unsigned n) { - const int bufsz=20; - char buf[bufsz]; - char *end=buf+bufsz; - char *p=utoa(end,n); - return std::string(p,end); -} - -inline std::string itos(int n) { - const int bufsz=20; - char buf[bufsz]; - char *end=buf+bufsz; - char *p=itoa(end,n); - return std::string(p,end); -} - -#ifdef ITOA_SAMPLE -# include <cstdio> -# include <sstream> -# include <iostream> -using namespace std; - -int main(int argc,char *argv[]) { - printf("d U d U d U\n"); - for (int i=1;i<argc;++i) { - int n; - unsigned un; - sscanf(argv[i],"%d",&n); - sscanf(argv[i],"%u",&un); - printf("%d %u %s",n,un,static_itoa(n)); - printf(" %s %s %s\n",static_utoa(un),itos(n).c_str(),utos(un).c_str()); - } - return 0; -} -#endif - -#endif diff --git a/decoder/stringlib.cc b/decoder/stringlib.cc deleted file mode 100644 index 3e52ae87..00000000 --- a/decoder/stringlib.cc +++ /dev/null @@ -1,98 +0,0 @@ -#include "stringlib.h" - -#include <cstring> -#include <cstdlib> -#include <cassert> -#include <iostream> -#include <map> - -#include "lattice.h" - -using namespace std; - -void ParseTranslatorInput(const string& line, string* input, string* ref) { - size_t hint = 0; - if (line.find("{\"rules\":") == 0) { - hint = line.find("}}"); - if (hint == string::npos) { - cerr << "Syntax error: " << line << endl; - abort(); - } - hint += 2; - } - size_t pos = line.find("|||", hint); - if (pos == string::npos) { *input = line; return; } - ref->clear(); - *input = line.substr(0, pos - 1); - string rline = line.substr(pos + 4); - if (rline.size() > 0) { - assert(ref); - *ref = rline; - } -} - -void ParseTranslatorInputLattice(const string& line, string* input, Lattice* ref) { - string sref; - ParseTranslatorInput(line, input, &sref); - if (sref.size() > 0) { - assert(ref); - LatticeTools::ConvertTextOrPLF(sref, ref); - } -} - -void ProcessAndStripSGML(string* pline, map<string, string>* out) { - map<string, string>& meta = *out; - string& line = *pline; - string lline = LowercaseString(line); - if (lline.find("<seg")!=0) return; - size_t close = lline.find(">"); - if (close == string::npos) return; // error - size_t end = lline.find("</seg>"); - string seg = Trim(lline.substr(4, close-4)); - string text = line.substr(close+1, end - close - 1); - for (size_t i = 1; i < seg.size(); i++) { - if (seg[i] == '=' && seg[i-1] == ' ') { - string less = seg.substr(0, i-1) + seg.substr(i); - seg = less; i = 0; continue; - } - if (seg[i] == '=' && seg[i+1] == ' ') { - string less = seg.substr(0, i+1); - if (i+2 < seg.size()) less += seg.substr(i+2); - seg = less; i = 0; continue; - } - } - line = Trim(text); - if (seg == "") return; - for (size_t i = 1; i < seg.size(); i++) { - if (seg[i] == '=') { - string label = seg.substr(0, i); - string val = seg.substr(i+1); - if (val[0] == '"') { - val = val.substr(1); - size_t close = val.find('"'); - if (close == string::npos) { - cerr << "SGML parse error: missing \"\n"; - seg = ""; - i = 0; - } else { - seg = val.substr(close+1); - val = val.substr(0, close); - i = 0; - } - } else { - size_t close = val.find(' '); - if (close == string::npos) { - seg = ""; - i = 0; - } else { - seg = val.substr(close+1); - val = val.substr(0, close); - } - } - label = Trim(label); - seg = Trim(seg); - meta[label] = val; - } - } -} - diff --git a/decoder/stringlib.h b/decoder/stringlib.h deleted file mode 100644 index 84e95d44..00000000 --- a/decoder/stringlib.h +++ /dev/null @@ -1,267 +0,0 @@ -#ifndef CDEC_STRINGLIB_H_ -#define CDEC_STRINGLIB_H_ - -//usage: string s=MAKESTRE(1<<" "<<c); -#define MAKESTR(expr) ((dynamic_cast<ostringstream &>(ostringstream()<<std::dec<<expr)).str()) -// std::dec (or seekp, or another manip) is needed to convert to std::ostream reference. - -#ifdef STRINGLIB_DEBUG -#include <iostream> -#define SLIBDBG(x) do { std::cerr<<"DBG(stringlib): "<<x<<std::endl; } while(0) -#else -#define SLIBDBG(x) -#endif - -#include <map> -#include <vector> -#include <cctype> -#include <cstring> -#include <string> -#include <sstream> -#include <algorithm> - -inline std::size_t skip_ws(std::string const& s,std::size_t starting=0,char const* ws=" \t\n\r") { - return s.find_first_not_of(ws,starting); -} - -// returns position of end of all non-ws chars before ending, i.e. string(s.begin()+skip_ws(s),s.begin()+trailing_ws(s)) strips both ends -inline std::size_t trailing_ws(std::string const& s,std::size_t ending=std::string::npos,char const* ws=" \t\n\r") { - std::size_t n=s.find_last_not_of(ws,ending); - if (n==std::string::npos) return n; - else return n+1; -} - -//TEST: if string is all whitespace, make sure that string(a+npos,a+npos) can't segfault (i.e. won't access any memory because begin==end) -inline std::string strip_ws(std::string const& s) { - return std::string(s.begin()+skip_ws(s),s.begin()+trailing_ws(s)); -} - - -inline bool is_single_line(std::string const& line) { - return std::count(line.begin(),line.end(),'\n')==0; // but we want to allow terminal newlines/blanks -} - -// is_single_line(strip_ws(line)) -inline bool is_single_line_stripped(std::string const& line) { - std::size_t b=skip_ws(line),e=trailing_ws(line); - std::size_t n=line.find('\n',b); - return n==std::string::npos || n>=e; -} - -struct toupperc { - inline char operator()(char c) const { - return std::toupper(c); - } -}; - -inline std::string toupper(std::string s) { - std::transform(s.begin(),s.end(),s.begin(),toupperc()); - return s; -} - -template <class Istr, class Isubstr> inline -bool match_begin(Istr bstr,Istr estr,Isubstr bsub,Isubstr esub) -{ - while (bsub != esub) { - if (bstr == estr) - return false; - if (*bsub++ != *bstr++) - return false; - } - return true; -} - -template <class Istr, class Prefix> inline -bool match_begin(Istr bstr,Istr estr,Prefix prefix) -{ - return match_begin(bstr,estr,prefix.begin(),prefix.end()); -} - -template <class Str, class Prefix> inline -bool match_begin(Str const& str,Prefix const& prefix) -{ - return match_begin(str.begin(),str.end(),prefix.begin(),prefix.end()); -} - - -// read line in the form of either: -// source -// source ||| target -// source will be returned as a string, target must be a sentence or -// a lattice (in PLF format) and will be returned as a Lattice object -void ParseTranslatorInput(const std::string& line, std::string* input, std::string* ref); -struct Lattice; -void ParseTranslatorInputLattice(const std::string& line, std::string* input, Lattice* ref); - -inline std::string Trim(const std::string& str, const std::string& dropChars = " \t") { - std::string res = str; - res.erase(str.find_last_not_of(dropChars)+1); - return res.erase(0, res.find_first_not_of(dropChars)); -} - -inline void Tokenize(const std::string& str, char delimiter, std::vector<std::string>* res) { - std::string s = str; - int last = 0; - res->clear(); - for (int i=0; i < s.size(); ++i) - if (s[i] == delimiter) { - s[i]=0; - if (last != i) { - res->push_back(&s[last]); - } - last = i + 1; - } - if (last != s.size()) - res->push_back(&s[last]); -} - -inline unsigned NTokens(const std::string& str, char delimiter) -{ - std::vector<std::string> r; - Tokenize(str,delimiter,&r); - return r.size(); -} - -inline std::string LowercaseString(const std::string& in) { - std::string res(in.size(),' '); - for (int i = 0; i < in.size(); ++i) - res[i] = tolower(in[i]); - return res; -} - -inline int CountSubstrings(const std::string& str, const std::string& sub) { - size_t p = 0; - int res = 0; - while (p < str.size()) { - p = str.find(sub, p); - if (p == std::string::npos) break; - ++res; - p += sub.size(); - } - return res; -} - -inline int SplitOnWhitespace(const std::string& in, std::vector<std::string>* out) { - out->clear(); - int i = 0; - int start = 0; - std::string cur; - while(i < in.size()) { - if (in[i] == ' ' || in[i] == '\t') { - if (i - start > 0) - out->push_back(in.substr(start, i - start)); - start = i + 1; - } - ++i; - } - if (i > start) - out->push_back(in.substr(start, i - start)); - return out->size(); -} - -inline std::vector<std::string> SplitOnWhitespace(std::string const& in) -{ - std::vector<std::string> r; - SplitOnWhitespace(in,&r); - return r; -} - - -struct mutable_c_str { - // because making a copy of a string might not copy its storage, so modifying a c_str() could screw up original (nobody uses cow nowadays because it needs locking under threading) - char *p; - mutable_c_str(std::string const& s) : p((char *)::operator new(s.size()+1)) { - std::memcpy(p,s.data(),s.size()); - p[s.size()]=0; - } - ~mutable_c_str() { ::operator delete(p); } -private: - mutable_c_str(mutable_c_str const&); -}; - -// ' ' '\t' tokens hardcoded -//NOTE: you should have stripped endline chars out first. -inline bool IsWordSep(char c) { - return c==' '||c=='\t'; -} - - -template <class F> -// *end must be 0 (i.e. [p,end] is valid storage, which will be written to with 0 to separate c string tokens -void VisitTokens(char *p,char *const end,F f) { - SLIBDBG("VisitTokens. p="<<p<<" Nleft="<<end-p); - if (p==end) return; - char *last; // 0 terminated already. this is ok to mutilate because s is a copy of the string passed in. well, barring copy on write i guess. - while(IsWordSep(*p)) { ++p;if (p==end) return; } // skip init whitespace - last=p; // first non-ws char - for(;;) { - SLIBDBG("Start of word. last="<<last<<" *p="<<*p<<" Nleft="<<end-p); - // last==p, pointing at first non-ws char not yet translated into f(word) call - for(;;) {// p to end of word - ++p; - if (p==end) { - f(last); - SLIBDBG("Returning. word="<<last<<" *p="<<*p<<" Nleft="<<end-p); - return; - } - if (IsWordSep(*p)) break; - } - *p=0; - f(last); - SLIBDBG("End of word. word="<<last<<" rest="<<p+1<<" Nleft="<<end-p); - for(;;) { // again skip extra whitespace - ++p; - if (p==end) return; - if (!IsWordSep(*p)) break; - } - last=p; - } -} - -template <class F> -void VisitTokens(char *p,F f) { - VisitTokens(p,p+std::strlen(p),f); -} - - -template <class F> -void VisitTokens(std::string const& s,F f) { - if (0) { - std::vector<std::string> ss=SplitOnWhitespace(s); - for (int i=0;i<ss.size();++i) - f(ss[i]); - return; - } - //FIXME: - if (s.empty()) return; - mutable_c_str mp(s); - SLIBDBG("mp="<<mp.p); - VisitTokens(mp.p,mp.p+s.size(),f); -} - -inline void SplitCommandAndParam(const std::string& in, std::string* cmd, std::string* param) { - cmd->clear(); - param->clear(); - std::vector<std::string> x; - SplitOnWhitespace(in, &x); - if (x.size() == 0) return; - *cmd = x[0]; - for (int i = 1; i < x.size(); ++i) { - if (i > 1) { *param += " "; } - *param += x[i]; - } -} - -void ProcessAndStripSGML(std::string* line, std::map<std::string, std::string>* out); - -// given the first character of a UTF8 block, find out how wide it is -// see http://en.wikipedia.org/wiki/UTF-8 for more info -inline unsigned int UTF8Len(unsigned char x) { - if (x < 0x80) return 1; - else if ((x >> 5) == 0x06) return 2; - else if ((x >> 4) == 0x0e) return 3; - else if ((x >> 3) == 0x1e) return 4; - else return 0; -} - -#endif diff --git a/decoder/stringlib_test.cc b/decoder/stringlib_test.cc deleted file mode 100755 index f66cdbeb..00000000 --- a/decoder/stringlib_test.cc +++ /dev/null @@ -1,17 +0,0 @@ -#define STRINGLIB_DEBUG -#include "stringlib.h" - -using namespace std; -struct print { - template <class S> - void operator()(S const& s) const { - cout<<s<<endl; - } -}; - -char p[]=" 1 are u 2 serious?"; -int main(int argc, char *argv[]) { - std::string const& w="verylongword"; - VisitTokens(p,print()); - VisitTokens(w,print()); -} diff --git a/decoder/tdict.cc b/decoder/tdict.cc deleted file mode 100644 index 1f68feae..00000000 --- a/decoder/tdict.cc +++ /dev/null @@ -1,154 +0,0 @@ -#define TD_ALLOW_UNDEFINED_WORDIDS 0 - -// if 1, word ids that are >= end() will give a numeric token name (single per-thread shared buffer), which of course won't be Convert-able back to the id, because it's not added to the dict. This is a convenience for logging fake token indices. Any tokens actually added to the dict may cause end() to overlap the range of fake ids you were using - that's up to you to prevent. - -#include <stdlib.h> -#include <cstring> -#include <sstream> -#include "Ngram.h" -#include "dict.h" -#include "tdict.h" -#include "Vocab.h" -#include "stringlib.h" -#include "threadlocal.h" - -using namespace std; - -Vocab TD::dict_(0,TD::max_wordid); -WordID TD::ss=dict_.ssIndex(); -WordID TD::se=dict_.seIndex(); -WordID TD::unk=dict_.unkIndex(); -char const*const TD::ss_str=Vocab_SentStart; -char const*const TD::se_str=Vocab_SentEnd; -char const*const TD::unk_str=Vocab_Unknown; - -// pre+(i-base)+">" for i in [base,e) -inline void pad(std::string const& pre,int base,int e) { - assert(base<=e); - ostringstream o; - for (int i=base;i<e;++i) { - o.str(pre); - o<<(i-base)<<'>'; - WordID id=TD::Convert(o.str()); - assert(id==i); // this fails. why? - } -} - - -namespace { -struct TD_init { - TD_init() { - /* - // disabled for now since it's breaking trunk - assert(TD::Convert(TD::ss_str)==TD::ss); - assert(TD::Convert(TD::se_str)==TD::se); - assert(TD::Convert(TD::unk_str)==TD::unk); - assert(TD::none==Vocab_None); - pad("<FILLER",TD::end(),TD::reserved_begin); - assert(TD::end()==TD::reserved_begin); - int reserved_end=TD::begin(); - pad("<RESERVED",TD::end(),reserved_end); - assert(TD::end()==reserved_end); - */ - } -}; - -TD_init td_init; -} - -unsigned int TD::NumWords() { - return dict_.numWords(); -} -WordID TD::end() { - return dict_.highIndex(); -} - -WordID TD::Convert(const std::string& s) { - return dict_.addWord((VocabString)s.c_str()); -} - -WordID TD::Convert(char const* s) { - return dict_.addWord((VocabString)s); -} - - -#if TD_ALLOW_UNDEFINED_WORDIDS -# include "static_utoa.h" -char undef_prefix[]="UNDEF_"; -static const int undefpre_n=sizeof(undef_prefix)/sizeof(undef_prefix[0]); -THREADLOCAL char undef_buf[]="UNDEF_________________"; -inline char const* undef_token(WordID w) -{ - append_utoa(undef_buf+undefpre_n,w); - return undef_buf; -} -#endif - -const char* TD::Convert(WordID w) { -#if TD_ALLOW_UNDEFINED_WORDIDS - if (w>=dict_.highIndex()) return undef_token(w); -#endif - return dict_.getWord((VocabIndex)w); -} - - -void TD::GetWordIDs(const std::vector<std::string>& strings, std::vector<WordID>* ids) { - ids->clear(); - for (vector<string>::const_iterator i = strings.begin(); i != strings.end(); ++i) - ids->push_back(TD::Convert(*i)); -} - -std::string TD::GetString(const std::vector<WordID>& str) { - ostringstream o; - for (int i=0;i<str.size();++i) { - if (i) o << ' '; - o << TD::Convert(str[i]); - } - return o.str(); -} - -std::string TD::GetString(WordID const* i,WordID const* e) { - ostringstream o; - bool sp=false; - for (;i<e;++i,sp=true) { - if (sp) - o << ' '; - o << TD::Convert(*i); - } - return o.str(); -} - -int TD::AppendString(const WordID& w, int pos, int bufsize, char* buffer) -{ - const char* word = TD::Convert(w); - const char* const end_buf = buffer + bufsize; - char* dest = buffer + pos; - while(dest < end_buf && *word) { - *dest = *word; - ++dest; - ++word; - } - return (dest - buffer); -} - - -namespace { -struct add_wordids { - typedef std::vector<WordID> Ws; - Ws *ids; - explicit add_wordids(Ws *i) : ids(i) { } - add_wordids(const add_wordids& o) : ids(o.ids) { } - void operator()(char const* s) { - ids->push_back(TD::Convert(s)); - } - void operator()(std::string const& s) { - ids->push_back(TD::Convert(s)); - } -}; - -} - -void TD::ConvertSentence(std::string const& s, std::vector<WordID>* ids) { - ids->clear(); - VisitTokens(s,add_wordids(ids)); -} diff --git a/decoder/tdict.h b/decoder/tdict.h deleted file mode 100644 index a7b3ee1c..00000000 --- a/decoder/tdict.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef _TDICT_H_ -#define _TDICT_H_ - -#include <string> -#include <vector> -#include "wordid.h" -#include <assert.h> - -class Vocab; - -struct TD { - /* // disabled for now - static const int reserved_begin=10; // allow room for SRI special tokens e.g. unk ss se pause. tokens until this get "<FILLERi>" - static const int n_reserved=10; // 0...n_reserved-1 get token '<RESERVEDi>' - static inline WordID reserved(int i) { - assert(i>=0 && i<n_reserved); - return (WordID)(reserved_begin+i); - } - static inline WordID begin() { - return reserved(n_reserved); - } - */ - static const WordID max_wordid=0x7fffffff; - static const WordID none=(WordID)-1; // Vocab_None - static char const* const ss_str; //="<s>"; - static char const* const se_str; //="</s>"; - static char const* const unk_str; //="<unk>"; - static WordID ss,se,unk; // x=Convert(x_str) - static WordID end(); // next id to be assigned; [begin,end) give the non-reserved tokens seen so far - static Vocab dict_; - static void ConvertSentence(std::string const& sent, std::vector<WordID>* ids); - static void GetWordIDs(const std::vector<std::string>& strings, std::vector<WordID>* ids); - static std::string GetString(const std::vector<WordID>& str); - static std::string GetString(WordID const* i,WordID const* e); - static int AppendString(const WordID& w, int pos, int bufsize, char* buffer); - static unsigned int NumWords(); - static WordID Convert(const std::string& s); - static WordID Convert(char const* s); - static const char* Convert(WordID w); -}; - -struct ToTD { - typedef WordID result_type; - result_type operator()(std::string const& t) const { - return TD::Convert(t); - } -}; - - -#endif diff --git a/decoder/test_data/weights b/decoder/test_data/weights deleted file mode 100644 index ea70229c..00000000 --- a/decoder/test_data/weights +++ /dev/null @@ -1,8 +0,0 @@ -# hiero -WordPenalty -0.387029 -LanguageModel 0.253195 -PhraseModel_0 0.142926 -PhraseModel_1 0.465119 -PhraseModel_2 0.079503 -CNPosteriorProbability 0.09259 -Inf -inf diff --git a/decoder/threadlocal.h b/decoder/threadlocal.h deleted file mode 100755 index d79f5d9d..00000000 --- a/decoder/threadlocal.h +++ /dev/null @@ -1,71 +0,0 @@ -#ifndef THREADLOCAL_H -#define THREADLOCAL_H - -#ifndef SETLOCAL_SWAP -# define SETLOCAL_SWAP 0 -#endif - -#ifdef BOOST_NO_MT - -# define THREADLOCAL - -#else - -#ifdef _MSC_VER - -//FIXME: doesn't work with DLLs ... use TLS apis instead (http://www.boost.org/libs/thread/doc/tss.html) -# define THREADLOCAL __declspec(thread) - -#else - -# define THREADLOCAL __thread - -#endif - -#endif - -#include <algorithm> //swap - -// naturally, the below are only thread-safe if value is THREADLOCAL -template <class D> -struct SaveLocal { - D &value; - D old_value; - SaveLocal(D& val) : value(val), old_value(val) {} - ~SaveLocal() { -#if SETLOCAL_SWAP - swap(value,old_value); -#else - value=old_value; -#endif - } -}; - -template <class D> -struct SetLocal { - D &value; - D old_value; - SetLocal(D& val,const D &new_value) : value(val), old_value( -#if SETLOCAL_SWAP - new_value -#else - val -#endif - ) { -#if SETLOCAL_SWAP - swap(value,old_value); -#else - value=new_value; -#endif - } - ~SetLocal() { -#if SETLOCAL_SWAP - swap(value,old_value); -#else - value=old_value; -#endif - } -}; - - -#endif diff --git a/decoder/timing_stats.cc b/decoder/timing_stats.cc deleted file mode 100644 index fc8e9df1..00000000 --- a/decoder/timing_stats.cc +++ /dev/null @@ -1,24 +0,0 @@ -#include "timing_stats.h" - -#include <iostream> -#include "time.h" //cygwin needs -using namespace std; - -map<string, TimerInfo> Timer::stats; - -Timer::Timer(const string& timername) : start_t(clock()), cur(stats[timername]) {} - -Timer::~Timer() { - ++cur.calls; - const clock_t end_t = clock(); - const double elapsed = (end_t - start_t) / 1000000.0; - cur.total_time += elapsed; -} - -void Timer::Summarize() { - for (map<string, TimerInfo>::iterator it = stats.begin(); it != stats.end(); ++it) { - cerr << it->first << ": " << it->second.total_time << " secs (" << it->second.calls << " calls)\n"; - } - stats.clear(); -} - diff --git a/decoder/timing_stats.h b/decoder/timing_stats.h deleted file mode 100644 index 0a9f7656..00000000 --- a/decoder/timing_stats.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef _TIMING_STATS_H_ -#define _TIMING_STATS_H_ - -#include <string> -#include <map> - -struct TimerInfo { - int calls; - double total_time; - TimerInfo() : calls(), total_time() {} -}; - -struct Timer { - Timer(const std::string& info); - ~Timer(); - static void Summarize(); - private: - static std::map<std::string, TimerInfo> stats; - clock_t start_t; - TimerInfo& cur; - Timer(const Timer& other); - const Timer& operator=(const Timer& other); -}; - -#endif diff --git a/decoder/weights.cc b/decoder/weights.cc deleted file mode 100644 index 84647585..00000000 --- a/decoder/weights.cc +++ /dev/null @@ -1,77 +0,0 @@ -#include "weights.h" - -#include <sstream> - -#include "fdict.h" -#include "filelib.h" - -using namespace std; - -void Weights::InitFromFile(const std::string& filename, vector<string>* feature_list) { - cerr << "Reading weights from " << filename << endl; - ReadFile in_file(filename); - istream& in = *in_file.stream(); - assert(in); - int weight_count = 0; - bool fl = false; - while (in) { - double val = 0; - string buf; - getline(in, buf); - if (buf.size() == 0) continue; - if (buf[0] == '#') continue; - for (int i = 0; i < buf.size(); ++i) - if (buf[i] == '=') buf[i] = ' '; - int start = 0; - while(start < buf.size() && buf[start] == ' ') ++start; - int end = 0; - while(end < buf.size() && buf[end] != ' ') ++end; - int fid = FD::Convert(buf.substr(start, end - start)); - while(end < buf.size() && buf[end] == ' ') ++end; - val = strtod(&buf.c_str()[end], NULL); - if (isnan(val)) { - cerr << FD::Convert(fid) << " has weight NaN!\n"; - abort(); - } - if (wv_.size() <= fid) - wv_.resize(fid + 1); - wv_[fid] = val; - if (feature_list) { feature_list->push_back(FD::Convert(fid)); } - ++weight_count; - if (weight_count % 50000 == 0) { cerr << '.' << flush; fl = true; } - if (weight_count % 2000000 == 0) { cerr << " [" << weight_count << "]\n"; fl = false; } - } - if (fl) { cerr << endl; } - cerr << "Loaded " << weight_count << " feature weights\n"; -} - -void Weights::WriteToFile(const std::string& fname, bool hide_zero_value_features) const { - WriteFile out(fname); - ostream& o = *out.stream(); - assert(o); - o.precision(17); - const int num_feats = FD::NumFeats(); - for (int i = 1; i < num_feats; ++i) { - const double val = (i < wv_.size() ? wv_[i] : 0.0); - if (hide_zero_value_features && val == 0.0) continue; - o << FD::Convert(i) << ' ' << val << endl; - } -} - -void Weights::InitVector(std::vector<double>* w) const { - *w = wv_; -} - -void Weights::InitSparseVector(SparseVector<double>* w) const { - for (int i = 1; i < wv_.size(); ++i) { - const double& weight = wv_[i]; - if (weight) w->set_value(i, weight); - } -} - -void Weights::InitFromVector(const std::vector<double>& w) { - wv_ = w; - if (wv_.size() > FD::NumFeats()) - cerr << "WARNING: initializing weight vector has more features than the global feature dictionary!\n"; - wv_.resize(FD::NumFeats(), 0); -} diff --git a/decoder/weights.h b/decoder/weights.h deleted file mode 100644 index f19aa3ce..00000000 --- a/decoder/weights.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef _WEIGHTS_H_ -#define _WEIGHTS_H_ - -#include <string> -#include <map> -#include <vector> -#include "sparse_vector.h" - -class Weights { - public: - Weights() {} - void InitFromFile(const std::string& fname, std::vector<std::string>* feature_list = NULL); - void WriteToFile(const std::string& fname, bool hide_zero_value_features = true) const; - void InitVector(std::vector<double>* w) const; - void InitSparseVector(SparseVector<double>* w) const; - void InitFromVector(const std::vector<double>& w); - private: - std::vector<double> wv_; -}; - -#endif diff --git a/decoder/weights_test.cc b/decoder/weights_test.cc deleted file mode 100644 index aa6b3db2..00000000 --- a/decoder/weights_test.cc +++ /dev/null @@ -1,28 +0,0 @@ -#include <cassert> -#include <iostream> -#include <fstream> -#include <vector> -#include <gtest/gtest.h> -#include "weights.h" -#include "tdict.h" -#include "hg.h" - -using namespace std; - -class WeightsTest : public testing::Test { - protected: - virtual void SetUp() { } - virtual void TearDown() { } -}; - - -TEST_F(WeightsTest,Load) { - Weights w; - w.InitFromFile("test_data/weights"); - w.WriteToFile("-"); -} - -int main(int argc, char **argv) { - testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/decoder/wordid.h b/decoder/wordid.h deleted file mode 100644 index fb50bcc1..00000000 --- a/decoder/wordid.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _WORD_ID_H_ -#define _WORD_ID_H_ - -typedef int WordID; - -#endif |