using log:nand and log:answer circuits

KNowledgeOnWebScale · Oct 14, 2023 · b2a5f8b · b2a5f8b
1 parent 75101bc
commit b2a5f8b
Show file tree

Hide file tree

Showing 25 changed files with 471 additions and 457 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.6.1
+5.0.0
diff --git a/rdfsurfaces/beetle/beetle.s b/rdfsurfaces/beetle/beetle.s
@@ -4,43 +4,43 @@
 '<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'('<http://example.org/ns#beetle>', '<http://example.org/ns#Car>').
 
 % all cars are green or blue
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:A'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:A'],
     (
         '<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'('_:A', '<http://example.org/ns#Car>'),
-        '<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#nand>'([],
             '<http://example.org/ns#is>'('_:A', '<http://example.org/ns#green>')
         ),
-        '<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#nand>'([],
             '<http://example.org/ns#is>'('_:A', '<http://example.org/ns#blue>')
         )
     )
 ).
 
 % green things are beautiful
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:A'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:A'],
     (
         '<http://example.org/ns#is>'('_:A', '<http://example.org/ns#green>'),
-        '<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#nand>'([],
             '<http://example.org/ns#is>'('_:A', '<http://example.org/ns#beautiful>')
         )
     )
 ).
 
 % blue things are beautiful
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:A'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:A'],
     (
         '<http://example.org/ns#is>'('_:A', '<http://example.org/ns#blue>'),
-        '<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#nand>'([],
             '<http://example.org/ns#is>'('_:A', '<http://example.org/ns#beautiful>')
         )
     )
 ).
 
 % questions
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:S', '_:O'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:S', '_:O'],
     (
         '<http://example.org/ns#is>'('_:S', '_:O'),
-        '<http://www.w3.org/2000/10/swap/log#onAnswerSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#answer>'([],
             '<http://example.org/ns#is>'('_:S', '_:O')
         )
     )

