coderunner 0.12.7 → 0.12.8

data/VERSION

@@ -1 +1 @@
-0.12.7
+0.12.8

data/coderunner.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.12.7"
+  s.version = "0.12.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]
@@ -64,13 +64,15 @@ Gem::Specification.new do |s|
     "lib/coderunner/test.rb",
     "lib/coderunner/version.rb",
     "lib/cubecalccrmod.rb",
-    "lib/cubecalccrmod/cubecalc_defaults.rb",
+    "lib/cubecalccrmod/cubecalc.rb",
     "lib/cubecalccrmod/default_modlets/empty_defaults.rb",
+    "lib/cubecalccrmod/defaults_files/cubecalc_defaults.rb",
     "lib/cubecalccrmod/defaults_files/sleep_defaults.rb",
     "lib/cubecalccrmod/empty.rb",
     "lib/cubecalccrmod/sleep.rb",
     "test/cubecalc.cc",
     "test/helper.rb",
+    "test/old_test.rb",
     "test/test_coderunner.rb"
   ]
   s.homepage = "http://coderunner.sourceforge.net"

data/lib/coderunner.rb

@@ -111,7 +111,7 @@ eprint '.' unless $has_put_startup_message_for_code_runner
 load CodeRunner::SCRIPT_FOLDER + "/fortran_namelist.rb"
 eprint '.' unless $has_put_startup_message_for_code_runner
 
-CodeRunner::CODE_RUNNER_VERSION = Version.new(Gem.loaded_specs['coderunner'].version.to_s)
+CodeRunner::CODE_RUNNER_VERSION = Version.new(Gem.loaded_specs['coderunner'].version.to_s) rescue "test"
 
 CodeRunner::GLOBAL_BINDING = binding
 

data/lib/coderunner/class_methods.rb

@@ -630,7 +630,7 @@ EOF
 			set_class_defaults(copts)
 			copts[:running_remotely] = true
 		else
-			copts[:Y].gsub!(/~/, ENV['HOME']) if copts[:Y]
+			copts[:Y] = copts[:Y].gsub(/~/, ENV['HOME']) if copts[:Y]
 			Dir.chdir((copts[:Y] or Dir.pwd)) do
 				set_runner_defaults(copts)
 # 				ep DEFAULT_RUNNER_OPTIONS

data/lib/coderunner/instance_methods.rb

@@ -179,7 +179,8 @@ class CodeRunner
 		
 		@version= options[:version]
 # 		ep 'ex', @executable
-		@run_class = setup_run_class(@code, modlet: @modlet, version: @version, executable: @executable)
+		ep 'modlet is ', @modlet
+		get_run_class
 
 		@cache = {}
 		
@@ -201,6 +202,10 @@ class CodeRunner
 		@maxes = {}; @mins = {}
 		@cmaxes = {}; @cmins = {}
 	end
+
+	def get_run_class
+		@run_class = setup_run_class(@code, modlet: @modlet, version: @version, executable: @executable)
+	end
 	
 	# Read the default values of runner options from the constant hash <tt>CodeRunner::DEFAULT_RUNNER_OPTIONS</tt>. This hash usually contains options set from the command line, but it can have its values edited manually in a script.
 	# 
@@ -212,6 +217,7 @@ class CodeRunner
  				#ep DEFAULT_RUNNER_OPTIONS, @multiple_processes
 
 		read_folder_defaults
+		get_run_class
 	end
 	
 	# Increase the value of <tt>@max_id</tt> by 1.
@@ -344,10 +350,11 @@ class CodeRunner
 
 
 	def self.repair_marshal_run_class_not_found_error(err)
+	    #ep 'error', err, err.message
 			code, modlet = err.message.scan(/CodeRunner\:\:([A-Z][a-z0-9_]+)(?:::([A-Z]\w+))?/)[0]
 			#ep 'merror', err, code, modlet; gets
 			code.gsub!(/([a-z0-9])([A-Z])/, '\1_\2')
-			(modlet.gsub!(/([a-z0-9])([A-Z])/, '\1_\2'); modlet.downcase) if modlet	
+			(modlet.gsub!(/([a-z0-9])([A-Z])/, '\1_\2'); modlet.downcase!) if modlet	
 			setup_run_class(code.downcase, modlet: modlet)
 	end
 
@@ -487,7 +494,22 @@ class CodeRunner
 					#interrupted = false; 
 					#old_trap2 = trap(2){}
 					#old_trap2 = trap(2){eputs "Interrupt acknowledged...#{Dir.pwd} finishing folder analyis. Interrupt again to override (may cause file corruption)."; interrupted = true}
