summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgraehl <graehl@ec762483-ff6d-05da-a07a-a48fb63a330f>2010-08-28 00:44:55 +0000
committergraehl <graehl@ec762483-ff6d-05da-a07a-a48fb63a330f>2010-08-28 00:44:55 +0000
commit22bcb46f38fcb285f93510a40b2109c61c7d965f (patch)
treee3dcebdfc5e9abce789baf13848a4aaa07665d86
parent79be7e35a72365d861dd4140323275cac52a9e33 (diff)
debugging no lhs trie index built
git-svn-id: https://ws10smt.googlecode.com/svn/trunk@629 ec762483-ff6d-05da-a07a-a48fb63a330f
-rwxr-xr-xdecoder/apply_fsa_models.cc42
-rwxr-xr-xutils/best.h4
-rw-r--r--utils/d_ary_heap.h2
3 files changed, 28 insertions, 20 deletions
diff --git a/decoder/apply_fsa_models.cc b/decoder/apply_fsa_models.cc
index f9edb005..e3837829 100755
--- a/decoder/apply_fsa_models.cc
+++ b/decoder/apply_fsa_models.cc
@@ -216,20 +216,21 @@ public:
template <class PV>
void index_lhs(PV &v) {
for (int i=0,e=adj.size();i!=e;++i) {
- PrefixTrieEdge const& e=adj[i];
- // assert(e.p.is_1()); // actually, after done_building, e will have telescoped dest->p/p.
- NTHandle n=e.w;
+ PrefixTrieEdge const& edge=adj[i];
+ // assert(edge.p.is_1()); // actually, after done_building, e will have telescoped dest->p/p.
+ NTHandle n=edge.w;
assert(n>=0);
- SHOWM3(DPFSA,"index_lhs",i,e,n);
- v[n]=e.dest;
+ SHOWM3(DPFSA,"index_lhs",i,edge,n);
+ v[n]=edge.dest;
}
}
template <class PV>
void done_root(PV &v) {
- done_building_r();
-// index_adj(); // we want an index for the root node?. don't think so - index_lhs handles it.
- index_lhs(v);
+ assert(is_root());
+ done_building_r(); //sets adj
+// index_adj(); // we want an index for the root node?. don't think so - index_lhs handles it. also we stopped clearing edge_for.
+ index_lhs(v); // uses adj
}
// call only once.
@@ -250,7 +251,7 @@ public:
// call only once.
void done_building() {
SHOWM3(DBUILDTRIE,"done_building",edge_for.size(),adj.size(),1);
-#if 0
+#if 1
adj.reinit_map(edge_for,*this);
#else
adj.reinit(edge_for.size());
@@ -264,6 +265,7 @@ public:
// (*this)(*i);
}
#endif
+ assert(adj.size()==edge_for.size());
// if (final) p_final/=p;
std::sort(adj.begin(),adj.end());
//TODO: store adjacent differences on edges (compared to
@@ -293,23 +295,21 @@ public:
PrefixTrieEdgeFor::iterator i=edge_for.find(w);
if (i!=edge_for.end())
return improve_edge(i->second,rulep);
- PrefixTrieEdge &e=edge_for[w];
+ PrefixTrieEdge &e=i->second;
NodeP r=new PrefixTrieNode(lhs_,rulep);
IF_PRINT_PREFIX(r->backp=BP(w,this));
- return e.dest=r;
+ e.dest=r;
+ return r;
}
void set_final(NTHandle lhs_,best_t pf) {
assert(no_adj());
final=true;
- /*
PrefixTrieEdge &e=edge_for[-1];
e.p=pf;
e.dest=0;
e.w=lhs_;
- if (pf>p)
- p=pf;
- */
+ maybe_improve(p,pf);
}
private:
@@ -327,7 +327,7 @@ public:
destroy_children();
}
void print(std::ostream &o) const {
- o << lhs << "->" << p;
+ o << "Node"<<this<< ": "<<lhs << "->" << p;
o << ',' << size() << ',';
print_back_str(o);
}
@@ -357,14 +357,16 @@ struct PrefixTrie {
SHOWM2(DBUILDTRIE,"PrefixTrie()",rulesp->size(),lhs2.size());
cfg.VisitRuleIds(*this);
root.done_root(lhs2);
+ SHOWM4(DBUILDTRIE,"done w/ PrefixTrie: ",root,root.adj.size(),lhs2.size(),lhs2[0]);
}
- void operator()(int ri) const {
+ void operator()(int ri) {
Rule const& r=rules()[ri];
NTHandle lhs=r.lhs;
best_t p=r.p;
- NodeP n=const_cast<PrefixTrieNode&>(root).build_lhs(lhs,p);
- SHOWM3(DBUILDTRIE,"Prefixtrie rule id",ri,root,p);
+// NodeP n=const_cast<PrefixTrieNode&>(root).build_lhs(lhs,p);
+ NodeP n=root.build_lhs(lhs,p);
+ SHOWM4(DBUILDTRIE,"Prefixtrie rule id, root",ri,root,p,*n);
for (RHS::const_iterator i=r.rhs.begin(),e=r.rhs.end();;++i) {
SHOWM2(DBUILDTRIE,"PrefixTrie build or final",i-r.rhs.begin(),*n);
if (i==e) {
@@ -381,6 +383,8 @@ struct PrefixTrie {
if (!r) throw std::runtime_error("PrefixTrie: no CFG rule w/ lhs "+cfgp->nt_name(n));
return r;
}
+private:
+ PrefixTrie(PrefixTrie const& o);
};
diff --git a/utils/best.h b/utils/best.h
index 689e7600..ed15e0be 100755
--- a/utils/best.h
+++ b/utils/best.h
@@ -5,6 +5,10 @@
typedef MaxPlus<double> best_t;
+inline bool better(best_t const& a,best_t const& b) {
+ return a.v_>b.v_; // intentionally reversed, so default min-heap, sort, etc. put best first.
+}
+
inline bool operator <(best_t const& a,best_t const& b) {
return a.v_>b.v_; // intentionally reversed, so default min-heap, sort, etc. put best first.
}
diff --git a/utils/d_ary_heap.h b/utils/d_ary_heap.h
index 49e040d8..10d04782 100644
--- a/utils/d_ary_heap.h
+++ b/utils/d_ary_heap.h
@@ -317,11 +317,11 @@
}
private:
- Equal equal;
Better better;
Container data;
DistanceMap distance;
IndexInHeapPropertyMap index_in_heap;
+ Equal equal;
// Get the parent of a given node in the heap
static inline size_type parent(size_type index) {