revert

bindsnet/network/network.py

@@ -352,27 +352,6 @@ def run(
         # Effective number of timesteps.
         timesteps = int(time / self.dt)
 
-        # Run synapse updates.
-        if "a_minus" in kwargs:
-            A_Minus = kwargs["a_minus"]
-            kwargs.pop("a_minus")
-            if isinstance(A_Minus, dict):
-                A_MD = True
-            else:
-                A_MD = False
-        else:
-            A_Minus = None
-
-        if "a_plus" in kwargs:
-            A_Plus = kwargs["a_plus"]
-            kwargs.pop("a_plus")
-            if isinstance(A_Plus, dict):
-                A_PD = True
-            else:
-                A_PD = False
-        else:
-            A_Plus = None
-
         # Simulate network activity for `time` timesteps.
         for t in range(timesteps):
             # Get input to all layers (synchronous mode).
@@ -425,30 +404,43 @@ def run(
                     else:
                         self.layers[l].s[:, unclamp[t]] = 0
 
+            # Run synapse updates.
+            if "a_minus" in kwargs:
+                A_Minus = kwargs["a_minus"]
+                kwargs.pop("a_minus")
+                if isinstance(A_Minus, dict):
+                    A_MD = True
+                else:
+                    A_MD = False
+            else:
+                A_Minus = None
+
+            if "a_plus" in kwargs:
+                A_Plus = kwargs["a_plus"]
+                kwargs.pop("a_plus")
+                if isinstance(A_Plus, dict):
+                    A_PD = True
+                else:
+                    A_PD = False
+            else:
+                A_Plus = None
+
             for c in self.connections:
-                flad_m = False
                 if A_Minus != None and ((isinstance(A_Minus, float)) or (c in A_Minus)):
                     if A_MD:
                         kwargs["a_minus"] = A_Minus[c]
                     else:
                         kwargs["a_minus"] = A_Minus
-                    flad_m = True
 
-                flad_p = False
                 if A_Plus != None and ((isinstance(A_Plus, float)) or (c in A_Plus)):
                     if A_PD:
                         kwargs["a_plus"] = A_Plus[c]
                     else:
                         kwargs["a_plus"] = A_Plus
-                    flad_p = True
 
                 self.connections[c].update(
                     mask=masks.get(c, None), learning=self.learning, **kwargs
                 )
-                if flad_m:
-                    kwargs.pop("a_minus")
-                if flad_p:
-                    kwargs.pop("a_plus")
 
             # # Get input to all layers.
             # current_inputs.update(self._get_inputs())