tests; refractor

.gitignore

@@ -1,3 +1,4 @@
 omp-merge-sort-seq
 omp-merge-sort-par
 *.o
+*.swp

Makefile

@@ -1,7 +1,7 @@
 CFLAGS = -Wall -Wextra -Werror -pedantic -std=c99 -fopenmp
 LDLIBS = -lrt
 CC = gcc
-SOURCES_COMMON = common.c
+SOURCES_COMMON = common.c mergeseq.c mergepar.c
 SOURCES_SEQ = $(SOURCES_COMMON) d2s.c
 OUT_SEQ = omp-merge-sort-seq
 OBJS_SEQ = $(SOURCES_SEQ:.c=.o)

common.c

@@ -1,6 +1,7 @@
 #include "common.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 struct timespec get_time(void)
 {
@@ -48,56 +49,20 @@ int* read_int_array(unsigned n)
 
 void read_input(int** array, unsigned* n)
 {
-  printf("Enter n: ");
+  if (isatty(0)) {
+    printf("Enter n: ");
+  }
   scanf("%u", n);
-  printf("Enter %u integers: ", 2 * *n);
+  if (isatty(0)) {
+    printf("Enter %u integers: ", 2 * *n);
+  }
   *array = read_int_array(2 * *n);
 }
 
 void print_array(int* array, unsigned n)
 {
   for (unsigned i = 0; i < n; ++i) {
-    printf("%i ", array[i]);
+    printf("%i%s", array[i], i == n - 1 ? "" : " ");
   }
   printf("\n");
 }
-
-void merge_sort_merge_seq(int* array, unsigned l, unsigned m, unsigned h)
-{
-  unsigned i = l, j = m + 1, k = 0;
-  int tmp[h - l + 1];
-  while (i <= m && j <= h) {
-    if (array[i] <= array[j]) {
-      tmp[k++] = array[i++];
-    }
-    else {
-      tmp[k++] = array[j++];
-    }
-  }
-
-  while (i <= m) {
-    tmp[k++] = array[i++];
-  }
-  while (j <= h) {
-    tmp[k++] = array[j++];
-  }
-
-  for (--k; k != (unsigned)-1; --k) {
-    array[l + k] = tmp[k];
-  }
-}
-
-void merge_sort_sub_seq(int* array, unsigned l, unsigned h)
-{
-  if (l < h) {
-    unsigned m = (l + h) / 2;
-    merge_sort_sub_seq(array, l, m);
-    merge_sort_sub_seq(array, m + 1, h);
-    merge_sort_merge_seq(array, l, m, h);
-  }
-}
-
-void merge_sort_seq(int* array, unsigned s)
-{
-  merge_sort_sub_seq(array, 0, s - 1);
-}

common.h

@@ -13,6 +13,4 @@ int* read_int_array(unsigned n);
 void read_input(int** array, unsigned* n);
 void print_array(int* array, unsigned n);
 
-void merge_sort_seq(int* array, unsigned s);
-
 #endif

d2p.c

@@ -1,6 +1,12 @@
 #include "common.h"
+#include "mergepar.h"
 
 int main(void)
 {
+  int* array;
+  unsigned n;
+  read_input(&array, &n);
+  merge_sort_par(array, 2 * n);
+  print_array(array, 2 * n);
   return 0;
 }

d2s.c

@@ -1,4 +1,5 @@
 #include "common.h"
+#include "mergeseq.h"
 
 int main(void)
 {

mergepar.c

@@ -0,0 +1,41 @@
+#include "common.h"
+
+void merge_sort_merge_par(int* array, unsigned l, unsigned m, unsigned h)
+{
+  unsigned i = l, j = m + 1, k = 0;
+  int tmp[h - l + 1];
+  while (i <= m && j <= h) {
+    if (array[i] <= array[j]) {
+      tmp[k++] = array[i++];
+    }
+    else {
+      tmp[k++] = array[j++];
+    }
+  }
+
+  while (i <= m) {
+    tmp[k++] = array[i++];
+  }
+  while (j <= h) {
+    tmp[k++] = array[j++];
+  }
+
+  for (--k; k != (unsigned)-1; --k) {
+    array[l + k] = tmp[k];
+  }
+}
+
+void merge_sort_sub_par(int* array, unsigned l, unsigned h)
+{
+  if (l < h) {
+    unsigned m = (l + h) / 2;
+    merge_sort_sub_par(array, l, m);
+    merge_sort_sub_par(array, m + 1, h);
+    merge_sort_merge_par(array, l, m, h);
+  }
+}
+
+void merge_sort_par(int* array, unsigned s)
+{
+  merge_sort_sub_par(array, 0, s - 1);
+}

mergepar.h

@@ -0,0 +1,6 @@
+#ifndef MERGEPAR_H
+#define MERGEPAR_H
+
+void merge_sort_par(int* array, unsigned s);
+
+#endif

mergeseq.c

@@ -0,0 +1,41 @@
+#include "common.h"
+
+void merge_sort_merge_seq(int* array, unsigned l, unsigned m, unsigned h)
+{
+  unsigned i = l, j = m + 1, k = 0;
+  int tmp[h - l + 1];
+  while (i <= m && j <= h) {
+    if (array[i] <= array[j]) {
+      tmp[k++] = array[i++];
+    }
+    else {
+      tmp[k++] = array[j++];
+    }
+  }
+
+  while (i <= m) {
+    tmp[k++] = array[i++];
+  }
+  while (j <= h) {
+    tmp[k++] = array[j++];
+  }
+
+  for (--k; k != (unsigned)-1; --k) {
+    array[l + k] = tmp[k];
+  }
+}
+
+void merge_sort_sub_seq(int* array, unsigned l, unsigned h)
+{
+  if (l < h) {
+    unsigned m = (l + h) / 2;
+    merge_sort_sub_seq(array, l, m);
+    merge_sort_sub_seq(array, m + 1, h);
+    merge_sort_merge_seq(array, l, m, h);
+  }
+}
+
+void merge_sort_seq(int* array, unsigned s)
+{
+  merge_sort_sub_seq(array, 0, s - 1);
+}

mergeseq.h

@@ -0,0 +1,6 @@
+#ifndef MERGESEQ_H
+#define MERGESEQ_H
+
+void merge_sort_seq(int* array, unsigned s);
+
+#endif

test.sh

@@ -0,0 +1,24 @@
+#! /usr/bin/env sh
+
+for exe in omp-merge-sort-seq omp-merge-sort-par
+do
+
+echo "Running ${exe}"
+
+for tIn in tests/*.in
+do
+  tOut=$(echo "${tIn}" | sed -re 's/(.+).in/\1/')".out"
+  tmpfile=$(mktemp)
+  cat "${tIn}" | "./${exe}" > "${tmpfile}"
+  cmp "${tmpfile}" "${tOut}"
+  res=$?
+  if [ ${res} -ne 0 ]
+  then
+    echo "${tIn} failed"
+  else
+    echo "${tIn} succeded"
+    rm "${tmpfile}"
+  fi
+done
+
+done

tests/01.in

@@ -0,0 +1,2 @@
+1
+2 1

tests/01.out

@@ -0,0 +1 @@
+1 2

tests/02.in

@@ -0,0 +1,2 @@
+2
+4 3 2 1

tests/02.out

@@ -0,0 +1 @@
+1 2 3 4

tests/03.in

@@ -0,0 +1,2 @@
+2
+4 2 3 1

tests/03.out

@@ -0,0 +1 @@
+1 2 3 4

tests/04.in

@@ -0,0 +1,2 @@
+5
+9 5 3 6 2 1 4 6 6 9

tests/04.out

@@ -0,0 +1 @@
+1 2 3 4 5 6 6 6 9 9