From 71eb8b4500ad745710c4f29dd9e97793cea43b0b Mon Sep 17 00:00:00 2001 From: graehl Date: Thu, 12 Aug 2010 01:21:10 +0000 Subject: decoder->utils git-svn-id: https://ws10smt.googlecode.com/svn/trunk@533 ec762483-ff6d-05da-a07a-a48fb63a330f --- decoder/batched_append.h | 25 ------- decoder/fast_lexical_cast.hpp | 11 --- decoder/indices_after.h | 169 ------------------------------------------ utils/batched_append.h | 25 +++++++ utils/fast_lexical_cast.hpp | 11 +++ utils/indices_after.h | 169 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 205 insertions(+), 205 deletions(-) delete mode 100755 decoder/batched_append.h delete mode 100755 decoder/fast_lexical_cast.hpp delete mode 100755 decoder/indices_after.h create mode 100755 utils/batched_append.h create mode 100755 utils/fast_lexical_cast.hpp create mode 100755 utils/indices_after.h diff --git a/decoder/batched_append.h b/decoder/batched_append.h deleted file mode 100755 index 14a6d576..00000000 --- a/decoder/batched_append.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef BATCHED_APPEND_H -#define BATCHED_APPEND_H - -#include //swap -#include - -template -void batched_append(Vector &v,SRange const& s) { - std::size_t news=v.size()+s.size(); - v.reserve(news); - v.insert(v.end(),s.begin(),s.end()); -} - -template -void batched_append_swap(Vector &v,SRange & s) { - using namespace std; // to find the right swap - size_t i=v.size(); - size_t news=i+s.size(); - v.resize(news); - typename SRange::iterator si=s.begin(); - for (;i - -using boost::lexical_cast; - -#endif diff --git a/decoder/indices_after.h b/decoder/indices_after.h deleted file mode 100755 index 2b662d5c..00000000 --- a/decoder/indices_after.h +++ /dev/null @@ -1,169 +0,0 @@ -#ifndef INDICES_AFTER_REMOVING_H -#define INDICES_AFTER_REMOVING_H - -#include // STATIC_CONSTANT -#include //swap -#include - -// iterator wrapper. inverts boolean value. -template -struct keep_not_marked -{ - typedef keep_not_marked self_type; - AB i; - bool operator *() const - { - return !*i; - } - void operator++() - { - ++i; - } - bool operator ==(self_type const& o) - { - return i==o.i; - } -}; - -// outputs sequence to out iterator, of new indices for each element i, corresponding to deleting element i from an array when remove[i] is true (-1 if it was deleted, new index otherwise), returning one-past-end of out (the return value = # of elements left after deletion) -template -unsigned new_indices_keep(KEEP i, KEEPe end,O out) { - unsigned f=0; - while (i!=end) - *out++ = *i++ ? f++ : (unsigned)-1; - return f; -}; - -template -unsigned new_indices_keep_if_n(unsigned n,It i,KeepIf const& r,O out) -{ - unsigned f=0; - while(n--) - *out++ = r(*i++) ? f++ : (unsigned)-1; - return f; -} - -template -unsigned new_indices(KEEP keep,O out) { - return new_indices(keep.begin(),keep.end(),out); -} - -// given a vector and a parallel sequence of bools where true means keep, keep only the marked elements while maintaining order. -// this is done with a parallel sequence to the input, marked with positions the kept items would map into in a destination array, with removed items marked with the index -1. the reverse would be more compact (parallel to destination array, index of input item that goes into it) but would require the input sequence be random access. -struct indices_after -{ - BOOST_STATIC_CONSTANT(unsigned,REMOVED=(unsigned)-1); - unsigned *map; // map[i] == REMOVED if i is deleted - unsigned n_kept; - unsigned n_mapped; - template - indices_after(AB i, ABe end) { - init(i,end); - } - - template - void init_keep_if(Vec v,R const& r) - { - n_mapped=v.size(); - if ( !n_mapped ) return; - map=(unsigned *)::operator new(sizeof(unsigned)*n_mapped); - n_kept=new_indices_keep_if_n(n_mapped,r,map); - } - - template - void init(AB i, ABe end) { - n_mapped=end-i; - if (n_mapped>0) { - map=(unsigned *)::operator new(sizeof(unsigned)*n_mapped); - n_kept=new_indices_keep(i,end,map); - } else - map=NULL; - } - template - void init(A const& a) - { - init(a.begin(),a.end()); - } - - template - indices_after(A const& a) - { - init(a.begin(),a.end()); - } - indices_after() : n_mapped(0) {} - ~indices_after() - { - if (n_mapped) - ::operator delete((void*)map); - } - bool removing(unsigned i) const - { - return map[i] == REMOVED; - } - bool keeping(unsigned i) const - { - return map[i] != REMOVED; - } - - unsigned operator[](unsigned i) const - { - return map[i]; - } - - template - void do_moves(Vec &v) const - { - assert(v.size()==n_mapped); - unsigned i=0; - for (;i - void do_moves_swap(Vec &v) const - { - using std::swap; - assert(v.size()==n_mapped); - unsigned r=n_mapped; - unsigned i=0; - for (;i - void copy_to(Vecto &to,Vecfrom const& v) const { - to.resize(n_kept); - for (unsigned i=0;i - void reindex(IndexI i,IndexI const end,IndexO o) const { - for(;i - void reindex_push_back(VecI const& i,VecO &o) const { - reindex(i.begin(),i.end(),std::back_inserter(o)); - } - -private: - indices_after(indices_after const&) - { - map=NULL; - } -}; - -#endif diff --git a/utils/batched_append.h b/utils/batched_append.h new file mode 100755 index 00000000..14a6d576 --- /dev/null +++ b/utils/batched_append.h @@ -0,0 +1,25 @@ +#ifndef BATCHED_APPEND_H +#define BATCHED_APPEND_H + +#include //swap +#include + +template +void batched_append(Vector &v,SRange const& s) { + std::size_t news=v.size()+s.size(); + v.reserve(news); + v.insert(v.end(),s.begin(),s.end()); +} + +template +void batched_append_swap(Vector &v,SRange & s) { + using namespace std; // to find the right swap + size_t i=v.size(); + size_t news=i+s.size(); + v.resize(news); + typename SRange::iterator si=s.begin(); + for (;i + +using boost::lexical_cast; + +#endif diff --git a/utils/indices_after.h b/utils/indices_after.h new file mode 100755 index 00000000..2b662d5c --- /dev/null +++ b/utils/indices_after.h @@ -0,0 +1,169 @@ +#ifndef INDICES_AFTER_REMOVING_H +#define INDICES_AFTER_REMOVING_H + +#include // STATIC_CONSTANT +#include //swap +#include + +// iterator wrapper. inverts boolean value. +template +struct keep_not_marked +{ + typedef keep_not_marked self_type; + AB i; + bool operator *() const + { + return !*i; + } + void operator++() + { + ++i; + } + bool operator ==(self_type const& o) + { + return i==o.i; + } +}; + +// outputs sequence to out iterator, of new indices for each element i, corresponding to deleting element i from an array when remove[i] is true (-1 if it was deleted, new index otherwise), returning one-past-end of out (the return value = # of elements left after deletion) +template +unsigned new_indices_keep(KEEP i, KEEPe end,O out) { + unsigned f=0; + while (i!=end) + *out++ = *i++ ? f++ : (unsigned)-1; + return f; +}; + +template +unsigned new_indices_keep_if_n(unsigned n,It i,KeepIf const& r,O out) +{ + unsigned f=0; + while(n--) + *out++ = r(*i++) ? f++ : (unsigned)-1; + return f; +} + +template +unsigned new_indices(KEEP keep,O out) { + return new_indices(keep.begin(),keep.end(),out); +} + +// given a vector and a parallel sequence of bools where true means keep, keep only the marked elements while maintaining order. +// this is done with a parallel sequence to the input, marked with positions the kept items would map into in a destination array, with removed items marked with the index -1. the reverse would be more compact (parallel to destination array, index of input item that goes into it) but would require the input sequence be random access. +struct indices_after +{ + BOOST_STATIC_CONSTANT(unsigned,REMOVED=(unsigned)-1); + unsigned *map; // map[i] == REMOVED if i is deleted + unsigned n_kept; + unsigned n_mapped; + template + indices_after(AB i, ABe end) { + init(i,end); + } + + template + void init_keep_if(Vec v,R const& r) + { + n_mapped=v.size(); + if ( !n_mapped ) return; + map=(unsigned *)::operator new(sizeof(unsigned)*n_mapped); + n_kept=new_indices_keep_if_n(n_mapped,r,map); + } + + template + void init(AB i, ABe end) { + n_mapped=end-i; + if (n_mapped>0) { + map=(unsigned *)::operator new(sizeof(unsigned)*n_mapped); + n_kept=new_indices_keep(i,end,map); + } else + map=NULL; + } + template + void init(A const& a) + { + init(a.begin(),a.end()); + } + + template + indices_after(A const& a) + { + init(a.begin(),a.end()); + } + indices_after() : n_mapped(0) {} + ~indices_after() + { + if (n_mapped) + ::operator delete((void*)map); + } + bool removing(unsigned i) const + { + return map[i] == REMOVED; + } + bool keeping(unsigned i) const + { + return map[i] != REMOVED; + } + + unsigned operator[](unsigned i) const + { + return map[i]; + } + + template + void do_moves(Vec &v) const + { + assert(v.size()==n_mapped); + unsigned i=0; + for (;i + void do_moves_swap(Vec &v) const + { + using std::swap; + assert(v.size()==n_mapped); + unsigned r=n_mapped; + unsigned i=0; + for (;i + void copy_to(Vecto &to,Vecfrom const& v) const { + to.resize(n_kept); + for (unsigned i=0;i + void reindex(IndexI i,IndexI const end,IndexO o) const { + for(;i + void reindex_push_back(VecI const& i,VecO &o) const { + reindex(i.begin(),i.end(),std::back_inserter(o)); + } + +private: + indices_after(indices_after const&) + { + map=NULL; + } +}; + +#endif -- cgit v1.2.3