coderunner 0.12.6 → 0.12.7
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/coderunner.gemspec +2 -2
- data/lib/coderunner/class_methods.rb +3 -3
- data/lib/coderunner/graphs_and_films.rb +17 -15
- metadata +2 -2
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.12.
|
1
|
+
0.12.7
|
data/coderunner.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = "coderunner"
|
8
|
-
s.version = "0.12.
|
8
|
+
s.version = "0.12.7"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Edmund Highcock"]
|
12
|
-
s.date = "2013-06-
|
12
|
+
s.date = "2013-06-26"
|
13
13
|
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."
|
14
14
|
s.email = "edmundhighcock@sourceforge.net"
|
15
15
|
s.executables = ["coderunner"]
|
@@ -569,8 +569,8 @@ EOF
|
|
569
569
|
runner = fetch_runner(copts)
|
570
570
|
eputs 'Starting Graph'
|
571
571
|
kit = runner.graphkit_from_lists(copts[:G], copts[:g])
|
572
|
-
options = copts[:w]
|
573
|
-
options = (options and options =~ /\S/) ? eval(options): {}
|
572
|
+
#options = copts[:w]
|
573
|
+
#options = (options and options =~ /\S/) ? eval(options): {}
|
574
574
|
name = nil unless name =~ /\S/
|
575
575
|
max = 0
|
576
576
|
name.sub!(/^\~/, ENV['HOME']) if name
|
@@ -582,7 +582,7 @@ EOF
|
|
582
582
|
name = name.sub(/%d/, (max + 1).to_s)
|
583
583
|
end
|
584
584
|
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/)
|
585
|
-
Dir.chdir(COMMAND_FOLDER){kit.gnuplot_write((name or kit.file_name),
|
585
|
+
Dir.chdir(COMMAND_FOLDER){kit.gnuplot_write((name or kit.file_name), {eval: copts[:w]})}
|
586
586
|
end
|
587
587
|
def self.read_default_command_options(copts)
|
588
588
|
DEFAULT_COMMAND_OPTIONS.each do |key, value|
|
@@ -397,7 +397,7 @@ class CodeRunner
|
|
397
397
|
eputs sprintf("Fetching graphs: %2.2f", i.to_f/frame_array.size.to_f * 100.0) + "% Complete"
|
398
398
|
# end
|
399
399
|
i+=1
|
400
|
-
[frame_index, graphkit_from_lists(graphs, run_graphs, extra_options.absorb({frame_index
|
400
|
+
[frame_index, graphkit_from_lists(graphs, run_graphs, extra_options.absorb({(extra_options[:in]||extra_options[:index_name]||:frame_index) => frame_index}))]
|
401
401
|
end
|
402
402
|
# eputs Marshal.load(Marshal.dump(array)).pretty_inspect
|
403
403
|
#Kernel.puts server_dump(array) if server
|
@@ -431,22 +431,23 @@ class CodeRunner
|
|
431
431
|
end
|
432
432
|
end
|
433
433
|
|
434
|
-
def self.graphkit_multiple_runners_with_frame_array(frame_array, list, print_message = false)
|
434
|
+
def self.graphkit_multiple_runners_with_frame_array(frame_array, list, extra_options, print_message = false)
|
435
435
|
i = 0
|
436
436
|
#
|
437
437
|
return list.inject(nil) do |kit_array, (runner, graph_lists)|
|
438
438
|
graphs, run_graphs = graph_lists
|
439
439
|
graphs.map!{|graph| runner.graphkit_shorthand(graph)}
|
440
440
|
run_graphs.map!{|graph| runner.run_graphkit_shorthand(graph)}
|
441
|
-
newkit_array = runner.graphkit_from_lists_with_frame_array(frame_array, graphs, run_graphs,
|
441
|
+
newkit_array = runner.graphkit_from_lists_with_frame_array(frame_array, graphs, run_graphs, extra_options)
|
442
442
|
# eputs newkit_array.pretty_inspect
|
443
443
|
kit_array ? (i=-1; kit.map{|(frame_index, kit)| i+= 1;[frame_index, new_kit[i][1]]}) : newkit_array
|
444
444
|
end
|
445
445
|
end
|
446
446
|
|
447
|
-
def self.
|
448
|
-
possible_options = [:frame_array, :fa, :skip_frames, :sf, :normalize, :n, :normalize_pieces, :np, :increment, :i, :skip_encoding, :se]
|
447
|
+
def self.make_film_multiple_runners_old(list, options)
|
448
|
+
possible_options = [:frame_array, :fa, :skip_frames, :sf, :normalize, :n, :normalize_pieces, :np, :increment, :i, :skip_encoding, :se, :index_name, :in]
|
449
449
|
fa = (options[:frame_array] or options[:fa] or list[0][0].run_list[list[0][0].filtered_ids[0]].frame_array(options) )
|
450
|
+
iname = options[:in]||options[:index_name]||:frame_index
|
450
451
|
|
451
452
|
fd = frame_digits = Math.log10(fa[1]).ceil
|
452
453
|
unless options[:skip_frames] or options[:sf]
|
@@ -458,8 +459,8 @@ class CodeRunner
|
|
458
459
|
# puts @@multiple_processes; gets
|
459
460
|
no_forks = (@@multiple_processes or 1)
|
460
461
|
ep @@multiple_processes, no_forks
|
461
|
-
end_graphkit = graphkit_multiple_runners(list,
|
462
|
-
begin_graphkit = graphkit_multiple_runners(list,
|
462
|
+
end_graphkit = graphkit_multiple_runners(list, iname => fa[1])
|
463
|
+
begin_graphkit = graphkit_multiple_runners(list, iname => fa[0])
|
463
464
|
|
464
465
|
end_area = end_graphkit.plot_area_size
|
465
466
|
begin_area = begin_graphkit.plot_area_size
|
@@ -490,8 +491,8 @@ class CodeRunner
|
|
490
491
|
frames.pieces(no_forks).each_with_index do |piece, myrank|
|
491
492
|
fork do
|
492
493
|
if options[:normalize_pieces]
|
493
|
-
end_area = graphkit_multiple_runners(list,
|
494
|
-
begin_area = graphkit_multiple_runners(list,
|
494
|
+
end_area = graphkit_multiple_runners(list, iname => piece.max).plot_area_size
|
495
|
+
begin_area = graphkit_multiple_runners(list, iname => piece.min).plot_area_size
|
495
496
|
axes = [:x, :y, :z]
|
496
497
|
for i in 0...end_area.size
|
497
498
|
next unless options[:normalize_pieces].include? axes[i]
|
@@ -503,7 +504,7 @@ class CodeRunner
|
|
503
504
|
end
|
504
505
|
end
|
505
506
|
eputs 'making graphs...'; sleep 1
|
506
|
-
graph_array = graphkit_multiple_runners_with_frame_array(piece, list, myrank==0)
|
507
|
+
graph_array = graphkit_multiple_runners_with_frame_array(piece, list, {:in => iname}, myrank==0)
|
507
508
|
# ep graph_array
|
508
509
|
eputs
|
509
510
|
graph_array.each_with_index do |(frame_index,g), pindex|
|
@@ -543,6 +544,7 @@ class CodeRunner
|
|
543
544
|
def self.make_film_multiple_runners(list, options)
|
544
545
|
possible_options = [:frame_array, :fa, :skip_frames, :sf, :normalize, :n, :normalize_pieces, :np, :increment, :i, :skip_encoding, :se]
|
545
546
|
fa = (options[:frame_array] or options[:fa] or list[0][0].run_list[list[0][0].filtered_ids[0]].frame_array(options) )
|
547
|
+
iname = options[:in]||options[:index_name]||:frame_index
|
546
548
|
|
547
549
|
fd = frame_digits = Math.log10(fa[1]).ceil
|
548
550
|
unless options[:skip_frames] or options[:sf]
|
@@ -554,8 +556,8 @@ class CodeRunner
|
|
554
556
|
# puts @@multiple_processes; gets
|
555
557
|
no_forks = (@@multiple_processes or 1)
|
556
558
|
ep @@multiple_processes, no_forks
|
557
|
-
end_graphkit = graphkit_multiple_runners(list,
|
558
|
-
begin_graphkit = graphkit_multiple_runners(list,
|
559
|
+
end_graphkit = graphkit_multiple_runners(list, iname => fa[1])
|
560
|
+
begin_graphkit = graphkit_multiple_runners(list, iname => fa[0])
|
559
561
|
|
560
562
|
end_area = end_graphkit.plot_area_size
|
561
563
|
begin_area = begin_graphkit.plot_area_size
|
@@ -595,8 +597,8 @@ class CodeRunner
|
|
595
597
|
# end
|
596
598
|
# fork do
|
597
599
|
if options[:normalize_pieces]
|
598
|
-
end_area = graphkit_multiple_runners(list,
|
599
|
-
begin_area = graphkit_multiple_runners(list,
|
600
|
+
end_area = graphkit_multiple_runners(list, iname => piece.max).plot_area_size
|
601
|
+
begin_area = graphkit_multiple_runners(list, iname => piece.min).plot_area_size
|
600
602
|
axes = [:x, :y, :z]
|
601
603
|
for i in 0...end_area.size
|
602
604
|
next unless options[:normalize_pieces].include? axes[i]
|
@@ -608,7 +610,7 @@ class CodeRunner
|
|
608
610
|
end
|
609
611
|
end
|
610
612
|
eputs 'making graphs...'; sleep 1 if myrank==0
|
611
|
-
graph_array = graphkit_multiple_runners_with_frame_array(piece, list, myrank==0)
|
613
|
+
graph_array = graphkit_multiple_runners_with_frame_array(piece, list, {:in => iname}, myrank==0)
|
612
614
|
# ep graph_array
|
613
615
|
eputs
|
614
616
|
graph_array.each_with_index do |(frame_index,g), pindex|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: coderunner
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.12.
|
4
|
+
version: 0.12.7
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-06-
|
12
|
+
date: 2013-06-26 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: graphkit
|