revision of quiver Hierarchy with new signature

gruninger · Aug 15, 2015 · dbb5713 · dbb5713
1 parent e0fe425
commit dbb5713
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/ontologies/quivers/loopless_quiver.clif → ontologies/quivers/directed_multigraph.clif b/ontologies/quivers/loopless_quiver.clif → ontologies/quivers/directed_multigraph.clif
@@ -1,10 +1,10 @@
 
-(cl-text http://colore.oor.net/quivers/loopless_quiver.clif
+(cl-text http://colore.oor.net/quivers/directed_multigraph.clif
 
 (cl-imports http://colore.oor.net/quivers/quiver.clif)
 
 (forall (e x)
 	(if	(edge e)
-		(not (madj e x x))))
+		(not (arc e x x))))
 
 )
diff --git a/ontologies/quivers/quiver.clif b/ontologies/quivers/quiver.clif
@@ -2,7 +2,7 @@
 (cl-text http://colore.oor.net/quivers/quiver.clif
 
 (forall (e x y)
-	(if	(madj e x y)
+	(if	(arc e x y)
 		(and	(edge e)
 			(vertex x)
 			(vertex y))))
@@ -14,16 +14,12 @@
 (forall (x)
 	(if	(edge x)
 		(exists (y z)
-			(madj x y z))))
+			(arc x y z))))
 
-(forall (e x y z)
-	(if	(and	(madj e x y)
-			(modj e z y))
-		(= x z)))
-
-(forall (e x y z)
-	(if	(and	(madj e x y)
-			(modj e x z))
-		(= y z)))
+(forall (e x y z u v)
+	(if	(and	(arc e x y)
+			(arc e u v))
+		(and	(= x u)
+			(= y v))))
 
 )
diff --git a/ontologies/quivers/simple_digraph.clif b/ontologies/quivers/simple_digraph.clif
@@ -4,7 +4,7 @@
 (cl-imports http://colore.oor.net/quivers/simple_quiver.clif)
 
 (forall (e x y)
-	(if	(madj e x y)
+	(if	(arc e x y)
 		(not (exists (ep)
-			(madj ep y x)))))
+			(arc ep y x)))))
 )
diff --git a/ontologies/quivers/simple_quiver.clif b/ontologies/quivers/simple_quiver.clif
@@ -4,8 +4,8 @@
 (cl-imports http://colore.oor.net/quivers/quiver.clif)
 
 (forall (e1 e2 x y)
-	(if	(and	(madj e1 x y)
-			(madj e2 x y))
+	(if	(and	(arc e1 x y)
+			(arc e2 x y))
 		(= e1 e2)))
 
 )