summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorredpony <redpony@ec762483-ff6d-05da-a07a-a48fb63a330f>2010-07-13 19:51:48 +0000
committerredpony <redpony@ec762483-ff6d-05da-a07a-a48fb63a330f>2010-07-13 19:51:48 +0000
commitc3fc0f68dd90fa1c88485c63624c9987b6e1b297 (patch)
tree407d7cad6f7db7565f4ddcc221ff1bff86003ef3
parentc7c274a7d4b0510c5cd7424704197de4aa6acde5 (diff)
revert xsing features
git-svn-id: https://ws10smt.googlecode.com/svn/trunk@239 ec762483-ff6d-05da-a07a-a48fb63a330f
-rw-r--r--extools/featurize_grammar.cc8
-rwxr-xr-xgi/pipeline/evaluation-pipeline.pl2
2 files changed, 5 insertions, 5 deletions
diff --git a/extools/featurize_grammar.cc b/extools/featurize_grammar.cc
index cb80a79f..5c51fffe 100644
--- a/extools/featurize_grammar.cc
+++ b/extools/featurize_grammar.cc
@@ -371,15 +371,15 @@ struct XFeatures: public FeatureExtractor {
assert(t_c > 0);
result->set_value(fid_xfe, log(t_c) - l_r_freq);
result->set_value(fid_labelledfe, log(t_c) - log(info.counts.value(kCFE)));
- if (t_c == 1)
- result->set_value(fid_xesingleton, 1.0);
+// if (t_c == 1)
+// result->set_value(fid_xesingleton, 1.0);
const int s_c = source_counts(r.source());
assert(s_c > 0);
result->set_value(fid_xef, log(s_c) - l_r_freq);
result->set_value(fid_labelledef, log(s_c) - log(info.counts.value(kCFE)));
- if (s_c == 1)
- result->set_value(fid_xfsingleton, 1.0);
+// if (s_c == 1)
+// result->set_value(fid_xfsingleton, 1.0);
}
void map_rule(RuleTuple& r) const {
diff --git a/gi/pipeline/evaluation-pipeline.pl b/gi/pipeline/evaluation-pipeline.pl
index 37863df3..f5ad7b14 100755
--- a/gi/pipeline/evaluation-pipeline.pl
+++ b/gi/pipeline/evaluation-pipeline.pl
@@ -11,7 +11,7 @@ my $SCRIPT_DIR; BEGIN { use Cwd qw/ abs_path /; use File::Basename; $SCRIPT_DIR
my $feat_map = {
"LogRuleCount" => [ "LogRuleCount", "SingletonRule" ] ,
# "XFeatures" => [ "XFE","XEF" ] ,
- "XFeatures" => [ "XFE","XEF","LabelledEF","LabelledFE","XE_Singleton","XF_Singleton"] ,
+ "XFeatures" => [ "XFE","XEF","LabelledEF","LabelledFE"], # ,"XE_Singleton","XF_Singleton"] ,
"LabelledRuleConditionals" => [ "LabelledFE","LabelledEF" ] ,
"LexProb" => [ "LexE2F", "LexF2E" ] ,
"BackoffRule" => [ "BackoffRule" ] ,