diff options
| -rw-r--r-- | Jamroot | 5 | ||||
| -rw-r--r-- | contrib/mira/Decoder.cpp (renamed from mira/Decoder.cpp) | 0 | ||||
| -rw-r--r-- | contrib/mira/Decoder.h (renamed from mira/Decoder.h) | 0 | ||||
| -rw-r--r-- | contrib/mira/Hildreth.cpp (renamed from mira/Hildreth.cpp) | 0 | ||||
| -rw-r--r-- | contrib/mira/Hildreth.h (renamed from mira/Hildreth.h) | 0 | ||||
| -rw-r--r-- | contrib/mira/HildrethTest.cpp (renamed from mira/HildrethTest.cpp) | 0 | ||||
| -rw-r--r-- | contrib/mira/HypothesisQueue.cpp (renamed from mira/HypothesisQueue.cpp) | 0 | ||||
| -rw-r--r-- | contrib/mira/HypothesisQueue.h (renamed from mira/HypothesisQueue.h) | 0 | ||||
| -rw-r--r-- | contrib/mira/Jamfile (renamed from mira/Jamfile) | 0 | ||||
| -rw-r--r-- | contrib/mira/Main.cpp (renamed from mira/Main.cpp) | 0 | ||||
| -rw-r--r-- | contrib/mira/Main.h (renamed from mira/Main.h) | 0 | ||||
| -rw-r--r-- | contrib/mira/MiraOptimiser.cpp (renamed from mira/MiraOptimiser.cpp) | 0 | ||||
| -rw-r--r-- | contrib/mira/MiraTest.cpp (renamed from mira/MiraTest.cpp) | 0 | ||||
| -rw-r--r-- | contrib/mira/Optimiser.h (renamed from mira/Optimiser.h) | 0 | ||||
| -rw-r--r-- | contrib/mira/Perceptron.cpp (renamed from mira/Perceptron.cpp) | 0 | ||||
| -rw-r--r-- | contrib/mira/expt.cfg (renamed from mira/expt.cfg) | 0 | ||||
| -rw-r--r-- | contrib/mira/mira.xcodeproj/project.pbxproj (renamed from mira/mira.xcodeproj/project.pbxproj) | 0 | ||||
| -rwxr-xr-x | contrib/mira/training-expt.perl (renamed from mira/training-expt.perl) | 0 | ||||
| -rw-r--r-- | moses/ScoreComponentCollection.cpp | 3 |
19 files changed, 4 insertions, 4 deletions
@@ -173,7 +173,8 @@ project : requirements ; #Add directories here if you want their incidental targets too (i.e. tests). -build-projects lm util phrase-extract phrase-extract/syntax-common search moses moses/LM mert moses-cmd mira scripts regression-testing ; +build-projects lm util phrase-extract phrase-extract/syntax-common search moses moses/LM mert moses-cmd scripts regression-testing ; +# mira if [ option.get "with-mm" : : "yes" ] { @@ -228,7 +229,7 @@ phrase-extract//extract-mixed-syntax phrase-extract//score-stsg phrase-extract//filter-rule-table biconcor -mira//mira +#mira//mira contrib/server//mosesserver mm rephraser diff --git a/mira/Decoder.cpp b/contrib/mira/Decoder.cpp index c9bb4c983..c9bb4c983 100644 --- a/mira/Decoder.cpp +++ b/contrib/mira/Decoder.cpp diff --git a/mira/Decoder.h b/contrib/mira/Decoder.h index 0cc1eb3ab..0cc1eb3ab 100644 --- a/mira/Decoder.h +++ b/contrib/mira/Decoder.h diff --git a/mira/Hildreth.cpp b/contrib/mira/Hildreth.cpp index 03076e767..03076e767 100644 --- a/mira/Hildreth.cpp +++ b/contrib/mira/Hildreth.cpp diff --git a/mira/Hildreth.h b/contrib/mira/Hildreth.h index 373f2ac43..373f2ac43 100644 --- a/mira/Hildreth.h +++ b/contrib/mira/Hildreth.h diff --git a/mira/HildrethTest.cpp b/contrib/mira/HildrethTest.cpp index 43e4403e4..43e4403e4 100644 --- a/mira/HildrethTest.cpp +++ b/contrib/mira/HildrethTest.cpp diff --git a/mira/HypothesisQueue.cpp b/contrib/mira/HypothesisQueue.cpp index 8c8daa4da..8c8daa4da 100644 --- a/mira/HypothesisQueue.cpp +++ b/contrib/mira/HypothesisQueue.cpp diff --git a/mira/HypothesisQueue.h b/contrib/mira/HypothesisQueue.h index 63cabbd0f..63cabbd0f 100644 --- a/mira/HypothesisQueue.h +++ b/contrib/mira/HypothesisQueue.h diff --git a/mira/Jamfile b/contrib/mira/Jamfile index e43a993b5..e43a993b5 100644 --- a/mira/Jamfile +++ b/contrib/mira/Jamfile diff --git a/mira/Main.cpp b/contrib/mira/Main.cpp index abf92b598..abf92b598 100644 --- a/mira/Main.cpp +++ b/contrib/mira/Main.cpp diff --git a/mira/Main.h b/contrib/mira/Main.h index 8736257f6..8736257f6 100644 --- a/mira/Main.h +++ b/contrib/mira/Main.h diff --git a/mira/MiraOptimiser.cpp b/contrib/mira/MiraOptimiser.cpp index d4854a1c4..d4854a1c4 100644 --- a/mira/MiraOptimiser.cpp +++ b/contrib/mira/MiraOptimiser.cpp diff --git a/mira/MiraTest.cpp b/contrib/mira/MiraTest.cpp index 774b324f8..774b324f8 100644 --- a/mira/MiraTest.cpp +++ b/contrib/mira/MiraTest.cpp diff --git a/mira/Optimiser.h b/contrib/mira/Optimiser.h index 6bae23055..6bae23055 100644 --- a/mira/Optimiser.h +++ b/contrib/mira/Optimiser.h diff --git a/mira/Perceptron.cpp b/contrib/mira/Perceptron.cpp index af61c28a9..af61c28a9 100644 --- a/mira/Perceptron.cpp +++ b/contrib/mira/Perceptron.cpp diff --git a/mira/expt.cfg b/contrib/mira/expt.cfg index 416eb1d3f..416eb1d3f 100644 --- a/mira/expt.cfg +++ b/contrib/mira/expt.cfg diff --git a/mira/mira.xcodeproj/project.pbxproj b/contrib/mira/mira.xcodeproj/project.pbxproj index 67662f4e0..67662f4e0 100644 --- a/mira/mira.xcodeproj/project.pbxproj +++ b/contrib/mira/mira.xcodeproj/project.pbxproj diff --git a/mira/training-expt.perl b/contrib/mira/training-expt.perl index 097ee7220..097ee7220 100755 --- a/mira/training-expt.perl +++ b/contrib/mira/training-expt.perl diff --git a/moses/ScoreComponentCollection.cpp b/moses/ScoreComponentCollection.cpp index 2903b112c..19c7475b6 100644 --- a/moses/ScoreComponentCollection.cpp +++ b/moses/ScoreComponentCollection.cpp @@ -309,8 +309,7 @@ void ScoreComponentCollection::OutputAllFeatureScores(std::ostream &out) const const vector<const StatefulFeatureFunction*>& sff = StatefulFeatureFunction::GetStatefulFeatureFunctions(); for( size_t i=0; i<sff.size(); i++ ) { const StatefulFeatureFunction *ff = sff[i]; - if (ff->GetScoreProducerDescription() != "BleuScoreFeature" - && ff->IsTuneable()) { + if (ff->IsTuneable()) { OutputFeatureScores( out, ff, lastName ); } } |