Mercurial > code > home > repos > homeauto

changeset 1093:e3ae71fbd3bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
logging and cleanups. Upgrade fuxi to have the cPickle optimization. Ignore-this: aa11ce504d20e6b3c9351d7ba2def092 darcs-hash:24384c0b4ebcfed9e8f2aa8563d3db0c117d748b
author drewp <drewp@bigasterisk.com>
date Mon, 09 May 2016 01:05:24 -0700
parents 54de5144900d
children 90bf3f11fc2b
files service/reasoning/inference.py service/reasoning/reasoning.py service/reasoning/requirements.txt
diffstat 3 files changed, 11 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/service/reasoning/inference.py	Mon May 09 00:32:08 2016 -0700
+++ b/service/reasoning/inference.py	Mon May 09 01:05:24 2016 -0700
@@ -2,22 +2,19 @@
 see ./reasoning for usage
 """
 
-import sys, os, contextlib
+import os, contextlib
 try:
     from rdflib.Graph import Graph
 except ImportError:
     from rdflib import Graph
     
+from rdflib import Namespace
 from rdflib.parser import StringInputSource
 
-sys.path.append("/my/proj/room/fuxi/build/lib.linux-x86_64-2.6")
 from FuXi.Rete.Util import generateTokenSet
 from FuXi.Rete import ReteNetwork
 from FuXi.Rete.RuleStore import N3RuleStore
 
-from rdflib import plugin, Namespace
-from rdflib.store import Store
-
 from greplin import scales 
 STATS = scales.collection('/web',
                           scales.PmfStat('readRules'))
--- a/service/reasoning/reasoning.py	Mon May 09 00:32:08 2016 -0700
+++ b/service/reasoning/reasoning.py	Mon May 09 01:05:24 2016 -0700
@@ -26,7 +26,6 @@
 from twisted.internet.defer import inlineCallbacks
 import cyclone.web, cyclone.websocket
 
-sys.path.append("scales/src")
 from greplin import scales
 from greplin.scales.cyclonehandler import StatsHandler
 
@@ -113,7 +112,7 @@
         try:
             ruleStatStmts, ruleParseSec = self.updateRules()
 
-            self.inferred = self._makeInferred(inputGraph.getGraph())
+            self.inferred, inferSec = self._makeInferred(inputGraph.getGraph())
 
             self.inferred += unquoteOutputStatements(self.inferred)
 
@@ -127,27 +126,29 @@
                 # oneShotGraph.
                 self.inferred += oneShotGraph
 
-            t2 = time.time()
+            t3 = time.time()
             self.actions.putResults(self.inputGraph.getGraph(), self.inferred)
-            putResultsTime = time.time() - t2
+            putResultsTime = time.time() - t3
         finally:
             if oneShot:
                 self.inferred = oldInferred
-        log.info("graphChanged took %.1f ms (rule parse %.1f ms, putResults %.1f ms)" %
+        log.info("graphChanged took %.1f ms (rule parse %.1f ms, infer %.1f ms, putResults %.1f ms)" %
                  ((time.time() - t1) * 1000,
                   ruleParseSec * 1000,
+                  inferSec * 1000,
                   putResultsTime * 1000))
 
     def _makeInferred(self, inputGraph):
         t1 = time.time()
+
         out = infer(inputGraph, self.ruleStore)
         for p, n in NS.iteritems():
             out.bind(p, n, override=True)
+
         inferenceTime = time.time() - t1
-
         out.add((ROOM['reasoner'], ROOM['inferenceTime'],
                  Literal(inferenceTime)))
-        return out
+        return out, inferenceTime
 
 
         
--- a/service/reasoning/requirements.txt	Mon May 09 00:32:08 2016 -0700
+++ b/service/reasoning/requirements.txt	Mon May 09 01:05:24 2016 -0700
@@ -2,5 +2,5 @@
 ipdb==0.7
 docopt==0.6.2
 rdflib==4.2.1
-git+http://github.com/drewp/FuXi.git@22263b0751a29839013ce43646dd18302c7b9bb1#egg=FuXi
+git+http://github.com/drewp/FuXi.git@003fb48984e9813808a23ba152798c125718f0e7#egg=FuXi
 git+http://github.com/drewp/scales.git@448d59fb491b7631877528e7695a93553bfaaa93#egg=scales