+ parser works now with mmap and sscanf

[qpalma.git] / python / compute_donacc.py

diff --git a/python/compute_donacc.py b/python/compute_donacc.py
index 534b1e3..bad0872 100644 (file)
--- a/python/compute_donacc.py
+++ b/python/compute_donacc.py
@@ -2,23 +2,24 @@
 # -*- coding: utf-8 -*-
 
 import math
-from numpy.matlib import zeros,inf
+from numpy.matlib import zeros,isinf
 from penalty_lookup_new import *
 
 def compute_donacc(donor_supp, acceptor_supp, d, a):
 
    assert(len(donor_supp)==len(acceptor_supp))
+   size = len(donor_supp)
   
-   donor = zeros((len(donor_supp),1))
-   acceptor= zeros((len(acceptor_supp),1))
+   donor    = [0.0]*size
+   acceptor = [0.0]*size
 
-   for idx in range(len(donor_supp)):
-     if donor_supp[idx] == inf:
+   for idx in range(size):
+     if isinf(donor_supp[idx]):
        donor[idx] = donor_supp[idx]
      else:
        donor[idx] = penalty_lookup_new(d, donor_supp[idx])
 
-     if acceptor_supp[idx] == inf:
+     if isinf(acceptor_supp[idx]):
        acceptor[idx] = acceptor_supp[idx]
      else:
        acceptor[idx] = penalty_lookup_new(a,acceptor_supp[idx])