diff options
| author | Shinya Sato <shinnya.sato@gmail.com> | 2022-01-09 18:21:11 +0900 |
|---|---|---|
| committer | Shinya Sato <shinnya.sato@gmail.com> | 2022-01-09 18:21:11 +0900 |
| commit | f17513be22ab8883ff2281c9ad80bf7b1c574c22 (patch) | |
| tree | 800fc8a7036db3452b2e04b6b4dc0408bb168628 /comparison | |
| parent | 0c2325ec1e518c8aebecfcfd1c8e64e08ee20b20 (diff) | |
| parent | 55dc9a89b7d13ab0f93fc52acd8a41084c0f93c9 (diff) | |
| download | inpla-f17513be22ab8883ff2281c9ad80bf7b1c574c22.tar.gz inpla-f17513be22ab8883ff2281c9ad80bf7b1c574c22.zip | |
Merge branch 'develop'
Diffstat (limited to 'comparison')
| -rw-r--r-- | comparison/Inpla/main.sh | 15 | ||||
| -rw-r--r-- | comparison/Inpla/src/msort-800000.in | 2 |
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 |