(Almost) contextualize all the things! NFC.

The only top-level imports now are needed for inheritance relationships.

The only function-level imports are HACKS that I need to FIXME; they
all `from context import context as ctx` and then fetch whatever they
actually need from the `ctx` just as if `ctx` had been passed in by the
caller instead of fetched from this magical global storage.
This commit is contained in:
Arthur O'Dwyer
2017-04-17 13:53:45 -07:00
parent 3096c49fb9
commit 25ba9bfe93
14 changed files with 180 additions and 106 deletions

View File

@ -2,7 +2,7 @@ import math
import logging
import random
from context import context
from conceptMapping import ConceptMapping
def selectListPosition(probabilities):
@ -60,12 +60,13 @@ def blur(value):
def chooseObjectFromList(objects, attribute):
from context import context as ctx
if not objects:
return None
probabilities = []
for objekt in objects:
value = getattr(objekt, attribute)
probability = temperatureAdjustedValue(context, value)
probability = temperatureAdjustedValue(ctx, value)
logging.info('Object: %s, value: %d, probability: %d',
objekt, value, probability)
probabilities += [probability]
@ -85,19 +86,21 @@ def chooseRelevantDescriptionByActivation(workspaceObject):
def similarPropertyLinks(slip_node):
from context import context as ctx
result = []
for slip_link in slip_node.propertyLinks:
association = slip_link.degreeOfAssociation() / 100.0
probability = temperatureAdjustedProbability(context, association)
probability = temperatureAdjustedProbability(ctx, association)
if coinFlip(probability):
result += [slip_link]
return result
def chooseSlipnodeByConceptualDepth(slip_nodes):
from context import context as ctx
if not slip_nodes:
return None
depths = [temperatureAdjustedValue(context, n.conceptualDepth) for n in slip_nodes]
depths = [temperatureAdjustedValue(ctx, n.conceptualDepth) for n in slip_nodes]
i = selectListPosition(depths)
return slip_nodes[i]
@ -137,7 +140,6 @@ def localDirectionCategoryRelevance(string, direction):
def getMappings(objectFromInitial, objectFromTarget,
initialDescriptions, targetDescriptions):
mappings = []
from conceptMapping import ConceptMapping
for initial in initialDescriptions:
for target in targetDescriptions:
if initial.descriptionType == target.descriptionType: