--- a/light9/web/graph.coffee	Mon Apr 30 07:25:12 2018 +0000
+++ b/light9/web/graph.coffee	Tue May 01 07:43:35 2018 +0000
@@ -1,7 +1,7 @@
 log = console.log
 
 # Patch is {addQuads: <quads>, delQuads: <quads>}
-# <quads> is [{subject: s, ...}, ...]
+# <quads> are made with Quad(s,p,o,g)
 
 # for mocha
 if require?
@@ -173,11 +173,13 @@
 
   LiteralRoundedFloat: (f) ->
     N3.DataFactory.literal(d3.format(".3f")(f),
-                          "http://www.w3.org/2001/XMLSchema#decimal")
+                          "http://www.w3.org/2001/XMLSchema#double")
+
+  Quad: (s, p, o, g) -> N3.DataFactory.quad(s, p, o, g)
 
   toJs: (literal) ->
     # incomplete
-    parseFloat(N3.Util.getLiteralValue(literal))
+    parseFloat(literal.value)
 
   loadTrig: (trig, cb) -> # for debugging
     patch = {delQuads: [], addQuads: []}
@@ -207,6 +209,8 @@
   _validatePatch: (patch) ->
     for qs in [patch.addQuads, patch.delQuads]
       for q in qs
+        if not q.equals
+          throw new Error("doesn't look like a proper Quad")
         if not q.graph?
           throw new Error("corrupt patch: #{JSON.stringify(q)}")
     
@@ -216,7 +220,9 @@
     # This is the only method that writes to @graph!
     @cachedFloatValues.clear()
     for quad in patch.delQuads
-      @graph.removeQuad(quad)
+      log("remove #{JSON.stringify(quad)}")      
+      did = @graph.removeQuad(quad)
+      log("removed: #{did}")
     for quad in patch.addQuads
       @graph.addQuad(quad)
     #log('applied patch locally', patchSizeSummary(patch))
@@ -228,7 +234,7 @@
     existing = @graph.getQuads(s, p, null, g)
     return {
       delQuads: existing,
-      addQuads: [{subject: s, predicate: p, object: newObject, graph: g}]
+      addQuads: [@Quad(s, p, newObject, g)]
     }
 
   patchObject: (s, p, newObject, g) ->
@@ -251,6 +257,7 @@
   _singleValue: (s, p) ->
     @_autoDeps.askedFor(s, p, null, null)
     quads = @graph.getQuads(s, p)
+    console.log('got',quads)
     objs = new Set(q.object for q in quads)
     
     switch objs.size
@@ -268,12 +275,12 @@
     return hit if hit != undefined
     #log('float miss', s, p)
 
-    ret = parseFloat(N3.Util.getLiteralValue(@_singleValue(s, p)))
+    ret = parseFloat(@_singleValue(s, p).value)
     @cachedFloatValues.set(key, ret)
     return ret
     
   stringValue: (s, p) ->
-    N3.Util.getLiteralValue(@_singleValue(s, p))
+    @_singleValue(s, p).value
     
   uriValue: (s, p) ->
     @_singleValue(s, p)

--- a/light9/web/graph_test.coffee	Mon Apr 30 07:25:12 2018 +0000
+++ b/light9/web/graph_test.coffee	Tue May 01 07:43:35 2018 +0000
@@ -19,7 +19,7 @@
     A3 = U('a3')
     A4 = U('a4')
     ctx = U('ctx')
-    quad = (s, p, o) -> {subject: s, predicate: p, object: o, graph: ctx}
+    quad = (s, p, o) -> graph.Quad(s, p, o, ctx)
 
     beforeEach (done) ->
       graph = new SyncedGraph()
@@ -77,7 +77,7 @@
         called++
         graph.uriValue(A1, A2)
         throw new Error('this test handler throws an error')
-      graph.runHandler(hand)
+      graph.runHandler(hand, 'run')
       graph.applyAndSendPatch({
         delQuads: [quad(A1, A2, A3)], addQuads: [quad(A1, A2, A4)]})
       assert.equal(2, called) 
@@ -86,13 +86,16 @@
 
       innerResults = []
       inner = ->
+        console.log('\nninnerfetch')
         innerResults.push(graph.uriValue(A1, A2))
+        console.log("innerResults #{JSON.stringify(innerResults)}\n")
 
       outerResults = []
       doRunInner = true
       outer = ->
         if doRunInner
-          graph.runHandler(inner)
+          graph.runHandler(inner, 'runinner')
+        console.log('push outer')
         outerResults.push(graph.floatValue(A1, U('someFloat')))
 
       beforeEach ->
@@ -105,7 +108,7 @@
       }
       affectOuter = {
         delQuads: [
-          quad(A1, U('someFloat'), '"1.5"^^http://www.w3.org/2001/XMLSchema#decimal')
+          quad(A1, U('someFloat'), graph.Literal(1.5))
         ], addQuads: [
           quad(A1, U('someFloat'), graph.LiteralRoundedFloat(2))
         ]}
@@ -115,36 +118,37 @@
         }
                   
       it 'calls everything normally once', ->
-        graph.runHandler(outer)
+        graph.runHandler(outer, 'run')
         assert.deepEqual([A3], innerResults)
         assert.deepEqual([1.5], outerResults)
 
