summaryrefslogtreecommitdiff
path: root/lib/merge.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/merge.rb')
-rw-r--r--lib/merge.rb10
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