diff --git a/rdfsurfaces/complex/complex.s b/rdfsurfaces/complex/complex.s
@@ -1,7 +1,7 @@
 % exponentiation
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:A', '_:B', '_:C', '_:D', '_:E', '_:F', '_:R', '_:T', '_:Z1', '_:Z2', '_:Z3', '_:Z4', '_:Z5', '_:Z6', '_:Z7', '_:Z8', '_:Z9', '_:Z10'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:A', '_:B', '_:C', '_:D', '_:E', '_:F', '_:R', '_:T', '_:Z1', '_:Z2', '_:Z3', '_:Z4', '_:Z5', '_:Z6', '_:Z7', '_:Z8', '_:Z9', '_:Z10'],
     (
-        '<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#nand>'([],
             triple([['_:A', '_:B'], ['_:C', '_:D']], '<http://eyereasoner.github.io/eye/complex#exponentiation>', ['_:E', '_:F'])
         ),
         '<http://eyereasoner.github.io/eye/complex#polar>'(['_:A', '_:B'], ['_:R', '_:T']),
@@ -21,9 +21,9 @@
 ).
 
 % asin
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:A', '_:B', '_:C', '_:D', '_:E', '_:F', '_:Z1', '_:Z2', '_:Z3', '_:Z4', '_:Z5', '_:Z6', '_:Z7', '_:Z8', '_:Z9', '_:Z10', '_:Z11', '_:Z12', '_:Z13', '_:Z14', '_:Z15'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:A', '_:B', '_:C', '_:D', '_:E', '_:F', '_:Z1', '_:Z2', '_:Z3', '_:Z4', '_:Z5', '_:Z6', '_:Z7', '_:Z8', '_:Z9', '_:Z10', '_:Z11', '_:Z12', '_:Z13', '_:Z14', '_:Z15'],
     (
-        '<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#nand>'([],
             triple(['_:A', '_:B'], '<http://eyereasoner.github.io/eye/complex#asin>', ['_:C', '_:D'])
         ),
         '<http://www.w3.org/2000/10/swap/math#sum>'([1, '_:A'], '_:Z1'),
@@ -49,9 +49,9 @@
 ).
 
 % acos
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:A', '_:B', '_:C', '_:D', '_:E', '_:F', '_:U', '_:Z1', '_:Z2', '_:Z3', '_:Z4', '_:Z5', '_:Z6', '_:Z7', '_:Z8', '_:Z9', '_:Z10', '_:Z11', '_:Z12', '_:Z13', '_:Z14', '_:Z15'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:A', '_:B', '_:C', '_:D', '_:E', '_:F', '_:U', '_:Z1', '_:Z2', '_:Z3', '_:Z4', '_:Z5', '_:Z6', '_:Z7', '_:Z8', '_:Z9', '_:Z10', '_:Z11', '_:Z12', '_:Z13', '_:Z14', '_:Z15'],
     (
-        '<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#nand>'([],
             triple(['_:A', '_:B'], '<http://eyereasoner.github.io/eye/complex#acos>', ['_:C', '_:D'])
         ),
         '<http://www.w3.org/2000/10/swap/math#sum>'([1, '_:A'], '_:Z1'),
@@ -77,9 +77,9 @@
     )
 ).
 
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:X', '_:Y', '_:R', '_:T', '_:Tp', '_:Z1', '_:Z2', '_:Z3', '_:Z4', '_:Z5'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:X', '_:Y', '_:R', '_:T', '_:Tp', '_:Z1', '_:Z2', '_:Z3', '_:Z4', '_:Z5'],
     (
-        '<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#nand>'([],
             triple(['_:X', '_:Y'], '<http://eyereasoner.github.io/eye/complex#polar>', ['_:R', '_:Tp'])
         ),
         '<http://www.w3.org/2000/10/swap/math#exponentiation>'(['_:X', 2], '_:Z1'),
@@ -93,9 +93,9 @@
     )
 ).
 
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:X', '_:Y', '_:T', '_:Tp'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:X', '_:Y', '_:T', '_:Tp'],
     (
-        '<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#nand>'([],
             triple(['_:X', '_:Y', '_:T'], '<http://eyereasoner.github.io/eye/complex#dial>', '_:Tp')
         ),
         '<http://www.w3.org/2000/10/swap/math#notLessThan>'('_:X', 0),
@@ -104,9 +104,9 @@
     )
 ).
 
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:X', '_:Y', '_:T', '_:Tp'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:X', '_:Y', '_:T', '_:Tp'],
     (
-        '<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#nand>'([],
             triple(['_:X', '_:Y', '_:T'], '<http://eyereasoner.github.io/eye/complex#dial>', '_:Tp')
         ),
         '<http://www.w3.org/2000/10/swap/math#lessThan>'('_:X', 0),
@@ -115,9 +115,9 @@
     )
 ).
 
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:X', '_:Y', '_:T', '_:Tp'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:X', '_:Y', '_:T', '_:Tp'],
     (
-        '<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#nand>'([],
             triple(['_:X', '_:Y', '_:T'], '<http://eyereasoner.github.io/eye/complex#dial>', '_:Tp')
         ),
         '<http://www.w3.org/2000/10/swap/math#lessThan>'('_:X', 0),
@@ -126,9 +126,9 @@
     )
 ).
 
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:X', '_:Y', '_:T', '_:Tp'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:X', '_:Y', '_:T', '_:Tp'],
     (
-        '<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#nand>'([],
             triple(['_:X', '_:Y', '_:T'], '<http://eyereasoner.github.io/eye/complex#dial>', '_:Tp')
         ),
         '<http://www.w3.org/2000/10/swap/math#notLessThan>'('_:X', 0),
@@ -139,55 +139,55 @@
 ).
 
 % questions
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:A', '_:B'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:A', '_:B'],
     (
         '<http://eyereasoner.github.io/eye/complex#exponentiation>'([[-1, 0], [0.5, 0]], ['_:A', '_:B']),
-        '<http://www.w3.org/2000/10/swap/log#onAnswerSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#answer>'([],
             '<http://eyereasoner.github.io/eye/complex#exponentiation>'([[-1, 0], [0.5, 0]], ['_:A', '_:B'])
         )
     )
 ).
 
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:A', '_:B'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:A', '_:B'],
     (
         '<http://eyereasoner.github.io/eye/complex#exponentiation>'([[2.718281828459045, 0], [0, 3.141592653589793]], ['_:A', '_:B']),
-        '<http://www.w3.org/2000/10/swap/log#onAnswerSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#answer>'([],
             '<http://eyereasoner.github.io/eye/complex#exponentiation>'([[2.718281828459045, 0], [0, 3.141592653589793]], ['_:A', '_:B'])
         )
     )
 ).
 
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:A', '_:B'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:A', '_:B'],
     (
         '<http://eyereasoner.github.io/eye/complex#exponentiation>'([[0, 1], [0, 1]], ['_:A', '_:B']),
-        '<http://www.w3.org/2000/10/swap/log#onAnswerSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#answer>'([],
             '<http://eyereasoner.github.io/eye/complex#exponentiation>'([[0, 1], [0, 1]], ['_:A', '_:B'])
         )
     )
 ).
 
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:A', '_:B'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:A', '_:B'],
     (
         '<http://eyereasoner.github.io/eye/complex#exponentiation>'([[2.718281828459045, 0], [-1.57079632679, 0]], ['_:A', '_:B']),
-        '<http://www.w3.org/2000/10/swap/log#onAnswerSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#answer>'([],
             '<http://eyereasoner.github.io/eye/complex#exponentiation>'([[2.718281828459045, 0], [-1.57079632679, 0]], ['_:A', '_:B'])
         )
     )
 ).
 
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:A', '_:B'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:A', '_:B'],
     (
         '<http://eyereasoner.github.io/eye/complex#asin>'([2, 0], ['_:A', '_:B']),
-        '<http://www.w3.org/2000/10/swap/log#onAnswerSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#answer>'([],
             '<http://eyereasoner.github.io/eye/complex#asin>'([2, 0], ['_:A', '_:B'])
         )
     )
 ).
 
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:A', '_:B'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:A', '_:B'],
     (
         '<http://eyereasoner.github.io/eye/complex#acos>'([2, 0], ['_:A', '_:B']),
-        '<http://www.w3.org/2000/10/swap/log#onAnswerSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#answer>'([],
             '<http://eyereasoner.github.io/eye/complex#acos>'([2, 0], ['_:A', '_:B'])
         )
     )

