LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File sphinxtrain-g2p_train-fixes.patch of Package sphinxtrain (Project home:malcolmlewis:TESTING)

diff -Naur a/src/programs/g2p_train/g2p_train.cpp b/src/programs/g2p_train/g2p_train.cpp
--- a/src/programs/g2p_train/g2p_train.cpp	2012-09-28 16:26:18.000000000 -0500
+++ b/src/programs/g2p_train/g2p_train.cpp	2014-01-26 01:32:37.609869908 -0600
@@ -24,14 +24,14 @@
 #include <fst/script/print.h>
 #include <ngram/ngram-shrink.h>
 #include <ngram/ngram-relentropy.h>
-#include <ngram/ngram-seymoreshrink.h>
-#include <ngram/ngram-countprune.h>
+#include <ngram/ngram-seymore-shrink.h>
+#include <ngram/ngram-count-prune.h>
 #include <ngram/ngram-input.h>
 #include <ngram/ngram-make.h>
-#include <ngram/ngram-kneserney.h>
+#include <ngram/ngram-kneser-ney.h>
 #include <ngram/ngram-absolute.h>
 #include <ngram/ngram-katz.h>
-#include <ngram/ngram-wittenbell.h>
+#include <ngram/ngram-witten-bell.h>
 #include <ngram/ngram-unsmoothed.h>
 #include <sphinxbase/err.h>
 #include "M2MFstAligner.hpp"
@@ -196,7 +196,7 @@
 	string dest = prefix+".fst.txt";
 	ostream *ostrm = new fst::ofstream(dest.c_str());
 	ostrm->precision(9);
-	s::FstClass *fstc = new s::FstClass(out);
+	s::FstClass *fstc = new s::FstClass(*out);
 	s::PrintFst(*fstc, *ostrm, dest, isyms, osyms, NULL, acceptor, show_weight_one);
 	ostrm->flush();
 	delete ostrm;
@@ -355,7 +355,7 @@
 	}
 
 	cout << "Minimizing model..." << endl;
-	MutableFstClass *minimized = new s::MutableFstClass(fst);
+	MutableFstClass *minimized = new s::MutableFstClass(*fst);
 	Minimize(minimized, 0, fst::kDelta);
 	fst = minimized->GetMutableFst<StdArc>();