703c9aa90011c25a620b7d862f062ec5d0382d84,spynnaker/pyNN/models/neuron/synapse_dynamics/synapse_dynamics_structural_stdp.py,SynapseDynamicsStructuralSTDP,merge,#SynapseDynamicsStructuralSTDP#Any#,129

Before Change

    def merge(self, synapse_dynamics):
        // If other is structural, check structural matches
        if isinstance(synapse_dynamics, AbstractSynapseDynamicsStructural):
            if not CommonSP.is_same_as(self, synapse_dynamics):
                raise SynapticConfigurationException(
                    "Synapse dynamics must match exactly when using multiple"
                    " edges to the same population")
        // If other is STDP, check STDP matches

After Change

    def merge(self, synapse_dynamics):
        // If other is structural, check structural matches
        if isinstance(synapse_dynamics, AbstractSynapseDynamicsStructural):
            if not SynapseDynamicsStructuralCommon.is_same_as(
                    self, synapse_dynamics):
                raise SynapticConfigurationException(
                    "Synapse dynamics must match exactly when using multiple"
                    " edges to the same population")

Instances