coderunner 0.15.2 → 0.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58161aafa099bd42c6f44f142a2e7f0dbd9be371
-  data.tar.gz: 3061cc19206df1c9dcab4e3df936585db85bf7d3
+  metadata.gz: 7b5b4e29d6198d90530476608c2ba60e25856824
+  data.tar.gz: 163dc42af84b5f77a711139eda5a05f3be4bbb79
 SHA512:
-  metadata.gz: 45044db1e9e4797b457b029cb603bf9d38d0912cc9d5b2adb950430a470efa797e238f73c4b0cd889a5a19d74316b424a69026931437978b1c414895e476e556
-  data.tar.gz: cc9fc3715bfa4eb67c57b27bea4b154b01af31720f8ee43dc0bab472521f4cd91ee3b1a833a1a26f105954cb8773a86bcba6c973b536ab5ef76d5be30ee03dbd
+  metadata.gz: 3bc02faa9a6e4cdfeef891c0dc065ede2a38810b61644a23f64b081906dae81600fe8c765a57f93285f952cd475e997f6d769fe05c44fa0f58c8ccb565dffd5c
+  data.tar.gz: 39e3b82a66e5c00416ffa3771d8cf89ba0fd6baf670fafe9819a8b4c44bfa2f35d3cd59dcc4ccf48f60956b58a71af5cbf9431fde097159284e2e76ff8ae29c4

data/VERSION

@@ -1 +1 @@
-0.15.2
+0.15.4

data/coderunner.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: coderunner 0.15.2 ruby lib
+# stub: coderunner 0.15.4 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.15.2"
+  s.version = "0.15.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Edmund Highcock"]
-  s.date = "2014-10-14"
+  s.date = "2014-10-16"
   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.rb

@@ -181,6 +181,7 @@ class CodeRunner
 	LONG_COMMAND_LINE_OPTIONS = [
 	["--replace-existing", "", GetoptLong::NO_ARGUMENT, %[Use with resubmit: causes each resubmitted run to replace the run being resubmitted.]],
 	["--smart-resubmit-name", "", GetoptLong::NO_ARGUMENT, %[Use with resubmit: causes each resubmitted run to only contain its original id and changed parameters in its run name.]],
+  ["--submit-runner-index", "", GetoptLong::NO_ARGUMENT, %[Use with submit or resubmit when specifying multiple root folders... selects which runner will be used for submitting (i.e. which root folder the runs will be submitted in.]],
 	] + CODE_COMMAND_OPTIONS
 	LONG_COMMAND_LINE_FLAGS = LONG_COMMAND_LINE_OPTIONS.map{|arr| [arr[0], arr[2]]}
 

data/lib/coderunner/class_methods.rb

@@ -610,10 +610,11 @@ EOF
   end
   def self.submit(copts = {})
 #     process_copts(copts)
-    runner = fetch_runner(copts)
+    runner = get_submit_runner(copts)
 #     raise "something is already submitting" if FileTest.exist? "submitting"
     runs = []
     raise "Parameters must be an array of inspected hashes" unless copts[:p].kind_of? Array
+    #raise "Can't submit using a merged runner" if runner.kind_of? CodeRunner::Merged
     Dir.chdir(runner.root_folder) do
 
       copts[:p].push nil if copts[:p] == []
@@ -630,9 +631,26 @@ EOF
     #puts "Got here"
     #exit(0)
   end
+  # Fetch a runner appropriate for submitting simulations. In 
+  # all usual cases this is just the default runner for the command
+  # but where several folders have been specified and we are dealing
+  # with a merged runner, a single runner is chosen from the merged
+  # runners using submit_runner_index
+  def self.get_submit_runner(copts)
+    runner = fetch_runner(copts)
+    unless runner.kind_of? CodeRunner::Merged
+      return runner
+    else
+      unless copts[:submit_runner_index]
+        raise "You can't submit runs using a merged runner. Please specify the option --submit-runner-index (or submit_runner_index in interactive mode)"
+      else
+        return runner.runners[copts[:submit_runner_index]]
+      end
+    end
+  end
   def self.resubmit(copts = {})
+    runner = get_submit_runner(copts)
 #     process_copts(copts)
-    runner = fetch_runner(copts)
 #     raise "something is already submitting" if FileTest.exist? "submitting"
     runs = []
     raise "Parameters must be an array of inspected hashes" unless copts[:p].kind_of? Array

data/lib/coderunner/graphs_and_films.rb

@@ -529,6 +529,7 @@ class CodeRunner
 		eputs "Waiting on subprocesses..."
 		Process.waitall
 		end
+
 		unless options[:skip_encoding]
 		eputs "making film"
 		frame_rate = (options[:frame_rate] or options[:fr] || 15)
@@ -733,11 +734,30 @@ class CodeRunner
 		eputs "Waiting on subprocesses..."
 		Process.waitall
 		end
+    if options[:negative]
+      options[:image_magick] = (options[:image_magick] ? options[:image_magick] + ";" : "") + " mogrify -negate -format png8 file; mv file8 file"
+    end
+    if options[:image_magick]
+      Dir.chdir('film_frames') do
+        Dir.entries.pieces(no_forks).each do |piece|
+          fork do
+            piece.each do |file|
+              system str=options[:image_magick].gsub(/file/, file)
+              p "image_magick", str
+            end
+          end
+        end
+      end
+    end
+		Process.waitall
 		unless options[:skip_encoding]
 		eputs "making film"
 		frame_rate = (options[:frame_rate] or options[:fr] || 15)
 		film_name = (options[:film_name] or options [:fn] or graphkit_frame_array[0][1].file_name + '_film').gsub(/\s/, '_')
-		puts `ffmpeg -y #{options[:bitrate] ? "-b #{options[:bitrate]}" : ""} -r #{frame_rate} -threads #{(@multiple_processes or 1)} -i film_frames/frame_%0#{fd}d#{extension}  #{film_name}.mp4`
+		#puts `ffmpeg -y #{options[:bitrate] ? "-b #{options[:bitrate]}" : ""} -r #{frame_rate} -threads #{(@multiple_processes or 1)} -i film_frames/frame_%0#{fd}d#{extension}  #{film_name}.mp4`
+		str =  "avconv  -y -r #{frame_rate} -threads #{(@multiple_processes or 1)} -i film_frames/frame_%0#{fd}d#{extension}  #{film_name}.mp4"
+    puts str
+    system str
 		end
 	end
 

data/lib/coderunner/merged_code_runner.rb

@@ -23,9 +23,14 @@ class CodeRunner
     # Iterates over the runners contained within the merged runner.
     # E.g.
     #   merged_runner.each{|runner| p runner.root_folder}
+    attr_reader :runners
 		def each
 			@runners.each{|r| yield(r)}
 		end
+    # Iterate over each of the merged runners, updating them.
+    def update(*args)
+      each{|r| r.update(*args)}
+    end
 		include Enumerable
     # Create a new merged runner. <tt>runners</tt> is an array of standard runners
     # (i.e. instances of CodeRunner).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.4
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit