Merge pull request #1043 from Axelrod-Python/reconcile-moran-b

Reconcile Moran processes

Author: meatballs

axelrod/__init__.py

@@ -16,7 +16,7 @@
     update_history, update_state_distribution, Player)
 from .mock_player import MockPlayer
 from .match import Match
-from .moran import MoranProcess, MoranProcessGraph, ApproximateMoranProcess
+from .moran import MoranProcess, ApproximateMoranProcess
 from .strategies import *
 from .deterministic_cache import DeterministicCache
 from .match_generator import *

axelrod/graph.py

@@ -47,6 +47,12 @@ def add_edges(self, edges):
         for edge in edges:
             self.add_edge(*edge)
 
+    def add_loops(self):
+        """
+        Add all loops to edges
+        """
+        self.add_edges((i, i) for i, _ in enumerate(self.vertices()))
+
     def edges(self):
         return self._edges
 
@@ -116,13 +122,14 @@ def complete_graph(length, loops=True):
     -------
     a Graph object
     """
-    offset = 1
-    if loops:
-        offset = 0
     graph = Graph(directed=False)
     edges = []
     for i in range(length):
-        for j in range(i + offset, length):
+        for j in range(i + 1, length):
             edges.append((i, j))
     graph.add_edges(edges)
+
+    if loops:
+        graph.add_loops()
+
     return graph