cdp 0.0.5 → 0.0.6

data/gemspec

@@ -3,7 +3,7 @@ $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
 spec = Gem::Specification.new do |s|
   s.name              = "cdp"
-  s.version           = '0.0.5'
+  s.version           = '0.0.6'
   s.platform          = Gem::Platform::RUBY
   s.files             = ["lib/cdp.rb"] + ["gemspec"]
   s.test_file         = "test/test_cdp.rb"

data/lib/cdp.rb

@@ -17,6 +17,8 @@ module Cdp
       Cdo.setCdo(ENV['HOME']+"/local/rhel55-x64/bin/cdo")
     when /blizzard/
       Cdo.setCdo(ENV['HOME']+"/local/bin/cdo")
+    when /thunder/
+      Cdo.setCdo(ENV['HOME']+"/local/squeeze-x64/bin/cdo")
     else
       puts "Use default Cdo:#{Cdo.getCdo} (version:#{Cdo.version})"
     end
@@ -32,7 +34,7 @@ module Cdp
   end
 
   # compute the experiments from the data directories and link the corresponding files
-  def Cdp.splitFilesIntoExperiments(files)
+  def Cdp.splitFilesIntoExperiments(files,exp='exp')
     gridFile = files.pop
     experiments = files.map {|f| File.basename(File.dirname(f))}.uniq.sort_by {|f| f.length}.reverse
     # take the larges part of the filenames as experiment name if the files are in
@@ -46,6 +48,7 @@ module Cdp
         end
       }.find_all {|v| not v.nil?}.size-1
       uniqName = files[0][0,n]
+      uniqName = exp if uniqName.empty?
       experiments = [uniqName]
     end
     experimentFiles, experimentAnalyzedData = {},{}

data/test/test_cdp.rb

@@ -40,6 +40,14 @@ class TestCdp < Test::Unit::TestCase
     assert_equal('gridfile',grid)
     assert_equal(exp['A'],['../A/a','../A/aa'])
     assert_equal(exp['B'],['../B/b','../B/bb'])
+    files << 'a' << 'aa' << 'b' << 'bb' << 'gridfile'
+    grid, exp, exp4ana = Cdp.splitFilesIntoExperiments(files)
+    assert_equal('exp',exp.keys[0])
+    files << './a' << './aa' << './b' << './bb' << './gridfile'
+    grid, exp, exp4ana = Cdp.splitFilesIntoExperiments(files)
+    assert_equal('exp',exp.keys[0])
+    grid, exp, exp4ana = Cdp.splitFilesIntoExperiments(files,'test')
+    assert_equal('test',exp.keys[0])
   end
   def test_masked_area_weight
     Cdo.debug = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cdp
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cdo