fixed #487

It is now possible to have synapses connecting 2 multi-compartment
models

c++/network.hpp

@@ -303,7 +303,8 @@ void network::integrate(double * I_ext_now) {
     // all compartments where neuron_idx is NaN will be treated
     // as single compartments and integrated normally
 
-    // integrate all channels in all compartments
+
+    // integrate all channels, mechanisms and synapses in all compartments
     for (int i = 0; i < n_comp; i++) {
 
         // move current values to previous values
@@ -314,19 +315,14 @@ void network::integrate(double * I_ext_now) {
         comp[i]->i_Ca = 0;
         comp[i]->I_ext = I_ext_now[i];
 
-        // integrate controllers
+
         comp[i]->integrateMechanisms();
 
         comp[i]->integrateChannels();
 
+        comp[i]->integrateSynapses();
 
 
-        // integrate synapses
-        if (isnan(comp[i]->neuron_idx))
-        {
-            comp[i]->integrateSynapses();
-        }
-
     }
 
     // integrate voltages in all single compartments

docs/reference/c++/network.md

@@ -242,7 +242,7 @@ and also assumes that no current is being injected into any compartment.
 
  **Code**
 
-[Click here to view this method's code](https://github.com/sg-s/xolotl/blob/master/c%2B%2B/network.hpp#L397)
+[Click here to view this method's code](https://github.com/sg-s/xolotl/blob/master/c%2B%2B/network.hpp#L393)
 
 -------