simplify reset_graph_elements

spynnaker/pyNN/models/neuron/population_vertex.py

@@ -42,8 +42,6 @@
 from pacman.model.resources import AbstractSDRAM, MultiRegionSDRAM
 from pacman.utilities.utility_calls import get_n_bits
 
-from spinn_front_end_common.abstract_models import (
-    AbstractCanReset)
 from spinn_front_end_common.interface.buffer_management\
     .recording_utilities import (
        get_recording_header_size, get_recording_data_constant_size)
@@ -173,7 +171,7 @@ def _is_structural(dynamics: AbstractSynapseDynamics
 
 class PopulationVertex(
         PopulationApplicationVertex, AbstractAcceptsIncomingSynapses,
-        AbstractCanReset, SupportsStructure):
+        SupportsStructure):
     """
     Underlying vertex model for Neural Populations.
     """
@@ -1348,8 +1346,10 @@ def __str__(self) -> str:
     def __repr__(self) -> str:
         return self.__str__()
 
-    @overrides(AbstractCanReset.reset_to_first_timestep)
     def reset_to_first_timestep(self) -> None:
+        """
+        Sets the required elements of the vertex
+        """
         # Reset state variables
         self.__state_variables.copy_into(self.__initial_state_variables)
 

spynnaker/pyNN/spinnaker.py

@@ -42,7 +42,8 @@
 from spynnaker.pyNN import model_binaries
 from spynnaker.pyNN.config_setup import add_spynnaker_cfg, SPYNNAKER_CFG
 from spynnaker.pyNN.models.recorder import Recorder
-from spynnaker.pyNN.models.neuron import AbstractPyNNNeuronModel
+from spynnaker.pyNN.models.neuron import (
+    AbstractPyNNNeuronModel, PopulationVertex)
 from spynnaker.pyNN.data import SpynnakerDataView
 from spynnaker.pyNN.data.spynnaker_data_writer import SpynnakerDataWriter
 from spynnaker.pyNN.extra_algorithms import (
@@ -427,6 +428,13 @@ def _execute_delay_support_adder(self) -> None:
             raise ConfigurationException(
                 f"Unexpected cfg setting delay_support_adder: {name}")
 
+    @overrides(AbstractSpinnakerBase.reset)
+    def reset(self) -> None:
+        super().reset()
+        for vertex in self._data_writer.get_vertices_by_type(
+                PopulationVertex):
+            vertex.reset_to_first_timestep()
+
     @overrides(AbstractSpinnakerBase._execute_buffer_extractor)
     def _execute_buffer_extractor(self) -> None:
         super()._execute_buffer_extractor()