coderunner 0.12.6 → 0.12.7

data/VERSION

@@ -1 +1 @@
-0.12.6
+0.12.7

data/coderunner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.12.6"
+  s.version = "0.12.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]
-  s.date = "2013-06-17"
+  s.date = "2013-06-26"
   s.description = "CodeRunner is a framework for the automated running and analysis of simulations. It automatically generates any necessary input files, organises the output data and analyses it. Because it is a modular system, it can easily be customised to work with any system and any simulation code. One of its greatest strengths is that it is independent of any one simulation code; thus it can easily plot and compare the data from different codes."
   s.email = "edmundhighcock@sourceforge.net"
   s.executables = ["coderunner"]

data/lib/coderunner/class_methods.rb

@@ -569,8 +569,8 @@ EOF
 		runner = fetch_runner(copts)
 		eputs 'Starting Graph'
 		kit = runner.graphkit_from_lists(copts[:G], copts[:g])
-		options = copts[:w]
-		options = (options and options =~ /\S/) ? eval(options): {}
+		#options = copts[:w]
+		#options = (options and options =~ /\S/) ? eval(options): {}
 		name = nil unless name =~ /\S/
 		max = 0
 		name.sub!(/^\~/, ENV['HOME']) if name
@@ -582,7 +582,7 @@ EOF
 			name = name.sub(/%d/, (max + 1).to_s)
 		end
 		raise "kit doesn't have a file_name and no filename specified; can't write graph" unless name or (kit.file_name.class == String and kit.file_name =~ /\S/)
-		Dir.chdir(COMMAND_FOLDER){kit.gnuplot_write((name or kit.file_name), options)}
+		Dir.chdir(COMMAND_FOLDER){kit.gnuplot_write((name or kit.file_name), {eval: copts[:w]})}
 	end
 	def self.read_default_command_options(copts)
 		DEFAULT_COMMAND_OPTIONS.each do |key, value|

data/lib/coderunner/graphs_and_films.rb

@@ -397,7 +397,7 @@ class CodeRunner
 				eputs sprintf("Fetching graphs: %2.2f", i.to_f/frame_array.size.to_f * 100.0) + "% Complete"
 # 			end
 			i+=1
-			[frame_index, graphkit_from_lists(graphs, run_graphs, extra_options.absorb({frame_index: frame_index}))]
+			[frame_index, graphkit_from_lists(graphs, run_graphs, extra_options.absorb({(extra_options[:in]||extra_options[:index_name]||:frame_index) => frame_index}))]
 		end
 # 		eputs Marshal.load(Marshal.dump(array)).pretty_inspect
 		#Kernel.puts server_dump(array) if server
@@ -431,22 +431,23 @@ class CodeRunner
 		end
 	end
 	
-	def self.graphkit_multiple_runners_with_frame_array(frame_array, list, print_message = false)
+	def self.graphkit_multiple_runners_with_frame_array(frame_array, list, extra_options, print_message = false)
 		i = 0
 # 		
 		return list.inject(nil) do |kit_array, (runner, graph_lists)|
 			graphs, run_graphs = graph_lists
 			graphs.map!{|graph| runner.graphkit_shorthand(graph)}
 			run_graphs.map!{|graph| runner.run_graphkit_shorthand(graph)}
-			newkit_array = runner.graphkit_from_lists_with_frame_array(frame_array, graphs, run_graphs, {})
+			newkit_array = runner.graphkit_from_lists_with_frame_array(frame_array, graphs, run_graphs, extra_options)
 # 			eputs newkit_array.pretty_inspect
 			kit_array ? (i=-1; kit.map{|(frame_index, kit)| i+= 1;[frame_index, new_kit[i][1]]}) : newkit_array
 		end
 	end
 	
-	def self.make_film_multiple_runners(list, options)
-		possible_options = [:frame_array, :fa, :skip_frames, :sf, :normalize, :n, :normalize_pieces, :np, :increment, :i, :skip_encoding, :se]
+	def self.make_film_multiple_runners_old(list, options)
+		possible_options = [:frame_array, :fa, :skip_frames, :sf, :normalize, :n, :normalize_pieces, :np, :increment, :i, :skip_encoding, :se, :index_name, :in]
 		fa = (options[:frame_array] or options[:fa] or list[0][0].run_list[list[0][0].filtered_ids[0]].frame_array(options)	)
