aboutsummaryrefslogtreecommitdiff
path: root/comparison
diff options
context:
space:
mode:
authorShinya Sato <shinnya.sato@gmail.com>2022-01-09 18:11:39 +0900
committerShinya Sato <shinnya.sato@gmail.com>2022-01-09 18:11:39 +0900
commit825c557dfbac1beff9a3ab0b5ac5ef6e27462f35 (patch)
treea8e38fbe329e357ff33c2a0a505bd97da948a875 /comparison
parent7b23eefd840a23d09859a4edf71eb30d80991714 (diff)
downloadinpla-825c557dfbac1beff9a3ab0b5ac5ef6e27462f35.tar.gz
inpla-825c557dfbac1beff9a3ab0b5ac5ef6e27462f35.zip
v0.6.0
Diffstat (limited to 'comparison')
-rw-r--r--comparison/Inpla/main.sh15
-rw-r--r--comparison/Inpla/src/msort-800000.in2
2 files changed, 10 insertions, 7 deletions
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