Merge pull request #827 from sdiazpier/sp_check

Moved vacant sp elements sanity check to decay function
nest · Oct 13, 2017 · ab2b396 · ab2b396
2 parents ff33e38 + 63d40c9
commit ab2b396
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/nestkernel/synaptic_element.h b/nestkernel/synaptic_element.h
@@ -172,7 +172,7 @@ class SynapticElement
   int
   get_z_vacant() const
   {
-    return std::max( std::floor( z_ ) - z_connected_, 0. );
+    return std::floor( z_ ) - z_connected_;
   }
   /*
    * Retrieves the current number of synaptic elements bound to a synapse
@@ -243,7 +243,10 @@ class SynapticElement
   void
   decay_z_vacant()
   {
-    z_ -= get_z_vacant() * tau_vacant_;
+    if ( get_z_vacant() > 0 )
+    {
+      z_ -= get_z_vacant() * tau_vacant_;
+    }
   }
 
   bool