Revert "added report and seems to be working"

This reverts commit b748da5.
SpiNNakerManchester · Feb 2, 2015 · 9c46905 · 9c46905
1 parent d9bfb07
commit 9c46905
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 331 deletions.
diff --git a/pacman/model/partitioned_graph/partitioned_vertex.py b/pacman/model/partitioned_graph/partitioned_vertex.py
@@ -19,6 +19,8 @@ def __init__(self, resources_required, label, constraints=None):
                     .AbstractConstraint`
         :raise pacman.exceptions.PacmanInvalidParameterException:
                     * If one of the constraints is not valid
+                    * If lo_atom is less than 0
+                    * If hi_atom is less than lo_atom
         """
         AbstractConstrainedVertex.__init__(self, label=label)
         self._label = label

diff --git a/pacman/model/routing_info/subedge_routing_info.py b/pacman/model/routing_info/subedge_routing_info.py
@@ -43,10 +43,3 @@ def mask(self):
     def subedge(self):
         return self._subedge
 
-    def __repr__(self):
-        return "subedge:{}, key:{}, mask:{}"\
-            .format(self._subedge, hex(self._key), hex(self._mask))
-
-    def __str__(self):
-        return self.__repr__()
-
diff --git a/pacman/operations/routing_info_allocator_algorithms/__init__.py b/pacman/operations/routing_info_allocator_algorithms/__init__.py
@@ -1,5 +1,2 @@
 from pacman.operations.routing_info_allocator_algorithms.\
-    basic_routing_info_allocator import BasicRoutingInfoAllocator
-from pacman.operations.routing_info_allocator_algorithms.\
-    malloc_based_routing_allocator.malloc_based_routing_info_allocator \
-    import MallocBasedRoutingInfoAllocator
+    basic_routing_info_allocator import BasicRoutingInfoAllocator
diff --git a/...n/operations/routing_info_allocator_algorithms/malloc_based_routing_allocator/__init__.py b/...n/operations/routing_info_allocator_algorithms/malloc_based_routing_allocator/__init__.py
diff --git a/...operations/routing_info_allocator_algorithms/malloc_based_routing_allocator/free_space.py b/...operations/routing_info_allocator_algorithms/malloc_based_routing_allocator/free_space.py
diff --git a/...llocator_algorithms/malloc_based_routing_allocator/malloc_based_routing_info_allocator.py b/...llocator_algorithms/malloc_based_routing_allocator/malloc_based_routing_info_allocator.py
diff --git a/pacman/utilities/constants.py b/pacman/utilities/constants.py
@@ -1,2 +1 @@
-DEFAULT_MASK = 0xfffff800  # DEFAULT LOCATION FOR THE APP MASK
-BITS_IN_KEY = 32
+DEFAULT_MASK = 0xfffff800  # DEFAULT LOCATION FOR THE APP MASK
diff --git a/pacman/utilities/reports.py b/pacman/utilities/reports.py
@@ -254,23 +254,20 @@ def routing_info_report(report_folder, hostname, subgraph, placements,
                         routing_infos):
     file_name = os.path.join(report_folder,
                              "virtual_key_space_information_report.rpt")
-    output = None
     try:
         output = open(file_name, "w")
     except IOError:
         logger.error("generate virtual key space information report: "
                      "Can't open file {} for writing.".format(file_name))
 
     for subvert in subgraph.subvertices:
-        output.write("Subvert: {} \n".format(subvert))
         outgoing_subedges = subgraph.outgoing_subedges_from_subvertex(subvert)
         for outgoing_subedge in outgoing_subedges:
             subedge_routing_info = routing_infos.\
                 get_subedge_information_from_subedge(outgoing_subedge)
-            output.write("{} \n".format(subedge_routing_info))
-        output.write("\n\n")
-    output.flush()
-    output.close()
+
+
+
 
 
 def router_report_from_router_tables(report_folder, routing_tables):