aboutsummaryrefslogtreecommitdiff
path: root/src/algebra/strap
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2009-02-08 01:44:04 +0000
committerdos-reis <gdr@axiomatics.org>2009-02-08 01:44:04 +0000
commit6d93161de89559ad66be655a50d3a5001c208c90 (patch)
tree30e165f0c3cf7d8eb28fae9fa9fc9dcf0acd3ab8 /src/algebra/strap
parent2fbcd8bc4f97cc3e534e11414f5a12dbc08edf2d (diff)
downloadopen-axiom-6d93161de89559ad66be655a50d3a5001c208c90.tar.gz
Fix AW/66
* algebra/zerodim.spad.pamphlet: Restore use of one? * algebra/updivp.spad.pamphlet: Likewise. * algebra/unifact.spad.pamphlet: Likewise. * algebra/triset.spad.pamphlet: Likewise. * algebra/tools.spad.pamphlet: Likewise. * algebra/suts.spad.pamphlet: Likewise. * algebra/sttaylor.spad.pamphlet: Likewise. * algebra/string.spad.pamphlet: Likewise. * algebra/sregset.spad.pamphlet: Likewise. * algebra/si.spad.pamphlet: Likewise. * algebra/sf.spad.pamphlet: Likewise. * algebra/riccati.spad.pamphlet: Likewise. * algebra/rf.spad.pamphlet: Likewise. * algebra/regset.spad.pamphlet: Likewise. * algebra/rderf.spad.pamphlet: Likewise. * algebra/rdeef.spad.pamphlet: Likewise. * algebra/quat.spad.pamphlet: Likewise. * algebra/puiseux.spad.pamphlet: Likewise. * algebra/pscat.spad.pamphlet: Likewise. * algebra/prtition.spad.pamphlet: Likewise. * algebra/prs.spad.pamphlet: Likewise. * algebra/primelt.spad.pamphlet: Likewise. * algebra/polycat.spad.pamphlet: Likewise. * algebra/poly.spad.pamphlet: Likewise. * algebra/polset.spad.pamphlet: Likewise. * algebra/pfo.spad.pamphlet: Likewise. * algebra/perm.spad.pamphlet: Likewise. * algebra/pattern.spad.pamphlet: Likewise. * algebra/padiclib.spad.pamphlet:Likewise. * algebra/openmath.spad.pamphlet: Likewise. * algebra/opalg.spad.pamphlet: Likewise. * algebra/op.spad.pamphlet: Likewise. * algebra/omerror.spad.pamphlet: Likewise. * algebra/oderf.spad.pamphlet: Likewise. * algebra/odeef.spad.pamphlet: Likewise. * algebra/oct.spad.pamphlet: Likewise. * algebra/nlinsol.spad.pamphlet: Likewise. * algebra/newpoly.spad.pamphlet: Likewise. * algebra/naalgc.spad.pamphlet: Likewise. * algebra/naalg.spad.pamphlet: Likewise. * algebra/multpoly.spad.pamphlet: Likewise. * algebra/mring.spad.pamphlet: Likewise. * algebra/modring.spad.pamphlet: Likewise. * algebra/moddfact.spad.pamphlet: Likewise. * algebra/mkfunc.spad.pamphlet: Likewise. * algebra/matstor.spad.pamphlet: Likewise. * algebra/matrix.spad.pamphlet: Likewise. * algebra/matcat.spad.pamphlet: Likewise. * algebra/manip.spad.pamphlet: Likewise. * algebra/lodof.spad.pamphlet: Likewise. * algebra/liouv.spad.pamphlet: Likewise. * algebra/laplace.spad.pamphlet: Likewise. * algebra/irexpand.spad.pamphlet: Likewise. * algebra/intrf.spad.pamphlet: Likewise. * algebra/intpm.spad.pamphlet: Likewise. * algebra/intfact.spad.pamphlet: Likewise. * algebra/integer.spad.pamphlet: Likewise. * algebra/intclos.spad.pamphlet: Likewise. * algebra/intaux.spad.pamphlet: Likewise. * algebra/intalg.spad.pamphlet: Likewise. * algebra/intaf.spad.pamphlet: Likewise. * algebra/gpol.spad.pamphlet: Likewise. * algebra/gpgcd.spad.pamphlet: Likewise. * algebra/gb.spad.pamphlet: Likewise. * algebra/gaussian.spad.pamphlet: Likewise. * algebra/galutil.spad.pamphlet: Likewise. * algebra/galpolyu.spad.pamphlet: Likewise. * algebra/galfact.spad.pamphlet: Likewise. * algebra/fspace.spad.pamphlet: Likewise. * algebra/fs2ups.spad.pamphlet: Likewise. * algebra/fs2expxp.spad.pamphlet: Likewise. * algebra/free.spad.pamphlet: Likewise. * algebra/fraction.spad.pamphlet: Likewise. * algebra/fr.spad.pamphlet: Likewise. * algebra/fparfrac.spad.pamphlet: Likewise. * algebra/fortran.spad.pamphlet: Likewise. * algebra/fmod.spad.pamphlet: Likewise. * algebra/float.spad.pamphlet: Likewise. * algebra/ffx.spad.pamphlet: Likewise. * algebra/ffnb.spad.pamphlet: Likewise. * algebra/ffcg.spad.pamphlet: Likewise. * algebra/ffcat.spad.pamphlet: Likewise. * algebra/exprode.spad.pamphlet: Likewise. * algebra/expr.spad.pamphlet: Likewise. * algebra/expexpan.spad.pamphlet: Likewise. * algebra/elemntry.spad.pamphlet: Likewise. * algebra/efupxs.spad.pamphlet: Likewise. * algebra/efuls.spad.pamphlet: Likewise. * algebra/e04routine.spad.pamphlet: Likewise. * algebra/e04agents.spad.pamphlet: Likewise. * algebra/divisor.spad.pamphlet: Likewise. * algebra/derham.spad.pamphlet: Likewise. * algebra/defintrf.spad.pamphlet: Likewise. * algebra/defintef.spad.pamphlet: Likewise. * algebra/defaults.spad.pamphlet: Likewise. * algebra/d03agents.spad.pamphlet: Likewise. * algebra/d01weights.spad.pamphlet: Likewise. * algebra/d01routine.spad.pamphlet: Likewise. * algebra/d01agents.spad.pamphlet: Likewise. * algebra/curve.spad.pamphlet: Likewise. * algebra/crfp.spad.pamphlet: Likewise. * algebra/cont.spad.pamphlet: Likewise. * algebra/constant.spad.pamphlet: Likewise. * algebra/complet.spad.pamphlet: Likewise. * algebra/combfunc.spad.pamphlet: Likewise. * algebra/catdef.spad.pamphlet: Likewise. * algebra/brill.spad.pamphlet: Likewise. * algebra/array1.spad.pamphlet: Likewise. * algebra/algfunc.spad.pamphlet: Likewise. * algebra/algfact.spad.pamphlet: Likewise.
Diffstat (limited to 'src/algebra/strap')
-rw-r--r--src/algebra/strap/DFLOAT.lsp475
-rw-r--r--src/algebra/strap/EUCDOM-.lsp115
-rw-r--r--src/algebra/strap/EUCDOM.lsp2
-rw-r--r--src/algebra/strap/FFIELDC-.lsp77
-rw-r--r--src/algebra/strap/INS-.lsp67
-rw-r--r--src/algebra/strap/INS.lsp6
-rw-r--r--src/algebra/strap/INT.lsp6
-rw-r--r--src/algebra/strap/ISTRING.lsp24
-rw-r--r--src/algebra/strap/MONOID-.lsp21
-rw-r--r--src/algebra/strap/MONOID.lsp2
-rw-r--r--src/algebra/strap/POLYCAT-.lsp246
-rw-r--r--src/algebra/strap/POLYCAT.lsp6
-rw-r--r--src/algebra/strap/PSETCAT-.lsp87
-rw-r--r--src/algebra/strap/PSETCAT.lsp8
-rw-r--r--src/algebra/strap/REF.lsp20
15 files changed, 581 insertions, 581 deletions
diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp
index 7a5876ff..97c30162 100644
--- a/src/algebra/strap/DFLOAT.lsp
+++ b/src/algebra/strap/DFLOAT.lsp
@@ -289,73 +289,78 @@
(PUT '|DFLOAT;zero?;$B;64| '|SPADreplace| 'ZEROP)
+(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Boolean|)
+ |DFLOAT;one?;$B;65|))
+
+(PUT '|DFLOAT;one?;$B;65| '|SPADreplace| '(XLAM (|x|) (= |x| 1.0)))
+
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Short|)
- |DFLOAT;hash;$Si;65|))
+ |DFLOAT;hash;$Si;66|))
-(PUT '|DFLOAT;hash;$Si;65| '|SPADreplace| 'HASHEQ)
+(PUT '|DFLOAT;hash;$Si;66| '|SPADreplace| 'HASHEQ)
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Pair|)
- |DFLOAT;recip;$U;66|))
+ |DFLOAT;recip;$U;67|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;differentiate;2$;67|))
+ |DFLOAT;differentiate;2$;68|))
-(PUT '|DFLOAT;differentiate;2$;67| '|SPADreplace| '(XLAM (|x|) 0.0))
+(PUT '|DFLOAT;differentiate;2$;68| '|SPADreplace| '(XLAM (|x|) 0.0))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;Gamma;2$;68|))
+ |DFLOAT;Gamma;2$;69|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%DoubleFloat| |%Shell|)
|%DoubleFloat|)
- |DFLOAT;Beta;3$;69|))
+ |DFLOAT;Beta;3$;70|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Integer|)
- |DFLOAT;wholePart;$I;70|))
+ |DFLOAT;wholePart;$I;71|))
-(PUT '|DFLOAT;wholePart;$I;70| '|SPADreplace| 'FIX)
+(PUT '|DFLOAT;wholePart;$I;71| '|SPADreplace| 'FIX)
(DECLAIM (FTYPE (FUNCTION
(|%Integer| |%Integer| (|%IntegerSection| 1)
|%Shell|)
|%DoubleFloat|)
- |DFLOAT;float;2IPi$;71|))
+ |DFLOAT;float;2IPi$;72|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;convert;2$;72|))
+ |DFLOAT;convert;2$;73|))
-(PUT '|DFLOAT;convert;2$;72| '|SPADreplace| '(XLAM (|x|) |x|))
+(PUT '|DFLOAT;convert;2$;73| '|SPADreplace| '(XLAM (|x|) |x|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Thing|)
- |DFLOAT;convert;$F;73|))
+ |DFLOAT;convert;$F;74|))
(DECLAIM (FTYPE (FUNCTION
(|%DoubleFloat| (|%IntegerSection| 0) |%Shell|)
|%Thing|)
- |DFLOAT;rationalApproximation;$NniF;74|))
+ |DFLOAT;rationalApproximation;$NniF;75|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%DoubleFloat| |%Shell|)
|%DoubleFloat|)
- |DFLOAT;atan;3$;75|))
+ |DFLOAT;atan;3$;76|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Thing|)
- |DFLOAT;retract;$F;76|))
+ |DFLOAT;retract;$F;77|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Pair|)
- |DFLOAT;retractIfCan;$U;77|))
+ |DFLOAT;retractIfCan;$U;78|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Integer|)
- |DFLOAT;retract;$I;78|))
+ |DFLOAT;retract;$I;79|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Pair|)
- |DFLOAT;retractIfCan;$U;79|))
+ |DFLOAT;retractIfCan;$U;80|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Integer|)
- |DFLOAT;sign;$I;80|))
+ |DFLOAT;sign;$I;81|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
- |DFLOAT;abs;2$;81|))
+ |DFLOAT;abs;2$;82|))
-(PUT '|DFLOAT;abs;2$;81| '|SPADreplace|
+(PUT '|DFLOAT;abs;2$;82| '|SPADreplace|
'(XLAM (|x|) (FLOAT-SIGN 1.0 |x|)))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Pair|)
@@ -365,11 +370,11 @@
(|%DoubleFloat| (|%IntegerSection| 0)
(|%IntegerSection| 0) |%Shell|)
|%Thing|)
- |DFLOAT;rationalApproximation;$2NniF;83|))
+ |DFLOAT;rationalApproximation;$2NniF;84|))
(DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Thing| |%Shell|)
|%DoubleFloat|)
- |DFLOAT;**;$F$;84|))
+ |DFLOAT;**;$F$;85|))
(DEFUN |DFLOAT;OMwrite;$S;1| (|x| $)
(PROG (|sp| |dev| |s|)
@@ -431,7 +436,7 @@
(FLOAT-DIGITS 0.0))
(DEFUN |DFLOAT;bits;Pi;10| ($)
- (PROG (#0=#:G1423)
+ (PROG (#0=#:G1425)
(RETURN
(COND
((EQL (FLOAT-RADIX 0.0) 2) (FLOAT-DIGITS 0.0))
@@ -580,35 +585,37 @@
(DEFUN |DFLOAT;zero?;$B;64| (|x| $) (DECLARE (IGNORE $)) (ZEROP |x|))
-(DEFUN |DFLOAT;hash;$Si;65| (|x| $) (DECLARE (IGNORE $)) (HASHEQ |x|))
+(DEFUN |DFLOAT;one?;$B;65| (|x| $) (DECLARE (IGNORE $)) (= |x| 1.0))
-(DEFUN |DFLOAT;recip;$U;66| (|x| $)
+(DEFUN |DFLOAT;hash;$Si;66| (|x| $) (DECLARE (IGNORE $)) (HASHEQ |x|))
+
+(DEFUN |DFLOAT;recip;$U;67| (|x| $)
(COND ((ZEROP |x|) (CONS 1 "failed")) ('T (CONS 0 (/ 1.0 |x|)))))
-(DEFUN |DFLOAT;differentiate;2$;67| (|x| $) (DECLARE (IGNORE $)) 0.0)
+(DEFUN |DFLOAT;differentiate;2$;68| (|x| $) (DECLARE (IGNORE $)) 0.0)
-(DEFUN |DFLOAT;Gamma;2$;68| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 94)))
+(DEFUN |DFLOAT;Gamma;2$;69| (|x| $)
+ (SPADCALL |x| (|getShellEntry| $ 95)))
-(DEFUN |DFLOAT;Beta;3$;69| (|x| |y| $)
- (SPADCALL |x| |y| (|getShellEntry| $ 96)))
+(DEFUN |DFLOAT;Beta;3$;70| (|x| |y| $)
+ (SPADCALL |x| |y| (|getShellEntry| $ 97)))
-(DEFUN |DFLOAT;wholePart;$I;70| (|x| $)
+(DEFUN |DFLOAT;wholePart;$I;71| (|x| $)
(DECLARE (IGNORE $))
(FIX |x|))
-(DEFUN |DFLOAT;float;2IPi$;71| (|ma| |ex| |b| $)
+(DEFUN |DFLOAT;float;2IPi$;72| (|ma| |ex| |b| $)
(* |ma| (EXPT (FLOAT |b| |$DoubleFloatMaximum|) |ex|)))
-(DEFUN |DFLOAT;convert;2$;72| (|x| $) (DECLARE (IGNORE $)) |x|)
+(DEFUN |DFLOAT;convert;2$;73| (|x| $) (DECLARE (IGNORE $)) |x|)
-(DEFUN |DFLOAT;convert;$F;73| (|x| $)
- (SPADCALL |x| (|getShellEntry| $ 102)))
+(DEFUN |DFLOAT;convert;$F;74| (|x| $)
+ (SPADCALL |x| (|getShellEntry| $ 103)))
-(DEFUN |DFLOAT;rationalApproximation;$NniF;74| (|x| |d| $)
- (|DFLOAT;rationalApproximation;$2NniF;83| |x| |d| 10 $))
+(DEFUN |DFLOAT;rationalApproximation;$NniF;75| (|x| |d| $)
+ (|DFLOAT;rationalApproximation;$2NniF;84| |x| |d| 10 $))
-(DEFUN |DFLOAT;atan;3$;75| (|x| |y| $)
+(DEFUN |DFLOAT;atan;3$;76| (|x| |y| $)
(PROG (|theta|)
(RETURN
(SEQ (COND
@@ -619,67 +626,67 @@
('T 0.0)))
('T
(SEQ (LETT |theta| (ATAN (FLOAT-SIGN 1.0 (/ |y| |x|)))
- |DFLOAT;atan;3$;75|)
+ |DFLOAT;atan;3$;76|)
(COND
((< |x| 0.0)
- (LETT |theta| (- PI |theta|) |DFLOAT;atan;3$;75|)))
+ (LETT |theta| (- PI |theta|) |DFLOAT;atan;3$;76|)))
(COND
((< |y| 0.0)
- (LETT |theta| (- |theta|) |DFLOAT;atan;3$;75|)))
+ (LETT |theta| (- |theta|) |DFLOAT;atan;3$;76|)))
(EXIT |theta|))))))))
-(DEFUN |DFLOAT;retract;$F;76| (|x| $)
- (PROG (#0=#:G1498)
+(DEFUN |DFLOAT;retract;$F;77| (|x| $)
+ (PROG (#0=#:G1501)
(RETURN
- (|DFLOAT;rationalApproximation;$2NniF;83| |x|
+ (|DFLOAT;rationalApproximation;$2NniF;84| |x|
(PROG1 (LETT #0# (- (FLOAT-DIGITS 0.0) 1)
- |DFLOAT;retract;$F;76|)
+ |DFLOAT;retract;$F;77|)
(|check-subtype| (COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#))
(FLOAT-RADIX 0.0) $))))
-(DEFUN |DFLOAT;retractIfCan;$U;77| (|x| $)
- (PROG (#0=#:G1503)
+(DEFUN |DFLOAT;retractIfCan;$U;78| (|x| $)
+ (PROG (#0=#:G1506)
(RETURN
(CONS 0
- (|DFLOAT;rationalApproximation;$2NniF;83| |x|
+ (|DFLOAT;rationalApproximation;$2NniF;84| |x|
(PROG1 (LETT #0# (- (FLOAT-DIGITS 0.0) 1)
- |DFLOAT;retractIfCan;$U;77|)
+ |DFLOAT;retractIfCan;$U;78|)
(|check-subtype| (COND ((< #0# 0) 'NIL) ('T 'T))
'(|NonNegativeInteger|) #0#))
(FLOAT-RADIX 0.0) $)))))
-(DEFUN |DFLOAT;retract;$I;78| (|x| $)
+(DEFUN |DFLOAT;retract;$I;79| (|x| $)
(PROG (|n|)
(RETURN
- (SEQ (LETT |n| (FIX |x|) |DFLOAT;retract;$I;78|)
+ (SEQ (LETT |n| (FIX |x|) |DFLOAT;retract;$I;79|)
(EXIT (COND
((= |x| (FLOAT |n| |$DoubleFloatMaximum|)) |n|)
('T (|error| "Not an integer"))))))))
-(DEFUN |DFLOAT;retractIfCan;$U;79| (|x| $)
+(DEFUN |DFLOAT;retractIfCan;$U;80| (|x| $)
(PROG (|n|)
(RETURN
- (SEQ (LETT |n| (FIX |x|) |DFLOAT;retractIfCan;$U;79|)
+ (SEQ (LETT |n| (FIX |x|) |DFLOAT;retractIfCan;$U;80|)
(EXIT (COND
((= |x| (FLOAT |n| |$DoubleFloatMaximum|))
(CONS 0 |n|))
('T (CONS 1 "failed"))))))))
-(DEFUN |DFLOAT;sign;$I;80| (|x| $)
- (|DFLOAT;retract;$I;78| (FLOAT-SIGN |x| 1.0) $))
+(DEFUN |DFLOAT;sign;$I;81| (|x| $)
+ (|DFLOAT;retract;$I;79| (FLOAT-SIGN |x| 1.0) $))
-(DEFUN |DFLOAT;abs;2$;81| (|x| $)
+(DEFUN |DFLOAT;abs;2$;82| (|x| $)
(DECLARE (IGNORE $))
(FLOAT-SIGN 1.0 |x|))
(DEFUN |DFLOAT;manexp| (|x| $)
- (PROG (|s| #0=#:G1524 |me| |two53|)
+ (PROG (|s| #0=#:G1527 |me| |two53|)
(RETURN
(SEQ (EXIT (COND
((ZEROP |x|) (CONS 0 0))
('T
- (SEQ (LETT |s| (|DFLOAT;sign;$I;80| |x| $)
+ (SEQ (LETT |s| (|DFLOAT;sign;$I;81| |x| $)
|DFLOAT;manexp|)
(LETT |x| (FLOAT-SIGN 1.0 |x|)
|DFLOAT;manexp|)
@@ -707,34 +714,34 @@
(- (QCDR |me|) (FLOAT-DIGITS 0.0))))))))
#0# (EXIT #0#)))))
-(DEFUN |DFLOAT;rationalApproximation;$2NniF;83| (|f| |d| |b| $)
- (PROG (|#G102| |nu| |ex| BASE #0=#:G1527 |de| |tol| |#G103| |q| |r|
- |p2| |q2| #1=#:G1535 |#G104| |#G105| |p0| |p1| |#G106|
- |#G107| |q0| |q1| |#G108| |#G109| |s| |t|)
+(DEFUN |DFLOAT;rationalApproximation;$2NniF;84| (|f| |d| |b| $)
+ (PROG (|#G103| |nu| |ex| BASE #0=#:G1530 |de| |tol| |#G104| |q| |r|
+ |p2| |q2| #1=#:G1538 |#G105| |#G106| |p0| |p1| |#G107|
+ |#G108| |q0| |q1| |#G109| |#G110| |s| |t|)
(RETURN
(SEQ (EXIT (SEQ (PROGN
- (LETT |#G102| (|DFLOAT;manexp| |f| $)
- |DFLOAT;rationalApproximation;$2NniF;83|)
- (LETT |nu| (QCAR |#G102|)
- |DFLOAT;rationalApproximation;$2NniF;83|)
- (LETT |ex| (QCDR |#G102|)
- |DFLOAT;rationalApproximation;$2NniF;83|)
- |#G102|)
+ (LETT |#G103| (|DFLOAT;manexp| |f| $)
+ |DFLOAT;rationalApproximation;$2NniF;84|)
+ (LETT |nu| (QCAR |#G103|)
+ |DFLOAT;rationalApproximation;$2NniF;84|)
+ (LETT |ex| (QCDR |#G103|)
+ |DFLOAT;rationalApproximation;$2NniF;84|)
+ |#G103|)
(LETT BASE (FLOAT-RADIX 0.0)
- |DFLOAT;rationalApproximation;$2NniF;83|)
+ |DFLOAT;rationalApproximation;$2NniF;84|)
(EXIT (COND
((< |ex| 0)
(SEQ (LETT |de|
(EXPT BASE
(PROG1
(LETT #0# (- |ex|)
- |DFLOAT;rationalApproximation;$2NniF;83|)
+ |DFLOAT;rationalApproximation;$2NniF;84|)
(|check-subtype|
(COND
((< #0# 0) 'NIL)
('T 'T))
'(|NonNegativeInteger|) #0#)))
- |DFLOAT;rationalApproximation;$2NniF;83|)
+ |DFLOAT;rationalApproximation;$2NniF;84|)
(EXIT
(COND
((< |b| 2)
@@ -742,37 +749,37 @@
('T
(SEQ
(LETT |tol| (EXPT |b| |d|)
- |DFLOAT;rationalApproximation;$2NniF;83|)
+ |DFLOAT;rationalApproximation;$2NniF;84|)
(LETT |s| |nu|
- |DFLOAT;rationalApproximation;$2NniF;83|)
+ |DFLOAT;rationalApproximation;$2NniF;84|)
(LETT |t| |de|
- |DFLOAT;rationalApproximation;$2NniF;83|)
+ |DFLOAT;rationalApproximation;$2NniF;84|)
(LETT |p0| 0
- |DFLOAT;rationalApproximation;$2NniF;83|)
+ |DFLOAT;rationalApproximation;$2NniF;84|)
(LETT |p1| 1
- |DFLOAT;rationalApproximation;$2NniF;83|)
+ |DFLOAT;rationalApproximation;$2NniF;84|)
(LETT |q0| 1
- |DFLOAT;rationalApproximation;$2NniF;83|)
+ |DFLOAT;rationalApproximation;$2NniF;84|)
(LETT |q1| 0
- |DFLOAT;rationalApproximation;$2NniF;83|)
+ |DFLOAT;rationalApproximation;$2NniF;84|)
(EXIT
(SEQ G190 NIL
(SEQ
(PROGN
- (LETT |#G103|
+ (LETT |#G104|
(DIVIDE2 |s| |t|)
- |DFLOAT;rationalApproximation;$2NniF;83|)
- (LETT |q| (QCAR |#G103|)
- |DFLOAT;rationalApproximation;$2NniF;83|)
- (LETT |r| (QCDR |#G103|)
- |DFLOAT;rationalApproximation;$2NniF;83|)
- |#G103|)
+ |DFLOAT;rationalApproximation;$2NniF;84|)
+ (LETT |q| (QCAR |#G104|)
+ |DFLOAT;rationalApproximation;$2NniF;84|)
+ (LETT |r| (QCDR |#G104|)
+ |DFLOAT;rationalApproximation;$2NniF;84|)
+ |#G104|)
(LETT |p2|
(+ (* |q| |p1|) |p0|)
- |DFLOAT;rationalApproximation;$2NniF;83|)
+ |DFLOAT;rationalApproximation;$2NniF;84|)
(LETT |q2|
(+ (* |q| |q1|) |q0|)
- |DFLOAT;rationalApproximation;$2NniF;83|)
+ |DFLOAT;rationalApproximation;$2NniF;84|)
(COND
((OR (EQL |r| 0)
(<
@@ -781,44 +788,44 @@
(- (* |nu| |q2|)
(* |de| |p2|)))
(|getShellEntry| $
- 119))
+ 120))
(* |de| (ABS |p2|))))
(EXIT
(PROGN
(LETT #1#
(SPADCALL |p2| |q2|
(|getShellEntry| $
- 118))
- |DFLOAT;rationalApproximation;$2NniF;83|)
+ 119))
+ |DFLOAT;rationalApproximation;$2NniF;84|)
(GO #1#)))))
(PROGN
- (LETT |#G104| |p1|
- |DFLOAT;rationalApproximation;$2NniF;83|)
- (LETT |#G105| |p2|
- |DFLOAT;rationalApproximation;$2NniF;83|)
- (LETT |p0| |#G104|
- |DFLOAT;rationalApproximation;$2NniF;83|)
- (LETT |p1| |#G105|
- |DFLOAT;rationalApproximation;$2NniF;83|))
+ (LETT |#G105| |p1|
+ |DFLOAT;rationalApproximation;$2NniF;84|)
+ (LETT |#G106| |p2|
+ |DFLOAT;rationalApproximation;$2NniF;84|)
+ (LETT |p0| |#G105|
+ |DFLOAT;rationalApproximation;$2NniF;84|)
+ (LETT |p1| |#G106|
+ |DFLOAT;rationalApproximation;$2NniF;84|))
(PROGN
- (LETT |#G106| |q1|
- |DFLOAT;rationalApproximation;$2NniF;83|)
- (LETT |#G107| |q2|
- |DFLOAT;rationalApproximation;$2NniF;83|)
- (LETT |q0| |#G106|
- |DFLOAT;rationalApproximation;$2NniF;83|)
- (LETT |q1| |#G107|
- |DFLOAT;rationalApproximation;$2NniF;83|))
+ (LETT |#G107| |q1|
+ |DFLOAT;rationalApproximation;$2NniF;84|)
+ (LETT |#G108| |q2|
+ |DFLOAT;rationalApproximation;$2NniF;84|)
+ (LETT |q0| |#G107|
+ |DFLOAT;rationalApproximation;$2NniF;84|)
+ (LETT |q1| |#G108|
+ |DFLOAT;rationalApproximation;$2NniF;84|))
(EXIT
(PROGN
- (LETT |#G108| |t|
- |DFLOAT;rationalApproximation;$2NniF;83|)
- (LETT |#G109| |r|
- |DFLOAT;rationalApproximation;$2NniF;83|)
- (LETT |s| |#G108|
- |DFLOAT;rationalApproximation;$2NniF;83|)
- (LETT |t| |#G109|
- |DFLOAT;rationalApproximation;$2NniF;83|))))
+ (LETT |#G109| |t|
+ |DFLOAT;rationalApproximation;$2NniF;84|)
+ (LETT |#G110| |r|
+ |DFLOAT;rationalApproximation;$2NniF;84|)
+ (LETT |s| |#G109|
+ |DFLOAT;rationalApproximation;$2NniF;84|)
+ (LETT |t| |#G110|
+ |DFLOAT;rationalApproximation;$2NniF;84|))))
NIL (GO G190) G191
(EXIT NIL)))))))))
('T
@@ -831,37 +838,35 @@
((< |ex| 0) 'NIL)
('T 'T))
'(|NonNegativeInteger|) |ex|))))
- (|getShellEntry| $ 120)))))))
+ (|getShellEntry| $ 121)))))))
#1# (EXIT #1#)))))
-(DEFUN |DFLOAT;**;$F$;84| (|x| |r| $)
- (PROG (|n| |d| #0=#:G1544)
+(DEFUN |DFLOAT;**;$F$;85| (|x| |r| $)
+ (PROG (|n| |d| #0=#:G1548)
(RETURN
(SEQ (EXIT (COND
((ZEROP |x|)
(COND
- ((SPADCALL |r| (|getShellEntry| $ 121))
- (|error| "0**0 is undefined"))
((SPADCALL |r| (|getShellEntry| $ 122))
+ (|error| "0**0 is undefined"))
+ ((SPADCALL |r| (|getShellEntry| $ 123))
(|error| "division by 0"))
('T 0.0)))
- ((OR (SPADCALL |r| (|getShellEntry| $ 121))
+ ((OR (SPADCALL |r| (|getShellEntry| $ 122))
(= |x| 1.0))
1.0)
('T
(COND
- ((SPADCALL |r| (|spadConstant| $ 123)
- (|getShellEntry| $ 124))
- |x|)
+ ((SPADCALL |r| (|getShellEntry| $ 124)) |x|)
('T
(SEQ (LETT |n|
(SPADCALL |r|
(|getShellEntry| $ 125))
- |DFLOAT;**;$F$;84|)
+ |DFLOAT;**;$F$;85|)
(LETT |d|
(SPADCALL |r|
(|getShellEntry| $ 126))
- |DFLOAT;**;$F$;84|)
+ |DFLOAT;**;$F$;85|)
(EXIT (COND
((MINUSP |x|)
(COND
@@ -871,16 +876,16 @@
(PROGN
(LETT #0#
(-
- (|DFLOAT;**;$F$;84|
+ (|DFLOAT;**;$F$;85|
(- |x|) |r| $))
- |DFLOAT;**;$F$;84|)
+ |DFLOAT;**;$F$;85|)
(GO #0#)))
('T
(PROGN
(LETT #0#
- (|DFLOAT;**;$F$;84|
+ (|DFLOAT;**;$F$;85|
(- |x|) |r| $)
- |DFLOAT;**;$F$;84|)
+ |DFLOAT;**;$F$;85|)
(GO #0#)))))
('T (|error| "negative root"))))
((EQL |d| 2)
@@ -899,7 +904,7 @@
(DEFUN |DoubleFloat| ()
(PROG ()
(RETURN
- (PROG (#0=#:G1557)
+ (PROG (#0=#:G1562)
(RETURN
(COND
((LETT #0# (HGET |$ConstructorCache| '|DoubleFloat|)
@@ -966,26 +971,26 @@
|DFLOAT;acsch;2$;59| |DFLOAT;acoth;2$;60|
|DFLOAT;asech;2$;61| |DFLOAT;/;3$;62|
|DFLOAT;negative?;$B;63| |DFLOAT;zero?;$B;64|
- (|SingleInteger|) |DFLOAT;hash;$Si;65|
- (|Union| $ '"failed") |DFLOAT;recip;$U;66|
- |DFLOAT;differentiate;2$;67|
+ |DFLOAT;one?;$B;65| (|SingleInteger|) |DFLOAT;hash;$Si;66|
+ (|Union| $ '"failed") |DFLOAT;recip;$U;67|
+ |DFLOAT;differentiate;2$;68|
(|DoubleFloatSpecialFunctions|) (47 . |Gamma|)
- |DFLOAT;Gamma;2$;68| (52 . |Beta|) |DFLOAT;Beta;3$;69|
- |DFLOAT;wholePart;$I;70| |DFLOAT;float;2IPi$;71|
- |DFLOAT;convert;2$;72| (|Float|) (58 . |convert|)
- |DFLOAT;convert;$F;73| (|Fraction| 24)
+ |DFLOAT;Gamma;2$;69| (52 . |Beta|) |DFLOAT;Beta;3$;70|
+ |DFLOAT;wholePart;$I;71| |DFLOAT;float;2IPi$;72|
+ |DFLOAT;convert;2$;73| (|Float|) (58 . |convert|)
+ |DFLOAT;convert;$F;74| (|Fraction| 24)
(|NonNegativeInteger|)
- |DFLOAT;rationalApproximation;$2NniF;83|
- |DFLOAT;rationalApproximation;$NniF;74|
- |DFLOAT;atan;3$;75| |DFLOAT;retract;$F;76|
- (|Union| 104 '"failed") |DFLOAT;retractIfCan;$U;77|
- |DFLOAT;retract;$I;78| (|Union| 24 '"failed")
- |DFLOAT;retractIfCan;$U;79| |DFLOAT;sign;$I;80|
- |DFLOAT;abs;2$;81| (63 . |Zero|) (67 . /) (73 . *)
+ |DFLOAT;rationalApproximation;$2NniF;84|
+ |DFLOAT;rationalApproximation;$NniF;75|
+ |DFLOAT;atan;3$;76| |DFLOAT;retract;$F;77|
+ (|Union| 105 '"failed") |DFLOAT;retractIfCan;$U;78|
+ |DFLOAT;retract;$I;79| (|Union| 24 '"failed")
+ |DFLOAT;retractIfCan;$U;80| |DFLOAT;sign;$I;81|
+ |DFLOAT;abs;2$;82| (63 . |Zero|) (67 . /) (73 . *)
(79 . |coerce|) (84 . |zero?|) (89 . |negative?|)
- (94 . |One|) (98 . =) (104 . |numer|) (109 . |denom|)
- |DFLOAT;**;$F$;84| (|PatternMatchResult| 101 $)
- (|Pattern| 101) (|Factored| $)
+ (94 . |one?|) (99 . |numer|) (104 . |denom|)
+ |DFLOAT;**;$F$;85| (|PatternMatchResult| 102 $)
+ (|Pattern| 102) (|Factored| $)
(|Record| (|:| |coef1| $) (|:| |coef2| $))
(|Union| 131 '"failed") (|List| $) (|Union| 133 '"failed")
(|Record| (|:| |coef1| $) (|:| |coef2| $)
@@ -995,31 +1000,31 @@
(|Record| (|:| |coef| 133) (|:| |generator| $))
(|Record| (|:| |unit| $) (|:| |canonical| $)
(|:| |associate| $)))
- '#(~= 114 |zero?| 120 |wholePart| 125 |unitNormal| 130
- |unitCanonical| 135 |unit?| 140 |truncate| 145 |tanh| 150
- |tan| 155 |subtractIfCan| 160 |squareFreePart| 166
- |squareFree| 171 |sqrt| 176 |sizeLess?| 181 |sinh| 187
- |sin| 192 |sign| 197 |sech| 202 |sec| 207 |sample| 212
- |round| 216 |retractIfCan| 221 |retract| 231 |rem| 241
- |recip| 247 |rationalApproximation| 252 |quo| 265
- |principalIdeal| 271 |prime?| 276 |precision| 281
- |positive?| 285 |pi| 290 |patternMatch| 294 |order| 301
- |one?| 306 |nthRoot| 311 |norm| 317 |negative?| 322
- |multiEuclidean| 327 |min| 333 |max| 343 |mantissa| 353
- |log2| 358 |log10| 363 |log| 368 |lcm| 373 |latex| 384
- |inv| 389 |hash| 394 |gcdPolynomial| 399 |gcd| 405
- |fractionPart| 416 |floor| 421 |float| 426 |factor| 439
- |extendedEuclidean| 444 |exquo| 457 |expressIdealMember|
- 463 |exponent| 469 |exp1| 474 |exp| 478 |euclideanSize|
- 483 |divide| 488 |digits| 494 |differentiate| 498 |csch|
- 509 |csc| 514 |coth| 519 |cot| 524 |cosh| 529 |cos| 534
- |convert| 539 |coerce| 559 |characteristic| 589 |ceiling|
- 593 |bits| 598 |base| 602 |atanh| 606 |atan| 611
- |associates?| 622 |asinh| 628 |asin| 633 |asech| 638
- |asec| 643 |acsch| 648 |acsc| 653 |acoth| 658 |acot| 663
- |acosh| 668 |acos| 673 |abs| 678 |Zero| 683 |One| 687
- |OMwrite| 691 |Gamma| 715 D 720 |Beta| 731 >= 737 > 743 =
- 749 <= 755 < 761 / 767 - 779 + 790 ** 796 * 826)
+ '#(~= 109 |zero?| 115 |wholePart| 120 |unitNormal| 125
+ |unitCanonical| 130 |unit?| 135 |truncate| 140 |tanh| 145
+ |tan| 150 |subtractIfCan| 155 |squareFreePart| 161
+ |squareFree| 166 |sqrt| 171 |sizeLess?| 176 |sinh| 182
+ |sin| 187 |sign| 192 |sech| 197 |sec| 202 |sample| 207
+ |round| 211 |retractIfCan| 216 |retract| 226 |rem| 236
+ |recip| 242 |rationalApproximation| 247 |quo| 260
+ |principalIdeal| 266 |prime?| 271 |precision| 276
+ |positive?| 280 |pi| 285 |patternMatch| 289 |order| 296
+ |one?| 301 |nthRoot| 306 |norm| 312 |negative?| 317
+ |multiEuclidean| 322 |min| 328 |max| 338 |mantissa| 348
+ |log2| 353 |log10| 358 |log| 363 |lcm| 368 |latex| 379
+ |inv| 384 |hash| 389 |gcdPolynomial| 394 |gcd| 400
+ |fractionPart| 411 |floor| 416 |float| 421 |factor| 434
+ |extendedEuclidean| 439 |exquo| 452 |expressIdealMember|
+ 458 |exponent| 464 |exp1| 469 |exp| 473 |euclideanSize|
+ 478 |divide| 483 |digits| 489 |differentiate| 493 |csch|
+ 504 |csc| 509 |coth| 514 |cot| 519 |cosh| 524 |cos| 529
+ |convert| 534 |coerce| 554 |characteristic| 584 |ceiling|
+ 588 |bits| 593 |base| 597 |atanh| 601 |atan| 606
+ |associates?| 617 |asinh| 623 |asin| 628 |asech| 633
+ |asec| 638 |acsch| 643 |acsc| 648 |acoth| 653 |acot| 658
+ |acosh| 663 |acos| 668 |abs| 673 |Zero| 678 |One| 682
+ |OMwrite| 686 |Gamma| 710 D 715 |Beta| 726 >= 732 > 738 =
+ 744 <= 750 < 756 / 762 - 774 + 785 ** 791 * 821)
'((|approximate| . 0) (|canonicalsClosed| . 0)
(|canonicalUnitNormal| . 0) (|noZeroDivisors| . 0)
((|commutative| "*") . 0) (|rightUnitary| . 0)
@@ -1053,14 +1058,14 @@
(|PrincipalIdealDomain|)
(|UniqueFactorizationDomain|)
(|GcdDomain|) (|DivisionRing|)
- (|IntegralDomain|) (|Algebra| 104)
+ (|IntegralDomain|) (|Algebra| 105)
(|Algebra| $$) (|DifferentialRing|)
(|CharacteristicZero|) (|OrderedRing|)
- (|Module| 104) (|EntireRing|)
+ (|Module| 105) (|EntireRing|)
(|CommutativeRing|) (|Module| $$)
- (|BiModule| 104 104) (|BiModule| $$ $$)
+ (|BiModule| 105 105) (|BiModule| $$ $$)
(|Ring|) (|OrderedAbelianGroup|)
- (|RightModule| 104) (|LeftModule| 104)
+ (|RightModule| 105) (|LeftModule| 105)
(|LeftModule| $$) (|Rng|)
(|RightModule| $$)
(|OrderedCancellationAbelianMonoid|)
@@ -1069,10 +1074,10 @@
(|CancellationAbelianMonoid|)
(|OrderedAbelianSemiGroup|)
(|AbelianMonoid|) (|Monoid|)
- (|PatternMatchable| 101) (|OrderedSet|)
+ (|PatternMatchable| 102) (|OrderedSet|)
(|AbelianSemiGroup|) (|SemiGroup|)
(|TranscendentalFunctionCategory|)
- (|RetractableTo| 104)
+ (|RetractableTo| 105)
(|RetractableTo| 24) (|RealConstant|)
(|SetCategory|) (|ConvertibleTo| 41)
(|ElementaryFunctionCategory|)
@@ -1082,9 +1087,9 @@
(|TrigonometricFunctionCategory|)
(|OpenMath|) (|ConvertibleTo| 129)
(|RadicalCategory|)
- (|ConvertibleTo| 101)
+ (|ConvertibleTo| 102)
(|ConvertibleTo| 13)
- (|CoercibleFrom| 104)
+ (|CoercibleFrom| 105)
(|CoercibleFrom| $$)
(|CoercibleFrom| 24) (|BasicType|)
(|CoercibleTo| 38))
@@ -1092,58 +1097,58 @@
'(0 6 0 7 2 9 0 8 6 10 1 9 11 0 12 2 9
11 0 13 14 1 9 11 0 15 1 9 11 0 16 2
0 0 22 0 29 1 38 0 13 39 1 41 0 13 42
- 1 93 13 13 94 2 93 13 13 13 96 1 101
- 0 13 102 0 104 0 117 2 104 0 24 24
- 118 2 24 0 105 0 119 1 104 0 24 120 1
- 104 18 0 121 1 104 18 0 122 0 104 0
- 123 2 104 18 0 0 124 1 104 24 0 125 1
- 104 24 0 126 2 0 18 0 0 1 1 0 18 0 87
- 1 0 24 0 98 1 0 139 0 1 1 0 0 0 1 1 0
- 18 0 1 1 0 0 0 1 1 0 0 0 75 1 0 0 0
- 63 2 0 90 0 0 1 1 0 0 0 1 1 0 130 0 1
- 1 0 0 0 54 2 0 18 0 0 1 1 0 0 0 73 1
- 0 0 0 61 1 0 24 0 115 1 0 0 0 78 1 0
- 0 0 65 0 0 0 1 1 0 0 0 1 1 0 110 0
- 111 1 0 113 0 114 1 0 104 0 109 1 0
- 24 0 112 2 0 0 0 0 1 1 0 90 0 91 2 0
- 104 0 105 107 3 0 104 0 105 105 106 2
- 0 0 0 0 1 1 0 138 133 1 1 0 18 0 1 0
- 0 22 27 1 0 18 0 1 0 0 0 37 3 0 128 0
- 129 128 1 1 0 24 0 33 1 0 18 0 1 2 0
- 0 0 24 1 1 0 0 0 1 1 0 18 0 86 2 0
- 134 133 0 1 0 0 0 32 2 0 0 0 0 51 0 0
- 0 31 2 0 0 0 0 50 1 0 24 0 25 1 0 0 0
- 28 1 0 0 0 55 1 0 0 0 60 2 0 0 0 0 1
- 1 0 0 133 1 1 0 8 0 1 1 0 0 0 1 1 0
- 88 0 89 2 0 137 137 137 1 1 0 0 133 1
- 2 0 0 0 0 1 1 0 0 0 1 1 0 0 0 1 3 0 0
- 24 24 22 99 2 0 0 24 24 1 1 0 130 0 1
- 3 0 132 0 0 0 1 2 0 135 0 0 1 2 0 90
- 0 0 1 2 0 134 133 0 1 1 0 24 0 26 0 0
- 0 36 1 0 0 0 59 1 0 105 0 1 2 0 136 0
- 0 1 0 0 22 1 1 0 0 0 92 2 0 0 0 105 1
- 1 0 0 0 76 1 0 0 0 66 1 0 0 0 77 1 0
- 0 0 64 1 0 0 0 74 1 0 0 0 62 1 0 41 0
- 43 1 0 129 0 1 1 0 101 0 103 1 0 13 0
- 100 1 0 0 104 1 1 0 0 24 58 1 0 0 104
- 1 1 0 0 0 1 1 0 0 24 58 1 0 38 0 40 0
- 0 105 1 1 0 0 0 1 0 0 22 30 0 0 22 23
- 1 0 0 0 81 2 0 0 0 0 108 1 0 0 0 69 2
- 0 18 0 0 1 1 0 0 0 79 1 0 0 0 67 1 0
- 0 0 84 1 0 0 0 72 1 0 0 0 82 1 0 0 0
- 70 1 0 0 0 83 1 0 0 0 71 1 0 0 0 80 1
- 0 0 0 68 1 0 0 0 116 0 0 0 34 0 0 0
- 35 2 0 11 9 0 20 3 0 11 9 0 18 21 1 0
- 8 0 17 2 0 8 0 18 19 1 0 0 0 95 1 0 0
- 0 1 2 0 0 0 105 1 2 0 0 0 0 97 2 0 18
- 0 0 1 2 0 18 0 0 1 2 0 18 0 0 52 2 0
- 18 0 0 1 2 0 18 0 0 44 2 0 0 0 24 53
- 2 0 0 0 0 85 2 0 0 0 0 47 1 0 0 0 45
- 2 0 0 0 0 46 2 0 0 0 0 57 2 0 0 0 104
- 127 2 0 0 0 24 56 2 0 0 0 105 1 2 0 0
- 0 22 1 2 0 0 104 0 1 2 0 0 0 104 1 2
- 0 0 0 0 48 2 0 0 24 0 49 2 0 0 105 0
- 1 2 0 0 22 0 29)))))
+ 1 94 13 13 95 2 94 13 13 13 97 1 102
+ 0 13 103 0 105 0 118 2 105 0 24 24
+ 119 2 24 0 106 0 120 1 105 0 24 121 1
+ 105 18 0 122 1 105 18 0 123 1 105 18
+ 0 124 1 105 24 0 125 1 105 24 0 126 2
+ 0 18 0 0 1 1 0 18 0 87 1 0 24 0 99 1
+ 0 139 0 1 1 0 0 0 1 1 0 18 0 1 1 0 0
+ 0 1 1 0 0 0 75 1 0 0 0 63 2 0 91 0 0
+ 1 1 0 0 0 1 1 0 130 0 1 1 0 0 0 54 2
+ 0 18 0 0 1 1 0 0 0 73 1 0 0 0 61 1 0
+ 24 0 116 1 0 0 0 78 1 0 0 0 65 0 0 0
+ 1 1 0 0 0 1 1 0 111 0 112 1 0 114 0
+ 115 1 0 105 0 110 1 0 24 0 113 2 0 0
+ 0 0 1 1 0 91 0 92 2 0 105 0 106 108 3
+ 0 105 0 106 106 107 2 0 0 0 0 1 1 0
+ 138 133 1 1 0 18 0 1 0 0 22 27 1 0 18
+ 0 1 0 0 0 37 3 0 128 0 129 128 1 1 0
+ 24 0 33 1 0 18 0 88 2 0 0 0 24 1 1 0
+ 0 0 1 1 0 18 0 86 2 0 134 133 0 1 0 0
+ 0 32 2 0 0 0 0 51 0 0 0 31 2 0 0 0 0
+ 50 1 0 24 0 25 1 0 0 0 28 1 0 0 0 55
+ 1 0 0 0 60 2 0 0 0 0 1 1 0 0 133 1 1
+ 0 8 0 1 1 0 0 0 1 1 0 89 0 90 2 0 137
+ 137 137 1 1 0 0 133 1 2 0 0 0 0 1 1 0
+ 0 0 1 1 0 0 0 1 3 0 0 24 24 22 100 2
+ 0 0 24 24 1 1 0 130 0 1 3 0 132 0 0 0
+ 1 2 0 135 0 0 1 2 0 91 0 0 1 2 0 134
+ 133 0 1 1 0 24 0 26 0 0 0 36 1 0 0 0
+ 59 1 0 106 0 1 2 0 136 0 0 1 0 0 22 1
+ 1 0 0 0 93 2 0 0 0 106 1 1 0 0 0 76 1
+ 0 0 0 66 1 0 0 0 77 1 0 0 0 64 1 0 0
+ 0 74 1 0 0 0 62 1 0 41 0 43 1 0 129 0
+ 1 1 0 102 0 104 1 0 13 0 101 1 0 0
+ 105 1 1 0 0 24 58 1 0 0 105 1 1 0 0 0
+ 1 1 0 0 24 58 1 0 38 0 40 0 0 106 1 1
+ 0 0 0 1 0 0 22 30 0 0 22 23 1 0 0 0
+ 81 2 0 0 0 0 109 1 0 0 0 69 2 0 18 0
+ 0 1 1 0 0 0 79 1 0 0 0 67 1 0 0 0 84
+ 1 0 0 0 72 1 0 0 0 82 1 0 0 0 70 1 0
+ 0 0 83 1 0 0 0 71 1 0 0 0 80 1 0 0 0
+ 68 1 0 0 0 117 0 0 0 34 0 0 0 35 2 0
+ 11 9 0 20 3 0 11 9 0 18 21 1 0 8 0 17
+ 2 0 8 0 18 19 1 0 0 0 96 1 0 0 0 1 2
+ 0 0 0 106 1 2 0 0 0 0 98 2 0 18 0 0 1
+ 2 0 18 0 0 1 2 0 18 0 0 52 2 0 18 0 0
+ 1 2 0 18 0 0 44 2 0 0 0 24 53 2 0 0 0
+ 0 85 2 0 0 0 0 47 1 0 0 0 45 2 0 0 0
+ 0 46 2 0 0 0 0 57 2 0 0 0 105 127 2 0
+ 0 0 24 56 2 0 0 0 106 1 2 0 0 0 22 1
+ 2 0 0 105 0 1 2 0 0 0 105 1 2 0 0 0 0
+ 48 2 0 0 24 0 49 2 0 0 106 0 1 2 0 0
+ 22 0 29)))))
'|lookupComplete|))
(MAKEPROP '|DoubleFloat| 'NILADIC T)
diff --git a/src/algebra/strap/EUCDOM-.lsp b/src/algebra/strap/EUCDOM-.lsp
index aada28a4..1cd2b434 100644
--- a/src/algebra/strap/EUCDOM-.lsp
+++ b/src/algebra/strap/EUCDOM-.lsp
@@ -102,14 +102,12 @@
|EUCDOM-;unitNormalizeIdealElt|)
|#G16|)
(EXIT (COND
- ((SPADCALL |a| (|spadConstant| $ 23)
- (|getShellEntry| $ 24))
- |s|)
+ ((SPADCALL |a| (|getShellEntry| $ 23)) |s|)
('T
(VECTOR (SPADCALL |a| (QVELT |s| 0)
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 24))
(SPADCALL |a| (QVELT |s| 1)
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 24))
|c|))))))))
(DEFUN |EUCDOM-;extendedEuclidean;2SR;7| (|x| |y| $)
@@ -117,14 +115,14 @@
(RETURN
(SEQ (LETT |s1|
(|EUCDOM-;unitNormalizeIdealElt|
- (VECTOR (|spadConstant| $ 23)
+ (VECTOR (|spadConstant| $ 25)
(|spadConstant| $ 26) |x|)
$)
|EUCDOM-;extendedEuclidean;2SR;7|)
(LETT |s2|
(|EUCDOM-;unitNormalizeIdealElt|
(VECTOR (|spadConstant| $ 26)
- (|spadConstant| $ 23) |y|)
+ (|spadConstant| $ 25) |y|)
$)
|EUCDOM-;extendedEuclidean;2SR;7|)
(EXIT (COND
@@ -147,12 +145,12 @@
(SPADCALL (QVELT |s1| 0)
(SPADCALL (QCAR |qr|)
(QVELT |s2| 0)
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 24))
(|getShellEntry| $ 27))
(SPADCALL (QVELT |s1| 1)
(SPADCALL (QCAR |qr|)
(QVELT |s2| 1)
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 24))
(|getShellEntry| $ 27))
(QCDR |qr|))
|EUCDOM-;extendedEuclidean;2SR;7|)
@@ -178,7 +176,7 @@
(QSETVELT |s1| 1
(SPADCALL (QVELT |s1| 1)
(SPADCALL (QCAR |qr|) |x|
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 24))
(|getShellEntry| $ 29)))
(EXIT
(LETT |s1|
@@ -207,16 +205,16 @@
(CONS 0
(CONS (SPADCALL (QVELT |s| 0)
(QCDR |w|)
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 24))
(SPADCALL (QVELT |s| 1)
(QCDR |w|)
- (|getShellEntry| $ 25)))))
+ (|getShellEntry| $ 24)))))
('T
(SEQ (LETT |qr|
(SPADCALL
(SPADCALL (QVELT |s| 0)
(QCDR |w|)
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 24))
|y| (|getShellEntry| $ 13))
|EUCDOM-;extendedEuclidean;3SU;8|)
(EXIT (CONS 0
@@ -224,13 +222,13 @@
(SPADCALL
(SPADCALL (QVELT |s| 1)
(QCDR |w|)
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 24))
(SPADCALL (QCAR |qr|) |x|
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 24))
(|getShellEntry| $ 29))))))))))))))))
(DEFUN |EUCDOM-;principalIdeal;LR;9| (|l| $)
- (PROG (|uca| |v| |u| #0=#:G1516 |vv| #1=#:G1517)
+ (PROG (|uca| |v| |u| #0=#:G1517 |vv| #1=#:G1518)
(RETURN
(SEQ (COND
((SPADCALL |l| NIL (|getShellEntry| $ 38))
@@ -280,7 +278,7 @@
(CONS
(SPADCALL (QVELT |u| 1)
|vv|
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 24))
#0#)
|EUCDOM-;principalIdeal;LR;9|)))
(LETT #1# (CDR #1#)
@@ -290,11 +288,11 @@
(QVELT |u| 2))))))))))
(DEFUN |EUCDOM-;expressIdealMember;LSU;10| (|l| |z| $)
- (PROG (#0=#:G1518 #1=#:G1519 |pid| |q| #2=#:G1520 |v| #3=#:G1521)
+ (PROG (#0=#:G1519 #1=#:G1520 |pid| |q| #2=#:G1521 |v| #3=#:G1522)
(RETURN
(SEQ (COND
((SPADCALL |z| (|spadConstant| $ 26)
- (|getShellEntry| $ 24))
+ (|getShellEntry| $ 44))
(CONS 0
(PROGN
(LETT #0# NIL
@@ -349,7 +347,7 @@
(LETT #2#
(CONS
(SPADCALL (QCDR |q|) |v|
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 24))
#2#)
|EUCDOM-;expressIdealMember;LSU;10|)))
(LETT #3# (CDR #3#)
@@ -358,9 +356,9 @@
(EXIT (NREVERSE0 #2#)))))))))))))))
(DEFUN |EUCDOM-;multiEuclidean;LSU;11| (|l| |z| $)
- (PROG (|n| |l1| |l2| #0=#:G1398 #1=#:G1522 #2=#:G1503 #3=#:G1501
- #4=#:G1502 #5=#:G1399 #6=#:G1523 #7=#:G1506 #8=#:G1504
- #9=#:G1505 |u| |v1| |v2|)
+ (PROG (|n| |l1| |l2| #0=#:G1398 #1=#:G1523 #2=#:G1504 #3=#:G1502
+ #4=#:G1503 #5=#:G1399 #6=#:G1524 #7=#:G1507 #8=#:G1505
+ #9=#:G1506 |u| |v1| |v2|)
(RETURN
(SEQ (LETT |n| (LENGTH |l|) |EUCDOM-;multiEuclidean;LSU;11|)
(EXIT (COND
@@ -369,11 +367,11 @@
((EQL |n| 1) (CONS 0 (LIST |z|)))
('T
(SEQ (LETT |l1|
- (SPADCALL |l| (|getShellEntry| $ 46))
+ (SPADCALL |l| (|getShellEntry| $ 47))
|EUCDOM-;multiEuclidean;LSU;11|)
(LETT |l2|
(SPADCALL |l1| (QUOTIENT2 |n| 2)
- (|getShellEntry| $ 48))
+ (|getShellEntry| $ 49))
|EUCDOM-;multiEuclidean;LSU;11|)
(LETT |u|
(SPADCALL
@@ -402,7 +400,7 @@
(#4#
(LETT #3#
(SPADCALL #3# #2#
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 24))
|EUCDOM-;multiEuclidean;LSU;11|))
('T
(PROGN
@@ -415,7 +413,7 @@
(GO G190) G191 (EXIT NIL))
(COND
(#4# #3#)
- ('T (|spadConstant| $ 23))))
+ ('T (|spadConstant| $ 25))))
(PROGN
(LETT #9# NIL
|EUCDOM-;multiEuclidean;LSU;11|)
@@ -441,7 +439,7 @@
(#9#
(LETT #8#
(SPADCALL #8# #7#
- (|getShellEntry| $ 25))
+ (|getShellEntry| $ 24))
|EUCDOM-;multiEuclidean;LSU;11|))
('T
(PROGN
@@ -454,8 +452,8 @@
(GO G190) G191 (EXIT NIL))
(COND
(#9# #8#)
- ('T (|spadConstant| $ 23))))
- |z| (|getShellEntry| $ 49))
+ ('T (|spadConstant| $ 25))))
+ |z| (|getShellEntry| $ 50))
|EUCDOM-;multiEuclidean;LSU;11|)
(EXIT (COND
((QEQCAR |u| 1) (CONS 1 "failed"))
@@ -463,7 +461,7 @@
(SEQ (LETT |v1|
(SPADCALL |l1|
(QCDR (QCDR |u|))
- (|getShellEntry| $ 50))
+ (|getShellEntry| $ 51))
|EUCDOM-;multiEuclidean;LSU;11|)
(EXIT
(COND
@@ -474,7 +472,7 @@
(LETT |v2|
(SPADCALL |l2|
(QCAR (QCDR |u|))
- (|getShellEntry| $ 50))
+ (|getShellEntry| $ 51))
|EUCDOM-;multiEuclidean;LSU;11|)
(EXIT
(COND
@@ -485,7 +483,7 @@
(SPADCALL (QCDR |v1|)
(QCDR |v2|)
(|getShellEntry| $
- 51))))))))))))))))))))))
+ 52))))))))))))))))))))))
(DEFUN |EuclideanDomain&| (|#1|)
(PROG (|dv$1| |dv$| $ |pv$|)
@@ -493,7 +491,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|EuclideanDomain&|))
(LETT |dv$| (LIST '|EuclideanDomain&| |dv$1|) . #0#)
- (LETT $ (|newShell| 53) . #0#)
+ (LETT $ (|newShell| 54) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -511,39 +509,40 @@
(16 . |unitCanonical|) (21 . |rem|) |EUCDOM-;gcd;3S;5|
(|Record| (|:| |unit| $) (|:| |canonical| $)
(|:| |associate| $))
- (27 . |unitNormal|) (32 . |One|) (36 . =) (42 . *)
- (48 . |Zero|) (52 . -) (58 . |sizeLess?|) (64 . +)
+ (27 . |unitNormal|) (32 . |one?|) (37 . *) (43 . |One|)
+ (47 . |Zero|) (51 . -) (57 . |sizeLess?|) (63 . +)
(|Record| (|:| |coef1| $) (|:| |coef2| $)
(|:| |generator| $))
|EUCDOM-;extendedEuclidean;2SR;7|
- (70 . |extendedEuclidean|) (76 . |exquo|)
+ (69 . |extendedEuclidean|) (75 . |exquo|)
(|Record| (|:| |coef1| $) (|:| |coef2| $))
(|Union| 34 '"failed") |EUCDOM-;extendedEuclidean;3SU;8|
- (|List| 6) (82 . =) (88 . |second|) (|List| $)
+ (|List| 6) (81 . =) (87 . |second|) (|List| $)
(|Record| (|:| |coef| 40) (|:| |generator| $))
- (93 . |principalIdeal|) |EUCDOM-;principalIdeal;LR;9|
- (|Union| 40 '"failed") |EUCDOM-;expressIdealMember;LSU;10|
- (98 . |copy|) (|Integer|) (103 . |split!|)
- (109 . |extendedEuclidean|) (116 . |multiEuclidean|)
- (122 . |concat|) |EUCDOM-;multiEuclidean;LSU;11|)
- '#(|sizeLess?| 128 |rem| 134 |quo| 140 |principalIdeal| 146
- |multiEuclidean| 151 |gcd| 157 |extendedEuclidean| 163
- |exquo| 176 |expressIdealMember| 182)
+ (92 . |principalIdeal|) |EUCDOM-;principalIdeal;LR;9|
+ (97 . =) (|Union| 40 '"failed")
+ |EUCDOM-;expressIdealMember;LSU;10| (103 . |copy|)
+ (|Integer|) (108 . |split!|) (114 . |extendedEuclidean|)
+ (121 . |multiEuclidean|) (127 . |concat|)
+ |EUCDOM-;multiEuclidean;LSU;11|)
+ '#(|sizeLess?| 133 |rem| 139 |quo| 145 |principalIdeal| 151
+ |multiEuclidean| 156 |gcd| 162 |extendedEuclidean| 168
+ |exquo| 181 |expressIdealMember| 187)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 52
+ (|makeByteWordVec2| 53
'(1 6 7 0 8 1 6 9 0 10 2 6 12 0 0 13 1
- 6 0 0 18 2 6 0 0 0 19 1 6 21 0 22 0 6
- 0 23 2 6 7 0 0 24 2 6 0 0 0 25 0 6 0
- 26 2 6 0 0 0 27 2 6 7 0 0 28 2 6 0 0
- 0 29 2 6 30 0 0 32 2 6 16 0 0 33 2 37
- 7 0 0 38 1 37 6 0 39 1 6 41 40 42 1
- 37 0 0 46 2 37 0 0 47 48 3 6 35 0 0 0
- 49 2 6 44 40 0 50 2 37 0 0 0 51 2 0 7
- 0 0 11 2 0 0 0 0 15 2 0 0 0 0 14 1 0
- 41 40 43 2 0 44 40 0 52 2 0 0 0 0 20
- 3 0 35 0 0 0 36 2 0 30 0 0 31 2 0 16
- 0 0 17 2 0 44 40 0 45)))))
+ 6 0 0 18 2 6 0 0 0 19 1 6 21 0 22 1 6
+ 7 0 23 2 6 0 0 0 24 0 6 0 25 0 6 0 26
+ 2 6 0 0 0 27 2 6 7 0 0 28 2 6 0 0 0
+ 29 2 6 30 0 0 32 2 6 16 0 0 33 2 37 7
+ 0 0 38 1 37 6 0 39 1 6 41 40 42 2 6 7
+ 0 0 44 1 37 0 0 47 2 37 0 0 48 49 3 6
+ 35 0 0 0 50 2 6 45 40 0 51 2 37 0 0 0
+ 52 2 0 7 0 0 11 2 0 0 0 0 15 2 0 0 0
+ 0 14 1 0 41 40 43 2 0 45 40 0 53 2 0
+ 0 0 0 20 3 0 35 0 0 0 36 2 0 30 0 0
+ 31 2 0 16 0 0 17 2 0 45 40 0 46)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/EUCDOM.lsp b/src/algebra/strap/EUCDOM.lsp
index b4b66503..fae7626f 100644
--- a/src/algebra/strap/EUCDOM.lsp
+++ b/src/algebra/strap/EUCDOM.lsp
@@ -4,7 +4,7 @@
(DEFPARAMETER |EuclideanDomain;AL| 'NIL)
(DEFUN |EuclideanDomain;| ()
- (PROG (#0=#:G1413)
+ (PROG (#0=#:G1414)
(RETURN
(PROG1 (LETT #0#
(|Join| (|PrincipalIdealDomain|)
diff --git a/src/algebra/strap/FFIELDC-.lsp b/src/algebra/strap/FFIELDC-.lsp
index 9e571320..2a3322ff 100644
--- a/src/algebra/strap/FFIELDC-.lsp
+++ b/src/algebra/strap/FFIELDC-.lsp
@@ -149,8 +149,7 @@
(SPADCALL |a|
(QUOTIENT2 |q| (QCAR |exp|))
(|getShellEntry| $ 47))
- (|spadConstant| $ 48)
- (|getShellEntry| $ 49))
+ (|getShellEntry| $ 48))
|FFIELDC-;primitive?;SB;9|)))
(LETT #0# (CDR #0#) |FFIELDC-;primitive?;SB;9|)
(GO G190) G191 (EXIT NIL))
@@ -162,7 +161,7 @@
(RETURN
(SEQ (COND
((SPADCALL |e| (|spadConstant| $ 7)
- (|getShellEntry| $ 49))
+ (|getShellEntry| $ 50))
(|error| "order(0) is not defined "))
('T
(SEQ (LETT |ord| (- 2 1) |FFIELDC-;order;SPi;10|)
@@ -187,8 +186,7 @@
(SPADCALL
(SPADCALL |e| |a|
(|getShellEntry| $ 47))
- (|spadConstant| $ 48)
- (|getShellEntry| $ 49))
+ (|getShellEntry| $ 48))
|FFIELDC-;order;SPi;10|)
(SEQ (LETT |j| 0 |FFIELDC-;order;SPi;10|)
(LETT #1# (- (QCDR |rec|) 2)
@@ -209,8 +207,7 @@
(SPADCALL
(SPADCALL |e| |a|
(|getShellEntry| $ 47))
- (|spadConstant| $ 48)
- (|getShellEntry| $ 49))
+ (|getShellEntry| $ 48))
|FFIELDC-;order;SPi;10|)))
(LETT |j| (QSADD1 |j|)
|FFIELDC-;order;SPi;10|)
@@ -238,7 +235,7 @@
(LETT |gen| (SPADCALL (|getShellEntry| $ 52))
|FFIELDC-;discreteLog;SNni;11|)
(EXIT (COND
- ((SPADCALL |b| |gen| (|getShellEntry| $ 49))
+ ((SPADCALL |b| |gen| (|getShellEntry| $ 50))
1)
('T
(SEQ (LETT |disclog| 0
@@ -389,7 +386,7 @@
"discreteLog: logarithm to base zero"
(|getShellEntry| $ 63))
(EXIT (CONS 1 "failed"))))
- ((SPADCALL |b| |logbase| (|getShellEntry| $ 49))
+ ((SPADCALL |b| |logbase| (|getShellEntry| $ 50))
(CONS 0 1))
('T
(COND
@@ -597,30 +594,30 @@
|FFIELDC-;createPrimitiveElement;S;8|
(|Record| (|:| |factor| 18) (|:| |exponent| 18))
(|List| 44) (71 . |factorsOfCyclicGroupSize|) (75 . **)
- (81 . |One|) (85 . =) |FFIELDC-;primitive?;SB;9|
- |FFIELDC-;order;SPi;10| (91 . |primitiveElement|)
- (|Table| 10 35) (95 . |tableForDiscreteLogarithm|)
- (100 . |#|) (|Union| 35 '"failed") (105 . |search|)
- (111 . *) |FFIELDC-;discreteLog;SNni;11| (|Void|)
- (|String|) (|OutputForm|) (117 . |messagePrint|)
- (|Factored| $) (122 . |factor|) (|Factored| 18)
- (127 . |factors|) (|DiscreteLogarithmPackage| 6)
- (132 . |shanksDiscLogAlgorithm|)
+ (81 . |one?|) |FFIELDC-;primitive?;SB;9| (86 . =)
+ |FFIELDC-;order;SPi;10| (92 . |primitiveElement|)
+ (|Table| 10 35) (96 . |tableForDiscreteLogarithm|)
+ (101 . |#|) (|Union| 35 '"failed") (106 . |search|)
+ (112 . *) |FFIELDC-;discreteLog;SNni;11| (|Void|)
+ (|String|) (|OutputForm|) (118 . |messagePrint|)
+ (|Factored| $) (123 . |factor|) (|Factored| 18)
+ (128 . |factors|) (|DiscreteLogarithmPackage| 6)
+ (133 . |shanksDiscLogAlgorithm|)
|FFIELDC-;discreteLog;2SU;12|
(|SparseUnivariatePolynomial| 6) (|Factored| 71)
(|UnivariatePolynomialSquareFree| 6 71)
- (139 . |squareFree|) (|DistinctDegreeFactorize| 6 71)
- (144 . |factor|) (149 . |Zero|) (153 . =) (159 . |Zero|)
+ (140 . |squareFree|) (|DistinctDegreeFactorize| 6 71)
+ (145 . |factor|) (150 . |Zero|) (154 . =) (160 . |Zero|)
(|Record| (|:| |irr| 71) (|:| |pow| 18)) (|List| 80)
(|Record| (|:| |cont| 6) (|:| |factors| 81))
- (163 . |distdfact|) (169 . |coerce|) (174 . |primeFactor|)
- (180 . *) (186 . |One|) (190 . *) (|EuclideanDomain&| 71)
- (196 . |gcd|) (|SparseUnivariatePolynomial| $)
+ (164 . |distdfact|) (170 . |coerce|) (175 . |primeFactor|)
+ (181 . *) (187 . |One|) (191 . *) (|EuclideanDomain&| 71)
+ (197 . |gcd|) (|SparseUnivariatePolynomial| $)
|FFIELDC-;gcdPolynomial;3Sup;16|)
- '#(|primitive?| 202 |order| 207 |nextItem| 217 |init| 222
- |gcdPolynomial| 226 |discreteLog| 232 |differentiate| 243
- |createPrimitiveElement| 248 |conditionP| 252 |charthRoot|
- 257)
+ '#(|primitive?| 203 |order| 208 |nextItem| 218 |init| 223
+ |gcdPolynomial| 227 |discreteLog| 233 |differentiate| 244
+ |createPrimitiveElement| 249 |conditionP| 253 |charthRoot|
+ 258)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
@@ -631,17 +628,17 @@
23 0 25 2 22 13 26 0 27 1 6 0 0 28 2
22 0 29 0 30 2 6 0 0 35 36 0 6 35 39
0 6 40 41 2 40 13 0 0 42 0 6 45 46 2
- 6 0 0 18 47 0 6 0 48 2 6 13 0 0 49 0
- 6 0 52 1 6 53 18 54 1 53 35 0 55 2 53
- 56 10 0 57 2 6 0 0 0 58 1 62 60 61 63
- 1 18 64 0 65 1 66 45 0 67 3 68 56 6 6
- 35 69 1 73 72 71 74 1 75 72 71 76 0
- 71 0 77 2 71 13 0 0 78 0 72 0 79 2 75
- 82 71 13 83 1 71 0 6 84 2 72 0 71 18
- 85 2 72 0 0 0 86 0 72 0 87 2 72 0 71
- 0 88 2 89 0 0 0 90 1 0 13 0 50 1 0 10
- 0 51 1 0 19 0 21 1 0 15 0 16 0 0 0 9
- 2 0 91 91 91 92 1 0 35 0 59 2 0 56 0
- 0 70 1 0 0 0 8 0 0 0 43 1 0 32 33 34
- 1 0 0 0 37 1 0 15 0 38)))))
+ 6 0 0 18 47 1 6 13 0 48 2 6 13 0 0 50
+ 0 6 0 52 1 6 53 18 54 1 53 35 0 55 2
+ 53 56 10 0 57 2 6 0 0 0 58 1 62 60 61
+ 63 1 18 64 0 65 1 66 45 0 67 3 68 56
+ 6 6 35 69 1 73 72 71 74 1 75 72 71 76
+ 0 71 0 77 2 71 13 0 0 78 0 72 0 79 2
+ 75 82 71 13 83 1 71 0 6 84 2 72 0 71
+ 18 85 2 72 0 0 0 86 0 72 0 87 2 72 0
+ 71 0 88 2 89 0 0 0 90 1 0 13 0 49 1 0
+ 10 0 51 1 0 19 0 21 1 0 15 0 16 0 0 0
+ 9 2 0 91 91 91 92 1 0 35 0 59 2 0 56
+ 0 0 70 1 0 0 0 8 0 0 0 43 1 0 32 33
+ 34 1 0 0 0 37 1 0 15 0 38)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/INS-.lsp b/src/algebra/strap/INS-.lsp
index d7e2223b..234dfc24 100644
--- a/src/algebra/strap/INS-.lsp
+++ b/src/algebra/strap/INS-.lsp
@@ -120,7 +120,7 @@
(DEFUN |INS-;rational?;SB;8| (|x| $) (DECLARE (IGNORE $)) 'T)
(DEFUN |INS-;euclideanSize;SNni;9| (|x| $)
- (PROG (#0=#:G1425 #1=#:G1426)
+ (PROG (#0=#:G1426 #1=#:G1427)
(RETURN
(COND
((SPADCALL |x| (|spadConstant| $ 9) (|getShellEntry| $ 24))
@@ -271,17 +271,16 @@
(LETT |d| |r| |INS-;invmod;3S;28|)
(EXIT (LETT |d1| |r1| |INS-;invmod;3S;28|)))
NIL (GO G190) G191 (EXIT NIL))
+ (COND
+ ((NULL (SPADCALL |c| (|getShellEntry| $ 83)))
+ (EXIT (|error| "inverse does not exist"))))
(EXIT (COND
- ((SPADCALL |c| (|spadConstant| $ 20)
- (|getShellEntry| $ 24))
- (COND
- ((SPADCALL |c1| (|getShellEntry| $ 79))
- (SPADCALL |c1| |b| (|getShellEntry| $ 77)))
- ('T |c1|)))
- ('T (|error| "inverse does not exist"))))))))
+ ((SPADCALL |c1| (|getShellEntry| $ 79))
+ (SPADCALL |c1| |b| (|getShellEntry| $ 77)))
+ ('T |c1|)))))))
(DEFUN |INS-;powmod;4S;29| (|x| |n| |p| $)
- (PROG (|y| #0=#:G1483 |z|)
+ (PROG (|y| #0=#:G1484 |z|)
(RETURN
(SEQ (EXIT (SEQ (COND
((SPADCALL |x| (|getShellEntry| $ 79))
@@ -306,7 +305,7 @@
(|getShellEntry| $ 12))
(LETT |y|
(SPADCALL |y| |z| |p|
- (|getShellEntry| $ 84))
+ (|getShellEntry| $ 85))
|INS-;powmod;4S;29|)))
(EXIT
(COND
@@ -326,7 +325,7 @@
('T
(LETT |z|
(SPADCALL |z| |z| |p|
- (|getShellEntry| $ 84))
+ (|getShellEntry| $ 85))
|INS-;powmod;4S;29|)))))
NIL (GO G190) G191 (EXIT NIL)))))))))
#0# (EXIT #0#)))))
@@ -337,7 +336,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|IntegerNumberSystem&|))
(LETT |dv$| (LIST '|IntegerNumberSystem&| |dv$1|) . #0#)
- (LETT $ (|newShell| 86) . #0#)
+ (LETT $ (|newShell| 87) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -378,20 +377,21 @@
(116 . |rem|) (|PositiveInteger|) (122 . *) (128 . +)
|INS-;symmetricRemainder;3S;27| (134 . |negative?|)
(139 . |positiveRemainder|) (145 . |quo|) (151 . *)
- |INS-;invmod;3S;28| (157 . |mulmod|) |INS-;powmod;4S;29|)
- '#(|symmetricRemainder| 164 |squareFree| 170 |retractIfCan|
- 175 |retract| 180 |rationalIfCan| 185 |rational?| 190
- |rational| 195 |prime?| 200 |powmod| 205 |positive?| 212
- |permutation| 217 |patternMatch| 223 |nextItem| 230 |mask|
- 235 |invmod| 240 |init| 246 |factorial| 250 |factor| 255
- |even?| 260 |euclideanSize| 265 |differentiate| 270 |copy|
- 275 |convert| 280 |characteristic| 300 |bit?| 304
- |binomial| 310)
+ (157 . |one?|) |INS-;invmod;3S;28| (162 . |mulmod|)
+ |INS-;powmod;4S;29|)
+ '#(|symmetricRemainder| 169 |squareFree| 175 |retractIfCan|
+ 180 |retract| 185 |rationalIfCan| 190 |rational?| 195
+ |rational| 200 |prime?| 205 |powmod| 210 |positive?| 217
+ |permutation| 222 |patternMatch| 228 |nextItem| 235 |mask|
+ 240 |invmod| 245 |init| 251 |factorial| 255 |factor| 260
+ |even?| 265 |euclideanSize| 270 |differentiate| 275 |copy|
+ 280 |convert| 285 |characteristic| 305 |bit?| 309
+ |binomial| 315)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 85
+ (|makeByteWordVec2| 86
'(0 6 0 9 1 6 11 0 12 2 6 11 0 0 14 1 6
0 0 17 2 6 0 0 0 18 0 6 0 20 1 6 0 0
21 2 6 11 0 0 24 1 6 25 0 26 1 28 0
@@ -401,15 +401,16 @@
1 6 11 0 60 2 6 0 0 0 61 3 65 64 6 37
64 66 1 69 0 25 70 2 6 0 0 0 74 2 6 0
75 0 76 2 6 0 0 0 77 1 6 11 0 79 2 6
- 0 0 0 80 2 6 0 0 0 81 2 6 0 0 0 82 3
- 6 0 0 0 0 84 2 0 0 0 0 78 1 0 43 0 46
- 1 0 57 0 58 1 0 25 0 36 1 0 72 0 73 1
- 0 11 0 23 1 0 69 0 71 1 0 11 0 49 3 0
- 0 0 0 0 85 1 0 11 0 15 2 0 0 0 0 56 3
- 0 67 0 37 67 68 1 0 62 0 63 1 0 0 0
- 22 2 0 0 0 0 83 0 0 0 59 1 0 0 0 52 1
- 0 43 0 44 1 0 11 0 13 1 0 7 0 27 1 0
- 0 0 10 1 0 0 0 16 1 0 31 0 32 1 0 28
- 0 30 1 0 37 0 39 1 0 33 0 35 0 0 7 8
- 2 0 11 0 0 19 2 0 0 0 0 54)))))
+ 0 0 0 80 2 6 0 0 0 81 2 6 0 0 0 82 1
+ 6 11 0 83 3 6 0 0 0 0 85 2 0 0 0 0 78
+ 1 0 43 0 46 1 0 57 0 58 1 0 25 0 36 1
+ 0 72 0 73 1 0 11 0 23 1 0 69 0 71 1 0
+ 11 0 49 3 0 0 0 0 0 86 1 0 11 0 15 2
+ 0 0 0 0 56 3 0 67 0 37 67 68 1 0 62 0
+ 63 1 0 0 0 22 2 0 0 0 0 84 0 0 0 59 1
+ 0 0 0 52 1 0 43 0 44 1 0 11 0 13 1 0
+ 7 0 27 1 0 0 0 10 1 0 0 0 16 1 0 31 0
+ 32 1 0 28 0 30 1 0 37 0 39 1 0 33 0
+ 35 0 0 7 8 2 0 11 0 0 19 2 0 0 0 0
+ 54)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/INS.lsp b/src/algebra/strap/INS.lsp
index eb352380..dd9be9b6 100644
--- a/src/algebra/strap/INS.lsp
+++ b/src/algebra/strap/INS.lsp
@@ -4,12 +4,12 @@
(DEFPARAMETER |IntegerNumberSystem;AL| 'NIL)
(DEFUN |IntegerNumberSystem;| ()
- (PROG (#0=#:G1414)
+ (PROG (#0=#:G1415)
(RETURN
(PROG1 (LETT #0#
(|sublisV|
- (PAIR '(#1=#:G1408 #2=#:G1409 #3=#:G1410
- #4=#:G1411 #5=#:G1412 #6=#:G1413)
+ (PAIR '(#1=#:G1409 #2=#:G1410 #3=#:G1411
+ #4=#:G1412 #5=#:G1413 #6=#:G1414)
(LIST '(|Integer|) '(|Integer|)
'(|Integer|) '(|InputForm|)
'(|Pattern| (|Integer|))
diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp
index a3bfd830..07f142fa 100644
--- a/src/algebra/strap/INT.lsp
+++ b/src/algebra/strap/INT.lsp
@@ -336,7 +336,7 @@
(INTEGER-LENGTH |a|))
(DEFUN |INT;addmod;4$;20| (|a| |b| |p| $)
- (PROG (|c| #0=#:G1433)
+ (PROG (|c| #0=#:G1434)
(RETURN
(SEQ (EXIT (SEQ (SEQ (LETT |c| (+ |a| |b|) |INT;addmod;4$;20|)
(EXIT (COND
@@ -464,7 +464,7 @@
(SPADCALL |p| (|getShellEntry| $ 98)))
(DEFUN |INT;factorPolynomial| (|p| $)
- (PROG (|pp| #0=#:G1504)
+ (PROG (|pp| #0=#:G1506)
(RETURN
(SEQ (LETT |pp| (SPADCALL |p| (|getShellEntry| $ 99))
|INT;factorPolynomial|)
@@ -507,7 +507,7 @@
(DEFUN |Integer| ()
(PROG ()
(RETURN
- (PROG (#0=#:G1529)
+ (PROG (#0=#:G1531)
(RETURN
(COND
((LETT #0# (HGET |$ConstructorCache| '|Integer|) |Integer|)
diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp
index 44bdb482..a7ba5fa0 100644
--- a/src/algebra/strap/ISTRING.lsp
+++ b/src/algebra/strap/ISTRING.lsp
@@ -181,8 +181,8 @@
(STRCONC "\\mbox{``" (STRCONC |s| "''}")))
(DEFUN |ISTRING;replace;$Us2$;15| (|s| |sg| |t| $)
- (PROG (|l| |m| |n| |h| #0=#:G1438 |r| #1=#:G1535 #2=#:G1536 |i|
- #3=#:G1537 |k|)
+ (PROG (|l| |m| |n| |h| #0=#:G1439 |r| #1=#:G1537 #2=#:G1538 |i|
+ #3=#:G1539 |k|)
(RETURN
(SEQ (LETT |l|
(- (SPADCALL |sg| (|getShellEntry| $ 39))
@@ -254,7 +254,7 @@
(EXIT |c|))))))
(DEFUN |ISTRING;substring?;2$IB;17| (|part| |whole| |startpos| $)
- (PROG (|np| |nw| |iw| |ip| #0=#:G1538 #1=#:G1452 #2=#:G1448)
+ (PROG (|np| |nw| |iw| |ip| #0=#:G1540 #1=#:G1453 #2=#:G1449)
(RETURN
(SEQ (EXIT (SEQ (LETT |np| (QCSIZE |part|)
|ISTRING;substring?;2$IB;17|)
@@ -323,7 +323,7 @@
('T (+ |r| (|getShellEntry| $ 6)))))))))))))
(DEFUN |ISTRING;position;C$2I;19| (|c| |t| |startpos| $)
- (PROG (|r| #0=#:G1539 #1=#:G1462)
+ (PROG (|r| #0=#:G1541 #1=#:G1463)
(RETURN
(SEQ (EXIT (SEQ (LETT |startpos|
(- |startpos| (|getShellEntry| $ 6))
@@ -359,7 +359,7 @@
#1# (EXIT #1#)))))
(DEFUN |ISTRING;position;Cc$2I;20| (|cc| |t| |startpos| $)
- (PROG (|r| #0=#:G1540 #1=#:G1468)
+ (PROG (|r| #0=#:G1542 #1=#:G1469)
(RETURN
(SEQ (EXIT (SEQ (LETT |startpos|
(- |startpos| (|getShellEntry| $ 6))
@@ -570,7 +570,7 @@
(SPADCALL |i| |n| (|getShellEntry| $ 20)) $))))))
(DEFUN |ISTRING;rightTrim;$C$;26| (|s| |c| $)
- (PROG (|j| #0=#:G1541)
+ (PROG (|j| #0=#:G1543)
(RETURN
(SEQ (SEQ (LETT |j| (SPADCALL |s| (|getShellEntry| $ 42))
|ISTRING;rightTrim;$C$;26|)
@@ -591,7 +591,7 @@
$))))))
(DEFUN |ISTRING;rightTrim;$Cc$;27| (|s| |cc| $)
- (PROG (|j| #0=#:G1542)
+ (PROG (|j| #0=#:G1544)
(RETURN
(SEQ (SEQ (LETT |j| (SPADCALL |s| (|getShellEntry| $ 42))
|ISTRING;rightTrim;$Cc$;27|)
@@ -612,7 +612,7 @@
$))))))
(DEFUN |ISTRING;concat;L$;28| (|l| $)
- (PROG (#0=#:G1543 #1=#:G1497 #2=#:G1495 #3=#:G1496 |t| |s| #4=#:G1544
+ (PROG (#0=#:G1545 #1=#:G1498 #2=#:G1496 #3=#:G1497 |t| |s| #4=#:G1546
|i|)
(RETURN
(SEQ (LETT |t|
@@ -734,8 +734,8 @@
(|stringMatch| |pattern| |target| (CHARACTER |wildcard|)))
(DEFUN |ISTRING;match?;2$CB;34| (|pattern| |target| |dontcare| $)
- (PROG (|n| |m| #0=#:G1515 #1=#:G1518 |s| #2=#:G1519 #3=#:G1528 |i|
- |p| #4=#:G1520 |q|)
+ (PROG (|n| |m| #0=#:G1517 #1=#:G1520 |s| #2=#:G1521 #3=#:G1530 |i|
+ |p| #4=#:G1522 |q|)
(RETURN
(SEQ (EXIT (SEQ (LETT |n|
(SPADCALL |pattern| (|getShellEntry| $ 42))
@@ -858,10 +858,10 @@
(EXIT 'T)))))))
#3# (EXIT #3#)))))
-(DEFUN |IndexedString| (#0=#:G1545)
+(DEFUN |IndexedString| (#0=#:G1547)
(PROG ()
(RETURN
- (PROG (#1=#:G1546)
+ (PROG (#1=#:G1548)
(RETURN
(COND
((LETT #1#
diff --git a/src/algebra/strap/MONOID-.lsp b/src/algebra/strap/MONOID-.lsp
index b3cf1042..b4c3de53 100644
--- a/src/algebra/strap/MONOID-.lsp
+++ b/src/algebra/strap/MONOID-.lsp
@@ -20,14 +20,13 @@
(DEFUN |MONOID-;recip;SU;3| (|x| $)
(COND
- ((SPADCALL |x| (|spadConstant| $ 7) (|getShellEntry| $ 9))
- (CONS 0 |x|))
+ ((SPADCALL |x| (|getShellEntry| $ 12)) (CONS 0 |x|))
('T (CONS 1 "failed"))))
(DEFUN |MONOID-;**;SNniS;4| (|x| |n| $)
(COND
((ZEROP |n|) (|spadConstant| $ 7))
- ('T (SPADCALL |x| |n| (|getShellEntry| $ 16)))))
+ ('T (SPADCALL |x| |n| (|getShellEntry| $ 17)))))
(DEFUN |Monoid&| (|#1|)
(PROG (|dv$1| |dv$| $ |pv$|)
@@ -35,7 +34,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|Monoid&|))
(LETT |dv$| (LIST '|Monoid&| |dv$1|) . #0#)
- (LETT $ (|newShell| 19) . #0#)
+ (LETT $ (|newShell| 20) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#))
@@ -46,16 +45,16 @@
(MAKEPROP '|Monoid&| '|infovec|
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (0 . |One|)
(|Boolean|) (4 . =) |MONOID-;one?;SB;1|
- |MONOID-;sample;S;2| (|Union| $ '"failed")
+ |MONOID-;sample;S;2| (10 . |one?|) (|Union| $ '"failed")
|MONOID-;recip;SU;3| (|PositiveInteger|)
- (|RepeatedSquaring| 6) (10 . |expt|)
+ (|RepeatedSquaring| 6) (15 . |expt|)
(|NonNegativeInteger|) |MONOID-;**;SNniS;4|)
- '#(|sample| 16 |recip| 20 |one?| 25 ** 30) 'NIL
+ '#(|sample| 21 |recip| 25 |one?| 30 ** 35) 'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
(CONS '#()
- (|makeByteWordVec2| 18
- '(0 6 0 7 2 6 8 0 0 9 2 15 6 6 14 16 0
- 0 0 11 1 0 12 0 13 1 0 8 0 10 2 0 0 0
- 17 18)))))
+ (|makeByteWordVec2| 19
+ '(0 6 0 7 2 6 8 0 0 9 1 6 8 0 12 2 16 6
+ 6 15 17 0 0 0 11 1 0 13 0 14 1 0 8 0
+ 10 2 0 0 0 18 19)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/MONOID.lsp b/src/algebra/strap/MONOID.lsp
index 049c98b2..4aead1bb 100644
--- a/src/algebra/strap/MONOID.lsp
+++ b/src/algebra/strap/MONOID.lsp
@@ -4,7 +4,7 @@
(DEFPARAMETER |Monoid;AL| 'NIL)
(DEFUN |Monoid;| ()
- (PROG (#0=#:G1399)
+ (PROG (#0=#:G1400)
(RETURN
(PROG1 (LETT #0#
(|Join| (|SemiGroup|)
diff --git a/src/algebra/strap/POLYCAT-.lsp b/src/algebra/strap/POLYCAT-.lsp
index 9f42bd88..d196bca2 100644
--- a/src/algebra/strap/POLYCAT-.lsp
+++ b/src/algebra/strap/POLYCAT-.lsp
@@ -142,8 +142,8 @@
|POLYCAT-;convert;SIf;43|))
(DEFUN |POLYCAT-;eval;SLS;1| (|p| |l| $)
- (PROG (#0=#:G1689 #1=#:G1427 #2=#:G1690 #3=#:G1691 |lvar| #4=#:G1692
- |e| #5=#:G1693)
+ (PROG (#0=#:G1690 #1=#:G1428 #2=#:G1691 #3=#:G1692 |lvar| #4=#:G1693
+ |e| #5=#:G1694)
(RETURN
(SEQ (COND
((NULL |l|) |p|)
@@ -261,7 +261,7 @@
('T (CONS 0 |l|))))))
(DEFUN |POLYCAT-;isTimes;SU;4| (|p| $)
- (PROG (|lv| #0=#:G1694 |v| #1=#:G1695 |l| |r|)
+ (PROG (|lv| #0=#:G1695 |v| #1=#:G1696 |l| |r|)
(RETURN
(SEQ (COND
((OR (NULL (LETT |lv|
@@ -297,10 +297,12 @@
|POLYCAT-;isTimes;SU;4|)
(GO G190) G191 (EXIT (NREVERSE0 #0#))))
|POLYCAT-;isTimes;SU;4|)
- (LETT |r| (SPADCALL |p| (|getShellEntry| $ 39))
- |POLYCAT-;isTimes;SU;4|)
(EXIT (COND
- ((SPADCALL |r| (|spadConstant| $ 35)
+ ((SPADCALL
+ (LETT |r|
+ (SPADCALL |p|
+ (|getShellEntry| $ 39))
+ |POLYCAT-;isTimes;SU;4|)
(|getShellEntry| $ 40))
(COND
((NULL (CDR |lv|)) (CONS 1 "failed"))
@@ -362,7 +364,7 @@
(CDR |lv|) (CDR |ln|) (|getShellEntry| $ 56)))))
(DEFUN |POLYCAT-;retract;SVarSet;9| (|p| $)
- (PROG (#0=#:G1478 |q|)
+ (PROG (#0=#:G1479 |q|)
(RETURN
(SEQ (LETT |q|
(PROG2 (LETT #0# (SPADCALL |p| (|getShellEntry| $ 43))
@@ -378,7 +380,7 @@
('T (|error| "Polynomial is not a single variable"))))))))
(DEFUN |POLYCAT-;retractIfCan;SU;10| (|p| $)
- (PROG (|q| #0=#:G1486)
+ (PROG (|q| #0=#:G1487)
(RETURN
(SEQ (EXIT (SEQ (SEQ (LETT |q|
(SPADCALL |p| (|getShellEntry| $ 43))
@@ -402,7 +404,7 @@
(|getShellEntry| $ 62)))
(DEFUN |POLYCAT-;primitiveMonomials;SL;12| (|p| $)
- (PROG (#0=#:G1696 |q| #1=#:G1697)
+ (PROG (#0=#:G1697 |q| #1=#:G1698)
(RETURN
(SEQ (PROGN
(LETT #0# NIL |POLYCAT-;primitiveMonomials;SL;12|)
@@ -425,7 +427,7 @@
(GO G190) G191 (EXIT (NREVERSE0 #0#))))))))
(DEFUN |POLYCAT-;totalDegree;SNni;13| (|p| $)
- (PROG (#0=#:G1492 |d| |u|)
+ (PROG (#0=#:G1493 |d| |u|)
(RETURN
(SEQ (COND
((SPADCALL |p| (|getShellEntry| $ 64)) 0)
@@ -465,7 +467,7 @@
(EXIT |d|))))))))
(DEFUN |POLYCAT-;totalDegree;SLNni;14| (|p| |lv| $)
- (PROG (#0=#:G1500 |v| |w| |d| |u|)
+ (PROG (#0=#:G1501 |v| |w| |d| |u|)
(RETURN
(SEQ (COND
((SPADCALL |p| (|getShellEntry| $ 64)) 0)
@@ -522,7 +524,7 @@
(|getShellEntry| $ 77)))
(DEFUN |POLYCAT-;allMonoms| (|l| $)
- (PROG (#0=#:G1698 |p| #1=#:G1699)
+ (PROG (#0=#:G1699 |p| #1=#:G1700)
(RETURN
(SEQ (SPADCALL
(SPADCALL
@@ -549,7 +551,7 @@
(|getShellEntry| $ 82))))))
(DEFUN |POLYCAT-;P2R| (|p| |b| |n| $)
- (PROG (|w| |bj| #0=#:G1701 |i| #1=#:G1700)
+ (PROG (|w| |bj| #0=#:G1702 |i| #1=#:G1701)
(RETURN
(SEQ (LETT |w|
(SPADCALL |n| (|spadConstant| $ 23)
@@ -578,7 +580,7 @@
(EXIT |w|)))))
(DEFUN |POLYCAT-;eq2R| (|l| |b| $)
- (PROG (#0=#:G1702 |bj| #1=#:G1703 #2=#:G1704 |p| #3=#:G1705)
+ (PROG (#0=#:G1703 |bj| #1=#:G1704 #2=#:G1705 |p| #3=#:G1706)
(RETURN
(SEQ (SPADCALL
(PROGN
@@ -628,7 +630,7 @@
(|getShellEntry| $ 92))))))
(DEFUN |POLYCAT-;reducedSystem;MM;20| (|m| $)
- (PROG (#0=#:G1706 |r| #1=#:G1707 |b| #2=#:G1708 |bj| #3=#:G1709 |d|
+ (PROG (#0=#:G1707 |r| #1=#:G1708 |b| #2=#:G1709 |bj| #3=#:G1710 |d|
|mm| |l|)
(RETURN
(SEQ (LETT |l| (SPADCALL |m| (|getShellEntry| $ 95))
@@ -702,7 +704,7 @@
(EXIT |mm|)))))
(DEFUN |POLYCAT-;reducedSystem;MVR;21| (|m| |v| $)
- (PROG (#0=#:G1710 |s| #1=#:G1711 |b| #2=#:G1712 |bj| #3=#:G1713 |d|
+ (PROG (#0=#:G1711 |s| #1=#:G1712 |b| #2=#:G1713 |bj| #3=#:G1714 |d|
|n| |mm| |w| |l| |r|)
(RETURN
(SEQ (LETT |l| (SPADCALL |m| (|getShellEntry| $ 95))
@@ -806,8 +808,8 @@
(SPADCALL |pp| (|getShellEntry| $ 120)))
(DEFUN |POLYCAT-;factor;SF;26| (|p| $)
- (PROG (|v| |ansR| #0=#:G1714 |w| #1=#:G1715 |up| |ansSUP| #2=#:G1716
- |ww| #3=#:G1717)
+ (PROG (|v| |ansR| #0=#:G1715 |w| #1=#:G1716 |up| |ansSUP| #2=#:G1717
+ |ww| #3=#:G1718)
(RETURN
(SEQ (LETT |v| (SPADCALL |p| (|getShellEntry| $ 43))
|POLYCAT-;factor;SF;26|)
@@ -906,13 +908,13 @@
(|getShellEntry| $ 133)))))))))))
(DEFUN |POLYCAT-;conditionP;MU;27| (|mat| $)
- (PROG (|ll| #0=#:G1718 |z| #1=#:G1719 |ch| |l| #2=#:G1720 #3=#:G1721
- #4=#:G1583 #5=#:G1581 #6=#:G1582 #7=#:G1722 |vars| |degs|
- #8=#:G1723 |d| #9=#:G1724 |nd| #10=#:G1610 #11=#:G1590
- |deg1| |redmons| #12=#:G1725 |v| #13=#:G1727 |u|
- #14=#:G1726 |llR| |monslist| |ans| #15=#:G1728
- #16=#:G1729 |mons| #17=#:G1730 |m| #18=#:G1731 |i|
- #19=#:G1606 #20=#:G1604 #21=#:G1605)
+ (PROG (|ll| #0=#:G1719 |z| #1=#:G1720 |ch| |l| #2=#:G1721 #3=#:G1722
+ #4=#:G1584 #5=#:G1582 #6=#:G1583 #7=#:G1723 |vars| |degs|
+ #8=#:G1724 |d| #9=#:G1725 |nd| #10=#:G1611 #11=#:G1591
+ |deg1| |redmons| #12=#:G1726 |v| #13=#:G1728 |u|
+ #14=#:G1727 |llR| |monslist| |ans| #15=#:G1729
+ #16=#:G1730 |mons| #17=#:G1731 |m| #18=#:G1732 |i|
+ #19=#:G1607 #20=#:G1605 #21=#:G1606)
(RETURN
(SEQ (EXIT (SEQ (LETT |ll|
(SPADCALL
@@ -1278,7 +1280,7 @@
$))))))))))
(DEFUN |POLYCAT-;charthRootlv| (|p| |vars| |ch| $)
- (PROG (|v| |dd| |cp| |d| #0=#:G1631 |ans| |ansx| #1=#:G1638)
+ (PROG (|v| |dd| |cp| |d| #0=#:G1632 |ans| |ansx| #1=#:G1639)
(RETURN
(SEQ (EXIT (COND
((NULL |vars|)
@@ -1409,7 +1411,7 @@
(SPADCALL |p| (|getShellEntry| $ 166)))
(DEFUN |POLYCAT-;squareFreePart;2S;34| (|p| $)
- (PROG (|s| |f| #0=#:G1732 #1=#:G1652 #2=#:G1650 #3=#:G1651)
+ (PROG (|s| |f| #0=#:G1733 #1=#:G1653 #2=#:G1651 #3=#:G1652)
(RETURN
(SEQ (SPADCALL
(SPADCALL
@@ -1455,7 +1457,7 @@
(|getShellEntry| $ 173)))
(DEFUN |POLYCAT-;primitivePart;2S;36| (|p| $)
- (PROG (#0=#:G1656)
+ (PROG (#0=#:G1657)
(RETURN
(QVELT (SPADCALL
(PROG2 (LETT #0#
@@ -1471,7 +1473,7 @@
1))))
(DEFUN |POLYCAT-;primitivePart;SVarSetS;37| (|p| |v| $)
- (PROG (#0=#:G1662)
+ (PROG (#0=#:G1663)
(RETURN
(QVELT (SPADCALL
(PROG2 (LETT #0#
@@ -1724,106 +1726,106 @@
|POLYCAT-;isPlus;SU;3| (56 . |variables|)
(61 . |monomial?|) (66 . |One|) (70 . |One|)
(|NonNegativeInteger|) (74 . |degree|) (80 . |monomial|)
- (87 . |leadingCoefficient|) (92 . =) (98 . |coerce|)
- |POLYCAT-;isTimes;SU;4| (103 . |mainVariable|) (108 . =)
+ (87 . |leadingCoefficient|) (92 . |one?|) (97 . |coerce|)
+ |POLYCAT-;isTimes;SU;4| (102 . |mainVariable|) (107 . =)
(|Record| (|:| |var| 9) (|:| |exponent| 36))
(|Union| 45 '"failed") |POLYCAT-;isExpt;SU;5|
- (|SparseUnivariatePolynomial| $) (114 . |univariate|)
- (|SparseUnivariatePolynomial| 6) (120 . |coefficient|)
+ (|SparseUnivariatePolynomial| $) (113 . |univariate|)
+ (|SparseUnivariatePolynomial| 6) (119 . |coefficient|)
|POLYCAT-;coefficient;SVarSetNniS;6| (|List| 36)
- (126 . |coefficient|) |POLYCAT-;coefficient;SLLS;7|
- (133 . |monomial|) |POLYCAT-;monomial;SLLS;8|
- (140 . |coerce|) |POLYCAT-;retract;SVarSet;9|
- |POLYCAT-;retractIfCan;SU;10| (145 . |degree|)
- (150 . |monomial|) |POLYCAT-;primitiveMonomials;SL;12|
- (156 . |ground?|) (161 . |Zero|) (165 . ~=)
- (171 . |degree|) (176 . |leadingCoefficient|)
- (181 . |totalDegree|) (186 . |reductum|)
- |POLYCAT-;totalDegree;SNni;13| (191 . |member?|)
- (197 . |totalDegree|) |POLYCAT-;totalDegree;SLNni;14|
- (203 . |resultant|) (209 . |resultant|)
- (216 . |discriminant|) (221 . |discriminant|)
- (227 . |primitiveMonomials|) (|List| 6) (232 . |concat|)
- (237 . |removeDuplicates!|) (|Vector| 7) (242 . |new|)
- (|Integer|) (248 . |minIndex|) (253 . |coefficient|)
- (259 . |qsetelt!|) (|List| 7) (|List| 89) (|Matrix| 7)
- (266 . |matrix|) (|List| 80) (|Matrix| 6)
- (271 . |listOfLists|) (276 . |vertConcat|) (|Matrix| $)
- (282 . |reducedSystem|) (|Vector| 6) (287 . |entries|)
- (292 . |concat|) (298 . |concat|)
+ (125 . |coefficient|) |POLYCAT-;coefficient;SLLS;7|
+ (132 . |monomial|) |POLYCAT-;monomial;SLLS;8|
+ (139 . |coerce|) |POLYCAT-;retract;SVarSet;9|
+ |POLYCAT-;retractIfCan;SU;10| (144 . |degree|)
+ (149 . |monomial|) |POLYCAT-;primitiveMonomials;SL;12|
+ (155 . |ground?|) (160 . |Zero|) (164 . ~=)
+ (170 . |degree|) (175 . |leadingCoefficient|)
+ (180 . |totalDegree|) (185 . |reductum|)
+ |POLYCAT-;totalDegree;SNni;13| (190 . |member?|)
+ (196 . |totalDegree|) |POLYCAT-;totalDegree;SLNni;14|
+ (202 . |resultant|) (208 . |resultant|)
+ (215 . |discriminant|) (220 . |discriminant|)
+ (226 . |primitiveMonomials|) (|List| 6) (231 . |concat|)
+ (236 . |removeDuplicates!|) (|Vector| 7) (241 . |new|)
+ (|Integer|) (247 . |minIndex|) (252 . |coefficient|)
+ (258 . |qsetelt!|) (|List| 7) (|List| 89) (|Matrix| 7)
+ (265 . |matrix|) (|List| 80) (|Matrix| 6)
+ (270 . |listOfLists|) (275 . |vertConcat|) (|Matrix| $)
+ (281 . |reducedSystem|) (|Vector| 6) (286 . |entries|)
+ (291 . |concat|) (297 . |concat|)
(|Record| (|:| |mat| 91) (|:| |vec| 83)) (|Vector| $)
- (304 . |reducedSystem|)
+ (303 . |reducedSystem|)
(|GeneralPolynomialGcdPackage| 8 9 7 6)
- (310 . |gcdPolynomial|) (316 . |gcdPolynomial|)
+ (309 . |gcdPolynomial|) (315 . |gcdPolynomial|)
(|List| 50) (|Union| 109 '"failed")
(|PolynomialFactorizationByRecursion| 7 8 9 6)
- (322 . |solveLinearPolynomialEquationByRecursion|)
+ (321 . |solveLinearPolynomialEquationByRecursion|)
(|List| 48) (|Union| 113 '"failed")
- (328 . |solveLinearPolynomialEquation|) (|Factored| 50)
- (334 . |factorByRecursion|) (|Factored| 48)
- (339 . |factorPolynomial|)
- (344 . |factorSquareFreeByRecursion|)
- (349 . |factorSquareFreePolynomial|) (|Factored| $)
- (354 . |factor|) (|Factored| 7) (359 . |unit|)
+ (327 . |solveLinearPolynomialEquation|) (|Factored| 50)
+ (333 . |factorByRecursion|) (|Factored| 48)
+ (338 . |factorPolynomial|)
+ (343 . |factorSquareFreeByRecursion|)
+ (348 . |factorSquareFreePolynomial|) (|Factored| $)
+ (353 . |factor|) (|Factored| 7) (358 . |unit|)
(|Union| '"nil" '"sqfr" '"irred" '"prime")
(|Record| (|:| |flg| 126) (|:| |fctr| 7) (|:| |xpnt| 85))
- (|List| 127) (364 . |factorList|)
+ (|List| 127) (363 . |factorList|)
(|Record| (|:| |flg| 126) (|:| |fctr| 6) (|:| |xpnt| 85))
- (|List| 130) (|Factored| 6) (369 . |makeFR|)
- (375 . |unit|) (380 . |multivariate|)
+ (|List| 130) (|Factored| 6) (368 . |makeFR|)
+ (374 . |unit|) (379 . |multivariate|)
(|Record| (|:| |flg| 126) (|:| |fctr| 50) (|:| |xpnt| 85))
- (|List| 136) (386 . |factorList|) (391 . |factor|)
- (396 . |transpose|) (401 . |characteristic|)
- (405 . |setUnion|) (411 . |degree|) (|Union| $ '"failed")
- (417 . |exquo|) (423 . |ground|) (428 . |transpose|)
- (|Union| 104 '"failed") (433 . |conditionP|) (438 . |elt|)
- (444 . *) (450 . +) (456 . |conditionP|)
- (461 . |charthRoot|) (466 . |charthRoot|) (471 . |Zero|)
- (475 . |coefficient|) (482 . -)
+ (|List| 136) (385 . |factorList|) (390 . |factor|)
+ (395 . |transpose|) (400 . |characteristic|)
+ (404 . |setUnion|) (410 . |degree|) (|Union| $ '"failed")
+ (416 . |exquo|) (422 . |ground|) (427 . |transpose|)
+ (|Union| 104 '"failed") (432 . |conditionP|) (437 . |elt|)
+ (443 . *) (449 . +) (455 . |conditionP|)
+ (460 . |charthRoot|) (465 . |charthRoot|) (470 . |Zero|)
+ (474 . |coefficient|) (481 . -)
(|Record| (|:| |quotient| $) (|:| |remainder| $))
- (488 . |monicDivide|) |POLYCAT-;monicDivide;2SVarSetR;30|
- (|MultivariateSquareFree| 8 9 7 6) (494 . |squareFree|)
- (499 . |squareFree|) (|PolynomialSquareFree| 9 8 7 6)
- (504 . |squareFree|) (509 . |squareFree|) (514 . |unit|)
+ (487 . |monicDivide|) |POLYCAT-;monicDivide;2SVarSetR;30|
+ (|MultivariateSquareFree| 8 9 7 6) (493 . |squareFree|)
+ (498 . |squareFree|) (|PolynomialSquareFree| 9 8 7 6)
+ (503 . |squareFree|) (508 . |squareFree|) (513 . |unit|)
(|Record| (|:| |factor| 6) (|:| |exponent| 85))
- (|List| 169) (519 . |factors|) (524 . |squareFreePart|)
- (529 . |content|) (534 . |content|) (540 . |content|)
- (545 . |exquo|)
+ (|List| 169) (518 . |factors|) (523 . |squareFreePart|)
+ (528 . |content|) (533 . |content|) (539 . |content|)
+ (544 . |exquo|)
(|Record| (|:| |unit| $) (|:| |canonical| $)
(|:| |associate| $))
- (551 . |unitNormal|) (556 . |primitivePart|)
- (561 . |content|) (567 . |exquo|) (573 . |primitivePart|)
- (579 . <) (585 . <) (591 . <) (|PatternMatchResult| 85 6)
+ (550 . |unitNormal|) (555 . |primitivePart|)
+ (560 . |content|) (566 . |exquo|) (572 . |primitivePart|)
+ (578 . <) (584 . <) (590 . <) (|PatternMatchResult| 85 6)
(|Pattern| 85)
(|PatternMatchPolynomialCategory| 85 8 9 7 6)
- (597 . |patternMatch|) (|PatternMatchResult| 85 $)
- (604 . |patternMatch|) (|Float|)
+ (596 . |patternMatch|) (|PatternMatchResult| 85 $)
+ (603 . |patternMatch|) (|Float|)
(|PatternMatchResult| 192 6) (|Pattern| 192)
(|PatternMatchPolynomialCategory| 192 8 9 7 6)
- (611 . |patternMatch|) (|PatternMatchResult| 192 $)
- (618 . |patternMatch|) (625 . |convert|) (630 . |convert|)
+ (610 . |patternMatch|) (|PatternMatchResult| 192 $)
+ (617 . |patternMatch|) (624 . |convert|) (629 . |convert|)
(|Mapping| 187 9) (|Mapping| 187 7)
- (|PolynomialCategoryLifting| 8 9 7 6 187) (635 . |map|)
- (642 . |convert|) (647 . |convert|) (652 . |convert|)
+ (|PolynomialCategoryLifting| 8 9 7 6 187) (634 . |map|)
+ (641 . |convert|) (646 . |convert|) (651 . |convert|)
(|Mapping| 194 9) (|Mapping| 194 7)
- (|PolynomialCategoryLifting| 8 9 7 6 194) (657 . |map|)
- (664 . |convert|) (|InputForm|) (669 . |convert|)
- (674 . |convert|) (|Mapping| 213 9) (|Mapping| 213 7)
- (|PolynomialCategoryLifting| 8 9 7 6 213) (679 . |map|)
- (686 . |convert|) (|Matrix| 85) (|Vector| 85)
+ (|PolynomialCategoryLifting| 8 9 7 6 194) (656 . |map|)
+ (663 . |convert|) (|InputForm|) (668 . |convert|)
+ (673 . |convert|) (|Mapping| 213 9) (|Mapping| 213 7)
+ (|PolynomialCategoryLifting| 8 9 7 6 213) (678 . |map|)
+ (685 . |convert|) (|Matrix| 85) (|Vector| 85)
(|Record| (|:| |mat| 221) (|:| |vec| 222))
(|Union| 85 '"failed") (|Fraction| 85)
(|Union| 225 '"failed") (|Union| 7 '"failed"))
- '#(|totalDegree| 691 |squareFreePart| 702 |squareFree| 707
- |solveLinearPolynomialEquation| 712 |retractIfCan| 718
- |retract| 723 |resultant| 728 |reducedSystem| 735
- |primitivePart| 746 |primitiveMonomials| 757
- |patternMatch| 762 |monomials| 776 |monomial| 781
- |monicDivide| 788 |isTimes| 795 |isPlus| 800 |isExpt| 805
- |gcdPolynomial| 810 |factorSquareFreePolynomial| 816
- |factorPolynomial| 821 |factor| 826 |eval| 831
- |discriminant| 837 |convert| 843 |content| 858
- |conditionP| 864 |coefficient| 869 |charthRoot| 883 < 888)
+ '#(|totalDegree| 690 |squareFreePart| 701 |squareFree| 706
+ |solveLinearPolynomialEquation| 711 |retractIfCan| 717
+ |retract| 722 |resultant| 727 |reducedSystem| 734
+ |primitivePart| 745 |primitiveMonomials| 756
+ |patternMatch| 761 |monomials| 775 |monomial| 780
+ |monicDivide| 787 |isTimes| 794 |isPlus| 799 |isExpt| 804
+ |gcdPolynomial| 809 |factorSquareFreePolynomial| 815
+ |factorPolynomial| 820 |factor| 825 |eval| 830
+ |discriminant| 836 |convert| 842 |content| 857
+ |conditionP| 863 |coefficient| 868 |charthRoot| 882 < 887)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
@@ -1834,24 +1836,24 @@
7 0 23 2 6 24 0 0 25 1 6 0 0 26 1 6 0
0 27 1 6 17 0 29 1 6 16 0 32 1 6 24 0
33 0 6 0 34 0 7 0 35 2 6 36 0 9 37 3
- 6 0 0 9 36 38 1 6 7 0 39 2 7 24 0 0
- 40 1 6 0 7 41 1 6 12 0 43 2 6 24 0 0
- 44 2 6 48 0 9 49 2 50 6 0 36 51 3 6 0
- 0 16 53 54 3 6 0 0 16 53 56 1 6 0 9
- 58 1 6 8 0 61 2 6 0 7 8 62 1 6 24 0
- 64 0 50 0 65 2 50 24 0 0 66 1 50 36 0
- 67 1 50 6 0 68 1 6 36 0 69 1 50 0 0
- 70 2 16 24 9 0 72 2 6 36 0 16 73 2 50
- 6 0 0 75 3 0 0 0 0 9 76 1 50 6 0 77 2
- 0 0 0 9 78 1 6 17 0 79 1 80 0 17 81 1
- 80 0 0 82 2 83 0 36 7 84 1 83 85 0 86
- 2 6 7 0 8 87 3 83 7 0 85 7 88 1 91 0
- 90 92 1 94 93 0 95 2 91 0 0 0 96 1 0
- 91 97 98 1 99 80 0 100 2 80 0 0 0 101
- 2 83 0 0 0 102 2 0 103 97 104 105 2
- 106 50 50 50 107 2 0 48 48 48 108 2
- 111 110 109 50 112 2 0 114 113 48 115
- 1 111 116 50 117 1 0 118 48 119 1 111
+ 6 0 0 9 36 38 1 6 7 0 39 1 7 24 0 40
+ 1 6 0 7 41 1 6 12 0 43 2 6 24 0 0 44
+ 2 6 48 0 9 49 2 50 6 0 36 51 3 6 0 0
+ 16 53 54 3 6 0 0 16 53 56 1 6 0 9 58
+ 1 6 8 0 61 2 6 0 7 8 62 1 6 24 0 64 0
+ 50 0 65 2 50 24 0 0 66 1 50 36 0 67 1
+ 50 6 0 68 1 6 36 0 69 1 50 0 0 70 2
+ 16 24 9 0 72 2 6 36 0 16 73 2 50 6 0
+ 0 75 3 0 0 0 0 9 76 1 50 6 0 77 2 0 0
+ 0 9 78 1 6 17 0 79 1 80 0 17 81 1 80
+ 0 0 82 2 83 0 36 7 84 1 83 85 0 86 2
+ 6 7 0 8 87 3 83 7 0 85 7 88 1 91 0 90
+ 92 1 94 93 0 95 2 91 0 0 0 96 1 0 91
+ 97 98 1 99 80 0 100 2 80 0 0 0 101 2
+ 83 0 0 0 102 2 0 103 97 104 105 2 106
+ 50 50 50 107 2 0 48 48 48 108 2 111
+ 110 109 50 112 2 0 114 113 48 115 1
+ 111 116 50 117 1 0 118 48 119 1 111
116 50 120 1 0 118 48 121 1 7 122 0
123 1 124 7 0 125 1 124 128 0 129 2
132 0 6 131 133 1 116 50 0 134 2 6 0
diff --git a/src/algebra/strap/POLYCAT.lsp b/src/algebra/strap/POLYCAT.lsp
index 6e47a7ab..db85c3c6 100644
--- a/src/algebra/strap/POLYCAT.lsp
+++ b/src/algebra/strap/POLYCAT.lsp
@@ -6,7 +6,7 @@
(DEFPARAMETER |PolynomialCategory;AL| 'NIL)
(DEFUN |PolynomialCategory;| (|t#1| |t#2| |t#3|)
- (PROG (#0=#:G1416)
+ (PROG (#0=#:G1417)
(RETURN
(PROG1 (LETT #0#
(|sublisV|
@@ -223,9 +223,9 @@
(LIST '|PolynomialCategory| (|devaluate| |t#1|)
(|devaluate| |t#2|) (|devaluate| |t#3|)))))))
-(DEFUN |PolynomialCategory| (&REST #0=#:G1419 &AUX #1=#:G1417)
+(DEFUN |PolynomialCategory| (&REST #0=#:G1420 &AUX #1=#:G1418)
(DSETQ #1# #0#)
- (LET (#2=#:G1418)
+ (LET (#2=#:G1419)
(COND
((SETQ #2#
(|assoc| (|devaluateList| #1#) |PolynomialCategory;AL|))
diff --git a/src/algebra/strap/PSETCAT-.lsp b/src/algebra/strap/PSETCAT-.lsp
index 596c5712..63efb140 100644
--- a/src/algebra/strap/PSETCAT-.lsp
+++ b/src/algebra/strap/PSETCAT-.lsp
@@ -86,7 +86,7 @@
|PSETCAT-;elements|))))
(DEFUN |PSETCAT-;variables1| (|lp| $)
- (PROG (#0=#:G1559 |p| #1=#:G1560 |lvars|)
+ (PROG (#0=#:G1560 |p| #1=#:G1561 |lvars|)
(RETURN
(SEQ (LETT |lvars|
(PROGN
@@ -119,7 +119,7 @@
(SPADCALL |#2| |#1| (|getShellEntry| $ 16)))
(DEFUN |PSETCAT-;variables2| (|lp| $)
- (PROG (#0=#:G1561 |p| #1=#:G1562 |lvars|)
+ (PROG (#0=#:G1562 |p| #1=#:G1563 |lvars|)
(RETURN
(SEQ (LETT |lvars|
(PROGN
@@ -284,7 +284,7 @@
(SPADCALL |ws| (|getShellEntry| $ 30))))))))
(DEFUN |PSETCAT-;=;2SB;11| (|ps1| |ps2| $)
- (PROG (#0=#:G1563 #1=#:G1564 #2=#:G1565 |p| #3=#:G1566)
+ (PROG (#0=#:G1564 #1=#:G1565 #2=#:G1566 |p| #3=#:G1567)
(RETURN
(SEQ (SPADCALL
(SPADCALL
@@ -463,7 +463,7 @@
('T 'NIL)))
(DEFUN |PSETCAT-;exactQuo| (|r| |s| $)
- (PROG (#0=#:G1508)
+ (PROG (#0=#:G1509)
(RETURN
(COND
((|HasCategory| (|getShellEntry| $ 7) '(|EuclideanDomain|))
@@ -582,14 +582,12 @@
(|getShellEntry| $ 73))
|PSETCAT-;makeIrreducible!|)
(EXIT (COND
- ((SPADCALL |g| (|spadConstant| $ 61)
- (|getShellEntry| $ 75))
- |frac|)
+ ((SPADCALL |g| (|getShellEntry| $ 74)) |frac|)
('T
(SEQ (PROGN
(RPLACA |frac|
(SPADCALL (QCAR |frac|) |g|
- (|getShellEntry| $ 76)))
+ (|getShellEntry| $ 75)))
(QCAR |frac|))
(PROGN
(RPLACD |frac|
@@ -603,7 +601,7 @@
(RETURN
(SEQ (LETT |hRa|
(|PSETCAT-;makeIrreducible!|
- (SPADCALL |a| |ps| (|getShellEntry| $ 77)) $)
+ (SPADCALL |a| |ps| (|getShellEntry| $ 76)) $)
|PSETCAT-;remainder;PSR;24|)
(LETT |a| (QCAR |hRa|) |PSETCAT-;remainder;PSR;24|)
(LETT |r| (QCDR |hRa|) |PSETCAT-;remainder;PSR;24|)
@@ -633,7 +631,7 @@
(SEQ (LETT |hRa|
(|PSETCAT-;makeIrreducible!|
(SPADCALL |a| |ps|
- (|getShellEntry| $ 77))
+ (|getShellEntry| $ 76))
$)
|PSETCAT-;remainder;PSR;24|)
(LETT |a| (QCAR |hRa|)
@@ -662,7 +660,7 @@
(SPADCALL |a|
(|getShellEntry| $ 40))
(|getShellEntry| $ 67))
- (|getShellEntry| $ 78))
+ (|getShellEntry| $ 77))
|PSETCAT-;remainder;PSR;24|)
(EXIT
(LETT |c| |g|
@@ -674,9 +672,9 @@
(PROG (|p| |rs|)
(RETURN
(SEQ (COND
- ((SPADCALL |cs| (|getShellEntry| $ 81)) |ps|)
- ((SPADCALL |cs| (|getShellEntry| $ 82))
- (LIST (|spadConstant| $ 83)))
+ ((SPADCALL |cs| (|getShellEntry| $ 80)) |ps|)
+ ((SPADCALL |cs| (|getShellEntry| $ 81))
+ (LIST (|spadConstant| $ 82)))
('T
(SEQ (LETT |ps|
(SPADCALL (ELT $ 42) |ps|
@@ -686,7 +684,7 @@
((NULL |ps|) |ps|)
((SPADCALL (ELT $ 24) |ps|
(|getShellEntry| $ 43))
- (LIST (|spadConstant| $ 74)))
+ (LIST (|spadConstant| $ 83)))
('T
(SEQ (LETT |rs| NIL
|PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|)
@@ -702,7 +700,7 @@
(LETT |p|
(QCAR
(SPADCALL |p| |cs|
- (|getShellEntry| $ 77)))
+ (|getShellEntry| $ 76)))
|PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|)
(EXIT
(COND
@@ -718,7 +716,7 @@
(EXIT
(LETT |rs|
(LIST
- (|spadConstant| $ 74))
+ (|spadConstant| $ 83))
|PSETCAT-;rewriteIdealWithHeadRemainder;LSL;25|))))
('T
(SEQ
@@ -736,9 +734,9 @@
(PROG (|p| |rs|)
(RETURN
(SEQ (COND
- ((SPADCALL |cs| (|getShellEntry| $ 81)) |ps|)
- ((SPADCALL |cs| (|getShellEntry| $ 82))
- (LIST (|spadConstant| $ 83)))
+ ((SPADCALL |cs| (|getShellEntry| $ 80)) |ps|)
+ ((SPADCALL |cs| (|getShellEntry| $ 81))
+ (LIST (|spadConstant| $ 82)))
('T
(SEQ (LETT |ps|
(SPADCALL (ELT $ 42) |ps|
@@ -748,7 +746,7 @@
((NULL |ps|) |ps|)
((SPADCALL (ELT $ 24) |ps|
(|getShellEntry| $ 43))
- (LIST (|spadConstant| $ 74)))
+ (LIST (|spadConstant| $ 83)))
('T
(SEQ (LETT |rs| NIL
|PSETCAT-;rewriteIdealWithRemainder;LSL;26|)
@@ -781,7 +779,7 @@
(EXIT
(LETT |rs|
(LIST
- (|spadConstant| $ 74))
+ (|spadConstant| $ 83))
|PSETCAT-;rewriteIdealWithRemainder;LSL;26|))))
('T
(LETT |rs|
@@ -846,7 +844,7 @@
(CONS (|dispatchFunction|
|PSETCAT-;headRemainder;PSR;22|)
$))
- (|setShellEntry| $ 80
+ (|setShellEntry| $ 79
(CONS (|dispatchFunction|
|PSETCAT-;remainder;PSR;24|)
$))
@@ -888,24 +886,23 @@
(183 . |leadingCoefficient|) (188 . |gcd|) (194 . *)
(200 . |monomial|) (206 . *) (212 . -) (218 . *)
(|Record| (|:| |num| 10) (|:| |den| 7))
- (224 . |headRemainder|) (230 . |gcd|) (236 . |One|)
- (240 . =) (246 . |exactQuotient!|) (252 . |headRemainder|)
- (258 . +)
+ (224 . |headRemainder|) (230 . |gcd|) (236 . |one?|)
+ (241 . |exactQuotient!|) (247 . |headRemainder|) (253 . +)
(|Record| (|:| |rnum| 7) (|:| |polnum| 10) (|:| |den| 7))
- (264 . |remainder|) (270 . |trivialIdeal?|)
- (275 . |roughUnitIdeal?|) (280 . |Zero|)
- (284 . |primitivePart!|) (289 . |removeDuplicates|)
- (294 . |rewriteIdealWithHeadRemainder|)
- (300 . |remainder|) (306 . |unitCanonical|)
- (311 . |rewriteIdealWithRemainder|))
- '#(|variables| 317 |trivialIdeal?| 322 |triangular?| 327
- |sort| 332 |roughUnitIdeal?| 338 |roughSubIdeal?| 343
- |roughEqualIdeals?| 349 |roughBase?| 355
- |rewriteIdealWithRemainder| 360
- |rewriteIdealWithHeadRemainder| 366 |remainder| 372
- |mainVariables| 378 |mainVariable?| 383 |headRemainder|
- 389 |collectUpper| 395 |collectUnder| 401 |collect| 407 =
- 413)
+ (259 . |remainder|) (265 . |trivialIdeal?|)
+ (270 . |roughUnitIdeal?|) (275 . |Zero|) (279 . |One|)
+ (283 . |primitivePart!|) (288 . |removeDuplicates|)
+ (293 . |rewriteIdealWithHeadRemainder|)
+ (299 . |remainder|) (305 . |unitCanonical|)
+ (310 . |rewriteIdealWithRemainder|))
+ '#(|variables| 316 |trivialIdeal?| 321 |triangular?| 326
+ |sort| 331 |roughUnitIdeal?| 337 |roughSubIdeal?| 342
+ |roughEqualIdeals?| 348 |roughBase?| 354
+ |rewriteIdealWithRemainder| 359
+ |rewriteIdealWithHeadRemainder| 365 |remainder| 371
+ |mainVariables| 377 |mainVariable?| 382 |headRemainder|
+ 388 |collectUpper| 394 |collectUnder| 400 |collect| 406 =
+ 412)
'NIL
(CONS (|makeByteWordVec2| 1 'NIL)
(CONS '#()
@@ -926,16 +923,16 @@
64 2 7 0 0 0 65 2 10 0 7 0 66 2 10 0
7 8 67 2 10 0 0 0 68 2 10 0 0 0 69 2
7 0 0 0 70 2 0 71 10 0 72 2 10 7 7 0
- 73 0 10 0 74 2 7 15 0 0 75 2 10 0 0 7
- 76 2 6 71 10 0 77 2 10 0 0 0 78 2 0
- 79 10 0 80 1 6 15 0 81 1 6 15 0 82 0
+ 73 1 7 15 0 74 2 10 0 0 7 75 2 6 71
+ 10 0 76 2 10 0 0 0 77 2 0 78 10 0 79
+ 1 6 15 0 80 1 6 15 0 81 0 10 0 82 0
10 0 83 1 10 0 0 84 1 11 0 0 85 2 0
- 11 11 0 86 2 6 79 10 0 87 1 10 0 0 88
+ 11 11 0 86 2 6 78 10 0 87 1 10 0 0 88
2 0 11 11 0 89 1 0 13 0 23 1 0 15 0
47 1 0 15 0 46 2 0 34 0 9 35 1 0 15 0
48 2 0 15 0 0 54 2 0 15 0 0 57 1 0 15
0 52 2 0 11 11 0 89 2 0 11 11 0 86 2
- 0 79 10 0 80 1 0 13 0 27 2 0 15 9 0
+ 0 78 10 0 79 1 0 13 0 27 2 0 15 9 0
29 2 0 71 10 0 72 2 0 0 0 9 32 2 0 0
0 9 31 2 0 0 0 9 33 2 0 15 0 0 39)))))
'|lookupComplete|))
diff --git a/src/algebra/strap/PSETCAT.lsp b/src/algebra/strap/PSETCAT.lsp
index 84ee249a..dd7de5be 100644
--- a/src/algebra/strap/PSETCAT.lsp
+++ b/src/algebra/strap/PSETCAT.lsp
@@ -6,7 +6,7 @@
(DEFPARAMETER |PolynomialSetCategory;AL| 'NIL)
(DEFUN |PolynomialSetCategory;| (|t#1| |t#2| |t#3| |t#4|)
- (PROG (#0=#:G1432)
+ (PROG (#0=#:G1433)
(RETURN
(PROG1 (LETT #0#
(|sublisV|
@@ -16,7 +16,7 @@
(|devaluate| |t#3|)
(|devaluate| |t#4|)))
(|sublisV|
- (PAIR '(#1=#:G1431) (LIST '(|List| |t#4|)))
+ (PAIR '(#1=#:G1432) (LIST '(|List| |t#4|)))
(COND
(|PolynomialSetCategory;CAT|)
('T
@@ -107,9 +107,9 @@
(|devaluate| |t#2|) (|devaluate| |t#3|)
(|devaluate| |t#4|)))))))
-(DEFUN |PolynomialSetCategory| (&REST #0=#:G1435 &AUX #1=#:G1433)
+(DEFUN |PolynomialSetCategory| (&REST #0=#:G1436 &AUX #1=#:G1434)
(DSETQ #1# #0#)
- (LET (#2=#:G1434)
+ (LET (#2=#:G1435)
(COND
((SETQ #2#
(|assoc| (|devaluateList| #1#) |PolynomialSetCategory;AL|))
diff --git a/src/algebra/strap/REF.lsp b/src/algebra/strap/REF.lsp
index 2cdb9536..46acc333 100644
--- a/src/algebra/strap/REF.lsp
+++ b/src/algebra/strap/REF.lsp
@@ -43,7 +43,7 @@
(PROGN (RPLACA |p| |v|) (QCAR |p|)))
(DEFUN |REF;coerce;$Of;7| (|p| $)
- (SPADCALL (SPADCALL "ref" (|getShellEntry| $ 17))
+ (SPADCALL (SPADCALL '|ref| (|getShellEntry| $ 17))
(LIST (SPADCALL (QCAR |p|) (|getShellEntry| $ 18)))
(|getShellEntry| $ 20)))
@@ -71,7 +71,7 @@
(PROGN
(LETT |dv$1| (|devaluate| |#1|) . #0=(|Reference|))
(LETT |dv$| (LIST '|Reference| |dv$1|) . #0#)
- (LETT $ (|newShell| 23) . #0#)
+ (LETT $ (|newShell| 24) . #0#)
(|setShellEntry| $ 0 |dv$|)
(|setShellEntry| $ 3
(LETT |pv$|
@@ -92,20 +92,20 @@
(LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) '|Rep| (|Boolean|)
|REF;=;2$B;1| |REF;ref;S$;2| |REF;elt;$S;3|
|REF;setelt;$2S;4| |REF;deref;$S;5| |REF;setref;$2S;6|
- (|String|) (|OutputForm|) (0 . |message|) (5 . |coerce|)
+ (|OutputForm|) (|Symbol|) (0 . |coerce|) (5 . |coerce|)
(|List| $) (10 . |prefix|) (16 . |coerce|)
- (|SingleInteger|))
+ (|SingleInteger|) (|String|))
'#(~= 21 |setref| 27 |setelt| 33 |ref| 39 |latex| 44 |hash|
49 |elt| 54 |deref| 59 |coerce| 64 = 69)
'NIL
(CONS (|makeByteWordVec2| 1 '(1 0 1 1))
(CONS '#(|SetCategory&| NIL |BasicType&| NIL)
(CONS '#((|SetCategory|) (|Type|) (|BasicType|)
- (|CoercibleTo| 16))
- (|makeByteWordVec2| 22
- '(1 16 0 15 17 1 6 16 0 18 2 16 0 0 19
- 20 1 0 16 0 21 2 1 8 0 0 1 2 0 6 0 6
- 14 2 0 6 0 6 12 1 0 0 6 10 1 1 15 0 1
+ (|CoercibleTo| 15))
+ (|makeByteWordVec2| 23
+ '(1 16 15 0 17 1 6 15 0 18 2 15 0 0 19
+ 20 1 0 15 0 21 2 1 8 0 0 1 2 0 6 0 6
+ 14 2 0 6 0 6 12 1 0 0 6 10 1 1 23 0 1
1 1 22 0 1 1 0 6 0 11 1 0 6 0 13 1 1
- 16 0 21 2 0 8 0 0 9)))))
+ 15 0 21 2 0 8 0 0 9)))))
'|lookupComplete|))
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-12 17:50:23 +0000