From 36d80c9ec1d28488f9b5c97cd202c196efff694e Mon Sep 17 00:00:00 2001
From: Mario Mulansky <mario.mulansky@gmx.net>
Date: Fri, 24 Apr 2015 15:58:35 +0200
Subject: distance tests now pass with new spike trains

---
 pyspike/cython/python_backend.py | 41 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

(limited to 'pyspike/cython/python_backend.py')

diff --git a/pyspike/cython/python_backend.py b/pyspike/cython/python_backend.py
index bcf9c30..c65bfb0 100644
--- a/pyspike/cython/python_backend.py
+++ b/pyspike/cython/python_backend.py
@@ -330,47 +330,48 @@ def cumulative_sync_python(spikes1, spikes2):
 ############################################################
 # coincidence_python
 ############################################################
-def coincidence_python(spikes1, spikes2, max_tau):
+def coincidence_python(spikes1, spikes2, t_start, t_end, max_tau):
 
     def get_tau(spikes1, spikes2, i, j, max_tau):
         m = 1E100   # some huge number
-        if i < len(spikes1)-2:
+        if i < len(spikes1)-1 and i > -1:
             m = min(m, spikes1[i+1]-spikes1[i])
-        if j < len(spikes2)-2:
+        if j < len(spikes2)-1 and j > -1:
             m = min(m, spikes2[j+1]-spikes2[j])
-        if i > 1:
+        if i > 0:
             m = min(m, spikes1[i]-spikes1[i-1])
-        if j > 1:
+        if j > 0:
             m = min(m, spikes2[j]-spikes2[j-1])
         m *= 0.5
         if max_tau > 0.0:
             m = min(m, max_tau)
         return m
+
     N1 = len(spikes1)
     N2 = len(spikes2)
-    i = 0
-    j = 0
+    i = -1
+    j = -1
     n = 0
-    st = np.zeros(N1 + N2 - 2)  # spike times
-    c = np.zeros(N1 + N2 - 2)   # coincidences
-    mp = np.ones(N1 + N2 - 2)   # multiplicity
-    while n < N1 + N2 - 2:
-        if spikes1[i+1] < spikes2[j+1]:
+    st = np.zeros(N1 + N2 + 2)  # spike times
+    c = np.zeros(N1 + N2 + 2)   # coincidences
+    mp = np.ones(N1 + N2 + 2)   # multiplicity
+    while i + j < N1 + N2 - 2:
+        if (i < N1-1) and (j == N2-1 or spikes1[i+1] < spikes2[j+1]):
             i += 1
             n += 1
             tau = get_tau(spikes1, spikes2, i, j, max_tau)
             st[n] = spikes1[i]
-            if j > 0 and spikes1[i]-spikes2[j] < tau:
+            if j > -1 and spikes1[i]-spikes2[j] < tau:
                 # coincidence between the current spike and the previous spike
                 # both get marked with 1
                 c[n] = 1
                 c[n-1] = 1
-        elif spikes1[i+1] > spikes2[j+1]:
+        elif (j < N2-1) and (i == N1-1 or spikes1[i+1] > spikes2[j+1]):
             j += 1
             n += 1
             tau = get_tau(spikes1, spikes2, i, j, max_tau)
             st[n] = spikes2[j]
-            if i > 0 and spikes2[j]-spikes1[i] < tau:
+            if i > -1 and spikes2[j]-spikes1[i] < tau:
                 # coincidence between the current spike and the previous spike
                 # both get marked with 1
                 c[n] = 1
@@ -379,8 +380,6 @@ def coincidence_python(spikes1, spikes2, max_tau):
             # advance in both spike trains
             j += 1
             i += 1
-            if i == N1-1 or j == N2-1:
-                break
             n += 1
             # add only one event, but with coincidence 2 and multiplicity 2
             st[n] = spikes1[i]
@@ -391,12 +390,12 @@ def coincidence_python(spikes1, spikes2, max_tau):
     c = c[:n+2]
     mp = mp[:n+2]
 
-    st[0] = spikes1[0]
-    st[-1] = spikes1[-1]
+    st[0] = t_start
+    st[len(st)-1] = t_end
     c[0] = c[1]
-    c[-1] = c[-2]
+    c[len(c)-1] = c[len(c)-2]
     mp[0] = mp[1]
-    mp[-1] = mp[-2]
+    mp[len(mp)-1] = mp[len(mp)-2]
 
     return st, c, mp
 
-- 
cgit v1.2.3