diff --git a/rdfsurfaces/contradiction/contradiction-builtin-output.s b/rdfsurfaces/contradiction/contradiction-builtin-output.s
@@ -1 +1 @@
-inference_fuse('<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],'<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'(':y',':z')),'<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'(':y',':z')).
+inference_fuse('<http://www.w3.org/2000/10/swap/log#nand>'([],'<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'(':y',':z')),'<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'(':y',':z')).
diff --git a/rdfsurfaces/contradiction/contradiction-builtin.s b/rdfsurfaces/contradiction/contradiction-builtin.s
@@ -1,16 +1,16 @@
 :- dynamic('<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'/2).
 
 % ForAll x : x = y -> x a z 
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:x'],(
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:x'],(
         '<http://www.w3.org/2000/10/swap/log#equalTo>'('_:x',':y'),
-        '<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#nand>'([],
            '<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'('_:x',':z')        
         )
     )
 ).
 
 % ForAll x : x in [y] -> ~(x a z)
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:x'],(
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:x'],(
         '<http://www.w3.org/2000/10/swap/list#in>'('_:x',[':y']),
         '<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'('_:x',':z')        
     )

diff --git a/rdfsurfaces/contradiction/contradiction-output.s b/rdfsurfaces/contradiction/contradiction-output.s
@@ -1,3 +1,3 @@
 '<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'('<http://example.org/ns#Socrates>','<http://example.org/ns#Human>').
 '<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'('<http://example.org/ns#Socrates>','<http://example.org/ns#Mortal>').
-inference_fuse('<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],'<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'('<http://example.org/ns#Socrates>','<http://example.org/ns#Mortal>')),'<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'('<http://example.org/ns#Socrates>','<http://example.org/ns#Mortal>')).
+inference_fuse('<http://www.w3.org/2000/10/swap/log#nand>'([],'<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'('<http://example.org/ns#Socrates>','<http://example.org/ns#Mortal>')),'<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'('<http://example.org/ns#Socrates>','<http://example.org/ns#Mortal>')).
diff --git a/rdfsurfaces/contradiction/contradiction.s b/rdfsurfaces/contradiction/contradiction.s
@@ -6,26 +6,26 @@
 % humans are mortal
 '<http://www.w3.org/2000/01/rdf-schema#subClassOf>'('<http://example.org/ns#Human>', '<http://example.org/ns#Mortal>').
 
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:A', '_:B', '_:S'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:A', '_:B', '_:S'],
     (
         '<http://www.w3.org/2000/01/rdf-schema#subClassOf>'('_:A', '_:B'),
         '<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'('_:S', '_:A'),
-        '<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#nand>'([],
             '<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'('_:S', '_:B')
         )
     )
 ).
 
 % Socrates is a not mortal
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+'<http://www.w3.org/2000/10/swap/log#nand>'([],
     '<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'('<http://example.org/ns#Socrates>', '<http://example.org/ns#Mortal>')
 ).
 
 % questions
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:S', '_:C'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:S', '_:C'],
     (
         '<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'('_:S', '_:C'),
-        '<http://www.w3.org/2000/10/swap/log#onAnswerSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#answer>'([],
             '<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>'('_:S', '_:C')
         )
     )

