Merge branch 'master' of https://github.com/Alex-Linhares/co.py.cat

copycat/codeletMethods.py

@@ -1010,7 +1010,7 @@ def correspondence_strength_tester(ctx, codelet):
                  objectFromTarget.flipped_version())))
     correspondence.updateStrength()
     strength = correspondence.totalStrength
-    #TODO: use entropy
+    # TODO: use entropy
     probability = temperature.getAdjustedProbability(strength / 100.0)
     if random.coinFlip(probability):
         # activate some concepts
@@ -1064,8 +1064,8 @@ def correspondence_builder(ctx, codelet):
     # if there is an incompatible bond then fight against it
     initial = correspondence.objectFromInitial
     target = correspondence.objectFromTarget
-    if  (initial.leftmost or initial.rightmost and
-         target.leftmost or target.rightmost):
+    if (initial.leftmost or initial.rightmost and
+            target.leftmost or target.rightmost):
         # search for the incompatible bond
         incompatibleBond = correspondence.getIncompatibleBond()
         if incompatibleBond:

copycat/coderack.py

@@ -83,7 +83,7 @@ class Coderack(object):
         if 'correspondence' in codeletName:
             return workspace.interStringUnhappiness / 100.0
         if 'description' in codeletName:
-            #TODO: use entropy
+            # TODO: use entropy
             return (temperature.value() / 100.0) ** 2
         return workspace.intraStringUnhappiness / 100.0
 
@@ -163,7 +163,7 @@ class Coderack(object):
         if codeletName == 'breaker':
             urgency = 1
 
-        #TODO: use entropy
+        # TODO: use entropy
         if temperature.value() < 25.0 and 'translator' in codeletName:
             urgency = 5
         for _ in range(howMany):
@@ -290,8 +290,8 @@ class Coderack(object):
         random = self.ctx.random
         temperature = self.ctx.temperature
         assert self.codelets
-        
-        #TODO: use entropy
+
+        # TODO: use entropy
         scale = (100.0 - temperature.value() + 10.0) / 15.0
         chosen = random.weighted_choice(self.codelets, [codelet.urgency ** scale for codelet in self.codelets])
         self.removeCodelet(chosen)

copycat/tests.py

@@ -27,11 +27,11 @@ def lower_bound_on_probability(hits, attempts, confidence=0.95):
     if attempts == 0:
         return 0
     z = pnormaldist(confidence)
-    zsqr = z*z
+    zsqr = z * z
     phat = 1.0 * hits / attempts
-    under_sqrt = (phat * (1 - phat) + zsqr / (4*attempts)) / attempts
+    under_sqrt = (phat * (1 - phat) + zsqr / (4 * attempts)) / attempts
     denominator = (1 + zsqr / attempts)
-    return (phat + zsqr / (2*attempts) - z * (under_sqrt ** 0.5)) / denominator
+    return (phat + zsqr / (2 * attempts) - z * (under_sqrt ** 0.5)) / denominator
 
 
 def upper_bound_on_probability(hits, attempts, confidence=0.95):

copycat/workspace.py

@@ -44,6 +44,16 @@ class Workspace(object):
         self.modified = WorkspaceString(self.ctx, self.modifiedString)
         self.target = WorkspaceString(self.ctx, self.targetString)
 
+    '''
+    # TODO: Initial part of refactoring in this method
+    def getAssessedUnhappiness(self, unhappiness):
+        o.Unhappiness = __adjustUnhappiness(
+            o.relativeImportance * o.Unhappiness
+            for o in self.objects)
+        pass
+    '''
+
+    # TODO: Extract method?
     def assessUnhappiness(self):
         self.intraStringUnhappiness = __adjustUnhappiness(
             o.relativeImportance * o.intraStringUnhappiness
@@ -55,6 +65,7 @@ class Workspace(object):
             o.relativeImportance * o.totalUnhappiness
             for o in self.objects)
 
+    # TODO: these 3 methods seem to be the same... are they?  If so, Extract method.
     def calculateIntraStringUnhappiness(self):
         value = sum(
             o.relativeImportance * o.intraStringUnhappiness
@@ -102,7 +113,7 @@ class Workspace(object):
         ))
 
     def numberOfUnrelatedObjects(self):
-        """A list of all objects in the workspace with >= 1 open bond slots"""
+        """Computes the number of all objects in the workspace with >= 1 open bond slots."""
         objects = [o for o in self.objects
                    if o.string == self.initial or o.string == self.target]
         objects = [o for o in objects if not o.spansString()]
@@ -120,21 +131,21 @@ class Workspace(object):
         return len(objects)
 
     def numberOfUnreplacedObjects(self):
-        """A list of all unreplaced objects in the initial string"""
+        """A list of all unreplaced objects in the initial string."""
         objects = [o for o in self.objects
                    if o.string == self.initial and isinstance(o, Letter)]
         objects = [o for o in objects if not o.replacement]
         return len(objects)
 
     def numberOfUncorrespondingObjects(self):
-        """A list of all uncorresponded objects in the initial string"""
+        """A list of all uncorresponded objects in the initial string."""
         objects = [o for o in self.objects
                    if o.string == self.initial or o.string == self.target]
         objects = [o for o in objects if not o.correspondence]
         return len(objects)
 
     def numberOfBonds(self):
-        """The number of bonds in the workspace"""
+        """The number of bonds in the workspace."""
         return sum(1 for o in self.structures if isinstance(o, Bond))
 
     def correspondences(self):

copycat/workspaceString.py

@@ -38,7 +38,7 @@ class WorkspaceString(object):
         return self.string[i]
 
     def updateRelativeImportance(self):
-        """Update the normalised importance of all objects in the string"""
+        """Update the normalised importance of all objects in the string."""
         total = sum(o.rawImportance for o in self.objects)
         if not total:
             for o in self.objects: