Changeset 2098 for branches

Timestamp:

2015-06-17T19:58:44-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/ring.lisp

@@ -49 +49 @@
 (in-package :ring)
 
-#|
-
-(defstruct (ring)
-  "Defines a RING structure, whose fields
-are common ring operations necessary to implement
-Groebner bases."
-  (parse #'identity :type function)
-  (unit #'identity :type function)
-  (zerop #'identity :type function)
-  (add #'identity :type function)
-  (sub #'identity :type function)
-  (uminus #'identity :type function)
-  (mul #'identity :type function)
-  (div #'identity :type function)
-  (lcm #'identity :type function)
-  (ezgcd #'identity :type function)
-  (gcd #'identity :type function))
-
-(defparameter +ring-of-integers+
-  (make-ring
-   :parse #'identity
-   :unit #'(lambda () 1)
-   :zerop #'zerop
-   :add #'+
-   :sub #'-
-   :uminus #'-
-   :mul #'*
-   :div #'/
-   :lcm #'lcm
-   :ezgcd #'(lambda (x y &aux (c (gcd x y))) (values c (/ x c) (/ y c)))
-   :gcd #'gcd
-   )
-  "The ring of integers.")
-|#
-
-(defgeneric ring-parse (object)
+(defgeneric parse (object)
   (:method ((object t)) object))
 
-(defgeneric ring-unit-for (object)
+(defgeneric unit-for (object)
   (:method ((self number)) 1))
 
-(defgeneric ring-zerop (object)
+(defgeneric zerop (object)
   (:method ((self number)) (zerop self)))
 
-(defgeneric ring-add (x y)
+(defgeneric add (x y)
   (:method ((x number) (y number)) (+ x y))) 
 
-(defgeneric ring-mul (x y)
+(defgeneric mul (x y)
   (:method ((x number) (y number)) (* x y))) 
 
-(defgeneric ring-tensor-mul (x y))
+(defgeneric tensor-mul (x y))
 
-(defgeneric ring-div (x y)
+(defgeneric div (x y)
   (:method ((x number) (y number)) (/ x y))) 
 
-(defgeneric ring-lcm (x y)
+(defgeneric lcm (x y)
   (:method ((x integer) (y integer)) (lcm x y))) 
 
-(defgeneric ring-ezgcd (x y)
+(defgeneric ezgcd (x y)
   (:method ((x integer) (y integer)
             &aux (c (gcd x y)))
     (values c (/ x c) (/ y c))))
 
-(defgeneric ring-gcd (x y)
+(defgeneric gcd (x y)
   (:method ((x integer) (y integer))
     (gcd x y)))