diff options
| author | Carlo Zancanaro <carlo@pc-4w14-0.cs.usyd.edu.au> | 2012-11-02 11:06:41 +1100 |
|---|---|---|
| committer | Carlo Zancanaro <carlo@pc-4w14-0.cs.usyd.edu.au> | 2012-11-02 11:06:41 +1100 |
| commit | ea660a9528cea35b7971dfc405e464cbddb2d1d0 (patch) | |
| tree | c1989f3d1bd79ac8325326f00ba3cb321f0a3911 /impl/Expression.hpp | |
| parent | a8472ef1867418b94116324531b3587e0e0e7363 (diff) | |
| parent | 1c3d68659fb6341e7a72d563448380a7ffae8c2e (diff) | |
Merge branch 'master' of ssh://bitbucket.org/czan/honours
Conflicts:
tex/thesis/contribution/contribution.tex
Diffstat (limited to 'impl/Expression.hpp')
| -rw-r--r-- | impl/Expression.hpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/impl/Expression.hpp b/impl/Expression.hpp index dcf7201..619bc7e 100644 --- a/impl/Expression.hpp +++ b/impl/Expression.hpp @@ -197,8 +197,7 @@ struct MaxExpression : public OperatorExpression<Domain> { return this->_arguments[strat.get(*this)]->eval(rho, strat); } - unsigned int bestStrategy(VariableAssignment<Domain>& rho, MaxStrategy<Domain>& strat) const { - unsigned int bestIndex = const_cast<const MaxStrategy<Domain>&>(strat).get(*this); + unsigned int bestStrategy(VariableAssignment<Domain>& rho, MaxStrategy<Domain>& strat, unsigned int bestIndex) const { Domain bestValue = this->_arguments[bestIndex]->eval(rho, strat); for (unsigned int i = 0, length = this->_arguments.size(); |