annotate service/reasoning/inputgraph.py @ 1156:ee168d55524a

reasoning & collector move into docker images Ignore-this: 67e97d307eba96791cbe77e57c57ad57 darcs-hash:47056d579a870b473e95f4eb7897aae0a97c03cc
author drewp <drewp@bigasterisk.com>
date Mon, 03 Sep 2018 00:45:34 -0700
parents 98aad873874d
children 79d041273e26
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1108
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
1 import logging, time, sys
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
2
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
3 from rdflib import Graph, ConjunctiveGraph
1108
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
4 from rdflib import Namespace, URIRef, Literal, RDF, RDFS
1086
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
5 from rdflib.parser import StringInputSource
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
6
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
7 from twisted.python.filepath import FilePath
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
8 from twisted.internet.defer import inlineCallbacks, gatherResults
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
9
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
10 from rdflibtrig import addTrig
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
11 from graphop import graphEqual
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
12
1108
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
13 from patchsource import ReconnectingPatchSource
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
14
1156
ee168d55524a reasoning & collector move into docker images
drewp <drewp@bigasterisk.com>
parents: 1119
diff changeset
15 sys.path.append("/my/proj/rdfdb")
ee168d55524a reasoning & collector move into docker images
drewp <drewp@bigasterisk.com>
parents: 1119
diff changeset
16 from rdfdb.rdflibpatch import patchQuads
1108
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
17
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
18 log = logging.getLogger('fetch')
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
19
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
20 ROOM = Namespace("http://projects.bigasterisk.com/room/")
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
21 DEV = Namespace("http://projects.bigasterisk.com/device/")
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
22
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
23
1086
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
24 def parseRdf(text, contentType):
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
25 g = Graph()
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
26 g.parse(StringInputSource(text), format={
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
27 'text/n3': 'n3',
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
28 }[contentType])
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
29 return g
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
30
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
31
1108
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
32 class RemoteData(object):
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
33 def __init__(self, onChange):
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
34 self.onChange = onChange
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
35 self.graph = ConjunctiveGraph()
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
36 self.patchSource = ReconnectingPatchSource(URIRef('http://bang:9072/graph/home'), self.onPatch)
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
37
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
38 def onPatch(self, p, fullGraph):
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
39 if fullGraph:
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
40 self.graph = ConjunctiveGraph()
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
41 patchQuads(self.graph,
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
42 deleteQuads=p.delQuads,
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
43 addQuads=p.addQuads,
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
44 perfect=True)
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
45
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
46 ignorePredicates = [
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
47 ROOM['signalStrength'],
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
48 # perhaps anything with a number-datatype for its
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
49 # object should be filtered out, and you have to make
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
50 # an upstream quantization (e.g. 'temp high'/'temp
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
51 # low') if you want to do reasoning on the difference
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
52 URIRef("http://bigasterisk.com/map#lastSeenAgoSec"),
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
53 URIRef("http://bigasterisk.com/map#lastSeenAgo"),
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
54 ROOM['usingPower'],
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
55 ROOM['idleTimeMinutes'],
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
56 ROOM['idleTimeMs'],
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
57 ROOM['graphLoadMs'],
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
58 ROOM['localTimeToSecond'],
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
59 ROOM['history'],
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
60 ROOM['temperatureF'],
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
61 ROOM['connectedAgo'],
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
62 RDFS['comment'],
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
63 ]
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
64 ignoreContexts = [
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
65 URIRef('http://bigasterisk.com/sse_collector/'),
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
66 ]
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
67 for affected in p.addQuads + p.delQuads:
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
68 if (affected[1] not in ignorePredicates and
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
69 affected[3] not in ignoreContexts):
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
70 log.debug(" remote graph changed")
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
71 self.onChange()
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
72 break
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
73 else:
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
74 log.debug(" remote graph has no changes to trigger rules")
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
75
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
76 class InputGraph(object):
1108
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
77 def __init__(self, inputDirs, onChange):
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
78 """
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
79 this has one Graph that's made of:
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
80 - all .n3 files from inputDirs (read at startup)
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
81 - all the remote graphs, specified in the file graphs
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
82
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
83 call updateFileData or updateRemoteData to reread those
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
84 graphs. getGraph to access the combined graph.
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
85
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
86 onChange(self) is called if the contents of the full graph
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
87 change (in an interesting way) during updateFileData or
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
88 updateRemoteData. Interesting means statements other than the
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
89 ones with the predicates on the boring list. onChange(self,
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
90 oneShot=True) means: don't store the result of this change
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
91 anywhere; it needs to be processed only once
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
92 """
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
93 self.inputDirs = inputDirs
1117
d5687ba23279 fix input graph web display by dirtying combinedGraph better.
drewp <drewp@bigasterisk.com>
parents: 1108
diff changeset
94 self._onChange = onChange
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
95 self._fileGraph = Graph()
1117
d5687ba23279 fix input graph web display by dirtying combinedGraph better.
drewp <drewp@bigasterisk.com>
parents: 1108
diff changeset
96 self._remoteData = RemoteData(lambda: self.onChangeLocal())
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
97 self._combinedGraph = None
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
98 self._oneShotAdditionGraph = None
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
99
1117
d5687ba23279 fix input graph web display by dirtying combinedGraph better.
drewp <drewp@bigasterisk.com>
parents: 1108
diff changeset
100 def onChangeLocal(self, oneShot=False, oneShotGraph=None):
d5687ba23279 fix input graph web display by dirtying combinedGraph better.
drewp <drewp@bigasterisk.com>
parents: 1108
diff changeset
101 self._combinedGraph = None
d5687ba23279 fix input graph web display by dirtying combinedGraph better.
drewp <drewp@bigasterisk.com>
parents: 1108
diff changeset
102 self._onChange(self, oneShot=oneShot, oneShotGraph=oneShotGraph)
d5687ba23279 fix input graph web display by dirtying combinedGraph better.
drewp <drewp@bigasterisk.com>
parents: 1108
diff changeset
103
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
104 def updateFileData(self):
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
105 """
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
106 make sure we contain the correct data from the files in inputDirs
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
107 """
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
108 # this sample one is actually only needed for the output, but I don't
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
109 # think I want to have a separate graph for the output
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
110 # handling
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
111 log.debug("read file graphs")
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
112 for fp in FilePath("input").walk():
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
113 if fp.isdir():
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
114 continue
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
115 if fp.splitext()[1] != '.n3':
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
116 continue
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
117 log.debug("read %s", fp)
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
118 # todo: if this fails, leave the report in the graph
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
119 self._fileGraph.parse(fp.open(), format="n3")
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
120 self._combinedGraph = None
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
121
1117
d5687ba23279 fix input graph web display by dirtying combinedGraph better.
drewp <drewp@bigasterisk.com>
parents: 1108
diff changeset
122 self.onChangeLocal()
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
123
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
124 def addOneShot(self, g):
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
125 """
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
126 add this graph to the total, call onChange, and then revert
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
127 the addition of this graph
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
128 """
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
129 self._oneShotAdditionGraph = g
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
130 self._combinedGraph = None
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
131 try:
1119
98aad873874d fix oneshot
drewp <drewp@bigasterisk.com>
parents: 1117
diff changeset
132 self.onChangeLocal(oneShot=True, oneShotGraph=g)
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
133 finally:
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
134 self._oneShotAdditionGraph = None
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
135 self._combinedGraph = None
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
136
1086
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
137 def addOneShotFromString(self, body, contentType):
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
138 g = parseRdf(body, contentType)
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
139 if not len(g):
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
140 log.warn("incoming oneshot graph had no statements: %r", body)
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
141 return 0
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
142 t1 = time.time()
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
143 self.addOneShot(g)
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
144 return time.time() - t1
6ab5238fc049 refactor
drewp <drewp@bigasterisk.com>
parents: 1080
diff changeset
145
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
146 def getGraph(self):
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
147 """rdflib Graph with the file+remote contents of the input graph"""
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
148 # this could be much faster with the combined readonly graph
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
149 # view from rdflib
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
150 if self._combinedGraph is None:
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
151 self._combinedGraph = Graph()
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
152 if self._fileGraph:
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
153 for s in self._fileGraph:
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
154 self._combinedGraph.add(s)
1108
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
155 for s in self._remoteData.graph:
8caf62030955 reasoning uses sse_collector
drewp <drewp@bigasterisk.com>
parents: 1086
diff changeset
156 self._combinedGraph.add(s)
1080
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
157 if self._oneShotAdditionGraph:
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
158 for s in self._oneShotAdditionGraph:
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
159 self._combinedGraph.add(s)
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
160
4d16fa39d54a refactor inputgraph
drewp <drewp@bigasterisk.com>
parents:
diff changeset
161 return self._combinedGraph