-				 	run = @run_class.new(self).process_directory #NB this doesn't always return an object of class run_class - since the run may actually be from a different code
+
+					# Here we make sure we are creating a run object of the right class for this folder
+					if FileTest.exist?('code_runner_info.rb') and File.read('code_runner_info.rb') =~ /Classname:.*?(?<class>[A-Z][\w:]+)/
+						classname = $~[:class]
+						begin 
+							run_cls = Object.recursive_const_get(classname)
+						rescue NameError=>err
+							ep err, err.message
+							self.class.repair_marshal_run_class_not_found_error(StandardError.new(classname))
+							run_cls = Object.recursive_const_get(classname)
+						end
+					else
+						run_cls = @run_class
+					end
+
+				 	run = run_cls.new(self).process_directory #NB this doesn't always return an object of class run_class - since the run may actually be from a different code
 					#trap(2, old_trap2)
 					#(eputs "Calling old interrupt #{Dir.pwd}"; Process.kill(2, 0)) if interrupted
 				rescue => err
@@ -934,9 +956,9 @@ Conditions contain a single = sign: #{conditions}
 # 		pp @run_list.values.map{|run| run.instance_variables.map{|var| [var, run.instance_variable_get(var).class]}}
 		
 		generate_combined_ids
-		@combined_run_list.each{|id, run| run.runner = nil}
+		@combined_run_list.each{|id, run| run.runner = nil; run.phantom_runs.each{|pr| pr.runner=nil} if run.phantom_runs}
 		File.open(@root_folder + "/.CODE_RUNNER_TEMP_RUN_LIST_CACHE", 'w'){|file| file.puts Marshal.dump @run_list}
-		@combined_run_list.each{|id, run| run.runner = self}
+		@combined_run_list.each{|id, run| run.runner = self; run.phantom_runs.each{|pr| pr.runner=self} if run.phantom_runs}
 	end
 
 	# Self-explanatory! Call CodeRunner::Run#process_directory for every run whose status is not either :Complete or :Failed. (Note, for historical reasons traverse_directories is called rather than CodeRunner::Run#process_directory directly but the effect is nearly the same).

data/lib/coderunner/run.rb

@@ -331,7 +331,7 @@ def results_file
 # ID:		#{@id}
 
 # Results:
-#{(rcp.results+rcp.run_info).inject({}){|hash, (var,type_co)| hash[var] = send(var); hash}.pretty_inspect}
+#{(rcp.results+rcp.run_info - [:phantom_runs]).inject({}){|hash, (var,type_co)| hash[var] = send(var); hash}.pretty_inspect}
 
 # <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 EOF
@@ -359,6 +359,7 @@ def save
 	runner, @runner = @runner, nil
 	@system_triers, old_triers = nil, @system_triers
 	@phantom_runs.each{|run| run.runner = nil} if @phantom_runs
+	#@phantom_runs.each{|run| run.runner = nil} if @phantom_runs
 # 	logi(self)
 	Dir.chdir(@directory){File.open(".code_runner_run_data", 'w'){|file| file.puts Marshal.dump(self)}}
 	@runner = runner
@@ -409,13 +410,15 @@ end
 # Return the folder where the default defaults file is located.
 
 def defaults_location
-	if @runner.defaults_file
+	#if @runner.defaults_file
 		location = [rcp.user_defaults_location, rcp.code_module_folder	+ "/defaults_files"].find{|folder| FileTest.exist? folder and Dir.entries(folder).include? defaults_file_name}
-		raise "Defaults file: #{defaults_file_name} not found" unless location
-		return location
-	else
-		return "#{SCRIPT_FOLDER}/code_modules/#@code"
-	end
+		#raise "Defaults file: #{defaults_file_name} not found" unless location
+		raise "Can't find defaults_file #{defaults_file_name} in #{[rcp.user_defaults_location, rcp.code_module_folder	+ "/defaults_files"].join(',')}." unless location
+		location
+		#return location
+	#else
+		#location = [rcp.user_defaults_location, rcp.code_module_folder	+ "/defaults_files"].find{|folder| FileTest.exist? folder and Dir.entries(folder).include? defaults_file_name}
+	#end
 end
 
 # Return true if the run is completed, false otherwise
@@ -680,7 +683,7 @@ def info_file
 # #{@job_no ? "Job_No:		#{@job_no}" : ""}
 
 # Parameters:
-#{(rcp.variables + rcp.run_info + [:version, :code, :modlet, :sys]).inject({}){|hash, var| hash[var] = send(var) unless (!send(var) and send(var) ==  nil); hash}.pretty_inspect}
+#{(rcp.variables + rcp.run_info + [:version, :code, :modlet, :sys] - [:phantom_runs]).inject({}){|hash, var| hash[var] = send(var) unless (!send(var) and send(var) ==  nil); hash}.pretty_inspect}
 
 
 # Actual Command:
@@ -766,6 +769,19 @@ def self.check_and_update
 		end
 		
 		@readout_list = (rcp.variables+rcp.results) unless rcp.readout_list
