diff options
author | Araq <rumpf_a@web.de> | 2018-10-28 13:16:55 +0100 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2018-10-28 13:17:08 +0100 |
commit | c804b606f9a023b677fd05fe274b7270eb84f7ca (patch) | |
tree | 9788fdee3f0fd849144d1a1a78fdd5720c48cb33 /tests | |
parent | fe855d8ba4b8f4f41a5c27a5c3e09cd86060fad2 (diff) | |
download | Nim-c804b606f9a023b677fd05fe274b7270eb84f7ca.tar.gz |
make tests\benchmarks programs compile again
Diffstat (limited to 'tests')
-rw-r--r-- | tests/benchmarks/fannkuch.nim | 36 | ||||
-rw-r--r-- | tests/benchmarks/quicksort.nim | 32 |
2 files changed, 34 insertions, 34 deletions
diff --git a/tests/benchmarks/fannkuch.nim b/tests/benchmarks/fannkuch.nim index 55405b3c9..c87295092 100644 --- a/tests/benchmarks/fannkuch.nim +++ b/tests/benchmarks/fannkuch.nim @@ -1,31 +1,31 @@ import os import strutils -proc fannkuch (n: int): int = +proc fannkuch(n: int): int = var count: seq[int] maxFlips = 0 - m = n-1 - r = n - check = 0 + m = n-1 + r = n + check = 0 perm1: seq[int] - perm: seq[int] + perm: seq[int] - newSeq (count, n+1) - newSeq (perm1, n) - newSeq (perm, n) + newSeq(count, n+1) + newSeq(perm1, n) + newSeq(perm, n) for i in 0 .. n-1: count[i] = i+1 perm1[i] = i perm[i] = i count[n] = n+1 - while True: + while true: if check < 30: - for i in items (perm1): - write (stdout, $(i+1)) - echo ("") - inc (check) + for i in items(perm1): + write(stdout, $(i+1)) + echo("") + inc(check) while r != 1: count[r-1] = r @@ -40,8 +40,8 @@ proc fannkuch (n: int): int = var k = perm[0] while k != 0: for i in 0 .. (k div 2): - swap (perm[i], perm[k-i]) - inc (flipsCount) + swap(perm[i], perm[k-i]) + inc(flipsCount) k = perm[0] if flipsCount > maxFlips: @@ -59,11 +59,11 @@ proc fannkuch (n: int): int = perm1[i] = perm1[i+1] perm1[r] = tmp - dec (count[r]) + dec(count[r]) if count[r] > 0: break makePerm - inc (r) + inc(r) return maxFlips var n = 10 -echo ("Pfannkuchen(" & $n & ") = " & $fannkuch (n)) +echo("Pfannkuchen(" & $n & ") = " & $fannkuch(n)) diff --git a/tests/benchmarks/quicksort.nim b/tests/benchmarks/quicksort.nim index 6a1222b9a..114321492 100644 --- a/tests/benchmarks/quicksort.nim +++ b/tests/benchmarks/quicksort.nim @@ -21,34 +21,34 @@ proc random(): int32 = var n = 9999999 var data: seq[int32] -newSeq (data, n) +newSeq(data, n) for i in 0 .. data.high(): data[i] = random() -proc `$` (d: seq[int32]): string = +proc `$`(d: seq[int32]): string = result = "[ " - for i in items (d): - result.addSep (", ", 2) - result.add ($(i and 0xFFFF_FFFF'i64)) - result.add (" ]") + for i in items(d): + result.addSep(", ", 2) + result.add($(i and 0xFFFF_FFFF'i64)) + result.add(" ]") # Sort the data -proc sort (start, stop: int) = +proc sort(start, stop: int) = if stop <= start+1: return var j = start for i in start..stop-2: if data[i] <% data[stop-1]: - swap (data[i], data[j]) - inc (j) - swap (data[j], data[stop-1]) + swap(data[i], data[j]) + inc(j) + swap(data[j], data[stop-1]) - sort (start, j) - sort (j+1, stop) + sort(start, j) + sort(j+1, stop) -sort (0, data.len) -echo (data[n div 2 - 1] and 0xFFFF_FFFF'i64, ", ", - data[n div 2] and 0xFFFF_FFFF'i64, ", ", - data[n div 2 + 1] and 0xFFFF_FFFF'i64) +sort(0, data.len) +echo(data[n div 2 - 1] and 0xFFFF_FFFF'i64, ", ", + data[n div 2] and 0xFFFF_FFFF'i64, ", ", + data[n div 2 + 1] and 0xFFFF_FFFF'i64) |