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

Disentangle one reference to slipnet.

Browse Source
This commit is contained in:
Arthur O'Dwyer
2017-04-17 11:21:03 -07:00
parent cc288161a4
commit 6871d7a86c
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
copycat/codeletMethods.py
View File

@ -77,10 +77,6 @@ def __getDescriptors(bondFacet, source, destination):
return sourceDescriptor, destinationDescriptor return sourceDescriptor, destinationDescriptor
def __allOppositeMappings(mappings):
return all(m.label == slipnet.opposite for m in mappings)
def __structureVsStructure(structure1, weight1, structure2, weight2): def __structureVsStructure(structure1, weight1, structure2, weight2):
structure1.updateStrength() structure1.updateStrength()
structure2.updateStrength() structure2.updateStrength()
@ -837,7 +833,7 @@ def bottom_up_correspondence_scout(coderack, codelet):
if (objectFromInitial.spansString() and if (objectFromInitial.spansString() and
objectFromTarget.spansString() and objectFromTarget.spansString() and
slipnet.directionCategory in initialDescriptionTypes slipnet.directionCategory in initialDescriptionTypes
and __allOppositeMappings(formulas.oppositeMappings) and all(m.label == slipnet.opposite for m in opposites) # unreached?
and slipnet.opposite.activation != 100.0): and slipnet.opposite.activation != 100.0):
objectFromTarget = objectFromTarget.flippedVersion() objectFromTarget = objectFromTarget.flippedVersion()
conceptMappings = formulas.getMappings( conceptMappings = formulas.getMappings(
@ -888,7 +884,7 @@ def important_object_correspondence_scout(coderack, codelet):
if (objectFromInitial.spansString() if (objectFromInitial.spansString()
and objectFromTarget.spansString() and objectFromTarget.spansString()
and slipnet.directionCategory in initialDescriptionTypes and slipnet.directionCategory in initialDescriptionTypes
and __allOppositeMappings(formulas.oppositeMappings) and all(m.label == slipnet.opposite for m in opposites) # unreached?
and slipnet.opposite.activation != 100.0): and slipnet.opposite.activation != 100.0):
objectFromTarget = objectFromTarget.flippedVersion() objectFromTarget = objectFromTarget.flippedVersion()
conceptMappings = formulas.getMappings( conceptMappings = formulas.getMappings(