diff options
author | Chris Dyer <cdyer@allegro.clab.cs.cmu.edu> | 2014-03-18 02:05:25 -0400 |
---|---|---|
committer | Chris Dyer <cdyer@allegro.clab.cs.cmu.edu> | 2014-03-18 02:05:25 -0400 |
commit | 2a9ee1febae6a63173f74ae24e2bfe439e409525 (patch) | |
tree | 44b930ed4bdaedc4e6c6f43af18474fb367b97fd /utils | |
parent | 55beb71dbbfe8421a8e8be9d2d7868a5d87d77d5 (diff) |
chris edits
Diffstat (limited to 'utils')
-rw-r--r-- | utils/exp_semiring.h | 2 | ||||
-rw-r--r-- | utils/logval.h | 2 | ||||
-rw-r--r-- | utils/star.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/utils/exp_semiring.h b/utils/exp_semiring.h index 7572ccf5..26a22071 100644 --- a/utils/exp_semiring.h +++ b/utils/exp_semiring.h @@ -56,7 +56,7 @@ const PRPair<P,R> operator*(const PRPair<P,R>& a, const PRPair<P,R>& b) { } template <class P, class R> -const PRPair<P,R> star(const PRPair<P,R>& x) { +inline const PRPair<P,R> star(const PRPair<P,R>& x) { const P pstar = star(x.p); return PRPair<P,R>(pstar, pstar * x.r * pstar); } diff --git a/utils/logval.h b/utils/logval.h index 7f1e1024..0c9ee982 100644 --- a/utils/logval.h +++ b/utils/logval.h @@ -244,7 +244,7 @@ template <class T> std::size_t hash_value(const LogVal<T>& x) { return x.hash_impl(); } template <class T> -LogVal<T> star(LogVal<T> x) { +inline LogVal<T> star(LogVal<T> x) { if (x.is_0()) return x; if (x.v_ >= 0) { x.v_ = std::numeric_limits<T>::infinity(); diff --git a/utils/star.h b/utils/star.h index e7358ffa..21977dc9 100644 --- a/utils/star.h +++ b/utils/star.h @@ -4,14 +4,14 @@ // star(x) computes the infinite sum x^0 + x^1 + x^2 + ... template <typename T> -T star(const T& x) { +inline T star(const T& x) { if (!x) return T(); if (x > T(1)) return std::numeric_limits<T>::infinity(); if (x < -T(1)) return -std::numeric_limits<T>::infinity(); return T(1) / (T(1) - x); } -bool star(bool x) { +inline bool star(bool x) { return x; } |