use variable names P,i,t to agree with the notation in the papers

j-friedrich · Mar 20, 2017 · 41b9a0f · 41b9a0f
1 parent a651414
commit 41b9a0f
Show file tree

Hide file tree

Showing 2 changed files with 369 additions and 682 deletions.
diff --git a/functions.py b/functions.py
@@ -454,9 +454,12 @@ def onnls(y, g, lam=0, shift=100, window=None, mask=None, tol=1e-9, max_iter=Non
         h = g
         for i in range(w):
             K[i:, i] = h[:w - i]
-        a = np.linalg.inv(K).sum(0)
-        _y = y - lam * a[0]
-        _y[-w:] = y[-w:] - lam * a
+        if lam:
+            a = np.linalg.inv(K).sum(0)
+            _y = y - lam * a[0]
+            _y[-w:] = y[-w:] - lam * a
+        else:
+            _y = y
 
     s = np.zeros(T)
     KK = K.T.dot(K)