diff options
author | Carlo Zancanaro <carlo@pc-4w14-0.cs.usyd.edu.au> | 2012-05-28 16:12:34 +1000 |
---|---|---|
committer | Carlo Zancanaro <carlo@pc-4w14-0.cs.usyd.edu.au> | 2012-05-28 16:12:34 +1000 |
commit | 72b70a4ff7dad8185eb2dd652bdd2983b829930a (patch) | |
tree | d9cd8c92030dfe4c41d5480612dd0f2df74e5ce1 /impl/Operator.hpp | |
parent | ea05c9c5fa30b8822f618e861d12a09df1f8f017 (diff) | |
parent | 7c6700343578ad0a2acab48fcb4ef0cbb1a370b9 (diff) |
Merge branch 'master' of ssh://bitbucket.org/czan/honours
Conflicts:
impl/IdSet.hpp
impl/main.cpp
impl/systems/long-fixpoint
Diffstat (limited to 'impl/Operator.hpp')
-rw-r--r-- | impl/Operator.hpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/impl/Operator.hpp b/impl/Operator.hpp index dee7f47..80bc8b2 100644 --- a/impl/Operator.hpp +++ b/impl/Operator.hpp @@ -38,6 +38,7 @@ struct Maximum : public Operator<T> { ++it) { T temporary = (**it)(assignment, visited); value = (temporary < value ? value : temporary); + if (value == infinity<T>()) break; } return value; } @@ -51,6 +52,7 @@ struct Minimum : public Operator<T> { ++it) { T temporary = (**it)(assignment, visited); value = (temporary < value ? temporary : value); + if (value == -infinity<T>()) break; } return value; } |