From e62cacdcd3cc1ae04ae33257b79652384e92e568 Mon Sep 17 00:00:00 2001
From: David Kaufmann <astra@fsinf.at>
Date: Mon, 7 Nov 2011 11:13:01 +0100
Subject: [PATCH] parameter angepasst

---
 openmp/merge/merge.plt       |  7 ++++---
 openmp/merge/test_threads.sh | 11 +++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/openmp/merge/merge.plt b/openmp/merge/merge.plt
index 798c9ad..0728940 100644
--- a/openmp/merge/merge.plt
+++ b/openmp/merge/merge.plt
@@ -4,9 +4,10 @@ set grid
 set title "Merging times"
 set xlabel "value of parameter p"
 set ylabel "seconds per sort run"
-set xrange [ 1.0000 : 50.000 ] # Anzahl an Messungen
-set yrange [ 0.0000 : 0.080 ] # Sekunden pro sort
-set xtics 0,5,50
+set xrange [ 1.0000 : 250.0 ] # Aufteilung in p Teile
+set yrange [ 0.0000 : 2.0 ] # Sekunden pro sort
+set xtics 25,25,500
+set ytics 0.25,0.25,3.75
 set datafile separator ","
 plot 'merge.dat' using 1:2 notitle with points, \
 	 'merge.dat' using 1:2 title "interpolate" with lines, \
diff --git a/openmp/merge/test_threads.sh b/openmp/merge/test_threads.sh
index 3b75f6b..968a7e6 100755
--- a/openmp/merge/test_threads.sh
+++ b/openmp/merge/test_threads.sh
@@ -3,10 +3,13 @@
 STATFILE=merge.dat
 
 rm $STATFILE
-for i in 1 2 4 5 8 10 20 25 40 50 100 125 200 250 500 1000
+for i in 1 2 4 5 8 10 20 25 40 50 100 125 200
 do
-	echo -n "$i," >> $STATFILE
-	./sort -t $i | sed 's/took \([0-9]*\.[0-9]*\) seconds\./\1/' >> $STATFILE
+	SORTMSG=`./sort -t $i`
+	echo "$i:" $SORTMSG
+	echo $SORTMSG | sed "s/took \([0-9]*\.[0-9]*\) seconds\./${i},\1/" >> $STATFILE
 done
 
-gnuplot merge.plt && display merge.png
+if [ $DISPLAY ]; then
+	gnuplot merge.plt && display merge.png
+fi
-- 
2.43.0