cdp 0.0.5 → 0.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/gemspec +1 -1
  2. data/lib/cdp.rb +4 -1
  3. data/test/test_cdp.rb +8 -0
  4. metadata +2 -2
data/gemspec CHANGED
@@ -3,7 +3,7 @@ $:.unshift File.join(File.dirname(__FILE__),"..","lib")
3
3
 
4
4
  spec = Gem::Specification.new do |s|
5
5
  s.name = "cdp"
6
- s.version = '0.0.5'
6
+ s.version = '0.0.6'
7
7
  s.platform = Gem::Platform::RUBY
8
8
  s.files = ["lib/cdp.rb"] + ["gemspec"]
9
9
  s.test_file = "test/test_cdp.rb"
data/lib/cdp.rb CHANGED
@@ -17,6 +17,8 @@ module Cdp
17
17
  Cdo.setCdo(ENV['HOME']+"/local/rhel55-x64/bin/cdo")
18
18
  when /blizzard/
19
19
  Cdo.setCdo(ENV['HOME']+"/local/bin/cdo")
20
+ when /thunder/
21
+ Cdo.setCdo(ENV['HOME']+"/local/squeeze-x64/bin/cdo")
20
22
  else
21
23
  puts "Use default Cdo:#{Cdo.getCdo} (version:#{Cdo.version})"
22
24
  end
@@ -32,7 +34,7 @@ module Cdp
32
34
  end
33
35
 
34
36
  # compute the experiments from the data directories and link the corresponding files
35
- def Cdp.splitFilesIntoExperiments(files)
37
+ def Cdp.splitFilesIntoExperiments(files,exp='exp')
36
38
  gridFile = files.pop
37
39
  experiments = files.map {|f| File.basename(File.dirname(f))}.uniq.sort_by {|f| f.length}.reverse
38
40
  # take the larges part of the filenames as experiment name if the files are in
@@ -46,6 +48,7 @@ module Cdp
46
48
  end
47
49
  }.find_all {|v| not v.nil?}.size-1
48
50
  uniqName = files[0][0,n]
51
+ uniqName = exp if uniqName.empty?
49
52
  experiments = [uniqName]
50
53
  end
51
54
  experimentFiles, experimentAnalyzedData = {},{}
@@ -40,6 +40,14 @@ class TestCdp < Test::Unit::TestCase
40
40
  assert_equal('gridfile',grid)
41
41
  assert_equal(exp['A'],['../A/a','../A/aa'])
42
42
  assert_equal(exp['B'],['../B/b','../B/bb'])
43
+ files << 'a' << 'aa' << 'b' << 'bb' << 'gridfile'
44
+ grid, exp, exp4ana = Cdp.splitFilesIntoExperiments(files)
45
+ assert_equal('exp',exp.keys[0])
46
+ files << './a' << './aa' << './b' << './bb' << './gridfile'
47
+ grid, exp, exp4ana = Cdp.splitFilesIntoExperiments(files)
48
+ assert_equal('exp',exp.keys[0])
49
+ grid, exp, exp4ana = Cdp.splitFilesIntoExperiments(files,'test')
50
+ assert_equal('test',exp.keys[0])
43
51
  end
44
52
  def test_masked_area_weight
45
53
  Cdo.debug = false
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cdp
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.5
4
+ version: 0.0.6
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: 2012-11-26 00:00:00.000000000 Z
12
+ date: 2012-12-14 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: cdo