Mercurial > code > home > repos > homeauto
annotate service/mqtt_to_rdf/inference/inference.py @ 1727:23e6154e6c11
file moves
| author | drewp@bigasterisk.com |
|---|---|
| date | Tue, 20 Jun 2023 23:26:24 -0700 |
| parents | service/mqtt_to_rdf/inference.py@88f6e9bf69d1 |
| children |
| rev | line source |
|---|---|
| 1587 | 1 """ |
| 2 copied from reasoning 2021-08-29. probably same api. should | |
| 3 be able to lib/ this out | |
| 4 """ | |
|
1588
0757fafbfdab
WIP inferencer - partial var and function support
drewp@bigasterisk.com
parents:
1587
diff
changeset
|
5 import itertools |
| 1587 | 6 import logging |
| 1601 | 7 import time |
| 1594 | 8 from collections import defaultdict |
| 1626 | 9 from dataclasses import dataclass |
| 1727 | 10 from pathlib import Path |
|
1692
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
11 from typing import Dict, Iterator, List, Optional, Tuple, Union, cast |
|
1588
0757fafbfdab
WIP inferencer - partial var and function support
drewp@bigasterisk.com
parents:
1587
diff
changeset
|
12 |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
13 from prometheus_client import Histogram, Summary |
| 1673 | 14 from rdflib import Graph, Namespace |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
15 from rdflib.graph import ConjunctiveGraph |
| 1727 | 16 from rdflib.term import Node, URIRef |
| 1587 | 17 |
| 1727 | 18 from inference.candidate_binding import CandidateBinding |
| 19 from inference.inference_types import (BindingUnknown, Inconsistent, RhsBnode, RuleUnboundBnode, Triple, WorkingSetBnode) | |
| 20 from inference.lhs_evaluation import functionsFor | |
| 21 from inference.rdf_debug import graphDump | |
| 22 from inference.stmt_chunk import (AlignedRuleChunk, Chunk, ChunkedGraph, applyChunky) | |
| 23 from inference.structured_log import StructuredLog | |
| 1605 | 24 |
| 1587 | 25 log = logging.getLogger('infer') |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
26 odolog = logging.getLogger('infer.odo') # the "odometer" logic |
|
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
27 ringlog = logging.getLogger('infer.ring') # for ChunkLooper |
|
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
28 |
|
1593
b0df43d5494c
big rewrite- more classes, smaller methods, more typesafe, all current tests passing
drewp@bigasterisk.com
parents:
1592
diff
changeset
|
29 INDENT = ' ' |
| 1587 | 30 |
| 1626 | 31 INFER_CALLS = Summary('inference_infer_calls', 'calls') |
| 32 INFER_GRAPH_SIZE = Histogram('inference_graph_size', 'statements', buckets=[2**x for x in range(2, 20, 2)]) | |
| 1587 | 33 |
| 34 ROOM = Namespace("http://projects.bigasterisk.com/room/") | |
| 35 LOG = Namespace('http://www.w3.org/2000/10/swap/log#') | |
| 36 MATH = Namespace('http://www.w3.org/2000/10/swap/math#') | |
| 37 | |
| 38 | |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
39 class NoOptions(ValueError): |
|
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
40 """ChunkLooper has no possibilites to add to the binding; the whole rule must therefore not apply""" |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
41 |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
42 |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
43 def debug(logger, slog: Optional[StructuredLog], msg): |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
44 logger.debug(msg) |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
45 if slog: |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
46 slog.say(msg) |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
47 |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
48 |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
49 _chunkLooperShortId = itertools.count() |
| 1632 | 50 |
| 51 | |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
52 @dataclass |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
53 class ChunkLooper: |
|
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
54 """given one LHS Chunk, iterate through the possible matches for it, |
| 1632 | 55 returning what bindings they would imply. Only distinct bindings are |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
56 returned. The bindings build on any `prev` ChunkLooper's results. |
| 1632 | 57 |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
58 In the odometer metaphor used below, this is one of the rings. |
|
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
59 |
| 1632 | 60 This iterator is restartable.""" |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
61 lhsChunk: Chunk |
|
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
62 prev: Optional['ChunkLooper'] |
|
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
63 workingSet: 'ChunkedGraph' |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
64 slog: Optional[StructuredLog] |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
65 |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
66 def __repr__(self): |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
67 return f'{self.__class__.__name__}{self._shortId}{"<pastEnd>" if self.pastEnd() else ""}' |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
68 |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
69 def __post_init__(self): |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
70 self._shortId = next(_chunkLooperShortId) |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
71 self._alignedMatches = list(self.lhsChunk.ruleMatchesFrom(self.workingSet)) |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
72 del self.workingSet |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
73 |
|
1668
89e53cb8a01c
fix some harder tests. Mostly, _advanceTheStack needed to spin the odometer rings starting from the other side, to get all the right combos
drewp@bigasterisk.com
parents:
1667
diff
changeset
|
74 # only ours- do not store prev, since it could change without us |
|
89e53cb8a01c
fix some harder tests. Mostly, _advanceTheStack needed to spin the odometer rings starting from the other side, to get all the right combos
drewp@bigasterisk.com
parents:
1667
diff
changeset
|
75 self._current = CandidateBinding({}) |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
76 self.currentSourceChunk: Optional[Chunk] = None # for debugging only |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
77 self._pastEnd = False |
| 1667 | 78 self._seenBindings: List[CandidateBinding] = [] # combined bindings (up to our ring) that we've returned |
| 1648 | 79 |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
80 if ringlog.isEnabledFor(logging.DEBUG): |
| 1667 | 81 ringlog.debug('') |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
82 msg = f'{INDENT*6} introducing {self!r}({self.lhsChunk}, {self._alignedMatches=})' |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
83 msg = msg.replace('AlignedRuleChunk', f'\n{INDENT*12}AlignedRuleChunk') |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
84 ringlog.debug(msg) |
| 1648 | 85 |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
86 self.restart() |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
87 |
|
1635
22d481f0a924
refactor: use CandidateBinding throughout, not loose dicts
drewp@bigasterisk.com
parents:
1634
diff
changeset
|
88 def _prevBindings(self) -> CandidateBinding: |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
89 if not self.prev or self.prev.pastEnd(): |
|
1635
22d481f0a924
refactor: use CandidateBinding throughout, not loose dicts
drewp@bigasterisk.com
parents:
1634
diff
changeset
|
90 return CandidateBinding({}) |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
91 |
|
1635
22d481f0a924
refactor: use CandidateBinding throughout, not loose dicts
drewp@bigasterisk.com
parents:
1634
diff
changeset
|
92 return self.prev.currentBinding() |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
93 |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
94 def advance(self): |
|
1668
89e53cb8a01c
fix some harder tests. Mostly, _advanceTheStack needed to spin the odometer rings starting from the other side, to get all the right combos
drewp@bigasterisk.com
parents:
1667
diff
changeset
|
95 """update _current to a new set of valid bindings we haven't seen (since |
|
89e53cb8a01c
fix some harder tests. Mostly, _advanceTheStack needed to spin the odometer rings starting from the other side, to get all the right combos
drewp@bigasterisk.com
parents:
1667
diff
changeset
|
96 last restart), or go into pastEnd mode. Note that _current is just our |
|
89e53cb8a01c
fix some harder tests. Mostly, _advanceTheStack needed to spin the odometer rings starting from the other side, to get all the right combos
drewp@bigasterisk.com
parents:
1667
diff
changeset
|
97 contribution, but returned valid bindings include all prev rings.""" |
|
1633
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
98 if self._pastEnd: |
|
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
99 raise NotImplementedError('need restart') |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
100 ringlog.debug('') |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
101 debug(ringlog, self.slog, f'{INDENT*6} --> {self}.advance start:') |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
102 |
|
1693
0455a1e18e4f
really rough fix to a broken test. hopefully this gets redone
drewp@bigasterisk.com
parents:
1692
diff
changeset
|
103 self._currentIsFromFunc = None |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
104 augmentedWorkingSet: List[AlignedRuleChunk] = [] |
|
1633
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
105 if self.prev is None: |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
106 augmentedWorkingSet = self._alignedMatches |
|
1633
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
107 else: |
| 1673 | 108 augmentedWorkingSet = list(applyChunky(self.prev.currentBinding(), self._alignedMatches)) |
|
1633
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
109 |
|
1634
ba59cfc3c747
hack math:sum in there. Test suite is passing except some slow performers
drewp@bigasterisk.com
parents:
1633
diff
changeset
|
110 if self._advanceWithPlainMatches(augmentedWorkingSet): |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
111 debug(ringlog, self.slog, f'{INDENT*6} <-- {self}.advance finished with plain matches') |
|
1634
ba59cfc3c747
hack math:sum in there. Test suite is passing except some slow performers
drewp@bigasterisk.com
parents:
1633
diff
changeset
|
112 return |
|
ba59cfc3c747
hack math:sum in there. Test suite is passing except some slow performers
drewp@bigasterisk.com
parents:
1633
diff
changeset
|
113 |
| 1639 | 114 if self._advanceWithFunctions(): |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
115 debug(ringlog, self.slog, f'{INDENT*6} <-- {self}.advance finished with function matches') |
|
1634
ba59cfc3c747
hack math:sum in there. Test suite is passing except some slow performers
drewp@bigasterisk.com
parents:
1633
diff
changeset
|
116 return |
|
ba59cfc3c747
hack math:sum in there. Test suite is passing except some slow performers
drewp@bigasterisk.com
parents:
1633
diff
changeset
|
117 |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
118 debug(ringlog, self.slog, f'{INDENT*6} <-- {self}.advance had nothing and is now past end') |
|
1634
ba59cfc3c747
hack math:sum in there. Test suite is passing except some slow performers
drewp@bigasterisk.com
parents:
1633
diff
changeset
|
119 self._pastEnd = True |
|
ba59cfc3c747
hack math:sum in there. Test suite is passing except some slow performers
drewp@bigasterisk.com
parents:
1633
diff
changeset
|
120 |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
121 def _advanceWithPlainMatches(self, augmentedWorkingSet: List[AlignedRuleChunk]) -> bool: |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
122 # if augmentedWorkingSet: |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
123 # debug(ringlog, self.slog, f'{INDENT*7} {self} mines {len(augmentedWorkingSet)} matching augmented statements') |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
124 # for s in augmentedWorkingSet: |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
125 # debug(ringlog, self.slog, f'{INDENT*8} {s}') |
|
1633
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
126 |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
127 for aligned in augmentedWorkingSet: |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
128 try: |
|
1668
89e53cb8a01c
fix some harder tests. Mostly, _advanceTheStack needed to spin the odometer rings starting from the other side, to get all the right combos
drewp@bigasterisk.com
parents:
1667
diff
changeset
|
129 newBinding = aligned.newBindingIfMatched(self._prevBindings()) |
|
89e53cb8a01c
fix some harder tests. Mostly, _advanceTheStack needed to spin the odometer rings starting from the other side, to get all the right combos
drewp@bigasterisk.com
parents:
1667
diff
changeset
|
130 except Inconsistent as exc: |
| 1727 | 131 debug(ringlog, self.slog, f'{INDENT*7} ChunkLooper{self._shortId} - {aligned} would be inconsistent with prev bindings ({exc})') |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
132 continue |
| 1632 | 133 |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
134 if self._testAndKeepNewBinding(newBinding, aligned.workingSetChunk): |
|
1634
ba59cfc3c747
hack math:sum in there. Test suite is passing except some slow performers
drewp@bigasterisk.com
parents:
1633
diff
changeset
|
135 return True |
|
ba59cfc3c747
hack math:sum in there. Test suite is passing except some slow performers
drewp@bigasterisk.com
parents:
1633
diff
changeset
|
136 return False |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
137 |
| 1639 | 138 def _advanceWithFunctions(self) -> bool: |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
139 pred: Node = self.lhsChunk.predicate |
| 1640 | 140 if not isinstance(pred, URIRef): |
| 141 raise NotImplementedError | |
| 1632 | 142 |
| 1637 | 143 for functionType in functionsFor(pred): |
| 1661 | 144 fn = functionType(self.lhsChunk) |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
145 # debug(ringlog, self.slog, f'{INDENT*7} ChunkLooper{self._shortId} advanceWithFunctions, {functionType=}') |
| 1652 | 146 |
|
1634
ba59cfc3c747
hack math:sum in there. Test suite is passing except some slow performers
drewp@bigasterisk.com
parents:
1633
diff
changeset
|
147 try: |
|
1692
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
148 log.debug(f'fn.bind {self._prevBindings()} ...') |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
149 #fullBinding = self._prevBindings().copy() |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
150 newBinding = fn.bind(self._prevBindings()) |
|
1692
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
151 log.debug(f'...makes {newBinding=}') |
| 1637 | 152 except BindingUnknown: |
|
1634
ba59cfc3c747
hack math:sum in there. Test suite is passing except some slow performers
drewp@bigasterisk.com
parents:
1633
diff
changeset
|
153 pass |
|
ba59cfc3c747
hack math:sum in there. Test suite is passing except some slow performers
drewp@bigasterisk.com
parents:
1633
diff
changeset
|
154 else: |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
155 if newBinding is not None: |
|
1693
0455a1e18e4f
really rough fix to a broken test. hopefully this gets redone
drewp@bigasterisk.com
parents:
1692
diff
changeset
|
156 self._currentIsFromFunc = fn |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
157 if self._testAndKeepNewBinding(newBinding, self.lhsChunk): |
| 1637 | 158 return True |
|
1634
ba59cfc3c747
hack math:sum in there. Test suite is passing except some slow performers
drewp@bigasterisk.com
parents:
1633
diff
changeset
|
159 |
|
ba59cfc3c747
hack math:sum in there. Test suite is passing except some slow performers
drewp@bigasterisk.com
parents:
1633
diff
changeset
|
160 return False |
|
ba59cfc3c747
hack math:sum in there. Test suite is passing except some slow performers
drewp@bigasterisk.com
parents:
1633
diff
changeset
|
161 |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
162 def _testAndKeepNewBinding(self, newBinding: CandidateBinding, sourceChunk: Chunk): |
|
1668
89e53cb8a01c
fix some harder tests. Mostly, _advanceTheStack needed to spin the odometer rings starting from the other side, to get all the right combos
drewp@bigasterisk.com
parents:
1667
diff
changeset
|
163 fullBinding: CandidateBinding = self._prevBindings().copy() |
|
89e53cb8a01c
fix some harder tests. Mostly, _advanceTheStack needed to spin the odometer rings starting from the other side, to get all the right combos
drewp@bigasterisk.com
parents:
1667
diff
changeset
|
164 fullBinding.addNewBindings(newBinding) |
|
89e53cb8a01c
fix some harder tests. Mostly, _advanceTheStack needed to spin the odometer rings starting from the other side, to get all the right combos
drewp@bigasterisk.com
parents:
1667
diff
changeset
|
165 isNew = fullBinding not in self._seenBindings |
| 1697 | 166 |
| 167 if ringlog.isEnabledFor(logging.DEBUG): | |
| 168 ringlog.debug(f'{INDENT*7} {self} considering {newBinding=} to make {fullBinding}. {isNew=}') | |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
169 # if self.slog: |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
170 # self.slog.looperConsider(self, newBinding, fullBinding, isNew) |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
171 |
|
1668
89e53cb8a01c
fix some harder tests. Mostly, _advanceTheStack needed to spin the odometer rings starting from the other side, to get all the right combos
drewp@bigasterisk.com
parents:
1667
diff
changeset
|
172 if isNew: |
|
89e53cb8a01c
fix some harder tests. Mostly, _advanceTheStack needed to spin the odometer rings starting from the other side, to get all the right combos
drewp@bigasterisk.com
parents:
1667
diff
changeset
|
173 self._seenBindings.append(fullBinding.copy()) |
|
89e53cb8a01c
fix some harder tests. Mostly, _advanceTheStack needed to spin the odometer rings starting from the other side, to get all the right combos
drewp@bigasterisk.com
parents:
1667
diff
changeset
|
174 self._current = newBinding |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
175 self.currentSourceChunk = sourceChunk |
|
1668
89e53cb8a01c
fix some harder tests. Mostly, _advanceTheStack needed to spin the odometer rings starting from the other side, to get all the right combos
drewp@bigasterisk.com
parents:
1667
diff
changeset
|
176 return True |
|
89e53cb8a01c
fix some harder tests. Mostly, _advanceTheStack needed to spin the odometer rings starting from the other side, to get all the right combos
drewp@bigasterisk.com
parents:
1667
diff
changeset
|
177 return False |
|
89e53cb8a01c
fix some harder tests. Mostly, _advanceTheStack needed to spin the odometer rings starting from the other side, to get all the right combos
drewp@bigasterisk.com
parents:
1667
diff
changeset
|
178 |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
179 def localBinding(self) -> CandidateBinding: |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
180 if self.pastEnd(): |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
181 raise NotImplementedError() |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
182 return self._current |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
183 |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
184 def currentBinding(self) -> CandidateBinding: |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
185 if self.pastEnd(): |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
186 raise NotImplementedError() |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
187 together = self._prevBindings().copy() |
|
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
188 together.addNewBindings(self._current) |
|
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
189 return together |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
190 |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
191 def pastEnd(self) -> bool: |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
192 return self._pastEnd |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
193 |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
194 def restart(self): |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
195 try: |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
196 self._pastEnd = False |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
197 self._seenBindings = [] |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
198 self.advance() |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
199 if self.pastEnd(): |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
200 raise NoOptions() |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
201 finally: |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
202 debug(ringlog, self.slog, f'{INDENT*7} ChunkLooper{self._shortId} restarts: pastEnd={self.pastEnd()}') |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
203 |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
204 |
| 1594 | 205 @dataclass |
|
1593
b0df43d5494c
big rewrite- more classes, smaller methods, more typesafe, all current tests passing
drewp@bigasterisk.com
parents:
1592
diff
changeset
|
206 class Lhs: |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
207 graph: ChunkedGraph # our full LHS graph, as input. See below for the statements partitioned into groups. |
| 1594 | 208 |
| 209 def __post_init__(self): | |
| 1648 | 210 |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
211 self.myPreds = self.graph.allPredicatesExceptFunctions() |
| 1602 | 212 |
|
1609
34f2817320cc
new tests for a smaller part of the inner loop
drewp@bigasterisk.com
parents:
1608
diff
changeset
|
213 def __repr__(self): |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
214 return f"Lhs({self.graph!r})" |
| 1695 | 215 |
| 1727 | 216 def findCandidateBindings(self, knownTrue: ChunkedGraph, stats, slog: Optional[StructuredLog], ruleStatementsIterationLimit) -> Iterator['BoundLhs']: |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
217 """distinct bindings that fit the LHS of a rule, using statements from |
|
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
218 workingSet and functions from LHS""" |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
219 if not self.graph: |
|
1633
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
220 # special case- no LHS! |
|
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
221 yield BoundLhs(self, CandidateBinding({})) |
|
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
222 return |
|
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
223 |
| 1640 | 224 if self._checkPredicateCounts(knownTrue): |
| 225 stats['_checkPredicateCountsCulls'] += 1 | |
| 226 return | |
| 227 | |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
228 if not all(ch in knownTrue for ch in self.graph.staticChunks): |
| 1648 | 229 stats['staticStmtCulls'] += 1 |
| 230 return | |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
231 # After this point we don't need to consider self.graph.staticChunks. |
| 1648 | 232 |
|
1656
d8e5b2232474
bugfix for simple (no arg lists) functions not evaluating
drewp@bigasterisk.com
parents:
1653
diff
changeset
|
233 if not self.graph.patternChunks and not self.graph.chunksUsedByFuncs: |
| 1648 | 234 # static only |
| 235 yield BoundLhs(self, CandidateBinding({})) | |
| 236 return | |
| 237 | |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
238 log.debug('') |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
239 try: |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
240 chunkStack = self._assembleRings(knownTrue, stats, slog) |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
241 except NoOptions: |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
242 ringlog.debug(f'{INDENT*5} start up with no options; 0 bindings') |
|
1593
b0df43d5494c
big rewrite- more classes, smaller methods, more typesafe, all current tests passing
drewp@bigasterisk.com
parents:
1592
diff
changeset
|
243 return |
|
1692
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
244 log.debug('') |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
245 log.debug('') |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
246 self._debugChunkStack('time to spin: initial odometer is', chunkStack) |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
247 |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
248 if slog: |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
249 slog.say('time to spin') |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
250 slog.odometer(chunkStack) |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
251 self._assertAllRingsAreValid(chunkStack) |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
252 |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
253 lastRing = chunkStack[-1] |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
254 iterCount = 0 |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
255 while True: |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
256 iterCount += 1 |
| 1648 | 257 if iterCount > ruleStatementsIterationLimit: |
| 258 raise ValueError('rule too complex') | |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
259 |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
260 log.debug(f'{INDENT*4} vv findCandBindings iteration {iterCount}') |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
261 |
|
1633
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
262 yield BoundLhs(self, lastRing.currentBinding()) |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
263 |
| 1667 | 264 # self._debugChunkStack('odometer', chunkStack) |
|
1607
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
265 |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
266 done = self._advanceTheStack(chunkStack) |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
267 |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
268 self._debugChunkStack(f'odometer after ({done=})', chunkStack) |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
269 if slog: |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
270 slog.odometer(chunkStack) |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
271 |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
272 log.debug(f'{INDENT*4} ^^ findCandBindings iteration done') |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
273 if done: |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
274 break |
|
1607
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
275 |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
276 def _debugChunkStack(self, label: str, chunkStack: List[ChunkLooper]): |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
277 odolog.debug(f'{INDENT*4} {label}:') |
| 1652 | 278 for i, l in enumerate(chunkStack): |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
279 odolog.debug(f'{INDENT*5} [{i}] {l} curbind={l.localBinding() if not l.pastEnd() else "<end>"}') |
| 1632 | 280 |
| 1640 | 281 def _checkPredicateCounts(self, knownTrue): |
| 282 """raise NoOptions quickly in some cases""" | |
| 1648 | 283 |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
284 if self.graph.noPredicatesAppear(self.myPreds): |
| 1652 | 285 log.debug(f'{INDENT*3} checkPredicateCounts does cull because not all {self.myPreds=} are in knownTrue') |
| 1640 | 286 return True |
| 1652 | 287 log.debug(f'{INDENT*3} checkPredicateCounts does not cull because all {self.myPreds=} are in knownTrue') |
| 1640 | 288 return False |
| 289 | |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
290 def _assembleRings(self, knownTrue: ChunkedGraph, stats, slog) -> List[ChunkLooper]: |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
291 """make ChunkLooper for each stmt in our LHS graph, but do it in a way that they all |
| 1652 | 292 start out valid (or else raise NoOptions). static chunks have already been confirmed.""" |
|
1633
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
293 |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
294 log.debug(f'{INDENT*4} stats={dict(stats)}') |
|
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
295 odolog.debug(f'{INDENT*3} build new ChunkLooper stack') |
|
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
296 chunks = list(self.graph.patternChunks.union(self.graph.chunksUsedByFuncs)) |
|
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
297 chunks.sort(key=None) |
|
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
298 odolog.info(f' {INDENT*3} taking permutations of {len(chunks)=}') |
|
1692
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
299 |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
300 permsTried = 0 |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
301 |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
302 for perm in self._partitionedGraphPermutations(): |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
303 looperRings: List[ChunkLooper] = [] |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
304 prev: Optional[ChunkLooper] = None |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
305 if odolog.isEnabledFor(logging.DEBUG): |
| 1727 | 306 odolog.debug(f'{INDENT*4} [perm {permsTried}] try rule chunks in this order: {" THEN ".join(repr(p) for p in perm)}') |
|
1633
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
307 |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
308 for ruleChunk in perm: |
|
1633
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
309 try: |
| 1661 | 310 # These are getting rebuilt a lot which takes time. It would |
| 311 # be nice if they could accept a changing `prev` order | |
| 312 # (which might already be ok). | |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
313 looper = ChunkLooper(ruleChunk, prev, knownTrue, slog) |
|
1633
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
314 except NoOptions: |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
315 odolog.debug(f'{INDENT*5} permutation didnt work, try another') |
|
1633
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
316 break |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
317 looperRings.append(looper) |
|
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
318 prev = looperRings[-1] |
|
1633
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
319 else: |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
320 # bug: At this point we've only shown that these are valid |
|
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
321 # starting rings. The rules might be tricky enough that this |
|
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
322 # permutation won't get us to the solution. |
|
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
323 return looperRings |
|
1692
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
324 if permsTried > 50000: |
| 1652 | 325 raise NotImplementedError(f'trying too many permutations {len(chunks)=}') |
|
1692
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
326 permsTried += 1 |
| 1648 | 327 |
| 1697 | 328 stats['permsTried'] += permsTried |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
329 odolog.debug(f'{INDENT*5} no perms worked- rule cannot match anything') |
|
1633
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
330 raise NoOptions() |
|
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
331 |
|
1692
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
332 def _unpartitionedGraphPermutations(self) -> Iterator[Tuple[Chunk, ...]]: |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
333 for perm in itertools.permutations(sorted(list(self.graph.patternChunks.union(self.graph.chunksUsedByFuncs)))): |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
334 yield perm |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
335 |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
336 def _partitionedGraphPermutations(self) -> Iterator[Tuple[Chunk, ...]]: |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
337 """always puts function chunks after pattern chunks |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
338 |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
339 (and, if we cared, static chunks could go before that. Currently they're |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
340 culled out elsewhere, but that's done as a special case) |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
341 """ |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
342 tupleOfNoChunks: Tuple[Chunk, ...] = () |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
343 pats = sorted(self.graph.patternChunks) |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
344 funcs = sorted(self.graph.chunksUsedByFuncs) |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
345 for patternPart in itertools.permutations(pats) if pats else [tupleOfNoChunks]: |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
346 for funcPart in itertools.permutations(funcs) if funcs else [tupleOfNoChunks]: |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
347 perm = patternPart + funcPart |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
348 yield perm |
|
2883da14847c
debugging and cleanup, as i looked for a bug
drewp@bigasterisk.com
parents:
1677
diff
changeset
|
349 |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
350 def _advanceTheStack(self, looperRings: List[ChunkLooper]) -> bool: |
|
1696
cdf706cf5f82
fix a test (odometer rollover direction)
drewp@bigasterisk.com
parents:
1695
diff
changeset
|
351 toRestart: List[ChunkLooper] = [] |
|
cdf706cf5f82
fix a test (odometer rollover direction)
drewp@bigasterisk.com
parents:
1695
diff
changeset
|
352 pos = len(looperRings) - 1 |
|
cdf706cf5f82
fix a test (odometer rollover direction)
drewp@bigasterisk.com
parents:
1695
diff
changeset
|
353 while True: |
|
cdf706cf5f82
fix a test (odometer rollover direction)
drewp@bigasterisk.com
parents:
1695
diff
changeset
|
354 looperRings[pos].advance() |
|
cdf706cf5f82
fix a test (odometer rollover direction)
drewp@bigasterisk.com
parents:
1695
diff
changeset
|
355 if looperRings[pos].pastEnd(): |
|
cdf706cf5f82
fix a test (odometer rollover direction)
drewp@bigasterisk.com
parents:
1695
diff
changeset
|
356 if pos == 0: |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
357 return True |
|
1696
cdf706cf5f82
fix a test (odometer rollover direction)
drewp@bigasterisk.com
parents:
1695
diff
changeset
|
358 toRestart.append(looperRings[pos]) |
|
cdf706cf5f82
fix a test (odometer rollover direction)
drewp@bigasterisk.com
parents:
1695
diff
changeset
|
359 pos -= 1 |
|
cdf706cf5f82
fix a test (odometer rollover direction)
drewp@bigasterisk.com
parents:
1695
diff
changeset
|
360 else: |
|
cdf706cf5f82
fix a test (odometer rollover direction)
drewp@bigasterisk.com
parents:
1695
diff
changeset
|
361 break |
|
cdf706cf5f82
fix a test (odometer rollover direction)
drewp@bigasterisk.com
parents:
1695
diff
changeset
|
362 for ring in reversed(toRestart): |
|
cdf706cf5f82
fix a test (odometer rollover direction)
drewp@bigasterisk.com
parents:
1695
diff
changeset
|
363 ring.restart() |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
364 return False |
|
1607
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
365 |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
366 def _assertAllRingsAreValid(self, looperRings): |
|
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
367 if any(ring.pastEnd() for ring in looperRings): # this is an unexpected debug assertion |
|
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
368 odolog.warning(f'{INDENT*4} some rings started at pastEnd {looperRings}') |
|
1633
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
369 raise NoOptions() |
|
6107603ed455
fix farenheit rule case, fix some others that depend on rings order, but this breaks some performance because of itertools.perm
drewp@bigasterisk.com
parents:
1632
diff
changeset
|
370 |
|
1592
d7b66234064b
pure reordering of funcs to make the next diffs smaller
drewp@bigasterisk.com
parents:
1591
diff
changeset
|
371 |
|
1622
38bd8ef9ef67
add CandidateTermMatches, unused so far
drewp@bigasterisk.com
parents:
1621
diff
changeset
|
372 @dataclass |
|
1607
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
373 class BoundLhs: |
|
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
374 lhs: Lhs |
| 1610 | 375 binding: CandidateBinding |
|
1607
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
376 |
|
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
377 |
|
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
378 @dataclass |
|
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
379 class Rule: |
|
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
380 lhsGraph: Graph |
|
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
381 rhsGraph: Graph |
| 1632 | 382 |
|
1607
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
383 def __post_init__(self): |
| 1673 | 384 self.lhs = Lhs(ChunkedGraph(self.lhsGraph, RuleUnboundBnode, functionsFor)) |
| 385 | |
| 386 self.maps = {} | |
| 387 | |
| 388 self.rhsGraphConvert: List[Triple] = [] | |
| 389 for s, p, o in self.rhsGraph: | |
| 390 from rdflib import BNode | |
| 391 if isinstance(s, BNode): | |
| 392 s = RhsBnode(s) | |
| 393 if isinstance(p, BNode): | |
| 394 p = RhsBnode(p) | |
| 395 if isinstance(o, BNode): | |
| 396 o = RhsBnode(o) | |
| 397 self.rhsGraphConvert.append((s, p, o)) | |
|
1607
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
398 |
| 1727 | 399 def applyRule(self, workingSet: Graph, implied: Graph, stats: Dict, slog: Optional[StructuredLog], ruleStatementsIterationLimit): |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
400 # this does not change for the current applyRule call. The rule will be |
|
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
401 # tried again in an outer loop, in case it can produce more. |
| 1673 | 402 workingSetChunked = ChunkedGraph(workingSet, WorkingSetBnode, functionsFor) |
|
1651
20474ad4968e
WIP - functions are broken as i move most layers to work in Chunks not Triples
drewp@bigasterisk.com
parents:
1650
diff
changeset
|
403 |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
404 for bound in self.lhs.findCandidateBindings(workingSetChunked, stats, slog, ruleStatementsIterationLimit): |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
405 if slog: |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
406 slog.foundBinding(bound) |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
407 log.debug(f'{INDENT*5} +rule has a working binding: {bound}') |
|
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
408 |
| 1673 | 409 newStmts = self.generateImpliedFromRhs(bound.binding) |
|
1612
272f78d4671a
mark skipped tests. move applyRule into Rule. minor cleanups.
drewp@bigasterisk.com
parents:
1611
diff
changeset
|
410 |
| 1673 | 411 for newStmt in newStmts: |
|
1631
2c85a4f5dd9c
big rewrite of infer() using statements not variables as the things to iterate over
drewp@bigasterisk.com
parents:
1627
diff
changeset
|
412 # log.debug(f'{INDENT*6} adding {newStmt=}') |
|
1612
272f78d4671a
mark skipped tests. move applyRule into Rule. minor cleanups.
drewp@bigasterisk.com
parents:
1611
diff
changeset
|
413 workingSet.add(newStmt) |
|
272f78d4671a
mark skipped tests. move applyRule into Rule. minor cleanups.
drewp@bigasterisk.com
parents:
1611
diff
changeset
|
414 implied.add(newStmt) |
|
272f78d4671a
mark skipped tests. move applyRule into Rule. minor cleanups.
drewp@bigasterisk.com
parents:
1611
diff
changeset
|
415 |
| 1673 | 416 def generateImpliedFromRhs(self, binding: CandidateBinding) -> List[Triple]: |
| 417 | |
| 418 out: List[Triple] = [] | |
| 419 | |
| 420 # Each time the RHS is used (in a rule firing), its own BNodes (which | |
| 421 # are subtype RhsBnode) need to be turned into distinct ones. Note that | |
| 422 # bnodes that come from the working set should not be remapped. | |
| 423 rhsBnodeMap: Dict[RhsBnode, WorkingSetBnode] = {} | |
| 424 | |
| 425 # but, the iteration loop could come back with the same bindings again | |
| 426 key = binding.key() | |
| 427 rhsBnodeMap = self.maps.setdefault(key, {}) | |
| 428 | |
| 429 for stmt in binding.apply(self.rhsGraphConvert): | |
| 430 | |
| 431 outStmt: List[Node] = [] | |
| 432 | |
| 433 for t in stmt: | |
| 434 if isinstance(t, RhsBnode): | |
| 435 if t not in rhsBnodeMap: | |
| 436 rhsBnodeMap[t] = WorkingSetBnode() | |
| 437 t = rhsBnodeMap[t] | |
| 438 | |
| 439 outStmt.append(t) | |
| 440 | |
| 441 log.debug(f'{INDENT*6} rhs stmt {stmt} became {outStmt}') | |
| 442 out.append((outStmt[0], outStmt[1], outStmt[2])) | |
| 443 | |
| 444 return out | |
| 445 | |
|
1607
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
446 |
| 1648 | 447 @dataclass |
| 1587 | 448 class Inference: |
| 1673 | 449 rulesIterationLimit = 4 |
|
1664
1a7c1261302c
logic fix- some bindings were being returned 2+; some 0 times
drewp@bigasterisk.com
parents:
1661
diff
changeset
|
450 ruleStatementsIterationLimit = 5000 |
| 1587 | 451 |
| 452 def __init__(self) -> None: | |
| 1648 | 453 self.rules: List[Rule] = [] |
| 454 self._nonRuleStmts: List[Triple] = [] | |
| 1587 | 455 |
| 456 def setRules(self, g: ConjunctiveGraph): | |
| 1648 | 457 self.rules = [] |
| 458 self._nonRuleStmts = [] | |
|
1599
abbf0eb0e640
fix a bug with a slightly moer complicated set of rules
drewp@bigasterisk.com
parents:
1598
diff
changeset
|
459 for stmt in g: |
|
abbf0eb0e640
fix a bug with a slightly moer complicated set of rules
drewp@bigasterisk.com
parents:
1598
diff
changeset
|
460 if stmt[1] == LOG['implies']: |
|
1607
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
461 self.rules.append(Rule(stmt[0], stmt[2])) |
|
1649
bb5d2b5370ac
add nonRuleStatments to Inference api. there's already a test in an eariler commit
drewp@bigasterisk.com
parents:
1648
diff
changeset
|
462 else: |
|
bb5d2b5370ac
add nonRuleStatments to Inference api. there's already a test in an eariler commit
drewp@bigasterisk.com
parents:
1648
diff
changeset
|
463 self._nonRuleStmts.append(stmt) |
|
bb5d2b5370ac
add nonRuleStatments to Inference api. there's already a test in an eariler commit
drewp@bigasterisk.com
parents:
1648
diff
changeset
|
464 |
|
bb5d2b5370ac
add nonRuleStatments to Inference api. there's already a test in an eariler commit
drewp@bigasterisk.com
parents:
1648
diff
changeset
|
465 def nonRuleStatements(self) -> List[Triple]: |
|
bb5d2b5370ac
add nonRuleStatments to Inference api. there's already a test in an eariler commit
drewp@bigasterisk.com
parents:
1648
diff
changeset
|
466 return self._nonRuleStmts |
| 1587 | 467 |
| 1601 | 468 @INFER_CALLS.time() |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
469 def infer(self, graph: Graph, htmlLog: Optional[Path] = None): |
| 1587 | 470 """ |
| 471 returns new graph of inferred statements. | |
| 472 """ | |
| 1727 | 473 n = cast(int, graph.__len__()) |
| 1626 | 474 INFER_GRAPH_SIZE.observe(n) |
| 475 log.info(f'{INDENT*0} Begin inference of graph len={n} with rules len={len(self.rules)}:') | |
| 1601 | 476 startTime = time.time() |
|
1607
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
477 stats: Dict[str, Union[int, float]] = defaultdict(lambda: 0) |
|
1649
bb5d2b5370ac
add nonRuleStatments to Inference api. there's already a test in an eariler commit
drewp@bigasterisk.com
parents:
1648
diff
changeset
|
478 |
|
1589
5c1055be3c36
WIP more debugging, working towards bnode-matching support
drewp@bigasterisk.com
parents:
1588
diff
changeset
|
479 # everything that is true: the input graph, plus every rule conclusion we can make |
|
1593
b0df43d5494c
big rewrite- more classes, smaller methods, more typesafe, all current tests passing
drewp@bigasterisk.com
parents:
1592
diff
changeset
|
480 workingSet = Graph() |
|
1649
bb5d2b5370ac
add nonRuleStatments to Inference api. there's already a test in an eariler commit
drewp@bigasterisk.com
parents:
1648
diff
changeset
|
481 workingSet += self._nonRuleStmts |
|
1593
b0df43d5494c
big rewrite- more classes, smaller methods, more typesafe, all current tests passing
drewp@bigasterisk.com
parents:
1592
diff
changeset
|
482 workingSet += graph |
| 1587 | 483 |
| 1594 | 484 # just the statements that came from RHS's of rules that fired. |
| 1587 | 485 implied = ConjunctiveGraph() |
| 486 | |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
487 slog = StructuredLog(htmlLog) if htmlLog else None |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
488 |
| 1648 | 489 rulesIterations = 0 |
| 1587 | 490 delta = 1 |
|
1607
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
491 stats['initWorkingSet'] = cast(int, workingSet.__len__()) |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
492 if slog: |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
493 slog.workingSet = workingSet |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
494 |
|
1674
4a15b4cd4600
don't jsut quietly succeed if iteration limit is reached
drewp@bigasterisk.com
parents:
1673
diff
changeset
|
495 while delta > 0: |
| 1620 | 496 log.debug('') |
| 1648 | 497 log.info(f'{INDENT*1}*iteration {rulesIterations}') |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
498 if slog: |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
499 slog.startIteration(rulesIterations) |
| 1648 | 500 |
| 1587 | 501 delta = -len(implied) |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
502 self._iterateAllRules(workingSet, implied, stats, slog) |
| 1587 | 503 delta += len(implied) |
| 1648 | 504 rulesIterations += 1 |
| 1597 | 505 log.info(f'{INDENT*2} this inference iteration added {delta} more implied stmts') |
|
1674
4a15b4cd4600
don't jsut quietly succeed if iteration limit is reached
drewp@bigasterisk.com
parents:
1673
diff
changeset
|
506 if rulesIterations >= self.rulesIterationLimit: |
|
4a15b4cd4600
don't jsut quietly succeed if iteration limit is reached
drewp@bigasterisk.com
parents:
1673
diff
changeset
|
507 raise ValueError(f"rule too complex after {rulesIterations=}") |
| 1648 | 508 stats['iterations'] = rulesIterations |
|
1607
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
509 stats['timeSpent'] = round(time.time() - startTime, 3) |
|
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
510 stats['impliedStmts'] = len(implied) |
| 1648 | 511 log.info(f'{INDENT*0} Inference done {dict(stats)}.') |
| 512 log.debug('Implied:') | |
| 513 log.debug(graphDump(implied)) | |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
514 |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
515 if slog: |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
516 slog.render() |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
517 log.info(f'wrote {htmlLog}') |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
518 |
| 1587 | 519 return implied |
| 520 | |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
521 def _iterateAllRules(self, workingSet: Graph, implied: Graph, stats, slog: Optional[StructuredLog]): |
|
1612
272f78d4671a
mark skipped tests. move applyRule into Rule. minor cleanups.
drewp@bigasterisk.com
parents:
1611
diff
changeset
|
522 for i, rule in enumerate(self.rules): |
|
272f78d4671a
mark skipped tests. move applyRule into Rule. minor cleanups.
drewp@bigasterisk.com
parents:
1611
diff
changeset
|
523 self._logRuleApplicationHeader(workingSet, i, rule) |
|
1694
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
524 if slog: |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
525 slog.rule(workingSet, i, rule) |
|
73abfd4cf5d0
new html log and other refactoring as i work on the advanceTheStack problems
drewp@bigasterisk.com
parents:
1693
diff
changeset
|
526 rule.applyRule(workingSet, implied, stats, slog, self.ruleStatementsIterationLimit) |
| 1587 | 527 |
|
1607
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
528 def _logRuleApplicationHeader(self, workingSet, i, r: Rule): |
| 1594 | 529 if not log.isEnabledFor(logging.DEBUG): |
| 530 return | |
| 531 | |
| 532 log.debug('') | |
| 533 log.debug(f'{INDENT*2} workingSet:') | |
| 1648 | 534 # for j, stmt in enumerate(sorted(workingSet)): |
| 535 # log.debug(f'{INDENT*3} ({j}) {stmt}') | |
| 536 log.debug(f'{INDENT*3} {graphDump(workingSet, oneLine=False)}') | |
| 1594 | 537 |
| 538 log.debug('') | |
| 539 log.debug(f'{INDENT*2}-applying rule {i}') | |
| 1632 | 540 log.debug(f'{INDENT*3} rule def lhs:') |
| 1677 | 541 for stmt in sorted(r.lhs.graph.allChunks()): |
| 1632 | 542 log.debug(f'{INDENT*4} {stmt}') |
|
1607
b21885181e35
more modules, types. Maybe less repeated computation on BoundLhs
drewp@bigasterisk.com
parents:
1605
diff
changeset
|
543 log.debug(f'{INDENT*3} rule def rhs: {graphDump(r.rhsGraph)}') |