submit ver1.3

sejooning · Jun 20, 2016 · 37405b5 · 37405b5
1 parent 179d01d
commit 37405b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/ncm.py b/ncm.py
@@ -646,10 +646,10 @@ def classify(T):
 
 
 def classifyNV(vec2Classify, p0Vec, p0S, p1Vec, p1S):
-    if abs(p0Vec - vec2Classify) + p0S > abs(p1Vec - vec2Classify) - p1S:
-        return abs((abs(p0Vec - vec2Classify) +  p0S )/ (abs(p1Vec - vec2Classify) -  p1S )), 1
+    if abs(p0Vec - vec2Classify) - p0S > abs(p1Vec - vec2Classify) - p1S:
+        return abs((abs(p0Vec - vec2Classify) - p0S )/ (abs(p1Vec - vec2Classify) -  p1S )), 1
     else: 
-        return abs((abs(p0Vec - vec2Classify) + p0S) / (abs(p1Vec - vec2Classify)  -  p1S)), 0  
+        return abs((abs(p0Vec - vec2Classify) - p0S) / (abs(p1Vec - vec2Classify)  -  p1S)), 0  
 
 #    if depth < 5:
 #        if (vec2Classify >= (p1Vec - p1S)):

diff --git a/ncm_fastq.py b/ncm_fastq.py
@@ -195,10 +195,10 @@ def createDataSetFromDir_test(base_dir, bedFile,order):
 
 
 def classifyNV(vec2Classify, p0Vec, p0S, p1Vec, p1S):    
-    if abs(p0Vec - vec2Classify) + p0S > abs(p1Vec - vec2Classify) - p1S:
-        return abs((abs(p0Vec - vec2Classify) +  p0S )/ (abs(p1Vec - vec2Classify) -  p1S )), 1
+    if abs(p0Vec - vec2Classify) - p0S > abs(p1Vec - vec2Classify) - p1S:
+        return abs((abs(p0Vec - vec2Classify) - p0S )/ (abs(p1Vec - vec2Classify) -  p1S )), 1
     else: 
-        return abs((abs(p0Vec - vec2Classify) + p0S) / (abs(p1Vec - vec2Classify)  -  p1S)), 0        
+        return abs((abs(p0Vec - vec2Classify) - p0S) / (abs(p1Vec - vec2Classify)  -  p1S)), 0        
 
 
 def getPredefinedModel(depth):