cdp 0.0.7 → 0.0.8.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 06ce939ab83bdfaeebfc75a34fce46dbf5ba3d9c
+  data.tar.gz: 860c1c3f76fd161e372eab00ba8daef93419c7fd
+SHA512:
+  metadata.gz: d584656c714ec20abe882df737a6b53fef4646241062aa6e4fa0a84dbb6c479eea6bf3deb97be054b0e566dea0e58601efe548be374377cf96d035dcc3bfcd1b
+  data.tar.gz: 25efbdda97dc4912b151c69b114a440a0c094d288a540d4237f292d60607f4f249b99fb6c03bff435988234bac2696003b999ab37954398d0d25c99b6b673e07

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.7'
+  s.version           = '0.0.8.1'
   s.platform          = Gem::Platform::RUBY
   s.files             = ["lib/cdp.rb"] + ["gemspec"]
   s.test_file         = "test/test_cdp.rb"

data/lib/cdp.rb

@@ -34,21 +34,27 @@ module Cdp
   end
 
   # compute the experiments from the data directories and link the corresponding files
-  def Cdp.splitFilesIntoExperiments(files,exp='exp')
-    experiments = files.map {|f| File.basename(File.dirname(f))}.uniq.sort_by {|f| f.length}.reverse
+  def Cdp.splitFilesIntoExperiments(files,exp=nil)
+    defautExpName = 'exp'
+    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
     # the current directory
-    if experiments == ["."] then
-      n = files.map(&:size).min.times.map {|i|
-        if files.map {|f| f[0,i-1]}.uniq.size == 1
-          1
-        else
-          nil
-        end
-      }.find_all {|v| not v.nil?}.size-1
-      uniqName = files[0][0,n]
-      uniqName = exp if uniqName.empty?
-      experiments = [uniqName]
+    if exp.nil?
+      if [["."],[".."],[".",".."],[""]].include?(experiments) then
+        n = files.map(&:size).min.times.map {|i|
+          if files.map {|f| f[0,i-1]}.uniq.size == 1
+            1
+          else
+            nil
+          end
+        }.find_all {|v| not v.nil?}.size-1
+        uniqName    = files[0][0,n]
+        uniqName    = defautExpName if uniqName.empty?
+        experiments = [uniqName]
+      end
+      experiments [defautExpName] if experiments == [".."]
+    else
+      experiments = [exp]
     end
     experimentFiles, experimentAnalyzedData = {},{}
     experiments.each {|experiment|

data/test/test_cdp.rb

@@ -1,5 +1,5 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
-require 'test/unit'
+require 'minitest/autorun'
 require 'cdp'
 require 'pp'
 
@@ -11,12 +11,13 @@ ICONOCEL = DATADIR     + "/oceLong.nc"
 ICONICE  = DATADIR     + "/oce.nc"
 WEIGHTS  = File.dirname(__FILE__) + "/weights.nc"
 
-class TestCdp < Test::Unit::TestCase
+class TestCdp < Minitest::Test
   def teardown
     FileUtils.rm(WEIGHTS) if File.exist?(WEIGHTS)
   end
   def test_set_debug
     Cdp.setDebug
+    Cdo.debug = true
     assert_equal(Cdp::debug,true)
     Cdp.setDebug(false)
     assert_equal(Cdp::debug,false)
@@ -35,16 +36,34 @@ class TestCdp < Test::Unit::TestCase
 
   def test_splitFiles
     files = []
+
     files << '../A/a' << '../A/aa' << '../B/b' << '../B/bb'
     exp, exp4ana = Cdp.splitFilesIntoExperiments(files)
     assert_equal(exp['A'],['../A/a','../A/aa'])
     assert_equal(exp['B'],['../B/b','../B/bb'])
+
     files << 'a' << 'aa' << 'b' << 'bb'
     grid, exp, exp4ana = Cdp.splitFilesIntoExperiments(files)
     assert_equal('exp',exp.keys[0])
+
+    files.clear
+    files << 'a0' << 'a1' << 'ab' << 'ac'
+    _files = files.clone
+    exp, exp4ana = Cdp.splitFilesIntoExperiments(files,'a')
+    pp exp
+    assert_equal('a',exp.keys[0])
+    assert_equal(_files,exp.values[0])
+
+    return
     files << './a' << './aa' << './b' << './bb'
     grid, exp, exp4ana = Cdp.splitFilesIntoExperiments(files)
     assert_equal('exp',exp.keys[0])
+    files << '../a' << '../aa' << '../b' << '../bb'
+    grid, exp, exp4ana = Cdp.splitFilesIntoExperiments(files)
+    assert_equal('exp',exp.keys[0])
+    files << '../a_01' << '../a_02' << '../a_03' << '../a_04'
+    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

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: cdp
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.0.8.1
 platform: ruby
 authors:
 - Ralf Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cdo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Climate Data Processing helpers
@@ -35,35 +32,34 @@ extra_rdoc_files:
 - README.textile
 - LICENSE
 files:
-- lib/cdp.rb
-- gemspec
-- README.textile
 - LICENSE
+- README.textile
+- gemspec
+- lib/cdp.rb
 - test/test_cdp.rb
 homepage: https://github.com/Try2Code/cdp
 licenses:
 - BSD
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: ! '---'
+specification_version: 4
+summary: "---"
 test_files:
 - test/test_cdp.rb