diff --git a/AlgebraicDataflowArchitectureModel/models/Clock.dtram b/AlgebraicDataflowArchitectureModel/models/Clock.dtram index 380ceca..f619eaf 100644 --- a/AlgebraicDataflowArchitectureModel/models/Clock.dtram +++ b/AlgebraicDataflowArchitectureModel/models/Clock.dtram @@ -1,18 +1,18 @@ model { channel CIO1 { - out min(m, tick) == mod(m + 1, 60) + out min(m: Int, tick) == mod(m + 1, 60) } channel HourUpdate { - in hour(h, update(h')) == h' - out hour_hand(h_ang, update(h')) == h' / 6 * PI + in hour(h: Int, update(h2)) == h2 + out hour_hand(h_ang: Float, update(h2)) == h2 / 6 * PI } channel MinUpdate { - in min(m, update(m')) == m' - out min_hand(m_ang, update(m')) == m' / 30 * PI + in min(m, update(m2)) == m2 + out min_hand(m_ang: Float, update(m2)) == m2 / 30 * PI } channel Clock { - in min(m, update(m')) == m' - out hour(h, update(m')) == if(eq(m', 0), mod(h + 1, 24), h) + in min(m, update(m2)) == m2 + out hour(h, update(m2)) == if(eq(m2, 0), mod(h + 1, 24), h) } } geometry {