Changeset 2116 for trunk/brian/experimental/c_stdp.py

Timestamp:

08/10/10 17:18:06 (22 months ago)

Author:

thesamovar

Message:

** Brian 1.2.2dev-2010-08-10 **

Fixed problems with STDP separating equations for triplet rule
Fixed sparse matrix problem with scipy 0.8.0

Files:

• trunk/brian/experimental/c_stdp.py (modified) (1 diff)

trunk/brian/experimental/c_stdp.py

@@ -59 +59 @@
         vars_post = [var for var in vars if var in modified_variables(post)]
 
-        # additional dependencies on the set of equations are induced by the
-        # interactions in pre and post code
-        additional_deps = pre.split('\n')+post.split('\n')
+        # additional dependencies are used to ensure that if there are multiple
+        # pre/post separated equations they are grouped together as one
+        additional_deps = ['__pre_deps='+'+'.join(vars_pre),
+                           '__post_deps='+'+'.join(vars_post)]
         separated_equations = separate_equations(eqs_obj, additional_deps)
         if not len(separated_equations) == 2:
+            print separated_equations
             raise ValueError('Equations should separate into pre and postsynaptic variables.')
         sep_pre, sep_post = separated_equations