+		iname = options[:in]||options[:index_name]||:frame_index
 
 		fd = frame_digits = Math.log10(fa[1]).ceil
 		unless options[:skip_frames] or options[:sf]
@@ -458,8 +459,8 @@ class CodeRunner
 # 		puts @@multiple_processes; gets
 		no_forks = (@@multiple_processes or 1)
 		ep @@multiple_processes, no_forks
-		end_graphkit = graphkit_multiple_runners(list, frame_index: fa[1])
-		begin_graphkit = graphkit_multiple_runners(list, frame_index: fa[0])
+		end_graphkit = graphkit_multiple_runners(list, iname => fa[1])
+		begin_graphkit = graphkit_multiple_runners(list, iname => fa[0])
 
 		end_area = end_graphkit.plot_area_size
 		begin_area = begin_graphkit.plot_area_size
@@ -490,8 +491,8 @@ class CodeRunner
 		frames.pieces(no_forks).each_with_index do |piece, myrank|
 			fork do
 				if options[:normalize_pieces]
-				end_area = graphkit_multiple_runners(list, frame_index: piece.max).plot_area_size
-				begin_area = graphkit_multiple_runners(list, frame_index: piece.min).plot_area_size
+				end_area = graphkit_multiple_runners(list, iname => piece.max).plot_area_size
+				begin_area = graphkit_multiple_runners(list, iname => piece.min).plot_area_size
 				axes = [:x, :y, :z]
 				for i in 0...end_area.size
 					next unless options[:normalize_pieces].include? axes[i]
@@ -503,7 +504,7 @@ class CodeRunner
 				end
 				end
 				eputs 'making graphs...'; sleep 1
-				graph_array = graphkit_multiple_runners_with_frame_array(piece, list, myrank==0)
+				graph_array = graphkit_multiple_runners_with_frame_array(piece, list, {:in => iname}, myrank==0)
 # 				ep graph_array
 				eputs
 				graph_array.each_with_index do |(frame_index,g), pindex|
@@ -543,6 +544,7 @@ class CodeRunner
 	def self.make_film_multiple_runners(list, options)
 		possible_options = [:frame_array, :fa, :skip_frames, :sf, :normalize, :n, :normalize_pieces, :np, :increment, :i, :skip_encoding, :se]
 		fa = (options[:frame_array] or options[:fa] or list[0][0].run_list[list[0][0].filtered_ids[0]].frame_array(options)	)
+		iname = options[:in]||options[:index_name]||:frame_index
 
 		fd = frame_digits = Math.log10(fa[1]).ceil
 		unless options[:skip_frames] or options[:sf]
@@ -554,8 +556,8 @@ class CodeRunner
 # 		puts @@multiple_processes; gets
 		no_forks = (@@multiple_processes or 1)
 		ep @@multiple_processes, no_forks
-		end_graphkit = graphkit_multiple_runners(list, frame_index: fa[1])
-		begin_graphkit = graphkit_multiple_runners(list, frame_index: fa[0])
+		end_graphkit = graphkit_multiple_runners(list, iname => fa[1])
+		begin_graphkit = graphkit_multiple_runners(list, iname => fa[0])
 
 		end_area = end_graphkit.plot_area_size
 		begin_area = begin_graphkit.plot_area_size
@@ -595,8 +597,8 @@ class CodeRunner
 # 				end
 # 			fork do
 				if options[:normalize_pieces]
-				end_area = graphkit_multiple_runners(list, frame_index: piece.max).plot_area_size
-				begin_area = graphkit_multiple_runners(list, frame_index: piece.min).plot_area_size
+				end_area = graphkit_multiple_runners(list, iname => piece.max).plot_area_size
+				begin_area = graphkit_multiple_runners(list, iname => piece.min).plot_area_size
 				axes = [:x, :y, :z]
 				for i in 0...end_area.size
 					next unless options[:normalize_pieces].include? axes[i]
@@ -608,7 +610,7 @@ class CodeRunner
 				end
 				end
 				eputs 'making graphs...'; sleep 1 if myrank==0
-				graph_array = graphkit_multiple_runners_with_frame_array(piece, list, myrank==0)
+				graph_array = graphkit_multiple_runners_with_frame_array(piece, list, {:in => iname}, myrank==0)
 # 				ep graph_array
 				eputs
 				graph_array.each_with_index do |(frame_index,g), pindex|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.12.6
+  version: 0.12.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit