Skip to content
Permalink
Browse files

Fix OrObs in semantics

  • Loading branch information...
palas committed Apr 14, 2019
1 parent 57ee1c8 commit b626bfb434da628fd99c6b302cc527e87cbd1e5a
Showing with 2 additions and 2 deletions.
  1. +1 −1 semantics-2.0/Semantics.hs
  2. +1 −1 semantics-2.0/formalisation/Semantics.thy
@@ -375,7 +375,7 @@ evalObservation :: BlockNumber -> State -> Observation -> Bool
evalObservation blockNumber _ (BelowTimeout timeout) = not $ isExpired blockNumber timeout
evalObservation blockNumber state (AndObs obs1 obs2) = (go obs1) && (go obs2)
where go = evalObservation blockNumber state
evalObservation blockNumber state (OrObs obs1 obs2) = (go obs1) && (go obs2)
evalObservation blockNumber state (OrObs obs1 obs2) = (go obs1) || (go obs2)
where go = evalObservation blockNumber state
evalObservation blockNumber state (NotObs obs) = not $ evalObservation blockNumber state obs
evalObservation _ state (ChoseThis idChoice choice) =
@@ -421,7 +421,7 @@ fun evalObservation :: "BlockNumber \<Rightarrow> State \<Rightarrow> Observatio
((evalObservation blockNumber state obs1) \<and>
(evalObservation blockNumber state obs2))" |
"evalObservation blockNumber state (OrObs obs1 obs2) =
((evalObservation blockNumber state obs1) \<and>
((evalObservation blockNumber state obs1) \<or>
(evalObservation blockNumber state obs2))" |
"evalObservation blockNumber state (NotObs obs) =
evalObservation blockNumber state obs" |

0 comments on commit b626bfb

Please sign in to comment.
You can’t perform that action at this time.