From aeb8cda755c3bda227fc6001940c875119cb38f9 Mon Sep 17 00:00:00 2001 From: J Alan Brogan Date: Mon, 1 Jun 2015 10:52:20 +0100 Subject: [PATCH] Tidy references (which were broken by daeff3d) #5 --- copycat/codeletMethods.py | 2 +- copycat/coderack.py | 4 ++-- copycat/coderackPressure.py | 2 +- copycat/slipnet.py | 12 ++++++++++++ copycat/workspaceObject.py | 19 +++++-------------- 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/copycat/codeletMethods.py b/copycat/codeletMethods.py index 46d0c37..0660210 100644 --- a/copycat/codeletMethods.py +++ b/copycat/codeletMethods.py @@ -4,7 +4,7 @@ import random import logging -import slipnet +from slipnet import slipnet import temperature import formulas from workspaceFormulas import chooseDirectedNeighbor diff --git a/copycat/coderack.py b/copycat/coderack.py index 0d32652..c3820ee 100644 --- a/copycat/coderack.py +++ b/copycat/coderack.py @@ -119,7 +119,7 @@ class CodeRack(object): def newCodelet(self, name, oldCodelet, strength, arguments=None): #logging.debug('Posting new codelet called %s' % name) - urgency = self.getUrgencyBin(strength) + urgency = getUrgencyBin(strength) newCodelet = Codelet(name, urgency, self.codeletsRun) if arguments: newCodelet.arguments = [arguments] @@ -163,7 +163,7 @@ class CodeRack(object): numberOfMappings = len(mappings) if urgency: urgency /= numberOfMappings - binn = self.getUrgencyBin(urgency) + binn = getUrgencyBin(urgency) logging.info('urgency: %s, number: %d, bin: %d', urgency, numberOfMappings, binn) self.newCodelet('correspondence-strength-tester', diff --git a/copycat/coderackPressure.py b/copycat/coderackPressure.py index 4c83519..b14dd2b 100644 --- a/copycat/coderackPressure.py +++ b/copycat/coderackPressure.py @@ -47,7 +47,7 @@ def _codelet_index(codelet): i = name_indices.get(codelet.name, -1) try: return int(i) - except ValueError: + except (TypeError, ValueError): try: node = codelet.arguments[0] return i[node] diff --git a/copycat/slipnet.py b/copycat/slipnet.py index 901888b..062d53d 100644 --- a/copycat/slipnet.py +++ b/copycat/slipnet.py @@ -4,6 +4,18 @@ from slipnode import Slipnode from sliplink import Sliplink +def distinguishingDescriptor(descriptor): + """Whether no other object of the same type has the same descriptor""" + if descriptor == slipnet.letter: + return False + if descriptor == slipnet.group: + return False + for number in slipnet.numbers: + if number == descriptor: + return False + return True + + class SlipNet(object): # pylint: disable=too-many-instance-attributes def __init__(self): diff --git a/copycat/workspaceObject.py b/copycat/workspaceObject.py index 59a489f..981262d 100644 --- a/copycat/workspaceObject.py +++ b/copycat/workspaceObject.py @@ -1,28 +1,15 @@ import logging from description import Description -from slipnet import slipnet +from slipnet import slipnet, distinguishingDescriptor from workspaceStructure import WorkspaceStructure -def distinguishingDescriptor(descriptor): - """Whether no other object of the same type has the same descriptor""" - if descriptor == slipnet.letter: - return False - if descriptor == slipnet.group: - return False - for number in slipnet.numbers: - if number == descriptor: - return False - return True - - class WorkspaceObject(WorkspaceStructure): # pylint: disable=too-many-instance-attributes def __init__(self, workspaceString): WorkspaceStructure.__init__(self) self.string = workspaceString - #self.string.objects += [ self ] self.descriptions = [] self.extrinsicDescriptions = [] self.incomingBonds = [] @@ -187,6 +174,10 @@ class WorkspaceObject(WorkspaceStructure): objectOnMyRightIsRightmost = True return objectOnMyRightIsRightmost and objectOnMyLeftIsLeftmost + def distinguishingDescriptor(self, descriptor): + # pylint: disable=no-self-use + return distinguishingDescriptor(descriptor) + def relevantDistinguishingDescriptors(self): return [d.descriptor for d in self.relevantDescriptions()