aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranklin Wei <me@fwei.tk>2018-07-09 11:55:42 -0400
committerFranklin Wei <me@fwei.tk>2018-07-09 11:55:42 -0400
commit1aefbfaad668d2a4aafab0a24f728727f9dddff3 (patch)
treeb138822f5c323e5fc809b547297be5eb377d9793
parent845dae9b06c07ea9b0fedf532471c13c269bbf40 (diff)
downloadcsaa-1aefbfaad668d2a4aafab0a24f728727f9dddff3.zip
csaa-1aefbfaad668d2a4aafab0a24f728727f9dddff3.tar.gz
csaa-1aefbfaad668d2a4aafab0a24f728727f9dddff3.tar.bz2
csaa-1aefbfaad668d2a4aafab0a24f728727f9dddff3.tar.xz
Minor changes to tests
-rw-r--r--graph.gnu1
-rw-r--r--postprocess.cpp2
-rwxr-xr-xtabulate.sh4
-rwxr-xr-xtestmain.sh4
4 files changed, 6 insertions, 5 deletions
diff --git a/graph.gnu b/graph.gnu
index e744081..dc09cf8 100644
--- a/graph.gnu
+++ b/graph.gnu
@@ -1,5 +1,6 @@
set xlabel "logleaves"
set ylabel "avg time per operation (sec)"
+set yrange [0:]
set terminal eps
diff --git a/postprocess.cpp b/postprocess.cpp
index c57d9ff..94c30cb 100644
--- a/postprocess.cpp
+++ b/postprocess.cpp
@@ -37,7 +37,7 @@ int main()
if(counts[i])
{
means[i] = sums[i] / counts[i];
- printf("%d %g\n", i, means[i]);
+ printf("%d %g\n", 1<<i, means[i]);
}
}
}
diff --git a/tabulate.sh b/tabulate.sh
index abb6ed3..aaf20be 100755
--- a/tabulate.sh
+++ b/tabulate.sh
@@ -1,8 +1,8 @@
#!/bin/bash
-for i in `seq 4 10`
+for i in `seq 2 14`
do
rm -f all_"$i".txt
- for j in `seq 1 3`
+ for j in `seq 1 1`
do
echo -n "$i $j " >> all_"$i".txt
cat run_"$i"_"$j".txt | awk '/Elapsed/ || /Maximum/ || /User time/ || /System time/' | awk 'BEGIN{line=0}{if(line%4<=1)printf($4" ");if(line %4==2)printf($8" ");if(line%4==3)printf($6" ");}{line+=1}END{printf("\n");}' >> all_"$i".txt
diff --git a/testmain.sh b/testmain.sh
index 6a63c64..c3b4651 100755
--- a/testmain.sh
+++ b/testmain.sh
@@ -1,8 +1,8 @@
#!/bin/bash
mkdir -p results
-trials=3
+trials=1
-for i in `seq 2 16`
+for i in `seq 2 14`
do
echo "logleaves "$i