More Pythonic idioms in coderackPressure.py.
No functional change.
This commit is contained in:
@ -63,37 +63,35 @@ class CoderackPressures(object):
|
|||||||
|
|
||||||
def initialisePressures(self):
|
def initialisePressures(self):
|
||||||
#logging.debug('coderackPressures.initialisePressures()')
|
#logging.debug('coderackPressures.initialisePressures()')
|
||||||
self.pressures = []
|
self.pressures = [
|
||||||
self.pressures += [CoderackPressure('Bottom Up Bonds')]
|
CoderackPressure('Bottom Up Bonds'),
|
||||||
self.pressures += [CoderackPressure('Top Down Successor Bonds')]
|
CoderackPressure('Top Down Successor Bonds'),
|
||||||
self.pressures += [CoderackPressure('Top Down Predecessor Bonds')]
|
CoderackPressure('Top Down Predecessor Bonds'),
|
||||||
self.pressures += [CoderackPressure('Top Down Sameness Bonds')]
|
CoderackPressure('Top Down Sameness Bonds'),
|
||||||
self.pressures += [CoderackPressure('Top Down Left Bonds')]
|
CoderackPressure('Top Down Left Bonds'),
|
||||||
self.pressures += [CoderackPressure('Top Down Right Bonds')]
|
CoderackPressure('Top Down Right Bonds'),
|
||||||
self.pressures += [CoderackPressure('Top Down Successor Group')]
|
CoderackPressure('Top Down Successor Group'),
|
||||||
self.pressures += [CoderackPressure('Top Down Predecessor Group')]
|
CoderackPressure('Top Down Predecessor Group'),
|
||||||
self.pressures += [CoderackPressure('Top Down Sameness Group')]
|
CoderackPressure('Top Down Sameness Group'),
|
||||||
self.pressures += [CoderackPressure('Top Down Left Group')]
|
CoderackPressure('Top Down Left Group'),
|
||||||
self.pressures += [CoderackPressure('Top Down Right Group')]
|
CoderackPressure('Top Down Right Group'),
|
||||||
self.pressures += [CoderackPressure('Bottom Up Whole Group')]
|
CoderackPressure('Bottom Up Whole Group'),
|
||||||
self.pressures += [CoderackPressure('Replacement Finder')]
|
CoderackPressure('Replacement Finder'),
|
||||||
self.pressures += [CoderackPressure('Rule Codelets')]
|
CoderackPressure('Rule Codelets'),
|
||||||
self.pressures += [CoderackPressure('Rule Translator')]
|
CoderackPressure('Rule Translator'),
|
||||||
self.pressures += [CoderackPressure('Bottom Up Correspondences')]
|
CoderackPressure('Bottom Up Correspondences'),
|
||||||
self.pressures += [CoderackPressure(
|
CoderackPressure('Important Object Correspondences'),
|
||||||
'Important Object Correspondences')]
|
CoderackPressure('Breakers'),
|
||||||
self.pressures += [CoderackPressure('Breakers')]
|
]
|
||||||
|
|
||||||
def calculatePressures(self):
|
def calculatePressures(self):
|
||||||
#logging.debug('coderackPressures.calculatePressures()')
|
#logging.debug('coderackPressures.calculatePressures()')
|
||||||
scale = (100.0 - Temperature + 10.0) / 15.0
|
scale = (100.0 - Temperature + 10.0) / 15.0
|
||||||
values = []
|
values = map(
|
||||||
for pressure in self.pressures:
|
lambda pressure: sum([c.urgency ** scale for c in pressure.codelets]),
|
||||||
value = sum([c.urgency ** scale for c in pressure.codelets])
|
self.pressures
|
||||||
values += [value]
|
)
|
||||||
totalValue = sum(values)
|
totalValue = sum(values) or 1.0
|
||||||
if not totalValue:
|
|
||||||
totalValue = 1.0
|
|
||||||
values = [value / totalValue for value in values]
|
values = [value / totalValue for value in values]
|
||||||
self.maxValue = max(values)
|
self.maxValue = max(values)
|
||||||
for pressure, value in zip(self.pressures, values):
|
for pressure, value in zip(self.pressures, values):
|
||||||
|
|||||||
Reference in New Issue
Block a user