corrections to vector spaces and timedurations

gruninger · Jan 14, 2016 · 633085a · 633085a
1 parent 8ba5bea
commit 633085a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/ontologies/algebra/module.clif b/ontologies/algebra/module.clif
@@ -2,15 +2,26 @@
 
 (cl-imports http://colore.oor.net/ringoids/ring.clif)
 
-(cl-imports http://colore.oor.net/magma/abelian_group.clif)
+(cl-module ringoid (cl-imports http://colore.oor.net/ringoids/ring.clif))
+
+(cl-module algebra (cl-imports http://colore.oor.net/magma/abelian_group.clif))
 
 (forall (r x y)
+	(if	(and	(ringoid r)
+			(algebra x)
+			(algebra y))
 	(= (mult r (op x y)) (op (mult r x) (mult r y))))
 
 (forall (r s x)
+	(if	(and	(ringoid r)
+			(algebra x)
+			(algebra y))
 	(= (mult (sum r s) x) (op (mult r x) (mult s x))))
 
 (forall (r s x)
+	(if	(and	(ringoid r)
+			(algebra x)
+			(algebra y))
 	(= (mult (prod r s) x) (mult r (mult s x))))
 
 (forall (x)

diff --git a/ontologies/algebra/vectorspace.clif b/ontologies/algebra/vectorspace.clif
@@ -1,19 +1,29 @@
 (cl-text http://colore.oor.net/algebra/vectorspace.clif
 
-(cl-imports http://colore.oor.net/ringoids/field.clif)
+(cl-module ringoid (cl-imports http://colore.oor.net/ringoids/ringoid.clif))
 
-(cl-imports http://colore.oor.net/magma/abelian_group.clif)
+(cl-module algebra (cl-imports http://colore.oor.net/magma/abelian_group.clif))
 
 (forall (r x y)
-	(= (mult r (op x y)) (op (mult r x) (mult r y))))
+	(if	(and	(ringoid r)
+			(algebra x)
+			(algebra y))
+		(= (mult r (op x y)) (op (mult r x) (mult r y)))))
 
 (forall (r s x)
-	(= (mult (sum r s) x) (op (mult r x) (mult s x))))
+	(if	(and	(ringoid r)
+			(algebra x)
+			(algebra y))
+		(= (mult (sum r s) x) (op (mult r x) (mult s x)))))
 
 (forall (r s x)
-	(= (mult (prod r s) x) (mult r (mult s x))))
+	(if	(and	(ringoid r)
+			(algebra x)
+			(algebra y))
+	(= (mult (prod r s) x) (mult r (mult s x)))))
 
 (forall (x)
-	(= x (mult one x)))
+	(if	(algebra x)
+		(= x (mult one x))))
 
 )
diff --git a/ontologies/duration/timeduration.clif b/ontologies/duration/timeduration.clif
@@ -46,13 +46,13 @@
 (if	(and	(timeduration d)
 		(field r)
 		(field s))
-        (= (mult (add r s) d) (add (mult r d) (mult s d)))))
+        (= (mult (sum r s) d) (add (mult r d) (mult s d)))))
 
 (forall (d r s)
 (if	(and	(timeduration d)
 		(field r)
 		(field s))
-        (= (mult (mult r s) d) (mult r (mult s d)))))
+        (= (mult (prod r s) d) (mult r (mult s d)))))
 
 (forall (d)
 (if	(timeduration d)