Merge pull request #18 from SpiNNakerManchester/pacman_buffered_in_out

Tested and fixed issues
SpiNNakerManchester · Mar 30, 2015 · d34bb66 · d34bb66
2 parents 191b11c + 634afd2
commit d34bb66
Show file tree

Hide file tree

Showing 37 changed files with 786 additions and 646 deletions.
diff --git a/pacman/model/abstract_classes/abstract_constrained_edge.py b/pacman/model/abstract_classes/abstract_constrained_edge.py
@@ -9,4 +9,4 @@
 class AbstractConstrainedEdge(AbstractConstrainedObject):
 
     def __init__(self, label, constraints=None):
-        AbstractConstrainedObject.__init__(self, label, constraints)
+        AbstractConstrainedObject.__init__(self, label, constraints)
diff --git a/pacman/model/abstract_classes/abstract_constrained_object.py b/pacman/model/abstract_classes/abstract_constrained_object.py
@@ -20,15 +20,14 @@ def add_constraint(self, constraint):
 
         :param constraint: constraint to add
         :type constraint:\
-                    :py:class:`pacman.model.constraints.abstract_constraint\
-                    .AbstractConstraint`
+                    :py:class:`pacman.model.constraints.abstract_constraint.AbstractConstraint`
         :return: None
         :rtype: None
         :raise pacman.exceptions.PacmanInvalidParameterException: If the\
                     constraint is not valid
         """
-        if (constraint is None
-                or not isinstance(constraint, AbstractConstraint)):
+        if (constraint is None or
+                not isinstance(constraint, AbstractConstraint)):
             raise PacmanInvalidParameterException(
                 "constraint", constraint, "Must be a pacman.model."
                                           "constraints.abstract_constraint."
@@ -41,8 +40,7 @@ def add_constraints(self, constraints):
 
         :param constraints: iterable of constraints to add
         :type constraints: iterable of\
-                    :py:class:`pacman.model.constraints.abstract_constraint\
-                    .AbstractConstraint`
+                    :py:class:`pacman.model.constraints.abstract_constraint.AbstractConstraint`
         :return: None
         :rtype: None
         :raise pacman.exceptions.PacmanInvalidParameterException: If one of \

diff --git a/pacman/model/abstract_constrained_vertex.py b/pacman/model/abstract_constrained_vertex.py
diff --git a/...n/model/constraints/partitioner_constraints/partitioner_same_size_as_vertex_constraint.py b/...n/model/constraints/partitioner_constraints/partitioner_same_size_as_vertex_constraint.py
@@ -13,7 +13,7 @@ def __init__(self, vertex):
 
         :param vertex: The vertex to which the constraint refers
         :type vertex: \
-                    :py:class:`pacman.model.graph.vertex.AbstractConstrainedVertex`
+                    :py:class:`pacman.model.partitionable_graph.abstract_partitionable_vertex.AbstractPartitionableVertex`
         :raise None: does not raise any known exceptions
         """
         AbstractPartitionerConstraint.__init__(
@@ -29,7 +29,8 @@ def vertex(self):
         """ The vertex to partition with
 
         :return: the vertex
-        :rtype: :py:class:`pacman.model.graph.vertex.AbstractConstrainedVertex`
+        :rtype:\
+                    :py:class:`pacman.model.partitionable_graph.abstract_partitionable_vertex.AbstractPartitionableVertex`
         :raise None: does not raise any known exceptions
         """
         return self._vertex
diff --git a/pacman/model/constraints/utility_constraints/vertex_has_dependent_constraint.py b/pacman/model/constraints/utility_constraints/vertex_has_dependent_constraint.py
diff --git a/pacman/model/constraints/utility_constraints/vertex_requires_multi_cast_source_constraint.py b/pacman/model/constraints/utility_constraints/vertex_requires_multi_cast_source_constraint.py
diff --git a/...del/constraints/utility_constraints/vertex_requires_virtual_chip_in_machine_constraint.py b/...del/constraints/utility_constraints/vertex_requires_virtual_chip_in_machine_constraint.py