From ef2df950520a47ca7011736648334eedeae5297a Mon Sep 17 00:00:00 2001
From: Patrick Simianer
Date: Wed, 19 Oct 2011 20:56:22 +0200
Subject: merged, compiles but not working
---
dtrain/kbestget.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'dtrain/kbestget.h')
diff --git a/dtrain/kbestget.h b/dtrain/kbestget.h
index d141da60..4aadee7a 100644
--- a/dtrain/kbestget.h
+++ b/dtrain/kbestget.h
@@ -7,6 +7,7 @@
#include "ff_register.h"
#include "decoder.h"
#include "weights.h"
+#include "logval.h"
using namespace std;
@@ -106,7 +107,8 @@ struct KBestGetter : public HypSampler
ScoredHyp h;
h.w = d->yield;
h.f = d->feature_values;
- h.model = log(d->score);
+ h.model = d->score;
+ cout << i << ". "<< h.model << endl;
h.rank = i;
h.score = scorer_->Score(h.w, *ref_, i);
s_.push_back(h);
@@ -125,7 +127,7 @@ struct KBestGetter : public HypSampler
ScoredHyp h;
h.w = d->yield;
h.f = d->feature_values;
- h.model = log(d->score);
+ h.model = -1*log(d->score);
h.rank = i;
h.score = scorer_->Score(h.w, *ref_, i);
s_.push_back(h);
--
cgit v1.2.3
From 18ba09140e937bde6c94247640484fe44f7cd665 Mon Sep 17 00:00:00 2001
From: Patrick Simianer
Date: Wed, 19 Oct 2011 21:41:00 +0200
Subject: debug
---
decoder/hg.h | 2 --
dtrain/dtrain.cc | 21 +++++++--------------
dtrain/kbestget.h | 8 +++++---
klm/lm/binary_format.hh | 2 --
klm/lm/model_test.cc | 8 --------
utils/dict.h | 5 ++---
utils/weights.cc | 1 +
7 files changed, 15 insertions(+), 32 deletions(-)
(limited to 'dtrain/kbestget.h')
diff --git a/decoder/hg.h b/decoder/hg.h
index 52a18601..f0ddbb76 100644
--- a/decoder/hg.h
+++ b/decoder/hg.h
@@ -397,8 +397,6 @@ public:
template
void Reweight(const V& weights) {
for (int i = 0; i < edges_.size(); ++i) {
- SparseVector v;
- //v.set_value(FD::Convert("use_shell"), 1000);
Edge& e = edges_[i];
e.edge_prob_.logeq(e.feature_values_.dot(weights));
}
diff --git a/dtrain/dtrain.cc b/dtrain/dtrain.cc
index e96b65aa..795c82fd 100644
--- a/dtrain/dtrain.cc
+++ b/dtrain/dtrain.cc
@@ -188,15 +188,6 @@ main(int argc, char** argv)
}
- //LogVal a(2.2);
- //LogVal b(2.1);
- //cout << a << endl;
- //cout << log(a) << endl;
- //LogVal c = a - b;
- //cout << log(c) << endl;
- //exit(0);
-
-
for (unsigned t = 0; t < T; t++) // T epochs
{
@@ -298,7 +289,7 @@ main(int argc, char** argv)
// FIXME
/*if (verbose) {
cout << "[ref: '";
- if (t > 0) cout << ref_ids_buf[ii];
+ if (t > 0) cout << ref_ids_buf[ii]; <---
else cout << ref_ids;
cout << endl;
cout << _p5 << _np << "1best: " << "'" << (*samples)[0].w << "'" << endl;
@@ -355,14 +346,16 @@ main(int argc, char** argv)
}
}
-
+ // DEBUG
vector x;
lambdas.init_vector(&x);
- for (int q = 0; q < x.size(); q++) {
- if (x[q] < -10 && x[q] != 0)
- cout << FD::Convert(q) << " " << x[q] << endl;
+ cout << "[" << ii << "]" << endl;
+ for (int jj = 0; jj < x.size(); jj++) {
+ if (x[jj] != 0)
+ cout << FD::Convert(jj) << " " << x[jj] << endl;
}
cout << " --- " << endl;
+ // /DEBUG
++ii;
diff --git a/dtrain/kbestget.h b/dtrain/kbestget.h
index 4aadee7a..98f289eb 100644
--- a/dtrain/kbestget.h
+++ b/dtrain/kbestget.h
@@ -107,8 +107,10 @@ struct KBestGetter : public HypSampler
ScoredHyp h;
h.w = d->yield;
h.f = d->feature_values;
- h.model = d->score;
- cout << i << ". "<< h.model << endl;
+ h.model = d->score.as_float();
+ // DEBUG
+ cout << i+1 << ". "<< h.model << endl;
+ // /DEBUG
h.rank = i;
h.score = scorer_->Score(h.w, *ref_, i);
s_.push_back(h);
@@ -127,7 +129,7 @@ struct KBestGetter : public HypSampler
ScoredHyp h;
h.w = d->yield;
h.f = d->feature_values;
- h.model = -1*log(d->score);
+ h.model = d->score.as_float();
h.rank = i;
h.score = scorer_->Score(h.w, *ref_, i);
s_.push_back(h);
diff --git a/klm/lm/binary_format.hh b/klm/lm/binary_format.hh
index a83f6b89..e9df0892 100644
--- a/klm/lm/binary_format.hh
+++ b/klm/lm/binary_format.hh
@@ -76,8 +76,6 @@ void MatchCheck(ModelType model_type, unsigned int search_version, const Paramet
void SeekPastHeader(int fd, const Parameters ¶ms);
-void SeekPastHeader(int fd, const Parameters ¶ms);
-
uint8_t *SetupBinary(const Config &config, const Parameters ¶ms, std::size_t memory_size, Backing &backing);
void ComplainAboutARPA(const Config &config, ModelType model_type);
diff --git a/klm/lm/model_test.cc b/klm/lm/model_test.cc
index 3585d34b..2654071f 100644
--- a/klm/lm/model_test.cc
+++ b/klm/lm/model_test.cc
@@ -264,14 +264,6 @@ template void NoUnkCheck(const M &model) {
BOOST_CHECK_CLOSE(-100.0, ret.prob, 0.001);
}
-template void NoUnkCheck(const M &model) {
- WordIndex unk_index = 0;
- State state;
-
- FullScoreReturn ret = model.FullScoreForgotState(&unk_index, &unk_index + 1, unk_index, state);
- BOOST_CHECK_CLOSE(-100.0, ret.prob, 0.001);
-}
-
template void Everything(const M &m) {
Starters(m);
Continuation(m);
diff --git a/utils/dict.h b/utils/dict.h
index 33cca6cf..a3400868 100644
--- a/utils/dict.h
+++ b/utils/dict.h
@@ -1,7 +1,6 @@
#ifndef DICT_H_
#define DICT_H_
-#include
#include
#include
@@ -73,8 +72,8 @@ class Dict {
inline const std::string& Convert(const WordID& id) const {
if (id == 0) return b0_;
- //assert(id <= (int)words_.size());
- if (id < 0 || id > (int)words_.size()) return b0_;
+ assert(id <= (int)words_.size());
+ //if (id < 0 || id > (int)words_.size()) return b0_;
return words_[id-1];
}
diff --git a/utils/weights.cc b/utils/weights.cc
index f1406cbf..ac407dfb 100644
--- a/utils/weights.cc
+++ b/utils/weights.cc
@@ -154,3 +154,4 @@ void Weights::ShowLargestFeatures(const vector& w) {
cerr << endl;
}
+
--
cgit v1.2.3
From 78baccbb4231bb84a456702d4f574f8e601a8182 Mon Sep 17 00:00:00 2001
From: Patrick Simianer
Date: Thu, 20 Oct 2011 02:20:43 +0200
Subject: really merged fix
---
dtrain/README.md | 2 +-
dtrain/dtrain.cc | 8 ++++----
dtrain/kbestget.h | 7 ++-----
dtrain/test/example/dtrain.ini | 8 ++++----
4 files changed, 11 insertions(+), 14 deletions(-)
(limited to 'dtrain/kbestget.h')
diff --git a/dtrain/README.md b/dtrain/README.md
index 1ee3823e..b453c649 100644
--- a/dtrain/README.md
+++ b/dtrain/README.md
@@ -43,7 +43,7 @@ Uncertain, known bugs, problems
FIXME
-----
-* merge with cdec master
+none
Data
----
diff --git a/dtrain/dtrain.cc b/dtrain/dtrain.cc
index 795c82fd..05c3728d 100644
--- a/dtrain/dtrain.cc
+++ b/dtrain/dtrain.cc
@@ -349,12 +349,12 @@ main(int argc, char** argv)
// DEBUG
vector x;
lambdas.init_vector(&x);
- cout << "[" << ii << "]" << endl;
+ //cout << "[" << ii << "]" << endl;
for (int jj = 0; jj < x.size(); jj++) {
- if (x[jj] != 0)
- cout << FD::Convert(jj) << " " << x[jj] << endl;
+ //if (x[jj] != 0)
+ //cout << FD::Convert(jj) << " " << x[jj] << endl;
}
- cout << " --- " << endl;
+ //cout << " --- " << endl;
// /DEBUG
++ii;
diff --git a/dtrain/kbestget.h b/dtrain/kbestget.h
index 98f289eb..abe657d0 100644
--- a/dtrain/kbestget.h
+++ b/dtrain/kbestget.h
@@ -107,10 +107,7 @@ struct KBestGetter : public HypSampler
ScoredHyp h;
h.w = d->yield;
h.f = d->feature_values;
- h.model = d->score.as_float();
- // DEBUG
- cout << i+1 << ". "<< h.model << endl;
- // /DEBUG
+ h.model = log(d->score);
h.rank = i;
h.score = scorer_->Score(h.w, *ref_, i);
s_.push_back(h);
@@ -129,7 +126,7 @@ struct KBestGetter : public HypSampler
ScoredHyp h;
h.w = d->yield;
h.f = d->feature_values;
- h.model = d->score.as_float();
+ h.model = log(d->score);
h.rank = i;
h.score = scorer_->Score(h.w, *ref_, i);
s_.push_back(h);
diff --git a/dtrain/test/example/dtrain.ini b/dtrain/test/example/dtrain.ini
index 96bdbf8e..185d6d90 100644
--- a/dtrain/test/example/dtrain.ini
+++ b/dtrain/test/example/dtrain.ini
@@ -1,14 +1,14 @@
decoder_config=test/example/cdec.ini
k=100
N=3
-gamma=0 #.00001
-epochs=2
+gamma=0
+epochs=5
input=test/example/nc-1k-tabs.gz
scorer=stupid_bleu
output=-
-stop_after=5
+stop_after=100
sample_from=kbest
-pair_sampling=all #108010
+pair_sampling=all
select_weights=VOID
print_weights=Glue WordPenalty LanguageModel LanguageModel_OOV PhraseModel_0 PhraseModel_1 PhraseModel_2 PhraseModel_3 PhraseModel_4 PassThrough
tmp=/tmp
--
cgit v1.2.3