Changeset 2145

Timestamp:

2015-06-17T21:30:09-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/ring.lisp (modified) (1 diff)

branches/f4grobner/ring.lisp

@@ -34 +34 @@
 (defpackage "RING"
   (:use :cl)
-  (:shadow "GCD" "LCM" "ZEROP" "+" "-" "*" "/" "EXPT")
-  (:export "PARSE"
-           "UNIT-FOR"
-           "ZEROP"
-           "+"
-           "-"
-           "*"
-           "+"
-           "/"
-           "EXPT"
-           "LCM"
-           "EZGCD"
-           "GCD"
-           "TOTAL-DEGREE"
-           "DIMENSION"
-           "SUGAR"
-           "DIVIDES-P"   
-           "DIVIDES-LCM-P"
-           "LCM-DIVIDES-LCM-P"
-           "LCM-EQUAL-LCM-P"
-           "DIVISIBLE-BY-P" 
-           "REL-PRIME-P"    
-           "EQUAL-P"           
-           "DEPENDS-P"      
-           "TENSOR-MUL"
-           "CONTRACT"
-           "ELT"))       
+  (:export "R-PARSE"
+           "R-UNIT-FOR"
+           "R-ZEROP"
+           "R+"
+           "R-"
+           "R*"
+           "R+"
+           "R/"
+           "R-EXPT"
+           "R-LCM"
+           "R-EZGCD"
+           "R-GCD"
+           "R-TOTAL-DEGREE"
+           "R-DIMENSION"
+           "R-SUGAR"
+           "R-DIVIDES-P"   
+           "R-DIVIDES-LCM-P"
+           "R-LCM-DIVIDES-LCM-P"
+           "R-LCM-EQUAL-LCM-P"
+           "R-DIVISIBLE-BY-P" 
+           "R-REL-PRIME-P"    
+           "R-EQUALP"          
+           "R-DEPENDS-P"      
+           "R-TENSOR-MUL"
+           "R-CONTRACT"))       
 
 (in-package :ring)
 
-(defgeneric unit-for (object)
+(defgeneric r-unit-for (object)
   (:method ((self number)) 1))
 
-(defgeneric zerop (object)
+(defgeneric r-zerop (object)
   (:method ((self number)) (cl:zerop self)))
 
-(defgeneric + (x y)
+(defgeneric r+ (x y)
   (:method ((x number) (y number)) (cl:+ x y))) 
 
-(defgeneric - (x y)
+(defgeneric r- (x y)
   (:method ((x number) (y number)) (cl:- x y))) 
 
-(defgeneric * (x y)
+(defgeneric r* (x y)
   (:method ((x number) (y number)) (cl:* x y))) 
 
-(defgeneric tensor-times (x y))
+(defgeneric r-tensor-product (x y))
 
-(defgeneric / (x y)
+(defgeneric r/ (x y)
   (:method ((x number) (y number)) (cl:/ x y))) 
 
-(defgeneric lcm (x y)
+(defgeneric r-lcm (x y)
   (:method ((x integer) (y integer)) (cl:lcm x y))) 
 
-(defgeneric expt (x y)
+(defgeneric r-expt (x y)
   (:method ((x integer) (y integer)) (cl:expt x y))) 
 
-(defgeneric ezgcd (x y)
+(defgeneric r-ezgcd (x y)
   (:method ((x integer) (y integer)
-            &aux (c (cl:gcd x y)))
-    (values c (cl:/ x c) (cl:/ y c))))
+            &aux (c (gcd x y)))
+    (values c (/ x c) (/ y c))))
 
-(defgeneric gcd (x y)
+(defgeneric r-gcd (x y)
   (:method ((x integer) (y integer))
     (cl:gcd x y)))
 
-(defgeneric dimension (object))
+(defgeneric r-dimension (object))
 
-(defgeneric total-degree (object &optional start end))
+(defgeneric r-total-degree (object &optional start end))
 
-(defgeneric divides-p (object1 object2)
+(defgeneric r-divides-p (object1 object2)
   (:method ((object1 integer) (object2 integer))
     (cl:zerop (rem object2 object1)))
   (:documentation "Returns T if OBJECT1 divides OBJECT2"))
 
-(defgeneric divides-lcm-p (object1 object2 object3)
+(defgeneric r-divides-lcm-p (object1 object2 object3)
   (:documentation "Returns T if OBJECT divides LCM(OBJECT2, OBJECT3), NIL otherwise."))
 
-(defgeneric lcm-divides-lcm-p (object1 object2 object3 object4)
+(defgeneric r-lcm-divides-lcm-p (object1 object2 object3 object4)
   (:documentation "Returns T if LCM(OBJECT1,OBJECT2) divides LCM(OBJECT3,OBJECT4), NIL otherwise."))
 
-(defgeneric lcm-equal-lcm-p (object1 object2 object3 object4)
+(defgeneric r-lcm-equal-lcm-p (object1 object2 object3 object4)
   (:documentation "Returns T if object LCM(OBJECT1,OBJECT2) equals LCM(OBJECT3,OBJECT4), NIL otherwise."))
 
-(defgeneric equal-p (object1 object2)
+(defgeneric r-equalp (object1 object2)
   (:method ((object1 t) (object2 t)) (equalp object1 object2))
   (:documentation "Equality using deep comparison of object slots."))
 
-(defgeneric elt (object index))
+(defgeneric r-elt (object index))
+(defgeneric (setf r-elt) (object index))