Inline the constant slipnet.timeStepLength. NFC.

copycat/copycat.py

@@ -5,28 +5,24 @@ from slipnet import slipnet
 from temperature import temperature
 from coderack import Coderack
 
-coderack = Coderack()
 
-def updateEverything():
+coderack = Coderack()
-    workspace.updateEverything()
-    coderack.updateCodelets()
-    slipnet.update()
-    workspace.updateTemperature()
-    coderack.pressures.calculatePressures()
 
 
 def mainLoop(lastUpdate):
-    temperature.tryUnclamp(coderack.codeletsRun)
+    currentTime = coderack.codeletsRun
-    result = lastUpdate
+    temperature.tryUnclamp(currentTime)
-    if not coderack.codeletsRun:
+    # Every 15 codelets, we update the workspace.
-        updateEverything()
+    if currentTime >= lastUpdate + 15:
-        result = coderack.codeletsRun
+        workspace.updateEverything()
-    elif coderack.codeletsRun - lastUpdate >= slipnet.timeStepLength:
+        coderack.updateCodelets()
-        updateEverything()
+        slipnet.update()
-        result = coderack.codeletsRun
+        workspace.updateTemperature()
+        coderack.pressures.calculatePressures()
+        lastUpdate = currentTime
     logging.debug('Number of codelets: %d', len(coderack.codelets))
     coderack.chooseAndRunCodelet()
-    return result
+    return lastUpdate
 
 
 def runTrial(answers):
@@ -34,7 +30,7 @@ def runTrial(answers):
     slipnet.reset()
     workspace.reset()
     coderack.reset()
-    lastUpdate = 0
+    lastUpdate = float('-inf')
     while not workspace.foundAnswer:
         lastUpdate = mainLoop(lastUpdate)
     if workspace.rule:

copycat/slipnet.py

@@ -23,7 +23,6 @@ class SlipNet(object):
         self.slipnodes = []
         self.sliplinks = []
         self.bondFacets = []
-        self.timeStepLength = 15
         self.numberOfUpdates = 0
         self.__addInitialNodes()
         self.__addInitialLinks()