head	1.9;access;symbols	zero-five-zero:1.9;locks	neto:1.9; strict;comment	@# @;1.9date	99.01.08.21.56.37;	author neto;	state Exp;branches;next	1.8;1.8date	98.12.28.21.03.51;	author neto;	state Exp;branches;next	1.7;1.7date	98.12.28.18.17.53;	author neto;	state Exp;branches;next	1.6;1.6date	98.11.26.16.58.32;	author neto;	state Exp;branches;next	1.5;1.5date	98.11.21.22.35.10;	author neto;	state Exp;branches;next	1.4;1.4date	98.11.21.22.09.54;	author neto;	state Exp;branches;next	1.3;1.3date	98.11.21.20.38.09;	author neto;	state Exp;branches;next	1.2;1.2date	98.11.21.20.31.47;	author neto;	state Exp;branches;next	1.1;1.1date	98.11.21.20.31.10;	author neto;	state Exp;branches;next	;desc@Script for generating tables from table*in@1.9log@Added proper generated data processingadded uni wpm processing@text@#! /bin/sh# vim:set ts=8 sw=2:s=../script/mktable.plmyname=MAKETABLE# TSP TSPLIB		(yes)    # need gr666# TSP unifbig           (yes)# TSP Ben 		(yes)# TSP DSJR      	(yes)# TSP clones# WPM TSPLIB  		(yes)# WPM unifbig		# WPM Ben 		(yes)# WPM DSJR small     	(yes)# WPM clones# WPM DSJR big		(toomuch time)# TSP DSJR big		(toomuch time)echo >>maketables.logecho >>maketables.logecho '$Id: maketables,v 1.8 1998/12/28 21:03:51 neto Exp neto $' >>maketables.logdate >>maketables.logo=genfor t in pct time; do    ##########TSP    # TSP TSPLIB    for b in hk hk-estimate optimal; do      for n in few many; do	echo $myname tsp.tsplib.$n.$b.$t	file=table.tsp.tsplib.$n.$b.$t.out	echo $file >>maketables.log	$s -t $t -l $b `grep -v '^#' table.tsp.tsplib.$n.in` >$file      done    done    # This is the gr666 stuff.      # I goofed when in defining the expt.tsp.tsplib.2 file by writing "optimal"    # for what was really the HK bound...    for b in optimal; do      for n in 2; do	echo $myname tsp.tsplib.$n.$b.$t	file=table.tsp.tsplib.$n.$b.$t.out	echo $file >>maketables.log	$s -t $t -l $b `grep -v '^#' table.tsp.tsplib.$n.in` >$file      done    done    # TSP Ben    for b in hka; do      for n in few; do	echo $myname tsp.ben.$n.$b.$t	file=table.tsp.ben.$n.$b.$t.out	echo $file >>maketables.log	$s -t $t -l $b `grep -v '^#' table.tsp.ben.$n.in` >$file      done    done    # TSP unifbig    echo $myname tsp.uni    file=table.tsp.uni.$t.out    echo $file >>maketables.log    $s -t $t -l hka `grep -v '^#' table.tsp.uni.in` >$file    perl condense.pl $file    # TSP DSJR     # (override with bounds file)    for b in hka; do      echo $myname tsp.dsjr.small.many.$b.$t      file=table.tsp.dsjr.$b.$t.out      echo $file >>maketables.log      $s -t $t -l $b -b expt.tsp.dsjr.small `grep -v '^#' table.tsp.dsjr.in` >$file    done    perl condense.pl $file    ##########WPM    # WPM DSJR     # (override with bounds file)    echo $myname wpm.dsjr.small    file=table.wpm.dsjr.optimal.$t.out    echo $file >>maketables.log    $s -t $t -l optimal -b expt.wpm.dsjr  `grep -v '^#' table.wpm.dsjr.in` >$file    # WPM TSPLIB    for i in tsplib; do      echo $myname WPM $i       file=table.wpm.$i.optimal.$t.out      echo $file >>maketables.log      $s -t $t -l optimal `grep -v '^#' table.wpm.$i.in` >$file    done    # WPM Ben    for i in ben tsplib; do      echo $myname WPM $i       file=table.wpm.$i.optimal.$t.out      echo $file >>maketables.log      $s -b expt.wpm.ben -t $t -l optimal `grep -v '^#' table.wpm.$i.in` >$file    done    # WPM unifbig     # (override with bounds file)  #  echo $myname wpm.dsjr.small  #  file=table.wpm.dsjr.small.optimal.$t.out  #  echo $file >>maketables.log  #  $s -t $t -l optimal -b expt.wpm.dsjr  `grep -v '^#' table.wpm.dsjr.small.in` >$file    # WPM UNI instances.    for i in uni; do      echo $myname WPM $i       file=table.wpm.$i.optimal.$t.out      echo $file >>maketables.log      $s -t $t -l optimal `grep -v '^#' table.wpm.$i.in` >$file    done    perl ./condense.pl $file   ############ Generated data  #  k=tsp; l=hka;#   for g in dangle explode shake jitter infill cn cd; do#     file=table.$k.$g.$t.out#     echo $file >>maketables.log#     $s -t $t -l $l -b expt.$k.gen.geo -b expt.$k.gen.nongeo -b expt.$k.gen2.geo `grep -v '^#' table.$k.$g.in` >$file#   done##   k=wpm; l=optimal;#    #for g in dangle explode shake jitter infill cn cd; do#    for g in cn; do#      file=table.$k.$g.$t.out#      echo $file >>maketables.log#      $s -t $t -l optimal -b expt.$k.gen.geo -b expt.$k.gen.nongeo -b expt.$k.gen2.geo `grep -v '^#' table.$k.$g.in` >$file#    done   k=wpm; l=optimal;    #for g in dangle explode shake jitter infill cn cd; do    for g in cn; do      file=table.$k.$g.special.$t.out      echo $file >>maketables.log      $s -t $t -l bestoftwenty -b expt.$k.gen.special `grep -v '^#' table.$k.$g.special.in` >$file    done  done@1.8log@Lots 'o' stuffIncluding added stuff for generated data@text@d25 1a25 1echo '$Id: maketables,v 1.7 1998/12/28 18:17:53 neto Exp neto $' >>maketables.logd115 5a119 3  for k in tsp wpm; do    for g in dangle explode shake jitter infill cn cd; do      file=table.$k.$g.outd121 5d127 27a153 5      $s -t $t -l optimal \	-b expt.$g.gen.geo \	-b expt.$g.gen.nongeo \	-b expt.$g.gen2.geo \	`grep -v '^#' table.$k.$g.in` >$filea154 1  doned156 2@1.7log@Added gr666 to TSPLIB rosterAdded some WPM Ben handlingAdded some condensation.@text@d25 1a25 1echo '$Id: maketables,v 1.6 1998/11/26 16:58:32 neto Exp neto $' >>maketables.logd28 2d32 32a63 8  ##########TSP  # TSP TSPLIB  for b in hk hk-estimate optimal; do    for n in few many; do      echo $myname tsp.tsplib.$n.$b.$t      file=table.tsp.tsplib.$n.$b.$t.out      echo $file >>maketables.log      $s -t $t -l $b `grep -v '^#' table.tsp.tsplib.$n.in` >$filea64 1  doned66 12a77 7  # This is the gr666 stuff.    # I goofed when in defining the expt.tsp.tsplib.2 file by writing "optimal"  # for what was really the HK bound...  for b in optimal; do    for n in 2; do      echo $myname tsp.tsplib.$n.$b.$t      file=table.tsp.tsplib.$n.$b.$t.outd79 1a79 1      $s -t $t -l $b `grep -v '^#' table.tsp.tsplib.$n.in` >$filed81 1a81 1  doned83 7d91 4a94 5  # TSP Ben  for b in hka; do    for n in few; do      echo $myname tsp.ben.$n.$b.$t      file=table.tsp.ben.$n.$b.$t.outd96 1a96 1      $s -t $t -l $b `grep -v '^#' table.tsp.ben.$n.in` >$filea97 1  doned99 7a105 16  # TSP unifbig  echo $myname tsp.uni  file=table.tsp.uni.$t.out  echo $file >>maketables.log  $s -t $t -l hka `grep -v '^#' table.tsp.uni.in` >$file  perl condense.pl $file  # TSP DSJR   # (override with bounds file)  for b in hka; do    echo $myname tsp.dsjr.small.many.$b.$t    file=table.tsp.dsjr.$b.$t.out    echo $file >>maketables.log    $s -t $t -l $b -b expt.tsp.dsjr.small `grep -v '^#' table.tsp.dsjr.in` >$file  done  perl condense.pl $filed107 6a112 15  ##########WPM  # WPM DSJR   # (override with bounds file)  echo $myname wpm.dsjr.small  file=table.wpm.dsjr.optimal.$t.out  echo $file >>maketables.log  $s -t $t -l optimal -b expt.wpm.dsjr  `grep -v '^#' table.wpm.dsjr.in` >$file  # WPM TSPLIB  for i in tsplib; do    echo $myname WPM $i     file=table.wpm.$i.optimal.$t.out    echo $file >>maketables.log    $s -t $t -l optimal `grep -v '^#' table.wpm.$i.in` >$file  donea113 7  # WPM Ben  for i in ben tsplib; do    echo $myname WPM $i     file=table.wpm.$i.optimal.$t.out    echo $file >>maketables.log    $s -b expt.wpm.ben -t $t -l optimal `grep -v '^#' table.wpm.$i.in` >$file  doned115 4a118 6  # WPM unifbig   # (override with bounds file)#  echo $myname wpm.dsjr.small#  file=table.wpm.dsjr.small.optimal.$t.out#  echo $file >>maketables.log#  $s -t $t -l optimal -b expt.wpm.dsjr  `grep -v '^#' table.wpm.dsjr.small.in` >$filed120 7@1.6log@Don't get spurious lines in output due to splitting a comment lineinto  multiple argument words.@text@d8 2a9 1# TSP unifbigd11 1a11 1# TSP DSJR small	(yes)d15 1a15 1# WPM unifbigd17 1a17 1# WPM DSJR small	(yes)d25 1a25 1echo '$Id: maketables,v 1.5 1998/11/21 22:35:10 neto Exp neto $' >>maketables.logd41 13d65 5a69 8#  for b in hka; do#    for n in few; do#      echo $myname tsp.ben.$n.$b.$t#      file=table.tsp.ben.$n.$b.$t.out#      echo $file >>maketables.log#      $s -t $t -l $b `grep -v '^#' table.tsp.ben.$n.in` >$file#    done#  doned71 1a71 1  # TSP DSJR smalld75 1a75 1    file=table.tsp.dsjr.small.many.$b.$t.outd79 1d85 1a85 1  file=table.wpm.dsjr.small.optimal.$t.outd87 9a95 1  $s -t $t -l optimal -b expt.wpm.dsjr  `grep -v '^#' table.wpm.dsjr.small.in` >$filed97 1a97 1  # WPM Ben, TSPLIBd102 1a102 1    $s -t $t -l optimal `grep -v '^#' table.wpm.$i.in` >$file@1.5log@Fixed shell looping bug@text@d24 1a24 1echo '$Id: maketables,v 1.4 1998/11/21 22:09:54 neto Exp neto $' >>maketables.logd36 1a36 1      $s -t $t -l $b `cat table.tsp.tsplib.$n.in` >$filed46 1a46 1      $s -t $t -l $b `cat table.tsp.ben.$n.in` >$filed56 1a56 1#      $s -t $t -l $b `cat table.tsp.ben.$n.in` >$filed66 1a66 1    $s -t $t -l $b -b expt.tsp.dsjr.small `cat table.tsp.dsjr.in` >$filed75 1a75 1  $s -t $t -l optimal -b expt.wpm.dsjr  `cat table.wpm.dsjr.small.in` >$filed82 1a82 1    $s -t $t -l optimal `cat table.wpm.$i.in` >$filed90 1a90 1#  $s -t $t -l optimal -b expt.wpm.dsjr  `cat table.wpm.dsjr.small.in` >$file@1.4log@Almost complete; only unifbig is missing@text@d24 1a24 1echo $Id: maketables,v 1.3 1998/11/21 20:38:09 neto Exp neto $ >>maketables.logd63 4a66 5      echo $myname tsp.dsjr.small.many.$b.$t      file=table.tsp.dsjr.small.many.$b.$t.out      echo $file >>maketables.log      $s -t $t -l $b -b expt.tsp.dsjr.small `cat table.tsp.dsjr.in` >$file    done@1.3log@Added logging output@text@d7 1a7 1# TSP TSPLIB	(yes)d9 2a10 2# TSP Ben 	(yes)# TSP DSJRd13 1a13 1# WPM TSPLIB  	(yes)d15 2a16 2# WPM Ben 	(yes)# WPM DSJR	(yes)d19 4d24 1a24 1echo $Id$ >>maketables.logd28 2d50 23a72 1  # WPM DSJR smalld74 1a74 1  file=table.wpm.dsjr.optimal.small.$t.outd76 1a76 1  $s -t $t -l optimal `cat table.wpm.dsjr.small.in` >$filed78 2a79 2  # WPM Ben, TSPLIB, DSJR  for i in ben dsjr tsplib; dod85 9@1.2log@/bin/sh@text@d2 1d19 4d28 3a30 1      $s -t $t -l $b `cat table.tsp.tsplib.$n.in` >table.tsp.tsplib.$n.$b.$t.outd38 3a40 1      $s -t $t -l $b `cat table.tsp.ben.$n.in` >table.tsp.ben.$n.$b.$t.outd46 3a48 1  $s -t $t -l optimal `cat table.wpm.dsjr.small.in` >table.wpm.dsjr.optimal.small.$t.outd53 3a55 1    $s -t $t -l optimal `cat table.wpm.$i.in` >table.wpm.$i.optimal.$t.outa59 1# Need TSP DSJR@1.1log@Initial revision@text@d1 1a1 1@