+
+		raise "
+
+Please add the line 
+
+-----------------------------------------------------------
+@code_module_folder = folder = File.dirname(File.expand_path(__FILE__)) # i.e. the directory this file is in
+---------------------------------------------------------
+
+to your code module.
+		
+		" unless rcp.code_module_folder
+
 # 		(variables+results).each{|v| const_get(:READOUT_LIST).push v} unless READOUT_LIST.size > 0
 
 		#if rcp.variables_0_5_0

data/lib/coderunner/system_modules/generic_linux.rb

@@ -48,7 +48,9 @@ def execute
     pid = File.read(fname + '.pid').to_i
     FileUtils.rm fname + '.pid'
   else
-    pid = Kernel.spawn(run_command + " & ")
+    #pid = Kernel.spawn(run_command + " ")
+    system run_command
+		pid = -1
   end
   
 #   require 'rbconfig'

data/lib/coderunner/version.rb

@@ -24,4 +24,8 @@ class Version
   def to_s
     @major.to_s + "." + @feature_group.to_s + "." + @feature.to_s + "." + @bugfix.to_s
   end
+
+	def inspect
+		"#{self.class}.new('#{to_s}')"
+	end
 end

data/lib/cubecalccrmod.rb

@@ -1,106 +1 @@
-class CodeRunner
-	class Cubecalc < Run
-		
-# @code = 'cubecalc'
-
-@variables = [:calculate_sides, :width, :height, :depth, :area]
-
-@naming_pars = [:width]
-
-@results = [:volume, :sides]
-
-# e.g. number of iterations
-
-@run_info = [:phantom_run_description]
-
-# @@executable_name = 'cubecalc'
-
-@code_long = "Cube Volume Calculator"
-
-@excluded_sub_folders = []
-
-@defaults_file_name = "cubecalc_defaults.rb"
-
-@modlet_required = true
-
-@uses_mpi = false
-
-def process_directory_code_specific
-	if @running
-		@status = :Incomplete
-	else
-		if FileTest.exist? 'results.txt'
-			@status = :Complete
-			@volume = File.readlines('results.txt')[0].scan(LongRegexen::FLOAT)[0][0].to_f
-		else
-			@status = :Failed
-		end
-		@sides = []
-		if FileTest.exist? 'sides.txt'
-			File.read('sides.txt').scan(Regexp.new("is\\s*" + LongRegexen::FLOAT.verbatim + "$")){@sides.push $~[:float].to_f}
-		end
-	end
-end
-
-def print_out_line
-	if @is_phantom
-		if @phantom_run_description == :area
-			return sprintf("%d:%d %30s %10s %f %s", @id, @job_no, @run_name, @status, (@volume or 0.0), @area.to_s)
-		else
-			raise 'there is only one phantom_run_description at the moment'
-		end
-	else
-		return sprintf("%d:%d %30s %10s %f %s", @id, @job_no, @run_name, @status, (@volume or 0.0), @sides.to_s)
-	end
-end
-
-def parameter_string
-	return sprintf("%d %s", @calculate_sides, 'edges.txt')
-end
-
-def generate_input_file
-	File.open('edges.txt', 'w') do |file|
-		file.puts @width
-		file.puts @height
-		file.puts @depth
-	end
-end
-# @run_class.variables.keys[0]
-def parameter_transition(run)
-end
-
-def executable_location
-	@runner.script_folder + '/test_suite'
-end
-	
-
-def generate_phantom_runs
-	return unless @sides
-	@sides.each do |area|
-# 		puts 'creating phantom: ' + @run_name
-		phantom = create_phantom
-		phantom.area = area
-		phantom.phantom_run_description = :area
-	end
-end
-
-def graphkit(name, options)
-	case name
-	when /sides/
-# 		x = AxisKit.autocreate({data: ["'width'", "'depth'", "'height'"], name: 'Properties'})
-		x = GraphKit::AxisKit.autocreate({data: sides, title: "Areas of the Sides:  #@run_name"})
-# 		x.range = [0, x.data.max]
-		kit = GraphKit.autocreate({x: x})
-		kit.style = 'data histograms'
-		kit.file_name = 'inputs'
-# 		kit.with = 'histogram clustered'
-		return kit
-	else
-		raise 'Unknown graph'
-	end
-end
-		
-		
-	end
-end
-
+require 'cubecalccrmod/cubecalc'

data/lib/cubecalccrmod/cubecalc.rb

