From: martinahansen <martinahansen@74ccb610-7750-0410-82ae-013aeee3265d>
Date: Mon, 22 Oct 2012 13:07:55 +0000 (+0000)
Subject: fixed nasty bug in classify_taxonomy
X-Git-Url: https://git.donarmstrong.com/?p=biopieces.git;a=commitdiff_plain;h=307a8065001cf85dcfc4e1a66fd62df5d2fa4e8b

fixed nasty bug in classify_taxonomy

git-svn-id: http://biopieces.googlecode.com/svn/trunk@1969 74ccb610-7750-0410-82ae-013aeee3265d
---

diff --git a/bp_bin/classify_taxonomy b/bp_bin/classify_taxonomy
index 7a9eae4..958ecb9 100755
--- a/bp_bin/classify_taxonomy
+++ b/bp_bin/classify_taxonomy
@@ -68,13 +68,13 @@ class TaxNode
   def merge(node_new, node_old = self)
     node_new.children.each do |name, child|
       if node_old.children[name]
-        node_old.count += node_new.count
-        node_old.score += node_new.score
+        node_old.count += child.count
+        node_old.score += child.score
+
+        merge(child, node_old.children[name])
       else
         node_old.children[name] = child
       end
-
-      merge(child, node_old.children[name])
     end
   end