diff --git a/velocity_safety_no_formulas.prism b/velocity_safety_no_formulas.prism index 02c7a5e..73c0abb 100644 --- a/velocity_safety_no_formulas.prism +++ b/velocity_safety_no_formulas.prism @@ -9,10 +9,10 @@ const int minX = 10; const int maxX = 144; -formula Gate_1 = (((421 -> (ski_position'=ski_position-1) & (move'=1); @@ -39,7 +39,7 @@ module skier [noop] !Safe & !Unsafe & !Hit_Gate & !Hit_Tree & move=0 -> (move'=1); - [done] Safe | Unsafe | Hit_Tree | Hit_Gate -> true; + [done] move=0 & (Safe | Unsafe | Hit_Tree | Hit_Gate) -> (done'=true); endmodule module updateY @@ -58,7 +58,7 @@ module updateY endmodule module updateX - x : [minX..maxX] ; + x : [minX..maxX] init initX; [update_x] move=3 & standstill>=8 -> (move'=0); [update_x] move=3 & standstill<8 & (ski_position=4 | ski_position=5) -> (move'=0); @@ -74,8 +74,8 @@ module updateX endmodule rewards - Hit_Tree : -100; - Hit_Gate : -100; - Unsafe : -100; + !done & Hit_Tree : -100; + !done & Hit_Gate : -100; + !done & Unsafe : -100; endrewards