alex/copycat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove global variable coderackPressures (bugfix?)

Browse Source 
Before this patch, `coderackPressures.updatePressures()` was always
a no-op, as evidenced by the until-now-harmless misspelling of Python's
list `remove` operation as `removeElement`.

I can't tell if this broke anything; my tests still pass.
This commit is contained in:
Arthur O'Dwyer
2017-04-16 18:05:50 -07:00
parent 5423d078e8
commit a41b639487
3 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
copycat/coderack.py
View File

@ -22,7 +22,6 @@ def getUrgencyBin(urgency):
class CodeRack(object): class CodeRack(object):
def __init__(self): def __init__(self):
#logging.debug('coderack.__init__()')
self.speedUpBonds = False self.speedUpBonds = False
self.removeBreakerCodelets = False self.removeBreakerCodelets = False
self.removeTerracedScan = False self.removeTerracedScan = False
@ -37,7 +36,6 @@ class CodeRack(object):
self.postings = {} self.postings = {}
def reset(self): def reset(self):
#logging.debug('coderack.reset()')
from temperature import temperature from temperature import temperature
self.codelets = [] self.codelets = []

11
copycat/coderackPressure.py
View File

@ -8,7 +8,6 @@ class CoderackPressure(object):
self.name = name self.name = name
def reset(self): def reset(self):
self.unmodifedValues = []
self.values = [] self.values = []
self.codelets = [] self.codelets = []
@ -57,12 +56,10 @@ def _codelet_index(codelet):
class CoderackPressures(object): class CoderackPressures(object):
def __init__(self): def __init__(self):
#logging.debug('coderackPressures.__init__()')
self.initialisePressures() self.initialisePressures()
self.reset() self.reset()
def initialisePressures(self): def initialisePressures(self):
#logging.debug('coderackPressures.initialisePressures()')
self.pressures = [ self.pressures = [
CoderackPressure('Bottom Up Bonds'), CoderackPressure('Bottom Up Bonds'),
CoderackPressure('Top Down Successor Bonds'), CoderackPressure('Top Down Successor Bonds'),
@ -85,7 +82,6 @@ class CoderackPressures(object):
] ]
def calculatePressures(self): def calculatePressures(self):
#logging.debug('coderackPressures.calculatePressures()')
scale = (100.0 - Temperature + 10.0) / 15.0 scale = (100.0 - Temperature + 10.0) / 15.0
values = map( values = map(
lambda pressure: sum(c.urgency ** scale for c in pressure.codelets), lambda pressure: sum(c.urgency ** scale for c in pressure.codelets),
@ -98,15 +94,14 @@ class CoderackPressures(object):
pressure.values += [value * 100.0] pressure.values += [value * 100.0]
for codelet in self.removedCodelets: for codelet in self.removedCodelets:
if codelet.pressure: if codelet.pressure:
codelet.pressure.codelets.removeElement(codelet) codelet.pressure.codelets.remove(codelet)
self.removedCodelets = [] self.removedCodelets = []
def reset(self): def reset(self):
#logging.debug('coderackPressures.reset()')
self.maxValue = 0.001 self.maxValue = 0.001
self.removedCodelets = []
for pressure in self.pressures: for pressure in self.pressures:
pressure.reset() pressure.reset()
self.removedCodelets = []
def addCodelet(self, codelet): def addCodelet(self, codelet):
i = _codelet_index(codelet) i = _codelet_index(codelet)
@ -121,5 +116,3 @@ class CoderackPressures(object):
def numberOfPressures(self): def numberOfPressures(self):
return len(self.pressures) return len(self.pressures)
coderackPressures = CoderackPressures()

3
copycat/copycat.py
View File

@ -4,7 +4,6 @@ from workspace import workspace
from slipnet import slipnet from slipnet import slipnet
from temperature import temperature from temperature import temperature
from coderack import coderack from coderack import coderack
from coderackPressure import coderackPressures
def updateEverything(): def updateEverything():
@ -12,7 +11,7 @@ def updateEverything():
coderack.updateCodelets() coderack.updateCodelets()
slipnet.update() slipnet.update()
workspace.updateTemperature() workspace.updateTemperature()
coderackPressures.calculatePressures() coderack.pressures.calculatePressures()
def mainLoop(lastUpdate): def mainLoop(lastUpdate):