diff --git a/copycat/coderack.py b/copycat/coderack.py index 0d7e5c6..173c6b3 100644 --- a/copycat/coderack.py +++ b/copycat/coderack.py @@ -22,7 +22,6 @@ def getUrgencyBin(urgency): class CodeRack(object): def __init__(self): - #logging.debug('coderack.__init__()') self.speedUpBonds = False self.removeBreakerCodelets = False self.removeTerracedScan = False @@ -37,7 +36,6 @@ class CodeRack(object): self.postings = {} def reset(self): - #logging.debug('coderack.reset()') from temperature import temperature self.codelets = [] diff --git a/copycat/coderackPressure.py b/copycat/coderackPressure.py index d60769b..c4103f6 100644 --- a/copycat/coderackPressure.py +++ b/copycat/coderackPressure.py @@ -8,7 +8,6 @@ class CoderackPressure(object): self.name = name def reset(self): - self.unmodifedValues = [] self.values = [] self.codelets = [] @@ -57,12 +56,10 @@ def _codelet_index(codelet): class CoderackPressures(object): def __init__(self): - #logging.debug('coderackPressures.__init__()') self.initialisePressures() self.reset() def initialisePressures(self): - #logging.debug('coderackPressures.initialisePressures()') self.pressures = [ CoderackPressure('Bottom Up Bonds'), CoderackPressure('Top Down Successor Bonds'), @@ -85,7 +82,6 @@ class CoderackPressures(object): ] def calculatePressures(self): - #logging.debug('coderackPressures.calculatePressures()') scale = (100.0 - Temperature + 10.0) / 15.0 values = map( lambda pressure: sum(c.urgency ** scale for c in pressure.codelets), @@ -98,15 +94,14 @@ class CoderackPressures(object): pressure.values += [value * 100.0] for codelet in self.removedCodelets: if codelet.pressure: - codelet.pressure.codelets.removeElement(codelet) + codelet.pressure.codelets.remove(codelet) self.removedCodelets = [] def reset(self): - #logging.debug('coderackPressures.reset()') self.maxValue = 0.001 + self.removedCodelets = [] for pressure in self.pressures: pressure.reset() - self.removedCodelets = [] def addCodelet(self, codelet): i = _codelet_index(codelet) @@ -121,5 +116,3 @@ class CoderackPressures(object): def numberOfPressures(self): return len(self.pressures) - -coderackPressures = CoderackPressures() diff --git a/copycat/copycat.py b/copycat/copycat.py index 89186e9..17f7348 100644 --- a/copycat/copycat.py +++ b/copycat/copycat.py @@ -4,7 +4,6 @@ from workspace import workspace from slipnet import slipnet from temperature import temperature from coderack import coderack -from coderackPressure import coderackPressures def updateEverything(): @@ -12,7 +11,7 @@ def updateEverything(): coderack.updateCodelets() slipnet.update() workspace.updateTemperature() - coderackPressures.calculatePressures() + coderack.pressures.calculatePressures() def mainLoop(lastUpdate):