@@ -0,0 +1,108 @@
+class CodeRunner
+	class Cubecalc < Run
+		
+# @code = 'cubecalc'
+
+@variables = [:calculate_sides, :width, :height, :depth, :area]
+
+@naming_pars = [:width]
+
+@results = [:volume, :sides]
+
+# e.g. number of iterations
+
+@run_info = [:phantom_run_description]
+
+# @@executable_name = 'cubecalc'
+
+@code_long = "Cube Volume Calculator"
+
+@excluded_sub_folders = []
+
+@defaults_file_name = "cubecalc_defaults.rb"
+
+@modlet_required = true
+
+@uses_mpi = false
+
+@code_module_folder = folder = File.dirname(File.expand_path(__FILE__)) # i.e. the directory this file is in
+
+def process_directory_code_specific
+	if @running
+		@status = :Incomplete
+	else
+		if FileTest.exist? 'results.txt'
+			@status = :Complete
+			@volume = File.readlines('results.txt')[0].scan(LongRegexen::FLOAT)[0][0].to_f
+		else
+			@status = :Failed
+		end
+		@sides = []
+		if FileTest.exist? 'sides.txt'
+			File.read('sides.txt').scan(Regexp.new("is\\s*" + LongRegexen::FLOAT.verbatim + "$")){@sides.push $~[:float].to_f}
+		end
+	end
+end
+
+def print_out_line
+	if @is_phantom
+		if @phantom_run_description == :area
+			return sprintf("%d:%d %30s %10s %f %s", @id, @job_no, @run_name, @status, (@volume or 0.0), @area.to_s)
+		else
+			raise 'there is only one phantom_run_description at the moment'
+		end
+	else
+		return sprintf("%d:%d %30s %10s %f %s", @id, @job_no, @run_name, @status, (@volume or 0.0), @sides.to_s)
+	end
+end
+
+def parameter_string
+	return sprintf("%d %s", @calculate_sides, 'edges.txt')
+end
+
+def generate_input_file
+	File.open('edges.txt', 'w') do |file|
+		file.puts @width
+		file.puts @height
+		file.puts @depth
+	end
+end
+# @run_class.variables.keys[0]
+def parameter_transition(run)
+end
+
+#def executable_location
+	#@runner.script_folder + '/test_suite'
+#end
+	
+
+def generate_phantom_runs
+	return unless @sides
+	@sides.each do |area|
+# 		puts 'creating phantom: ' + @run_name
+		phantom = create_phantom
+		phantom.area = area
+		phantom.phantom_run_description = :area
+	end
+end
+
+def graphkit(name, options)
+	case name
+	when /sides/
+# 		x = AxisKit.autocreate({data: ["'width'", "'depth'", "'height'"], name: 'Properties'})
+		x = GraphKit::AxisKit.autocreate({data: sides, title: "Areas of the Sides:  #@run_name"})
+# 		x.range = [0, x.data.max]
+		kit = GraphKit.autocreate({x: x})
+		kit.style = 'data histograms'
+		kit.file_name = 'inputs'
+# 		kit.with = 'histogram clustered'
+		return kit
+	else
+		raise 'Unknown graph'
+	end
+end
+		
+		
+	end
+end
+

data/test/old_test.rb

