From 33351ff0d4ecfb48e41b119d3d1d1e478d4afaae Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Wed, 3 May 2017 12:31:23 -0400 Subject: [PATCH] onerow: add table headers --- onerow/benchmark/generate_tables | 8 ++++---- onerow/benchmark/tables/gap.csv | 1 + onerow/benchmark/tables/speed.csv | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/onerow/benchmark/generate_tables b/onerow/benchmark/generate_tables index 7994cb4..7beed14 100755 --- a/onerow/benchmark/generate_tables +++ b/onerow/benchmark/generate_tables @@ -9,22 +9,22 @@ done echo " TABLE 1 " echo "--------------------------------------------------------------------------------" -printf "%s,%s,%s,%s,%s,%s,%s,%s,%s\n" instance cutsmir cutsw origgap mirperf wperf mircontrib wcontrib wimprov +printf "%s,%s,%s,%s,%s,%s,%s,%s,%s,%s\n" instance cutsmir cutsw origgap mirperf wperf mircontrib wcontrib wimprov wtime | tee 'tables/gap.csv' for i in out/*.yaml; do IN=${i/.yaml/} IN=${IN/out\//} printf "%s," $IN scripts/gap.rb $i -done | sort -t',' -nrsk 8 | sed -e 's/,$//g' | tee 'tables/gap.csv' +done | sort -t',' -nrsk 8 | sed -e 's/,$//g' | tee -a 'tables/gap.csv' echo echo echo " TABLE 2 " echo "--------------------------------------------------------------------------------" -printf "%s,%s,%s,%s,%s,%s\n" instance cutsmir cutsw mirt wedget avgm +printf "%s,%s,%s,%s,%s,%s\n" instance cutsmir cutsw mirt wedget avgm | tee 'tables/speed.csv' for i in out/*.yaml; do IN=${i/.yaml/} IN=${IN/out\//} printf "%s," $IN scripts/speed.rb $i -done | sort | sed -e 's/,$//g' | tee 'tables/speed.csv' +done | sort | sed -e 's/,$//g' | tee -a 'tables/speed.csv' diff --git a/onerow/benchmark/tables/gap.csv b/onerow/benchmark/tables/gap.csv index a1d0d64..0d65926 100644 --- a/onerow/benchmark/tables/gap.csv +++ b/onerow/benchmark/tables/gap.csv @@ -1,3 +1,4 @@ +instance,cutsmir,cutsw,origgap,mirperf,wperf,mircontrib,wcontrib,wimprov,wtime gmu-35-40.pre,27,508,0.01,0.07,9.94,0.74,99.26,9.88,77 eil33-2.pre,30,284,13.14,4.28,15.21,28.11,71.89,11.42,7439 mik-250-1-100-1.pre,100,961,19.65,53.52,73.44,72.87,27.13,42.86,7 diff --git a/onerow/benchmark/tables/speed.csv b/onerow/benchmark/tables/speed.csv index 026a5b5..99291e1 100644 --- a/onerow/benchmark/tables/speed.csv +++ b/onerow/benchmark/tables/speed.csv @@ -1,3 +1,4 @@ +instance,cutsmir,cutsw,mirt,wedget,avgm 30n20b8.pre,---,---,---,---,--- aflow40b.pre,---,---,---,---,--- app1-2.pre,---,---,---,---,---