diff --git a/rdfsurfaces/contradiction/contradiction5-output.s b/rdfsurfaces/contradiction/contradiction5-output.s
@@ -1 +1 @@
-inference_fuse('<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:x_1'],'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'('_:x_1','<http://example.org/ns#hates>'('<http://example.org/ns#Alice>','<http://example.org/ns#Quiche>'))),'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:a_1'],'<http://example.org/ns#hates>'('<http://example.org/ns#Alice>','<http://example.org/ns#Quiche>'))).
+inference_fuse('<http://www.w3.org/2000/10/swap/log#nand>'(['_:x_1'],'<http://www.w3.org/2000/10/swap/log#nand>'('_:x_1','<http://example.org/ns#hates>'('<http://example.org/ns#Alice>','<http://example.org/ns#Quiche>'))),'<http://www.w3.org/2000/10/swap/log#nand>'(['_:a_1'],'<http://example.org/ns#hates>'('<http://example.org/ns#Alice>','<http://example.org/ns#Quiche>'))).
diff --git a/rdfsurfaces/contradiction/contradiction5.s b/rdfsurfaces/contradiction/contradiction5.s
@@ -2,18 +2,18 @@
 
 :- dynamic('<http://example.org/ns#hates>'/2).
 
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:x'],
-    '<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'('_:x',
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:x'],
+    '<http://www.w3.org/2000/10/swap/log#nand>'('_:x',
         '<http://example.org/ns#hates>'('<http://example.org/ns#Alice>', '<http://example.org/ns#Quiche>')
     )
 ).
 
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:a'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:a'],
     '<http://example.org/ns#hates>'('<http://example.org/ns#Alice>', '<http://example.org/ns#Quiche>')
 ).
 
 '<http://example.org/ns#is>'('<http://example.org/ns#test>', true).
 
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+'<http://www.w3.org/2000/10/swap/log#nand>'([],
     '<http://example.org/ns#is>'('<http://example.org/ns#test>', true)
 ).
diff --git a/rdfsurfaces/dishes/dishes-output.s b/rdfsurfaces/dishes/dishes-output.s
@@ -1 +1 @@
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],'<urn:example:is>'('<urn:example:Faucet>','<urn:example:Open>')).
+'<http://www.w3.org/2000/10/swap/log#nand>'([],'<urn:example:is>'('<urn:example:Faucet>','<urn:example:Open>')).
diff --git a/rdfsurfaces/dishes/dishes.s b/rdfsurfaces/dishes/dishes.s
@@ -3,38 +3,38 @@
 :- dynamic('<urn:example:is>'/2).
 
 % Bob doesn't do the dishes
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+'<http://www.w3.org/2000/10/swap/log#nand>'([],
     '<urn:example:does>'('<urn:example:Bob>', '<urn:example:Dishes>')
 ).
 
 % When anyone cant do dishes, it is because the sink doens't contain water
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'(['_:X'],
+'<http://www.w3.org/2000/10/swap/log#nand>'(['_:X'],
     (
-        '<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#nand>'([],
             '<urn:example:does>'('_:X', '<urn:example:Dishes>')
         ),
         '<urn:example:contains>'('<urn:example:Sink>', '<urn:example:Water>')
     )
 ).
 
 % If the faucet is open, then the sink contains water
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+'<http://www.w3.org/2000/10/swap/log#nand>'([],
     (
         '<urn:example:is>'('<urn:example:Faucet>', '<urn:example:Open>'),
-        '<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#nand>'([],
             '<urn:example:contains>'('<urn:example:Sink>', '<urn:example:Water>')
         )
     )
 ).
 
 % Test that we don't have an open faucet
-'<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+'<http://www.w3.org/2000/10/swap/log#nand>'([],
     (
-        '<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#nand>'([],
             '<urn:example:is>'('<urn:example:Faucet>', '<urn:example:Open>')
         ),
-        '<http://www.w3.org/2000/10/swap/log#onAnswerSurface>'([],
-            '<http://www.w3.org/2000/10/swap/log#onNegativeSurface>'([],
+        '<http://www.w3.org/2000/10/swap/log#answer>'([],
+            '<http://www.w3.org/2000/10/swap/log#nand>'([],
                 '<urn:example:is>'('<urn:example:Faucet>', '<urn:example:Open>')
             )
         )