diff options
author | Carlo Zancanaro <carlo@carlo-laptop> | 2012-10-30 20:56:38 +1100 |
---|---|---|
committer | Carlo Zancanaro <carlo@carlo-laptop> | 2012-10-30 20:56:38 +1100 |
commit | 6a4786bde976e9a023c7f65a395384d214c5102c (patch) | |
tree | f3dd303f21dfa0be269a932dd05438041a290f27 /impl/systems/example.eqns | |
parent | ff2030f3a19926334fbe3a043c5f88622c17c2f8 (diff) | |
parent | 95b82ea3830c3a34455323167894647e3aa773a6 (diff) |
Merge branch 'master' of ssh://bitbucket.org/czan/honours
Conflicts:
impl/test/run
Diffstat (limited to 'impl/systems/example.eqns')
-rw-r--r-- | impl/systems/example.eqns | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/impl/systems/example.eqns b/impl/systems/example.eqns index 71ee74a..dc59a01 100644 --- a/impl/systems/example.eqns +++ b/impl/systems/example.eqns @@ -1,3 +1,3 @@ -x1 = max(0, min(x1-1, x2)) +x1 = max(0, min(x1 - 1, x2)) x2 = max(0, 5+x1, x1) -x3 = max(0, 1+x3, 0+x1) +x3 = max(0, 1 + x3, 0 + x1) |