-      it '[performance] reruns just the inner if its dependencies change', ->
-        graph.runHandler(outer)
+      it.skip '[performance] reruns just the inner if its dependencies change', ->
+        console.log(graph.quads())
+        graph.runHandler(outer, 'run')
         graph.applyAndSendPatch(affectInner)
         assert.deepEqual([A3, A4], innerResults)
         assert.deepEqual([1.5], outerResults)
         
-      it '[performance] reruns the outer (and therefore inner) if its dependencies change', ->
-        graph.runHandler(outer)
+      it.skip '[performance] reruns the outer (and therefore inner) if its dependencies change', ->
+        graph.runHandler(outer, 'run')
         graph.applyAndSendPatch(affectOuter)
         assert.deepEqual([A3, A3], innerResults)
         assert.deepEqual([1.5, 2], outerResults)
         
         
-      it '[performance] does not send a redundant inner run if it is already rerunning outer', ->
+      it.skip '[performance] does not send a redundant inner run if it is already rerunning outer', ->
         # Note that outer may or may not call inner each time, and we
         # don't want to redundantly call inner. We need to:
         #  1. build the set of handlers to rerun,
         #  2. call them from outside-in, and
         #  3. any runHandler calls that happen, they need to count as reruns.
-        graph.runHandler(outer)
+        graph.runHandler(outer, 'run')
         graph.applyAndSendPatch(affectBoth)
         assert.deepEqual([A3, A4], innerResults)
         assert.deepEqual([1.5, 2], outerResults)
 
       it 'reruns the outer and the inner if all dependencies change, but outer omits calling inner this time', ->
-        graph.runHandler(outer)
+        graph.runHandler(outer, 'run')
         doRunInner = false
         graph.applyAndSendPatch(affectBoth)
         assert.deepEqual([A3, A4], innerResults)
@@ -154,14 +158,14 @@
       it 'floatValue', ->
         values = []
         hand = -> values.push(graph.floatValue(A1, U('someFloat')))
-        graph.runHandler(hand)
+        graph.runHandler(hand, 'run')
         graph.patchObject(A1, U('someFloat'), graph.LiteralRoundedFloat(2), ctx)
         assert.deepEqual([1.5, 2.0], values)
         
       it 'stringValue', ->
         values = []
         hand = -> values.push(graph.stringValue(A1, U('someString')))
-        graph.runHandler(hand)
+        graph.runHandler(hand, 'run')
         graph.patchObject(A1, U('someString'), graph.Literal('world'), ctx)
         assert.deepEqual(['hello', 'world'], values)
 
@@ -169,14 +173,14 @@
         # covered above, but this one tests patchObject on a uri, too
         values = []
         hand = -> values.push(graph.uriValue(A1, A2))
-        graph.runHandler(hand)
+        graph.runHandler(hand, 'run')
         graph.patchObject(A1, A2, A4, ctx)
         assert.deepEqual([A3, A4], values)
 
       it 'objects', ->
         values = []
         hand = -> values.push(graph.objects(A1, U('multipleObjects')))
-        graph.runHandler(hand)
+        graph.runHandler(hand, 'run')
         graph.patchObject(A1, U('multipleObjects'), U('newOne'), ctx)
         expect(values[0]).to.deep.have.members([U('a4'), U('a5')])
         expect(values[1]).to.deep.have.members([U('newOne')])
@@ -185,7 +189,7 @@
         values = []
         rdfType = graph.Uri(RDF + 'type')
         hand = -> values.push(graph.subjects(rdfType, U('Type1')))
-        graph.runHandler(hand)
+        graph.runHandler(hand, 'run')
         graph.applyAndSendPatch(
           {delQuads: [], addQuads: [quad(A4, rdfType, U('Type1'))]})
         expect(values[0]).to.deep.have.members([A2, A3])
@@ -208,7 +212,7 @@
             @prefix : <http://example.com/> .
             :ctx { :x :y (:a1 :a2 :a3) } .
           ", () ->
-            graph.runHandler(hand)
+            graph.runHandler(hand, 'run')
             graph.clearGraph()
             graph.loadTrig "
               @prefix : <http://example.com/> .
@@ -222,7 +226,7 @@
         it 'when a new triple is added', ->
           values = []
           hand = -> values.push(graph.contains(A1, A1, A1))
-          graph.runHandler(hand)
+          graph.runHandler(hand, 'run')
           graph.applyAndSendPatch(
             {delQuads: [], addQuads: [quad(A1, A1, A1)]})
           assert.deepEqual([false, true], values)
@@ -230,7 +234,7 @@
         it 'when a relevant triple is removed', ->
           values = []
           hand = -> values.push(graph.contains(A1, A2, A3))
-          graph.runHandler(hand)
+          graph.runHandler(hand, 'run')
           graph.applyAndSendPatch(
             {delQuads: [quad(A1, A2, A3)], addQuads: []})
           assert.deepEqual([true, false], values)
@@ -241,13 +245,13 @@
         hand = ->
           called++
           graph.uriValue(A1, A2)
-        graph.runHandler(hand)
+        graph.runHandler(hand, 'run')
         graph.applyAndSendPatch({
           delQuads: [], addQuads: [quad(A2, A3, A4)]})
         assert.equal(1, called)
 
-      it '[performance] calls a handler 2x but then not again if the handler stopped caring about the data', ->
+      it.skip '[performance] calls a handler 2x but then not again if the handler stopped caring about the data', ->
         assert.fail()
 
-      it "[performance] doesn't get slow if the handler makes tons of repetitive lookups", ->
+      it.skip "[performance] doesn't get slow if the handler makes tons of repetitive lookups", ->
         assert.fail()