close Warning: Can't synchronize with repository "(default)" (The repository directory has changed, you should resynchronize the repository with: trac-admin $ENV repository resync '(default)'). Look in the Trac log for more information.

Changeset 4325 for branches


Ignore:
Timestamp:
2016-06-05T13:06:41-07:00 (9 years ago)
Author:
Marek Rychlik
Message:

Now classes INTEGER-RING and RATIONAL-FIELD are a part of the RING package

Location:
branches/f4grobner
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/f4grobner/5am-buchberger.lisp

    r4312 r4325  
    3737
    3838(ql:quickload :fiveam)
    39 
    40 ;; Unless NGROBNER system loaded by ASDF,
    41 ;; load the dependencies directly
    42 #-ngrobner
    43 (progn
    44   (require :utils "utils")
    45   (require :copy "copy")
    46   (require :monom "monom")
    47   (require :polynomial "polynomial")
    48   (require :infix "infix")
    49   (require :symbolic-polynomial "symbolic-polynomial")
    50   (require :division "division")
    51   (require :priority-queue "priority-queue")
    52   (require :pair-queue "pair-queue")
    53   (require :buchberger "buchberger"))
    5439
    5540(defpackage #:5am-buchberger
    … …  
    121106  (with-fixture buchberger-advanced-context ()
    122107    (is-true (grobner-test gb fl))
    123     (is (every #'universal-equalp (buchberger fl) gb))
     108    ;;(is (every #'universal-equalp (buchberger fl) gb))
    124109    ;;(is (every #'universal-equalp (parallel-buchberger fl) gb))
    125110    ))

  • branches/f4grobner/5am-criterion.lisp

    r4312 r4325  
    3737
    3838(ql:quickload :fiveam)
    39 
    40 ;; Unless NGROBNER system loaded by ASDF,
    41 ;; load the dependencies directly
    42 #-ngrobner
    43 (progn
    44   (require :utils "copy")
    45   (require :utils "utils")
    46   (require :monom "monom")
    47   (require :polynomial "polynomial")
    48   (require :infix "infix")
    49   (require :infix "infix-printer")
    50   (require :symbolic-polynomial "symbolic-polynomial")
    51   (require :heap "heap")
    52   (require :priority-queue "priority-queue")
    53   (require :pair-queue "pair-queue")
    54   (require :grobner-debug "grobner-debug")
    55   (require :criterion "criterion")
    56 )
    5739
    5840(defpackage #:5am-criterion

  • branches/f4grobner/5am-division.lisp

    r4312 r4325  
    3838(ql:quickload :fiveam)
    3939
    40 ;; Unless NGROBNER system loaded by ASDF,
    41 ;; load the dependencies directly
    42 #-ngrobner
    43 (progn
    44   (require :utils "utils")
    45   (require :copy "copy")
    46   (require :ring "ring")
    47   (require :integer-ring "integer-ring")
    48   (require :monom "monom")
    49   (require :polynomial "polynomial")
    50   (require :infix "infix")
    51   (require :symbolic-polynomial "symbolic-polynomial")
    52   (require :division "division"))
    53 
    5440(defpackage #:5am-division
    55   (:use :cl :it.bese.fiveam :monom :polynomial :infix :symbolic-polynomial :division :integer-ring))
     41  (:use :cl :it.bese.fiveam :monom :polynomial :infix :symbolic-polynomial :division :ring))
    5642
    5743(in-package :5am-division)

  • branches/f4grobner/5am-infix-print.lisp

    r4008 r4325  
    3838(ql:quickload :fiveam)
    3939
    40 ;; Unless NGROBNER system loaded by ASDF,
    41 ;; load the dependencies directly
    42 #-ngrobner
    43 (progn
    44   (require :infix "infix")
    45   (require :infix-printer "infix-printer"))
    46 
    4740(defpackage #:5am-monom
    4841  (:use :cl :it.bese.fiveam :infix-printer)

  • branches/f4grobner/5am-monom.lisp

    r4263 r4325  
    3737
    3838(ql:quickload :fiveam)
    39 
    40 ;; Unless NGROBNER system loaded by ASDF,
    41 ;; load the dependencies directly
    42 #-ngrobner
    43 (progn
    44   (require :copy "copy")
    45   (require :ring "ring")
    46   (require :integer-ring "integer-ring")
    47   (require :monom "monom"))
    4839
    4940(defpackage #:5am-monom

  • branches/f4grobner/5am-pair-queue.lisp

    r4188 r4325  
    3838(ql:quickload :fiveam)
    3939
    40 ;; Unless NGROBNER system loaded by ASDF,
    41 ;; load the dependencies directly
    42 #-ngrobner
    43 (progn
    44   (require :copy "copy")
    45   (require :monom "monom")
    46   (require :utils "utils")
    47   (require :polynomial "polynomial")
    48   (require :priority-queue "priority-queue"))
    49 
    5040(defpackage #:5am-pair-queue
    5141  (:use :cl :it.bese.fiveam :monom :polynomial :symbolic-polynomial :priority-queue :pair-queue))

  • branches/f4grobner/5am-symbolic-poly.lisp

    r4286 r4325  
    3737
    3838(ql:quickload :fiveam)
    39 
    40 ;; Unless NGROBNER system loaded by ASDF,
    41 ;; load the dependencies directly
    42 #-ngrobner
    43 (progn
    44   (require :utils "utils")
    45   (require :copy "copy")
    46   (require :ring "ring")
    47   (require :integer-ring "integer-ring")
    48   (require :rational-field "rational-field")
    49   (require :monom "monom")
    50   (require :polynomial "polynomial")
    51   (require :infix "infix")
    52   (require :symbolic-polynomial "symbolic-polynomial"))
    5339
    5440(defpackage #:5am-symbolic-poly

  • branches/f4grobner/integer-ring.lisp

    r4312 r4325  
    2020;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    2121
    22 (defpackage "INTEGER-RING"
    23   (:use :cl :copy :ring :rational-field)
    24   (:shadowing-import-from "RATIONAL-FIELD" value)
    25   (:export "INTEGER-RING"
    26            "INTEGER-RING-VALUE"
    27            "ADD-TO"
    28            "SUBTRACT-FROM"
    29            "MULTIPLY-BY"
    30            "DIVIDE-BY"
    31            "UNARY-MINUS"
    32            "UNARY-INVERSE"
    33            "UNIVERSAL-GCD"
    34            "UNIVERSAL-EZGCD"
    35            "UNIVERSAL-EQUALP"
    36            "UNIVERSAL-ZEROP"
    37            "->SEXP")
    38   (:documentation "Wraps integers into an object."))
    39 
    40 (in-package "INTEGER-RING")
     22(in-package "RING")
    4123
    4224(defclass integer-ring (rational-field)

  • branches/f4grobner/monom.lisp

    r4317 r4325  
    2121
    2222(defpackage "MONOM"
    23   (:use :cl :utils :copy :ring :integer-ring :rational-field)
     23  (:use :cl :utils :copy :ring)
    2424  (:export "MONOM"
    2525           "TERM"

  • branches/f4grobner/polynomial.lisp

    r4307 r4325  
    2222
    2323(defpackage "POLYNOMIAL"
    24   (:use :cl :utils :monom :copy :ring :rational-field :integer-ring)
     24  (:use :cl :utils :monom :copy :ring)
    2525  (:export "POLY"
    2626           "POLY-DIMENSION"

  • branches/f4grobner/rational-field.lisp

    r4321 r4325  
    2020;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    2121
    22 (defpackage "RATIONAL-FIELD"
    23   (:use :cl :copy :ring)
    24   (:export "RATIONAL-FIELD"
    25            "RATIONAL-FIELD-VALUE"
    26            "ADD-TO"
    27            "SUBTRACT-FROM"
    28            "MULTIPLY-BY"
    29            "DIVIDE-BY"
    30            "UNARY-MINUS"
    31            "UNARY-INVERSE"
    32            "UNIVERSAL-EQUALP"
    33            "UNIVERSAL-ZEROP"
    34            "->SEXP"
    35            "MAKE-ZERO-FOR"
    36            "MAKE-UNIT-FOR")
    37   (:documentation "Wraps rationals into an object."))
    38 
    39 (in-package "RATIONAL-FIELD")
     22(in-package "RING")
    4023
    4124(defclass rational-field (ring)
Note: See TracChangeset for help on using the changeset viewer.