Mercurial > code > home > repos > homeauto
changeset 1632:bd79a2941cab
just (a lot of) debug changes
| author | drewp@bigasterisk.com |
|---|---|
| date | Sun, 12 Sep 2021 21:46:39 -0700 |
| parents | 2c85a4f5dd9c |
| children | 6107603ed455 |
| files | service/mqtt_to_rdf/candidate_binding.py service/mqtt_to_rdf/inference.py |
| diffstat | 2 files changed, 37 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/service/mqtt_to_rdf/candidate_binding.py Sun Sep 12 04:32:52 2021 -0700 +++ b/service/mqtt_to_rdf/candidate_binding.py Sun Sep 12 21:46:39 2021 -0700 @@ -1,3 +1,4 @@ +import logging from dataclasses import dataclass from typing import Dict, Iterable, Iterator, Union @@ -6,7 +7,8 @@ from rdflib.term import Node, Variable from inference_types import BindableTerm, BindingUnknown, Triple - +log = logging.getLogger() +INDENT = ' ' @dataclass class CandidateBinding: @@ -24,7 +26,11 @@ self._applyTerm(stmt[1], returnBoundStatementsOnly), self._applyTerm(stmt[2], returnBoundStatementsOnly)) except BindingUnknown: + log.debug(f'{INDENT*7} CB.apply cant bind {stmt} using {self.binding}') + continue + log.debug(f'{INDENT*7} CB.apply took {stmt} to {bound}') + yield bound def _applyTerm(self, term: Node, failUnbound=True):
--- a/service/mqtt_to_rdf/inference.py Sun Sep 12 04:32:52 2021 -0700 +++ b/service/mqtt_to_rdf/inference.py Sun Sep 12 21:46:39 2021 -0700 @@ -45,16 +45,25 @@ """adding this stmt would be inconsistent with an existing binding""" +_stmtLooperShortId = itertools.count() + + @dataclass class StmtLooper: + """given one LHS stmt, iterate through the possible matches for it, + returning what bindings they would imply. Only distinct bindings are + returned. The bindings build on any `prev` StmtLooper's results. + + This iterator is restartable.""" lhsStmt: Triple prev: Optional['StmtLooper'] workingSet: ReadOnlyWorkingSet def __repr__(self): - return f'StmtLooper({graphDump([self.lhsStmt])} {"<pastEnd>" if self.pastEnd() else ""})' + return f'StmtLooper{self._shortId}({graphDump([self.lhsStmt])} {"<pastEnd>" if self.pastEnd() else ""})' def __post_init__(self): + self._shortId = next(_stmtLooperShortId) self._myWorkingSetMatches = self._myMatches(self.workingSet) self._current = CandidateBinding({}) @@ -86,12 +95,12 @@ except Inconsistent: log.debug(f'{INDENT*7} {self} - {stmt} would be inconsistent with prev bindings') continue - log.debug(f'seen {outBinding.binding} in {self._seenBindings}') + + log.debug(f'{INDENT*6} {outBinding=} {self._seenBindings=}') if outBinding.binding not in self._seenBindings: self._seenBindings.append(outBinding.binding.copy()) - log.debug(f'no, adding') self._current = outBinding - log.debug(f'{INDENT*7} {self} - Looper matches {stmt} which tells us {outBinding}') + log.debug(f'{INDENT*7} new binding from {self} -> {outBinding}') return log.debug(f'yes we saw') @@ -99,6 +108,8 @@ if self.lhsStmt[1] == ROOM['asFarenheit']: pb: Dict[BindableTerm, Node] = self._prevBindings() + log.debug(f'{INDENT*6} {self} consider ?x faren ?y where ?x={self.lhsStmt[0]} and {pb=}') + if self.lhsStmt[0] in pb: operands = [pb[cast(BindableTerm, self.lhsStmt[0])]] f = cast(Literal, Literal(Decimal(numericNode(operands[0])) * 9 / 5 + 32)) @@ -182,12 +193,10 @@ stmtStack.append(StmtLooper(s, prev, knownTrue)) prev = stmtStack[-1] except NoOptions: - log.debug(f'{INDENT*5} no options; 0 bindings') + log.debug(f'{INDENT*5} start up with no options; 0 bindings') return + self._debugStmtStack('initial odometer', stmtStack) - log.debug(f'{INDENT*5} initial odometer:') - for l in stmtStack: - log.debug(f'{INDENT*6} {l}') if any(ring.pastEnd() for ring in stmtStack): log.debug(f'{INDENT*5} some rings started at pastEnd {stmtStack}') @@ -202,24 +211,23 @@ log.debug(f'{INDENT*4} vv findCandBindings iteration {iterCount}') - log.debug(f'{INDENT*5} <<<') yield BoundLhs(self, sl.currentBinding()) - log.debug(f'{INDENT*5} >>>') - log.debug(f'{INDENT*5} odometer:') - for l in stmtStack: - log.debug(f'{INDENT*6} {l} curbind={l.currentBinding() if not l.pastEnd() else "<end>"}') + self._debugStmtStack('odometer', stmtStack) done = self._advanceAll(stmtStack) - log.debug(f'{INDENT*5} odometer after ({done=}):') - for l in stmtStack: - log.debug(f'{INDENT*6} {l} curbind={l.currentBinding() if not l.pastEnd() else "<end>"}') + self._debugStmtStack('odometer after ({done=})', stmtStack) log.debug(f'{INDENT*4} ^^ findCandBindings iteration done') if done: break + def _debugStmtStack(self, label, stmtStack): + log.debug(f'{INDENT*5} {label}:') + for l in stmtStack: + log.debug(f'{INDENT*6} {l} curbind={l.currentBinding() if not l.pastEnd() else "<end>"}') + def _advanceAll(self, stmtStack: List[StmtLooper]) -> bool: carry = True # 1st elem always must advance for i, ring in enumerate(stmtStack): @@ -387,10 +395,10 @@ class Rule: lhsGraph: Graph rhsGraph: Graph - + def __post_init__(self): self.lhs = Lhs(self.lhsGraph) - # + # self.rhsBnodeMap = {} def applyRule(self, workingSet: Graph, implied: Graph, stats: Dict): @@ -404,14 +412,13 @@ if isinstance(t, BNode): existingRhsBnodes.add(t) # if existingRhsBnodes: - # log.debug(f'{INDENT*6} mapping rhs bnodes {existingRhsBnodes} to new ones') + # log.debug(f'{INDENT*6} mapping rhs bnodes {existingRhsBnodes} to new ones') for b in existingRhsBnodes: key = tuple(sorted(bound.binding.binding.items())), b self.rhsBnodeMap.setdefault(key, BNode()) - bound.binding.addNewBindings(CandidateBinding({b: self.rhsBnodeMap[key]})) # for lhsBoundStmt in bound.binding.apply(bound.lhsStmtsWithoutEvals()): @@ -489,7 +496,9 @@ log.debug('') log.debug(f'{INDENT*2}-applying rule {i}') - log.debug(f'{INDENT*3} rule def lhs: {graphDump(r.lhsGraph)}') + log.debug(f'{INDENT*3} rule def lhs:') + for stmt in r.lhsGraph: + log.debug(f'{INDENT*4} {stmt}') log.debug(f'{INDENT*3} rule def rhs: {graphDump(r.rhsGraph)}')