Decouple temperature from coderack.

copycat/coderack.py

@@ -9,6 +9,8 @@ import workspaceFormulas
 from slipnet import slipnet
 from codelet import Codelet
 from coderackPressure import CoderackPressures
+from temperature import temperature
+
 
 NUMBER_OF_BINS = 7
 
@@ -36,8 +38,6 @@ class CodeRack(object):
         self.postings = {}
 
     def reset(self):
-        from temperature import temperature
-
         self.codelets = []
         self.codeletsRun = 0
         temperature.clamped = True

copycat/copycat.py

@@ -15,7 +15,7 @@ def updateEverything():
 
 
 def mainLoop(lastUpdate):
-    temperature.tryUnclamp()
+    temperature.tryUnclamp(coderack.codeletsRun)
     result = lastUpdate
     if not coderack.codeletsRun:
         updateEverything()

copycat/temperature.py

@@ -10,15 +10,10 @@ class Temperature(object):
     def update(self, value):
         self.value = value
 
-    def tryUnclamp(self):
+    def tryUnclamp(self, currentTime):
-        from coderack import coderack
+        if self.clamped and currentTime >= self.clampTime:
-
+            logging.info('unclamp temperature at %d', currentTime)
-        if self.clamped and coderack.codeletsRun >= self.clampTime:
-            logging.info('unclamp temperature at %d', coderack.codeletsRun)
             self.clamped = False
 
-    def log(self):
-        logging.debug('temperature.value: %f', self.value)
-
 
 temperature = Temperature()