Start tweaking ruby files so that we can gather stats on this.

Author: skytreader

.gitignore

@@ -2,7 +2,6 @@ book/*
 deprecated/*
 web/*
 workspace/*
-src/*
 *.py~
 *.pyc
 */__pycache__/*

python/stat_runner.py

@@ -1,5 +1,13 @@
 #! /usr/bin/env python3
 
+"""
+This script assumes that all the demo scripts can be ran with a csv flag which
+will output the log trace as CSV (to stdout).
+
+It further assumes that the last line of the CSV output is some kind of
+description about the best solution arrived at.
+"""
+
 import subprocess
 import sys
 

src/algorithms/stochastic/iterated_local_search.rb

@@ -1,5 +1,4 @@
 # Iterated Local Search algorithm in the Ruby Programming Language
-
 # The Clever Algorithms Project: http://www.CleverAlgorithms.com
 # (c) Copyright 2010 Jason Brownlee. Some Rights Reserved. 
 # This work is licensed under a Creative Commons Attribution-Noncommercial-Share Alike 2.5 Australia License.
@@ -65,7 +64,7 @@ def perturbation(cities, best)
   return candidate
 end
 
-def search(cities, max_iterations, max_no_improv)
+def search(cities, max_iterations, max_no_improv, output_format="human")
   best = {}
   best[:vector] = random_permutation(cities)
   best[:cost] = cost(best[:vector], cities)
@@ -74,7 +73,11 @@ def search(cities, max_iterations, max_no_improv)
     candidate = perturbation(cities, best)
     candidate = local_search(candidate, cities, max_no_improv)
     best = candidate if candidate[:cost] < best[:cost]
-    puts " > iteration #{(iter+1)}, best=#{best[:cost]}"
+    if output_format == "csv" then
+        puts "#{(iter + 1)},#{best[:cost]}"
+    else # The default
+        puts " > iteration #{(iter+1)}, best=#{best[:cost]}"
+    end
   end
   return best
 end
@@ -93,7 +96,17 @@ def search(cities, max_iterations, max_no_improv)
   # algorithm configuration
   max_iterations = 100
   max_no_improv = 50
+
+  output_format = "human"
+  if $*.length >= 1 then
+    output_format = "csv"
+  end
+
   # execute the algorithm
-  best = search(berlin52, max_iterations, max_no_improv)
-  puts "Done. Best Solution: c=#{best[:cost]}, v=#{best[:vector].inspect}"
+  best = search(berlin52, max_iterations, max_no_improv, output_format)
+  if output_format == "csv" then
+    puts "#{best[:cost]},#{best[:vector].join(",")}"
+  else
+    puts "Done. Best Solution: c=#{best[:cost]}, v=#{best[:vector].inspect}"
+  end
 end