Kill all the globals (except context)! NFC.

This commit is contained in:
Arthur O'Dwyer
2017-04-17 20:12:06 -07:00
parent 22b15c3866
commit bd4790a3f1
4 changed files with 8 additions and 16 deletions

View File

@ -1,17 +1,18 @@
import logging import logging
from workspace import workspace 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 context import context from context import context
context.slipnet = slipnet context.slipnet = Slipnet()
context.temperature = temperature context.temperature = Temperature()
context.coderack = Coderack(context) context.coderack = Coderack(context)
context.workspace = workspace context.workspace = Workspace()
def run(initial, modified, target, iterations): def run(initial, modified, target, iterations):
return context.run(initial, modified, target, iterations) return context.run(initial, modified, target, iterations)

View File

@ -274,6 +274,3 @@ class Slipnet(object):
self.__addNonSlipLink(previous, item, label=self.successor) self.__addNonSlipLink(previous, item, label=self.successor)
self.__addNonSlipLink(item, previous, label=self.predecessor) self.__addNonSlipLink(item, previous, label=self.predecessor)
previous = item previous = item
slipnet = Slipnet()

View File

@ -27,6 +27,3 @@ class Temperature(object):
def value(self): def value(self):
return 100.0 if self.clamped else self.actual_value return 100.0 if self.clamped else self.actual_value
temperature = Temperature()

View File

@ -148,7 +148,7 @@ class Workspace(object):
if self.changedObject and self.changedObject.correspondence: if self.changedObject and self.changedObject.correspondence:
result = [m for m in result = [m for m in
self.changedObject.correspondence.conceptMappings] self.changedObject.correspondence.conceptMappings]
for objekt in workspace.initial.objects: for objekt in self.initial.objects:
if objekt.correspondence: if objekt.correspondence:
for mapping in objekt.correspondence.slippages(): for mapping in objekt.correspondence.slippages():
if not mapping.isNearlyContainedBy(result): if not mapping.isNearlyContainedBy(result):
@ -171,6 +171,3 @@ class Workspace(object):
description.descriptor.buffer = 100.0 description.descriptor.buffer = 100.0
if description not in self.structures: if description not in self.structures:
self.structures += [description] self.structures += [description]
workspace = Workspace()