(NEEDS TESTING) cfg index rules->nts, sort by prob, remove duplicates keeping highest prob, topo sort (and after binarize topo sort). beginning to apply_fsa_models (PrefixTrieNode)

git-svn-id: https://ws10smt.googlecode.com/svn/trunk@539 ec762483-ff6d-05da-a07a-a48fb63a330f

1 files changed, 5 insertions, 5 deletions

diff --git a/decoder/exp_semiring.h b/decoder/exp_semiring.h
index f91beee4..111eaaf1 100644
--- a/decoder/exp_semiring.h
+++ b/decoder/exp_semiring.h
@@ -14,7 +14,7 @@
 //   PType scalar, RType vector
 // BAD examples:
 //   PType vector, RType scalar
-template <typename PType, typename RType>
+template <class PType, class RType>
 struct PRPair {
   PRPair() : p(), r() {}
   // Inside algorithm requires that T(0) and T(1)
@@ -35,26 +35,26 @@ struct PRPair {
   RType r;
 };
 
-template <typename P, typename R>
+template <class P, class R>
 std::ostream& operator<<(std::ostream& o, const PRPair<P,R>& x) {
   return o << '<' << x.p << ", " << x.r << '>';
 }
 
-template <typename P, typename R>
+template <class P, class R>
 const PRPair<P,R> operator+(const PRPair<P,R>& a, const PRPair<P,R>& b) {
   PRPair<P,R> result = a;
   result += b;
   return result;
 }
 
-template <typename P, typename R>
+template <class P, class R>
 const PRPair<P,R> operator*(const PRPair<P,R>& a, const PRPair<P,R>& b) {
   PRPair<P,R> result = a;
   result *= b;
   return result;
 }
 
-template <typename P, typename PWeightFunction, typename R, typename RWeightFunction>
+template <class P, class PWeightFunction, class R, class RWeightFunction>
 struct PRWeightFunction {
   explicit PRWeightFunction(const PWeightFunction& pwf = PWeightFunction(),
                             const RWeightFunction& rwf = RWeightFunction()) :