From cab81059f38bbe7da3b5e64b29983c3487707705 Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 7 Nov 2023 20:24:20 +0100 Subject: [PATCH] update examples --- examples/04_Greatest_Common_Divisor.mers | 6 +++--- examples/05_Matrix_Multiplicator.mers | 10 +++++----- examples/iter.mers | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/04_Greatest_Common_Divisor.mers b/examples/04_Greatest_Common_Divisor.mers index 4145abf..74293a3 100755 --- a/examples/04_Greatest_Common_Divisor.mers +++ b/examples/04_Greatest_Common_Divisor.mers @@ -3,10 +3,10 @@ gcd := vals -> { (a, b) := vals if a.eq(b) (a) - else if a.diff(b).signum.eq(1) - &vals = (a, a.diff(b)) + else if b.subtract(a).signum.eq(1) + &vals = (a, b.subtract(a)) else - &vals = (b.diff(a), b) + &vals = (a.subtract(b), b) } }.loop diff --git a/examples/05_Matrix_Multiplicator.mers b/examples/05_Matrix_Multiplicator.mers index e13a658..18366f4 100755 --- a/examples/05_Matrix_Multiplicator.mers +++ b/examples/05_Matrix_Multiplicator.mers @@ -62,7 +62,7 @@ read_matrix_line := width -> { if w.eq(0) { width = line.len } else { - {() -> if line.len.diff(w).signum.eq(1) { + {() -> if line.len.subtract(w).signum.eq(-1) { &line.push(0.0) } else (())}.loop } @@ -86,10 +86,10 @@ matrix_get := (matrix, (line, col)) -> { leftpad := (str, l) -> { str := (str).concat - d := str.len.diff(l) + d := l.subtract(str.len) {() -> if d.signum.eq(1) { &str = (" ", str).concat - &d = 1.diff(d) + &d = d.subtract(1) } else {(())}}.loop str } @@ -100,11 +100,11 @@ matrix_print := matrix -> { val_len := 0 matrix.for_each(line -> { l := line.len - if l.diff(width).signum.eq(-1) + if width.subtract(l).signum.eq(-1) &width = l line.for_each(val -> { l := (val).concat.len - if l.diff(val_len).eq(-1) + if val_len.subtract(l).eq(-1) &val_len = l }) }) diff --git a/examples/iter.mers b/examples/iter.mers index 3924eb8..8d5cb54 100755 --- a/examples/iter.mers +++ b/examples/iter.mers @@ -68,7 +68,7 @@ range := (min, max, inc) -> { val := min () -> { // -1 if val > max, 1 if max > val, 0 if max = val - should_inc := ((val, max).diff.signum, inc.signum).eq + should_inc := ((max, val).subtract.signum, inc.signum).eq if should_inc { v := val &val = (val, inc).sum