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

Whitespace. NFC.

Browse Source
This commit is contained in:
Arthur O'Dwyer
2017-04-22 17:56:46 -07:00
parent 3de933dbfa
commit e3e6b051d3
1 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
copycat/slipnet.py
View File

@ -114,13 +114,10 @@ class Slipnet(object):
# categories # categories
self.letterCategory = self.__addNode('letterCategory', 30.0) self.letterCategory = self.__addNode('letterCategory', 30.0)
self.stringPositionCategory = self.__addNode( self.stringPositionCategory = self.__addNode('stringPositionCategory', 70.0)
'stringPositionCategory', 70.0)
self.stringPositionCategory.codelets += ['top-down-description-scout'] self.stringPositionCategory.codelets += ['top-down-description-scout']
self.alphabeticPositionCategory = self.__addNode( self.alphabeticPositionCategory = self.__addNode('alphabeticPositionCategory', 80.0)
'alphabeticPositionCategory', 80.0) self.alphabeticPositionCategory.codelets += ['top-down-description-scout']
self.alphabeticPositionCategory.codelets += [
'top-down-description-scout']
self.directionCategory = self.__addNode('directionCategory', 70.0) self.directionCategory = self.__addNode('directionCategory', 70.0)
self.bondCategory = self.__addNode('bondCategory', 80.0) self.bondCategory = self.__addNode('bondCategory', 80.0)
self.groupCategory = self.__addNode('groupCategory', 80.0) self.groupCategory = self.__addNode('groupCategory', 80.0)
@ -149,14 +146,17 @@ class Slipnet(object):
# lengths # lengths
for number in self.numbers: for number in self.numbers:
self.__addInstanceLink(self.length, number) self.__addInstanceLink(self.length, number)
groups = [self.predecessorGroup, self.successorGroup, groups = [self.predecessorGroup, self.successorGroup, self.samenessGroup]
self.samenessGroup]
for group in groups: for group in groups:
self.__addNonSlipLink(group, self.length, length=95.0) self.__addNonSlipLink(group, self.length, length=95.0)
opposites = [(self.first, self.last), (self.leftmost, self.rightmost), opposites = [
(self.leftmost, self.rightmost), (self.left, self.right), (self.first, self.last),
(self.successor, self.predecessor), (self.leftmost, self.rightmost),
(self.successorGroup, self.predecessorGroup)] (self.leftmost, self.rightmost),
(self.left, self.right),
(self.successor, self.predecessor),
(self.successorGroup, self.predecessorGroup),
]
for a, b in opposites: for a, b in opposites:
self.__addOppositeLink(a, b) self.__addOppositeLink(a, b)
# properties # properties
@ -188,24 +188,18 @@ class Slipnet(object):
(self.groupCategory, self.samenessGroup), (self.groupCategory, self.samenessGroup),
# bond facets # bond facets
(self.bondFacet, self.letterCategory), (self.bondFacet, self.letterCategory),
(self.bondFacet, self.length)] (self.bondFacet, self.length),
]
for a, b in links: for a, b in links:
self.__addInstanceLink(a, b) self.__addInstanceLink(a, b)
# link bonds to their groups # link bonds to their groups
self.__addNonSlipLink( self.__addNonSlipLink(self.sameness, self.samenessGroup, label=self.groupCategory, length=30.0)
self.sameness, self.samenessGroup, label=self.groupCategory, self.__addNonSlipLink(self.successor, self.successorGroup, label=self.groupCategory, length=60.0)
length=30.0) self.__addNonSlipLink(self.predecessor, self.predecessorGroup, label=self.groupCategory, length=60.0)
self.__addNonSlipLink(self.successor, self.successorGroup,
label=self.groupCategory, length=60.0)
self.__addNonSlipLink(self.predecessor, self.predecessorGroup,
label=self.groupCategory, length=60.0)
# link bond groups to their bonds # link bond groups to their bonds
self.__addNonSlipLink(self.samenessGroup, self.sameness, self.__addNonSlipLink(self.samenessGroup, self.sameness, label=self.bondCategory, length=90.0)
label=self.bondCategory, length=90.0) self.__addNonSlipLink(self.successorGroup, self.successor, label=self.bondCategory, length=90.0)
self.__addNonSlipLink(self.successorGroup, self.successor, self.__addNonSlipLink(self.predecessorGroup, self.predecessor, label=self.bondCategory, length=90.0)
label=self.bondCategory, length=90.0)
self.__addNonSlipLink(self.predecessorGroup, self.predecessor,
label=self.bondCategory, length=90.0)
# letter category to length # letter category to length
self.__addSlipLink(self.letterCategory, self.length, length=95.0) self.__addSlipLink(self.letterCategory, self.length, length=95.0)
self.__addSlipLink(self.length, self.letterCategory, length=95.0) self.__addSlipLink(self.length, self.letterCategory, length=95.0)