diff --git a/AlgebraicDataflowArchitectureModel/models/JumpGame.model b/AlgebraicDataflowArchitectureModel/models/JumpGame.model index 756ea7e..baf60d2 100644 --- a/AlgebraicDataflowArchitectureModel/models/JumpGame.model +++ b/AlgebraicDataflowArchitectureModel/models/JumpGame.model @@ -23,35 +23,38 @@ } channel C1 { - in force(f, update1(f2, m2)) == f2 - in mass(m, update1(f2, m2)) == m2 - out acceleration(a:Tuple, update1(f2, m2)) == tuple(fst(f2) / m2, snd(f2) / m2) + ref onground(o, update1(f2, m2, o)) + in force(f, update1(f2, m2, o)) == f2 + in mass(m, update1(f2, m2, o)) == m2 + out acceleration(a:Tuple, update1(f2, m2, o)) == if(o, tuple(fst(f2) / m2, 0.0), tuple(fst(f2) / m2, snd(f2) / m2)) } channel C2 { - in position(p, update2(p2, g2)) == p2 - in ground(g, update2(p2, g2)) == g2 - out onground(o:Bool, update2(p2, g2)) == and(eq(g2, true), le(snd(p), 0.0)) + ref onground(o, update3(a2, o)) + in acceleration(a, update3(a2, o)) == a2 + out velocity(v:Tuple, update3(a2, o)) == if(and(o, lt(snd(v), 0.0)), + tuple(fst(v) + 0.01 * fst(a2), 0.0), + tuple(fst(v) + 0.01 * fst(a2), snd(v) + 0.01 * snd(a2))) } channel C3 { - ref onground(o, update3(a2, o)) - in acceleration(a, update3(a2, o)) == a2 - out velocity(v:Tuple, update3(a2, o)) == if(and(o, lt(snd(v), 0.0)), tuple(fst(v) + 0.01 * fst(a2), 0.0), - tuple(fst(v) + 0.01 * fst(a2), snd(v) + 0.01 * snd(a2))) + ref onground(o, update4(m2, o)) + in move(m, update4(m2, o)) == m2 + out velocity(v:Tuple, update4(m2, o)) == if(and(o, ge(snd(m2), 0.0)), m2, v) } channel C4 { - ref onground(o, update4(m2, o)) - in move(m, update4(m2, o)) == m2 - out velocity(v:Tuple, update4(m2, o)) == if(o, m2, v) + in velocity(v, update5(v2, g2)) == v2 + in ground(g, update5(v2, g2)) == g2 + out position(p:Tuple, update5(v2, g2)) == if(and(eq(g2, true), lt(snd(p) + 0.01 * snd(v2), 0.0)), + tuple(fst(p) + 0.01 * fst(v2), 0.0), + tuple(fst(p) + 0.01 * fst(v2), snd(p) + 0.01 * snd(v2))) } channel C5 { - ref onground(o, update5(v2, o)) - in velocity(v, update5(v2, o)) == v2 - out position(p:Tuple, update5(v2, o)) == if(and(o, lt(snd(p), 0.0)), tuple(fst(p) + 0.01 * fst(v2), 0.0), - tuple(fst(p) + 0.01 * fst(v2), snd(p) + 0.01 * snd(v2))) + in position(p, update2(p2, g2)) == p2 + in ground(g, update2(p2, g2)) == g2 + out onground(o:Bool, update2(p2, g2)) == and(eq(g2, true), le(snd(p), 0.0)) } channel C6 {