@@ -0,0 +1,472 @@
+require 'coderunner'
+require 'test/unit'
+
+module Test::Unit::Assertions
+	def assert_system(string)
+		assert(system(string), "System Command: '#{string}'")
+	end
+end
+
+`g++ cubecalc.cc -o cubecalc`
+
+
+ppipe = PPipe.new(10, false, redirect: true)
+
+raise "Please Specify Tests" unless ARGV[-1] 
+
+# CodeRunner::SYS = (ENV['CODE_RUNNER_SYSTEM'] or 'genericlinux')
+
+if ARGV[-1] =~ /0/
+	if FileTest.exist? 'results'
+		FileUtils.rm_r 'results'
+	end
+	FileUtils.makedirs 'results'
+
+	Dir.chdir('results') do
+		
+		puts 'testing test submission'	
+		exit unless system %[ruby ../lib/coderunner.rb submit -C cubecalc -m sleep -D sleep -X ../cubecalc -T]
+		raise "didn't find defaults" unless FileTest.exist? 'sleep_defaults.rb'
+		puts 'testing test submission complete'
+		
+		puts 'testing job_no detection'
+		puts fork{system %[ruby ../lib/coderunner.rb sub -p "{sleep_time: 4}"]}
+		sleep 2
+		#exit unless system %[ps | grep cubecalc]
+		Process.waitall
+		puts 'testing job_no detection complete'
+		
+	 		#exit
+
+		
+		puts 'testing canceling a job (not deleting)'
+		fork{system %[ruby ../../coderunner.rb sub -p "{sleep_time: 900}"]}
+		sleep 3
+		fork{system %[ruby ../../coderunner.rb sub -p "{sleep_time: 900, height: 3.0}"]}
+		sleep 4
+		runner = CodeRunner.new(Dir.pwd).update	
+		runner.print_out(0)
+		runner.print_out_size = 0
+		runner.cancel_job(2, no_confirm: true, delete: false)
+		#pipe = ppipe.fork do
+			#runner.cancel_job(2)
+		#end
+	 	##3.times{puts ppipe.gets}
+		#2.times{ppipe.puts(pipe, "")}
+		#puts 'confirming...'
+	## 	sleep 0.5
+	 	##2.times{puts ppipe.gets}
+		#puts 'about to say no'
+		#ppipe.puts(pipe, "n")
+	## 	9.times{puts ppipe.gets}
+		
+	 	#exit
+		
+		puts 'testing cancelling with deleting'
+		
+		runner.update
+		runner.print_out(0)
+		runner.print_out_size = 0
+		runner.cancel_job(3, no_confirm: true, delete: true)
+		#pipe = ppipe.fork do
+				#runner.cancel_job(3)
+		#end
+	## 	2.times{puts ppipe.gets}
+		#puts 'confirming...'
+		#ppipe.puts(pipe, "")
+	## 	ppipe.puts(pipe, "\n")
+	## 	sleep 0.5
+	## 	2.times{puts ppipe.gets}
+		#puts 'about to say yes'
+		#ppipe.puts(pipe, "y")
+	## 	8.times{puts ppipe.gets}
+
+		puts 'testing canceling complete'
+		
+	 	#exit
+
+	# exit
+		
+		puts
+			puts 'testing parameter scan'
+		File.open('parameter_scan.rb', 'w') do |file|
+			file.puts [
+				[
+					['width', [0.3, 0.5]], ['height', [0.5, 4.3]]
+				],
+				[
+					['width', [7.2]], ['height', [3.6, 12.6]]
+				]
+			].inspect
+		end
+		exit unless system %[ruby ../../coderunner.rb ps parameter_scan.rb]
+	# # 	exit unless system %[ruby ../../coderunner.rb -UN -O "width height"]
+		runner.update
+		runner.print_out(0)
+		
+
+		
+	# exit
+	# 	
+	end
+
+end # if ARGV[0] == 's'
+
+# exit
+	
+
+
+if ARGV[-1] =~ /1/
+FileUtils.rm_r 'results' if FileTest.exist? 'results'
+FileUtils.makedirs 'results'
+
+# CodeRunner::SYS = ENV['CODE_RUNNER_SYSTEM'] = 'genericlinux_testsystem' if CodeRunner::SYS == 'genericlinux'
+
+Dir.chdir('results') do
+
+
+		exit unless system %[ruby ../../coderunner.rb submit -C cubecalc -m empty -X ../cubecalc -T]
+	
+	defs = File.read('cubecalc_defaults.rb')
+	File.open('cubecalc_defaults.rb', 'w'){|f| f.puts defs.sub(/(sides\s+=\s+)0/, '\11')}
+	
+	puts 'testing submission with -p flag'	
+
+	exit unless system %[ruby ../../coderunner.rb submit -p "{width: 3.0,  height: 8.0}"]
+	raise "didn't find defaults" unless FileTest.exist? 'cubecalc_defaults.rb'
+	puts 'testing submission with -p flag complete'	
+# 	exit
+	
+	puts 'testing printing out status'
+	exit unless system %[ruby ../../coderunner.rb status -N]
+	puts 'that should have raised a TerminalError from print_out'
+	ENV['ROWS'] = Terminal.terminal_size[0].to_s 
+	ENV['COLS'] = Terminal.terminal_size[1].to_s
+	puts ENV['ROWS'], ENV['COLS']
+ 	exit unless system %[ruby ../../coderunner.rb st -N]
+	runner = CodeRunner.new(Dir.pwd).update
+	runner.print_out(0)
+	puts 'testing printing out status complete' 
+
+	puts 'testing using large cache'
+	%x[ruby ../../coderunner.rb sub -p "{width: 3.0, height: 6.0}"]
+	%x[ruby ../../coderunner.rb sub -p "{width: 3.0, height: 9.0}"]
+	puts "using large cache without updating"
+	runner.use_large_cache = true
+	runner.update.print_out(0)
+	puts 'using large cache after updating'
+	runner.update
+	runner.use_large_cache = true
+	runner.update.print_out(0)
+	puts 'testing using large cache complete'
+	
+	puts 'testing sorting'
+	%x[ruby ../../coderunner.rb sub -p "{width: 12.0, height: 9.0}"]
+	%x[ruby ../../coderunner.rb sub -p "{width: 5.0, height: 6.0}"]
+	puts '----', 'unsorted'
+ 	exit unless system %[ruby ../../coderunner.rb st -N]
+	puts '----', 'sort by volume'
+ 	exit unless system %[ruby ../../coderunner.rb st -O "volume" -N]
+	puts '----','sort by width then by height'
+ 	exit unless system %[ruby ../../coderunner.rb st -O "width;height" -N]
+	puts 'testing sorting complete'
+	
+	puts 'testing getting directory'
+	exit unless system %[ruby ../../coderunner.rb dir 3 -UN ]
+	puts 'testing getting directory complete'
+	
+	puts 'testing filtering'
+	puts '----', 'height == 9.0'
+ 	exit unless system %[ruby ../../coderunner.rb st -UNf "height == 9.0"]
+	puts '----', 'id == 1 or width == 12.0'
+	exit unless system %[ruby ../../coderunner.rb st -UNf 'id == 1 or width == 12.0']
+	puts 'testing filtering complete'
+
+# 	exit
+		
+	puts 'testing phantom runs'
+ 	exit unless system %[ruby ../../coderunner.rb st -UN -h -O "volume;area"]
+	puts 'testing using both'
+ 	exit unless system %[ruby ../../coderunner.rb st -UN -h both -O "volume;id"]
+	puts 'testing phantom runs complete'
+	
+	puts 'testing readout'
+ 	exit unless system %[ruby ../../coderunner.rb ro -UN -O "width;height"]
+	puts 'testing readout complete'
+	
+	puts 'testing run eval'
+	exit unless system %[ruby ../../coderunner.rb rc "puts %[hello I am run \#\@run_name]" -U -f "id ==1" ]
+	puts  'testing run eval complete'
+	
+	puts 'testing graph plotting'
+	exit unless system %[ruby ../../coderunner.rb sub -p "{width: 11.0, height: 9.0, depth: 2.0}"]
+
+# 	IO.popen(%[ruby ../../coderunner.rb -U -g "width*height*depth:volume"]) do |pipe|
+# 		sleep 1
+# 		pipe.puts
+# 	end
+	exit unless system %[ruby ../../coderunner.rb wg graph.ps -O volume -G "width*height*depth:volume"]
+	exit unless system %[ruby ../../coderunner.rb wg graph1.ps -U -O volume -G "width:height:depth:volume;;;height"]
+	exit unless system %[ruby ../../coderunner.rb wg "" -U -f "id==1 or id == 2" -g "sides"]
+	puts 'testing graph plotting complete'
+	
+	puts 'testing max'
+	exit unless system %[ruby ../../coderunner.rb st -U -f "max(:volume)"]
+	exit unless system %[ruby ../../coderunner.rb st -U -f "width == 3.0 and smax(:volume, :height)"]
+	puts 'testing max complete'
+	
+	
+	
+
+	
+
+
+# 	
+# # 	puts 'testing interactive mode'	
+# # 	IO.popen(%[ruby ../../coderunner.rb -i]) do |pipe|
+# #  		pipe.puts 'cr'
+# # 		pipe.puts 'exit'
+# #  	end
+# # 	puts 'testing interactive mode'	
+
+end #  Dir.chdir
+
+end # if 
+
+p ARGV[-1] =~ /2/
+
+if ARGV[-1] =~ /2/
+
+	FileUtils.rm_r 'results' if FileTest.exist? 'results'
+	FileUtils.makedirs 'results'
+	
+	CodeRunner.submit(Y: Dir.pwd + '/results', C: 'cubecalc', m: 'empty', X: '../cubecalc', T: true)
+# 	exit
+	defs = File.read('results/cubecalc_defaults.rb')
+	File.open('results/cubecalc_defaults.rb', 'w'){|f| f.puts defs.sub(/\#(@calculate_sides\s+=\s+)0/, '\11')}
+	CodeRunner.submit(Y: Dir.pwd + '/results', p: "{width: 3.0,  height: 8.0}")
+	CodeRunner.submit(Y: Dir.pwd + '/results', p: "{width: 3.0, height: 6.0}")
+	CodeRunner.submit(Y: Dir.pwd + '/results', p: "{width: 3.0,  height: 9.0}")
+	CodeRunner.submit(Y: Dir.pwd + '/results', p: "{width: 12.0,  height: 9.0}")
+	CodeRunner.submit(Y: Dir.pwd + '/results', p: "{width: 5.0,  height: 6.0}")
+	CodeRunner.submit(Y: Dir.pwd + '/results', p: "{width: 11.0, height: 9.0, depth: 2.0}")
+
+	class TestCodeRunner < Test::Unit::TestCase
+		
+		# Override this method as we want the tests to be run in the order they are defined
+		
+		def self.test_methods
+					public_instance_methods(true).grep(/^test/).map { |m| m.to_s}
+		end
+		
+		def setup
+			@runner = CodeRunner.fetch_runner(Y: Dir.pwd + '/results').update		
+		end
+		
+		def teardown
+		end
+		
+		def cl(command)
+			Dir.chdir('results'){assert_system command}
+		end
+
+		def cl2(command)
+			Dir.chdir('results3'){assert_system command}
+		end
+
+		
+		def cl3(command)
+			Dir.chdir('results3'){assert_system command}
+		end
+
+		
+		#def test_remote_coderunner
+			#puts 'testing remote coderunner'
+			#rc = RemoteCodeRunner.new(ENV['USER'] + '@localhost', Dir.pwd + '/results', U: true, N: true).update
+			#assert_equal(@runner.ids.sort, rc.ids.sort)
+			#rc.print_out(0)
+			#wdvh = rc.graphkit("width:height:depth:volume;;;height")
+			#wdvh.gnuplot
+			#assert_equal(4, wdvh.naxes)
+			#assert_equal(1, wdvh.data.size)
+			#assert_equal([30.0, 18.0, 24.0, 108.0, 27.0, 198.0], wdvh.data[0].axes[:f].data)
+			#sds = rc.run_graphkit('sides;;[1,2].include? id')
+	## 		sds.gnuplot
+			#wdvh.close
+			#puts 'testing remote coderunner complete'
+		#end
+		
+		#def test_run_eval_saving
+			#puts "\nTesting run command saving"
+			#cl(%[ruby ../../coderunner.rb rc '@test_var = :will_o_the_wisp' -U])
+			#@runner.update(false, true)
+			#assert_equal(:will_o_the_wisp, @runner.run_list[1].instance_variable_get(:@test_var))
+			#cl(%[ruby ../../coderunner.rb rc '@test_var2 = :will_o_the_wisps' -U -M 3])
+			
+			#@runner.update(false, true)
+			#assert_equal(:will_o_the_wisps, @runner.run_list[1].instance_variable_get(:@test_var2))
+			#puts 'finished testing run command saving'
+		#end
+		
+		#def test_relative_directory
+			#puts "\nTesting relative directory"
+			#@runner.recalc_all = true
+			#puts 'updating fully'
+			#@runner.update #(true, false)
+			#FileUtils.rm_r('results2') if FileTest.exist? 'results2'
+			#FileUtils.cp_r('results', 'results2')
+			#r = CodeRunner.fetch_runner(Y: 'results2', U: true)
+			#r.update(false)
+			#assert_equal(Dir.pwd + '/results', @runner.root_folder)
+			#assert_equal(Dir.pwd + '/results2', r.root_folder)
+			#assert_equal(@runner.run_list[1].directory.sub(File.expand_path(@runner.root_folder) + '/', ''), r.run_list[1].relative_directory)
+			#assert_equal(r.root_folder + '/' + r.run_list[1].relative_directory, r.run_list[1].directory)
+		#end
+		
+		#def test_set_start_id
+			#eputs "\ntesting set_start_id"
+			#FileUtils.rm_r 'results3' if FileTest.exist?('results3')
+			#FileUtils.mkdir('results3')
+			#cl3('ruby ../../coderunner.rb st -C cubecalc -m empty -X ../cubecalc -T')
+			#cl3("ruby ../../coderunner.rb ev 'set_start_id(20)'")
+			#cl3('ruby ../../coderunner.rb sub -p "{width: 12.0, height: 9.0}"')
+			#@runner3 = CodeRunner.new(Dir.pwd + '/results3').update
+			#assert_equal(20, @runner3.start_id)
+			#assert_equal(21, @runner3.max_id)
+			#eputs "\ntesting set_start_id complete"
+		#end
+
+		#def test_merged_code_runner
+			#@runner3 = CodeRunner.new(Dir.pwd + '/results3').update
+			#assert_nothing_raised{@mrunner = CodeRunner::Merged.new(@runner, @runner3)}
+			#@mrunner.print_out(0)
+			#assert_equal(@runner.run_list.size + 1, @mrunner.run_list.size)
+			#@mrunner2 = @runner.merge(@runner3)
+			#assert_equal(@mrunner2.run_list.keys, @mrunner.run_list.keys)
+		#end
+		
+		#def test_alter_ids
+			#FileUtils.rm_r('results4') if FileTest.exist? 'results4'
+			#FileUtils.cp_r('results', 'results4')
+			#@runner4 = CodeRunner.new(Dir.pwd + '/results4').update
+			#@runner4.alter_ids(40, no_confirm: true)
+			#@runner4a = CodeRunner.new(Dir.pwd + '/results4').update
+			#assert_equal(@runner.ids.map{|id| id + 40}.sort, @runner4.ids.sort)
+			#assert_equal(@runner4a.ids.sort, @runner4.ids.sort)
+			#@runner4.alter_ids(40, no_confirm: true)
+			#@runner4a.update
+			#assert_equal(@runner.ids.map{|id| id + 80}.sort, @runner4.ids.sort)
+			#assert_equal(@runner4a.ids.sort, @runner4.ids.sort)
+			#run = @runner4.run_list.values[0]
+			#assert(FileTest.exist?(run.directory), "Run directory exists")
+			#assert_equal(run.id, eval(File.read(run.directory + '/code_runner_info.rb'))[:id])
+		#end
+		
+		#def test_submit_non_parallel_with_large_cache
+			#FileUtils.touch('results/submitting')
+	## 		fork{cl('ruby ../../coderunner.rb sub -p "{width: 1.887, height: 9.0}"')}
+			#fork{CodeRunner.submit(Y: 'results', p: "{width: 1.887, height: 9.0}", U: true)}
+			#sleep 1.0
+			#@runner.update(true, false)
+			#assert_equal(0, @runner.run_list.values.find_all{|run| run.width==1.887}.size)
+			#FileUtils.rm('results/submitting')
+			#i = 0
+			#Process.waitall
+	## 		(@runner.update(true, true); sleep 0.5; i+=1 ; flunk if i==20) until @runner.run_list.values.find{|run| run.width==1.887}
+			#@runner.update(true, true)
+			#assert_equal(1, @runner.run_list.values.find_all{|run| run.width==1.887}.size)
+			#@runner.conditions = "id==7"
+			#@runner.destroy(no_confirm: true)
+			#assert_equal(0, @runner.run_list.values.find_all{|run| run.width==1.887}.size)
+			#assert_raise(RuntimeError){CodeRunner.submit(Y: 'results', p: "{run_test_flags: {test_submit_error_handling: true}}", U: true)}
+			#assert(!FileTest.exist?('results/submitting'))
+		#end
+		
+		def test_latex_graphkit
+			sds = @runner.run_graphkit('sides;;[1,2].include? id')
+ 			p sds
+			sds.ylabel = 'Hello'
+			sds.data.each_with_index{|dk,i| dk.title = i.to_s}
+			sds.xlabel = '\(\Gamma_{\epsilon}\)'
+			sds.title = 'Area of the Sides'
+			#pid1 = sds.gnuplot
+
+			sds.gnuplot_write('latgraph.eps', latex: true)
+			#pid = forkex "okular latgraph.eps"
+			sleep 3
+			#Process.kill 'TERM', pid
+			#Process.kill 'TERM', pid1
+		end
+		
+		def test_graphkit_multiplot
+			
+			######################
+			# Make 3 random graphs
+			######################
+			
+			
+			# As usual, data can be an array or a GSL::Vector
+			kit1 = GraphKit.autocreate(x: {data: [0,2,4], title: 'A label with latex \(\Gamma_\epsilon \chi\)', units: '\(\nu e\)'}, y: {data: [3.3, 5.5, 10], title: 'Label with latex \(\beta\)', units: '\(v_{thi}\)'})
+			kit1.title = 'First Graph'
+			kit1.gp.label = '\'A label\' at 2,7' # This 'gp' syntax is new. You can set pretty much any gnuplot option like this - see gnuplot help set
+			kit1.data[0].title = 'A new title'
+			
+			kit2 = GraphKit.autocreate(x: {data: [0,2,4], title: 'Stuff \(\Gamma_\epsilon \chi\)', units: '\(\nu e\)'}, y: {data: [2, -1, 2], title: 'Some \(\beta\)', units: '\(v_{thi}\)'})
+			kit2.title = 'Second Graph'
+			kit2.data[0].gp.with = 'lp linewidth 6' # See gnuplot help plot for data options
+			kit2.gp.key = 'off'
+			kit2.xlabel = 'A NEW XLABEL'
+			
+			kit3 = GraphKit.autocreate(x: {data: [0,5,10], title: 'Mouse Height \(\Gamma_\epsilon \chi\)', units: '\(\nu e\)'}, y: {data: [4, 3, 4], title: 'Mouse weight \(\kappa\)', units: '\(v_{thi}\)'})
+			kit3.title = 'Mouse info'
+			kit3.data[0].gp.with = 'lp'
+			kit3.gp.key = 'off'
+			
+			#####################
+			# Plot a single one
+			#####################
+			
+			kit1.gnuplot_write('first_graph.eps', latex: true) #Just plot it by itself
+			
+			###########################
+			# Plot multiple graphs
+			##########################
+
+			kit1.gnuplot_write('aname.eps', latex: true)
+			kit2.gnuplot_write('anothername.eps', latex: true)
+			kit3.gnuplot_write('athirdname.eps', latex: true, size: "2.0in,2.0in")
+			
+			my_preamble = <<EOF
+	\\documentclass{article}
+	%\documentclass[aip,reprint]{}
+	\\usepackage{graphics,bm,overpic,subfigure,color}
+
+	\\pagestyle{empty}
+	\\begin{document}
+	\\begin{figure}
+EOF
+			
+			
+			# Can use default preamble - just don't include preamble option in function call GraphKit.latex_multiplot('all_graphs.eps')
+			GraphKit.latex_multiplot('all_graphs.eps', preamble: my_preamble) do 
+<<EOF
+	\\subfigure{
+	\\includegraphics{aname}
+	}
+	\\subfigure{
+	\\begin{overpic}{anothername}
+				% The location is in percent of image width
+	\\put(44,22){\\includegraphics[scale=.45]
+				{athirdname}}
+	\\end{overpic}
+	} 
+EOF
+			end
+
+			
+			
+		end # def 
+			
+	end # class TestCodeRunner
+
+end