From bd4790a3f129c74af0afb333f89f42e1c2adfd05 Mon Sep 17 00:00:00 2001 From: Arthur O'Dwyer Date: Mon, 17 Apr 2017 20:12:06 -0700 Subject: [PATCH] Kill all the globals (except `context`)! NFC. --- copycat/copycat.py | 13 +++++++------ copycat/slipnet.py | 3 --- copycat/temperature.py | 3 --- copycat/workspace.py | 5 +---- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/copycat/copycat.py b/copycat/copycat.py index a3cdbcc..db50900 100644 --- a/copycat/copycat.py +++ b/copycat/copycat.py @@ -1,17 +1,18 @@ import logging -from workspace import workspace -from slipnet import slipnet -from temperature import temperature +from workspace import Workspace +from slipnet import Slipnet +from temperature import Temperature from coderack import Coderack from context import context -context.slipnet = slipnet -context.temperature = temperature +context.slipnet = Slipnet() +context.temperature = Temperature() context.coderack = Coderack(context) -context.workspace = workspace +context.workspace = Workspace() + def run(initial, modified, target, iterations): return context.run(initial, modified, target, iterations) diff --git a/copycat/slipnet.py b/copycat/slipnet.py index 097fcf9..8372025 100644 --- a/copycat/slipnet.py +++ b/copycat/slipnet.py @@ -274,6 +274,3 @@ class Slipnet(object): self.__addNonSlipLink(previous, item, label=self.successor) self.__addNonSlipLink(item, previous, label=self.predecessor) previous = item - - -slipnet = Slipnet() diff --git a/copycat/temperature.py b/copycat/temperature.py index 4ffed9d..c5b8c1f 100644 --- a/copycat/temperature.py +++ b/copycat/temperature.py @@ -27,6 +27,3 @@ class Temperature(object): def value(self): return 100.0 if self.clamped else self.actual_value - - -temperature = Temperature() diff --git a/copycat/workspace.py b/copycat/workspace.py index 58d4e40..f9dd4d5 100644 --- a/copycat/workspace.py +++ b/copycat/workspace.py @@ -148,7 +148,7 @@ class Workspace(object): if self.changedObject and self.changedObject.correspondence: result = [m for m in self.changedObject.correspondence.conceptMappings] - for objekt in workspace.initial.objects: + for objekt in self.initial.objects: if objekt.correspondence: for mapping in objekt.correspondence.slippages(): if not mapping.isNearlyContainedBy(result): @@ -171,6 +171,3 @@ class Workspace(object): description.descriptor.buffer = 100.0 if description not in self.structures: self.structures += [description] - - -workspace = Workspace()