From 825c557dfbac1beff9a3ab0b5ac5ef6e27462f35 Mon Sep 17 00:00:00 2001 From: Shinya Sato Date: Sun, 9 Jan 2022 18:11:39 +0900 Subject: v0.6.0 --- comparison/Inpla/main.sh | 15 +++++++++------ comparison/Inpla/src/msort-800000.in | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'comparison') diff --git a/comparison/Inpla/main.sh b/comparison/Inpla/main.sh index b0da0e2..f1e84a9 100644 --- a/comparison/Inpla/main.sh +++ b/comparison/Inpla/main.sh @@ -6,11 +6,14 @@ ./sptestInpla.sh src/ack-stream_3-11.in ./sptestInpla.sh src/ack-stream_3-11-reuse.in -./sptestInpla.sh src/bsort-40000.in '-c 200000' -./sptestInpla.sh src/bsort-40000-reuse.in '-c 200000' +./sptestInpla.sh src/bsort-40000.in +./sptestInpla.sh src/bsort-40000-reuse.in -./sptestInpla.sh src/qsort-800000.in '-c 8000000' -./sptestInpla.sh src/qsort-800000-reuse.in '-c 8000000' +./sptestInpla.sh src/isort-40000.in +./sptestInpla.sh src/isort-40000-reuse.in -./sptestInpla.sh src/msort-800000.in '-c 8000000' -./sptestInpla.sh src/msort-800000-reuse.in '-c 8000000' +./sptestInpla.sh src/qsort-800000.in +./sptestInpla.sh src/qsort-800000-reuse.in + +./sptestInpla.sh src/msort-800000.in +./sptestInpla.sh src/msort-800000-reuse.in diff --git a/comparison/Inpla/src/msort-800000.in b/comparison/Inpla/src/msort-800000.in index e04803f..b77f353 100644 --- a/comparison/Inpla/src/msort-800000.in +++ b/comparison/Inpla/src/msort-800000.in @@ -8,7 +8,7 @@ MS_tail(ret, int n) >< x:xs => MS(a)~left, MS(b)~right, Merge(ret,b)~a; Merge(ret, snd) >< [] => ret~snd; -Merge(ret, snd) >< x:xs => MergeC(ret, x, xs)~snd; +Merge(ret, snd) >< x:xs => MergeCC(ret, x, xs)~snd; MergeCC(ret, int y, ys) >< [] => ret~(y:ys); MergeCC(ret, int y, ys) >< (int x):xs -- cgit v1.2.3