diff options
author | mguetlein <martin.guetlein@gmail.com> | 2012-01-31 12:37:36 +0100 |
---|---|---|
committer | mguetlein <martin.guetlein@gmail.com> | 2012-01-31 12:37:36 +0100 |
commit | 63320057e2a2b2121c5c405c31e2e7b709fa9e44 (patch) | |
tree | 189eaa7dcb29b95853f2f00f1f3291c211edbba7 /lib/merge.rb | |
parent | eda4b9687ca4b093b7f194b6d0b2e58ce7eed3b2 (diff) |
adapt validation to r-util (split), add new r plots
Diffstat (limited to 'lib/merge.rb')
-rw-r--r-- | lib/merge.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/merge.rb b/lib/merge.rb index f30a3c1..bc6e1a7 100644 --- a/lib/merge.rb +++ b/lib/merge.rb @@ -31,6 +31,11 @@ module Lib return merge_count(object)>1 end + def self.merge_count( object ) + @@merge_count[object] = 1 if @@merge_count[object]==nil + return @@merge_count[object] + end + def self.merge_objects( object1, object2 ) raise "classes not equal : "+object1.class.to_s+" != "+object2.class.to_s if object1.class != object2.class object_class = object1.class @@ -137,11 +142,6 @@ module Lib {:value => value, :variance => variance } end - def self.merge_count( object ) - @@merge_count[object] = 1 if @@merge_count[object]==nil - return @@merge_count[object] - end - def self.set_merge_count(object, merge_count) @@merge_count[object] = merge_count end |