From f8913372cea43183d427cbe3d00c4967a840329b Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sun, 7 Jun 2009 16:23:51 +0000 Subject: * algebra/kl.spad.pamphlet (name$Kernel): Remove. * algebra/d01weights.spad.pamphlet: Adjust. * algebra/fs2expxp.spad.pamphlet: Likewise. * algebra/fs2ups.spad.pamphlet: Likewise. * algebra/fspace.spad.pamphlet: Likewise. * algebra/limitps.spad.pamphlet: Likewise. * algebra/transsolve.spad.pamphlet: Likewise. --- src/algebra/d01weights.spad.pamphlet | 5 +++-- src/algebra/fs2expxp.spad.pamphlet | 5 +++-- src/algebra/fs2ups.spad.pamphlet | 10 ++++++---- src/algebra/fspace.spad.pamphlet | 5 ++++- src/algebra/kl.spad.pamphlet | 3 --- src/algebra/limitps.spad.pamphlet | 2 +- src/algebra/strap/CHAR.lsp | 2 +- src/algebra/strap/DFLOAT.lsp | 2 +- src/algebra/strap/FFIELDC-.lsp | 2 +- src/algebra/strap/FPS-.lsp | 2 +- src/algebra/strap/OUTFORM.lsp | 2 +- src/algebra/transsolve.spad.pamphlet | 10 +++++----- 12 files changed, 27 insertions(+), 23 deletions(-) (limited to 'src/algebra') diff --git a/src/algebra/d01weights.spad.pamphlet b/src/algebra/d01weights.spad.pamphlet index f400d32d..0679c46e 100644 --- a/src/algebra/d01weights.spad.pamphlet +++ b/src/algebra/d01weights.spad.pamphlet @@ -72,7 +72,7 @@ d01WeightsPackage(): E == I where voo?:(EDF,EDF)->Boolean kernelIsLog(k:KEDF):Boolean == - (name k = (log :: Symbol))@Boolean + (name operator k = (log :: Symbol))@Boolean factorIn?(a:EDF,l:LEDF):Boolean == for i in 1..# l repeat @@ -205,7 +205,7 @@ d01WeightsPackage(): E == I where m case LEDF => -- if it is a list, it will have at least two elements is?(second(m)$LEDF,var)$EDF => omega:DF := retract(first(m)$LEDF)@DF - o:BOP := operator(n:Symbol:=name(e)$KEDF)$BOP + o:BOP := operator(n:Symbol:=name operator(e)$KEDF)$BOP (n = cos@Symbol)@Boolean => [o,omega] (n = sin@Symbol)@Boolean => [o,omega] "failed" @@ -267,6 +267,7 @@ d01WeightsPackage(): E == I where <>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +--Copyright (C) 2007-2009, Gabriel Dos Reis. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/fs2expxp.spad.pamphlet b/src/algebra/fs2expxp.spad.pamphlet index c27917f6..3678639c 100644 --- a/src/algebra/fs2expxp.spad.pamphlet +++ b/src/algebra/fs2expxp.spad.pamphlet @@ -334,7 +334,7 @@ FunctionSpaceToExponentialExpansion(R,FE,x,cen):_ is?(ker,"nthRoot" :: Symbol) => n := retract(second args)@I nthRootToXXP(first args,n :: NNI,posCheck?) - stateProblem(string name ker,"unknown kernel") + stateProblem(string name operator ker,"unknown kernel") --% exponentials and logarithms @@ -508,7 +508,7 @@ FunctionSpaceToExponentialExpansion(R,FE,x,cen):_ applyIfCan(acscIfCan,arg,"acsc",posCheck?) is?(ker,"asinh" :: SY) => applyIfCan(asinhIfCan,arg,"asinh",posCheck?) - stateProblem(string name ker,"unknown kernel") + stateProblem(string name operator ker,"unknown kernel") if FE has abs: FE -> FE then localAbs fcn == abs fcn @@ -556,6 +556,7 @@ FunctionSpaceToExponentialExpansion(R,FE,x,cen):_ <>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +--Copyright (C) 2007-2009, Gabriel Dos Reis. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/fs2ups.spad.pamphlet b/src/algebra/fs2ups.spad.pamphlet index 055d5a7b..280666f1 100644 --- a/src/algebra/fs2ups.spad.pamphlet +++ b/src/algebra/fs2ups.spad.pamphlet @@ -302,7 +302,7 @@ FunctionSpaceToUnivariatePowerSeries(R,FE,Expon,UPS,TRAN,x):_ is?(ker,"nthRoot" :: Symbol) => n := retract(second args)@I nthRootToUPS(first args,n :: NNI,posCheck?,atanFlag) - stateProblem(string name ker,"unknown kernel") + stateProblem(string name operator ker,"unknown kernel") nthRootToUPS(arg,n,posCheck?,atanFlag) == -- converts an nth root to a power series @@ -431,7 +431,7 @@ FunctionSpaceToUnivariatePowerSeries(R,FE,Expon,UPS,TRAN,x):_ applyIfCan(asechIfCan,arg,"asech",posCheck?,atanFlag) is?(ker,"acsch" :: SY) => applyIfCan(acschIfCan,arg,"acsch",posCheck?,atanFlag) - stateProblem(string name ker,"unknown kernel") + stateProblem(string name operator ker,"unknown kernel") powToUPS(args,posCheck?,atanFlag) == -- converts a power f(x) ** g(x) to a power series @@ -580,7 +580,7 @@ FunctionSpaceToUnivariatePowerSeries(R,FE,Expon,UPS,TRAN,x):_ is?(ker,"nthRoot" :: Symbol) => n := retract(second args)@I nthRootToGenUPS(first args,n :: NNI,posCheck?,atanFlag) - stateProblem(string name ker,"unknown kernel") + stateProblem(string name operator ker,"unknown kernel") nthRootToGenUPS(arg,n,posCheck?,atanFlag) == -- convert an nth root to a power series @@ -752,7 +752,7 @@ FunctionSpaceToUnivariatePowerSeries(R,FE,Expon,UPS,TRAN,x):_ genUPSApplyIfCan(asechIfCan,arg,"asech",posCheck?,atanFlag) is?(ker,"acsch" :: SY) => genUPSApplyIfCan(acschIfCan,arg,"acsch",posCheck?,atanFlag) - stateProblem(string name ker,"unknown kernel") + stateProblem(string name operator ker,"unknown kernel") powToGenUPS(args,posCheck?,atanFlag) == -- converts a power f(x) ** g(x) to a generalized power series @@ -767,6 +767,8 @@ FunctionSpaceToUnivariatePowerSeries(R,FE,Expon,UPS,TRAN,x):_ <>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +--Copyright (C) 2007-2009, Gabriel Dos Reis. +--All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/fspace.spad.pamphlet b/src/algebra/fspace.spad.pamphlet index 2a25eb6e..1768016e 100644 --- a/src/algebra/fspace.spad.pamphlet +++ b/src/algebra/fspace.spad.pamphlet @@ -184,7 +184,8 @@ ExpressionSpace(): Category == Defn where allk l == reduce("setUnion", [allKernels f for f in l], nil$List(K)) operators f == [operator k for k in allKernels f] height f == reduce("max", [height k for k in kernels f], 0) - freeOf?(x:%, s:SY) == not member?(s, [name k for k in allKernels x]) + freeOf?(x:%, s:SY) == + not member?(s, [name operator k for k in allKernels x]) distribute x == unwrap([k for k in allKernels x | is?(k, oppren)], x) box(l:List %) == opbox l paren(l:List %) == oppren l @@ -1058,6 +1059,8 @@ FunctionSpaceFunctions2(R, A, S, B): Exports == Implementation where <>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +--Copyright (C) 2007-2009, Gabriel Dos Reis. +--All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/kl.spad.pamphlet b/src/algebra/kl.spad.pamphlet index 14077426..66c40bed 100644 --- a/src/algebra/kl.spad.pamphlet +++ b/src/algebra/kl.spad.pamphlet @@ -125,8 +125,6 @@ Kernel(S: SetCategory): Exports == Implementation where Exports ==> Join(CachableSet, OrderedSet, Patternable S) with - name : % -> Symbol - ++ name(op(a1,...,an)) returns the name of op. operator: % -> OP ++ operator(op(a1,...,an)) returns the operator op. argument: % -> List S @@ -169,7 +167,6 @@ Kernel(S: SetCategory): Exports == Implementation where is?(k:%, s:Symbol) == is?(operator k, s) is?(k:%, o:OP) == (operator k) = o - name k == name operator k height k == k.nest operator k == k.op argument k == k.arg diff --git a/src/algebra/limitps.spad.pamphlet b/src/algebra/limitps.spad.pamphlet index 5a52d5bc..102a7e3e 100644 --- a/src/algebra/limitps.spad.pamphlet +++ b/src/algebra/limitps.spad.pamphlet @@ -101,7 +101,7 @@ PowerSeriesLimitPackage(R,FE): Exports == Implementation where while not empty? list repeat ker := first list not is?(ker,"log" :: Symbol) and member?(x,variables(ker::FE)) _ - and not(x = name(ker)) => + and not(x = name operator (ker)) => return list list := rest list empty() diff --git a/src/algebra/strap/CHAR.lsp b/src/algebra/strap/CHAR.lsp index 317ee9de..8f93519a 100644 --- a/src/algebra/strap/CHAR.lsp +++ b/src/algebra/strap/CHAR.lsp @@ -133,7 +133,7 @@ (PROG (#0=#:G1407) (RETURN (PROG1 (LETT #0# (+ 1 (CHAR-CODE |c|)) |CHAR;lookup;$Pi;8|) - (|check-subtype| (< 0 #0#) '(|PositiveInteger|) #0#))))) + (|check-subtype| (> #0# 0) '(|PositiveInteger|) #0#))))) (DEFUN |CHAR;char;Nni$;9| (|n| $) (DECLARE (IGNORE $)) diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp index e33128f2..57155b44 100644 --- a/src/algebra/strap/DFLOAT.lsp +++ b/src/algebra/strap/DFLOAT.lsp @@ -466,7 +466,7 @@ $) (|getShellEntry| $ 35))) |DFLOAT;bits;Pi;10|) - (|check-subtype| (AND (>= #0# 0) (< 0 #0#)) + (|check-subtype| (AND (>= #0# 0) (> #0# 0)) '(|PositiveInteger|) #0#))))))) (DEFUN |DFLOAT;max;$;11| ($) diff --git a/src/algebra/strap/FFIELDC-.lsp b/src/algebra/strap/FFIELDC-.lsp index e3efcd38..b55925bc 100644 --- a/src/algebra/strap/FFIELDC-.lsp +++ b/src/algebra/strap/FFIELDC-.lsp @@ -110,7 +110,7 @@ (SPADCALL (PROG1 |i| (|check-subtype| - (AND (>= |i| 0) (< 0 |i|)) + (AND (>= |i| 0) (> |i| 0)) '(|PositiveInteger|) |i|)) (|getShellEntry| $ 14)) |FFIELDC-;createPrimitiveElement;S;8|) diff --git a/src/algebra/strap/FPS-.lsp b/src/algebra/strap/FPS-.lsp index 58461486..9cf0ec3d 100644 --- a/src/algebra/strap/FPS-.lsp +++ b/src/algebra/strap/FPS-.lsp @@ -22,7 +22,7 @@ (|getShellEntry| $ 16)) 13301)) |FPS-;digits;Pi;2|) - (|check-subtype| (AND (>= #0# 0) (< 0 #0#)) + (|check-subtype| (AND (>= #0# 0) (> #0# 0)) '(|PositiveInteger|) #0#))))) (DEFUN |FloatingPointSystem&| (|#1|) diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp index 4205b99e..c215d85f 100644 --- a/src/algebra/strap/OUTFORM.lsp +++ b/src/algebra/strap/OUTFORM.lsp @@ -817,7 +817,7 @@ (SEQ (LETT |r| (SPADCALL (PROG1 |nn| - (|check-subtype| (< 0 |nn|) + (|check-subtype| (> |nn| 0) '(|PositiveInteger|) |nn|)) (|getShellEntry| $ 137)) |OUTFORM;differentiate;$Nni$;97|) diff --git a/src/algebra/transsolve.spad.pamphlet b/src/algebra/transsolve.spad.pamphlet index 9b96e460..5f0d4d24 100644 --- a/src/algebra/transsolve.spad.pamphlet +++ b/src/algebra/transsolve.spad.pamphlet @@ -313,7 +313,7 @@ TransSolvePackage(R) : Exports == Implementation where if #kernelofexpr = 0 then return false for i in kernelofexpr repeat - if not member?(name(first kernels(i)),testList) or _ + if not member?(name operator (first kernels(i)),testList) or _ not testkernel( (first argument first kernels(i)) ,Z) then return false true @@ -369,7 +369,7 @@ TransSolvePackage(R) : Exports == Implementation where if #kernelofeqnvar = 0 then return false for i in kernelofeqnvar repeat - if member?(name(first kernels(i)),testList) then + if member?(name operator (first kernels(i)),testList) then return true false @@ -387,7 +387,7 @@ TransSolvePackage(R) : Exports == Implementation where if #kernelofeqnvar = 0 then return false for i in kernelofeqnvar repeat - if not member?(name(first kernels(i)),testList) or _ + if not member?(name operator (first kernels(i)),testList) or _ not testkernel( (first argument first kernels(i)) ,Z) then return false true @@ -399,7 +399,7 @@ TransSolvePackage(R) : Exports == Implementation where if #kernelofeqnvar = 0 then return false for i in kernelofeqnvar repeat - if not member?(name(first kernels(i)),testList) or _ + if not member?(name operator (first kernels(i)),testList) or _ not testkernel( (first argument first kernels(i)) ,Z) then return false true @@ -472,7 +472,7 @@ TransSolvePackage(R) : Exports == Implementation where import SystemSolvePackage(RE) ker2Poly(k:Kernel RE, lvar:L S):Polynomial RE == - member?(nm:=name k, lvar) => nm :: Polynomial RE + member?(nm:=name operator k, lvar) => nm :: Polynomial RE k :: RE :: Polynomial RE smp2Poly(pol:SMP(R,Kernel RE), lvar:L S):Polynomial RE == -- cgit v1.2.3