maketables,v

Lin-Kernighan heuristic for the TSP and minimum weight perfect matching

head	1.9;
access;
symbols
	zero-five-zero:1.9;
locks
	neto:1.9; strict;
comment	@# @;


1.9
date	99.01.08.21.56.37;	author neto;	state Exp;
branches;
next	1.8;

1.8
date	98.12.28.21.03.51;	author neto;	state Exp;
branches;
next	1.7;

1.7
date	98.12.28.18.17.53;	author neto;	state Exp;
branches;
next	1.6;

1.6
date	98.11.26.16.58.32;	author neto;	state Exp;
branches;
next	1.5;

1.5
date	98.11.21.22.35.10;	author neto;	state Exp;
branches;
next	1.4;

1.4
date	98.11.21.22.09.54;	author neto;	state Exp;
branches;
next	1.3;

1.3
date	98.11.21.20.38.09;	author neto;	state Exp;
branches;
next	1.2;

1.2
date	98.11.21.20.31.47;	author neto;	state Exp;
branches;
next	1.1;

1.1
date	98.11.21.20.31.10;	author neto;	state Exp;
branches;
next	;


desc
@Script for generating tables from table*in
@


1.9
log
@Added proper generated data processing
added uni wpm processing
@
text
@#! /bin/sh

# vim:set ts=8 sw=2:
s=../script/mktable.pl
myname=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.log
echo >>maketables.log
echo '$Id: maketables,v 1.8 1998/12/28 21:03:51 neto Exp neto $' >>maketables.log
date >>maketables.log


o=gen
for 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.8
log
@Lots 'o' stuff
Including added stuff for generated data
@
text
@d25 1
a25 1
echo '$Id: maketables,v 1.7 1998/12/28 18:17:53 neto Exp neto $' >>maketables.log
d115 5
a119 3
  for k in tsp wpm; do
    for g in dangle explode shake jitter infill cn cd; do
      file=table.$k.$g.out
d121 5
d127 27
a153 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` >$file
a154 1
  done
d156 2
@


1.7
log
@Added gr666 to TSPLIB roster
Added some WPM Ben handling
Added some condensation.
@
text
@d25 1
a25 1
echo '$Id: maketables,v 1.6 1998/11/26 16:58:32 neto Exp neto $' >>maketables.log
d28 2
d32 32
a63 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` >$file
a64 1
  done
d66 12
a77 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.out
d79 1
a79 1
      $s -t $t -l $b `grep -v '^#' table.tsp.tsplib.$n.in` >$file
d81 1
a81 1
  done
d83 7
d91 4
a94 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.out
d96 1
a96 1
      $s -t $t -l $b `grep -v '^#' table.tsp.ben.$n.in` >$file
a97 1
  done
d99 7
a105 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 $file
d107 6
a112 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
  done
a113 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
  done
d115 4
a118 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` >$file
d120 7
@


1.6
log
@Don't get spurious lines in output due to splitting a comment line
into  multiple argument words.
@
text
@d8 2
a9 1
# TSP unifbig
d11 1
a11 1
# TSP DSJR small	(yes)
d15 1
a15 1
# WPM unifbig
d17 1
a17 1
# WPM DSJR small	(yes)
d25 1
a25 1
echo '$Id: maketables,v 1.5 1998/11/21 22:35:10 neto Exp neto $' >>maketables.log
d41 13
d65 5
a69 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
#  done
d71 1
a71 1
  # TSP DSJR small
d75 1
a75 1
    file=table.tsp.dsjr.small.many.$b.$t.out
d79 1
d85 1
a85 1
  file=table.wpm.dsjr.small.optimal.$t.out
d87 9
a95 1
  $s -t $t -l optimal -b expt.wpm.dsjr  `grep -v '^#' table.wpm.dsjr.small.in` >$file
d97 1
a97 1
  # WPM Ben, TSPLIB
d102 1
a102 1
    $s -t $t -l optimal `grep -v '^#' table.wpm.$i.in` >$file
@


1.5
log
@Fixed shell looping bug
@
text
@d24 1
a24 1
echo '$Id: maketables,v 1.4 1998/11/21 22:09:54 neto Exp neto $' >>maketables.log
d36 1
a36 1
      $s -t $t -l $b `cat table.tsp.tsplib.$n.in` >$file
d46 1
a46 1
      $s -t $t -l $b `cat table.tsp.ben.$n.in` >$file
d56 1
a56 1
#      $s -t $t -l $b `cat table.tsp.ben.$n.in` >$file
d66 1
a66 1
    $s -t $t -l $b -b expt.tsp.dsjr.small `cat table.tsp.dsjr.in` >$file
d75 1
a75 1
  $s -t $t -l optimal -b expt.wpm.dsjr  `cat table.wpm.dsjr.small.in` >$file
d82 1
a82 1
    $s -t $t -l optimal `cat table.wpm.$i.in` >$file
d90 1
a90 1
#  $s -t $t -l optimal -b expt.wpm.dsjr  `cat table.wpm.dsjr.small.in` >$file
@


1.4
log
@Almost complete; only unifbig is missing
@
text
@d24 1
a24 1
echo $Id: maketables,v 1.3 1998/11/21 20:38:09 neto Exp neto $ >>maketables.log
d63 4
a66 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.3
log
@Added logging output
@
text
@d7 1
a7 1
# TSP TSPLIB	(yes)
d9 2
a10 2
# TSP Ben 	(yes)
# TSP DSJR
d13 1
a13 1
# WPM TSPLIB  	(yes)
d15 2
a16 2
# WPM Ben 	(yes)
# WPM DSJR	(yes)
d19 4
d24 1
a24 1
echo $Id$ >>maketables.log
d28 2
d50 23
a72 1
  # WPM DSJR small
d74 1
a74 1
  file=table.wpm.dsjr.optimal.small.$t.out
d76 1
a76 1
  $s -t $t -l optimal `cat table.wpm.dsjr.small.in` >$file
d78 2
a79 2
  # WPM Ben, TSPLIB, DSJR
  for i in ben dsjr tsplib; do
d85 9
@


1.2
log
@/bin/sh
@
text
@d2 1
d19 4
d28 3
a30 1
      $s -t $t -l $b `cat table.tsp.tsplib.$n.in` >table.tsp.tsplib.$n.$b.$t.out
d38 3
a40 1
      $s -t $t -l $b `cat table.tsp.ben.$n.in` >table.tsp.ben.$n.$b.$t.out
d46 3
a48 1
  $s -t $t -l optimal `cat table.wpm.dsjr.small.in` >table.wpm.dsjr.optimal.small.$t.out
d53 3
a55 1
    $s -t $t -l optimal `cat table.wpm.$i.in` >table.wpm.$i.optimal.$t.out
a59 1
# Need TSP DSJR
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1

@