diff options
Diffstat (limited to 'src/algebra/expr.spad.pamphlet')
| -rw-r--r-- | src/algebra/expr.spad.pamphlet | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/algebra/expr.spad.pamphlet b/src/algebra/expr.spad.pamphlet index cc82f5ca..85dc5a24 100644 --- a/src/algebra/expr.spad.pamphlet +++ b/src/algebra/expr.spad.pamphlet @@ -18,7 +18,7 @@ ++ Date Last Updated: October 1993 (P.Gianni), February 1995 (MB) ++ Description: Expressions involving symbolic functions. ++ Keywords: operator, kernel, function. -Expression(R:OrderedSet): Exports == Implementation where +Expression(R: SetCategory): Exports == Implementation where Q ==> Fraction Integer K ==> Kernel % MP ==> SparseMultivariatePolynomial(R, K) @@ -66,7 +66,8 @@ Expression(R:OrderedSet): Exports == Implementation where belong? op == true retNotUnit x == - (u := constantIfCan(k := retract(x)@K)) case R => u::R + R has OrderedSet and + (u := constantIfCan(k := retract(x)@K)) case R => u::R error "Not retractable" retNotUnitIfCan x == @@ -127,7 +128,7 @@ Expression(R:OrderedSet): Exports == Implementation where n = 1 => x simplifyPower(numerator x,n pretend Integer) / simplifyPower(denominator x,n pretend Integer) - x:% < y:% == x <$Rep y + before?(x:%,y:%) == before?(x,y)$Rep x:% = y:% == x =$Rep y numer x == numer(x)$Rep denom x == denom(x)$Rep @@ -375,7 +376,7 @@ Expression(R:OrderedSet): Exports == Implementation where x:% * y:% == x *$Rep y x:% + y:% == x +$Rep y x:% = y:% == x =$Rep y - x:% < y:% == x <$Rep y + before?(x:%,y:%) == before?(x,y)$Rep numer x == x@Rep coerce(p:MP):% == p @@ -437,7 +438,7 @@ Expression(R:OrderedSet): Exports == Implementation where 0 == 0$Rep x:% + y:% == x +$Rep y x:% = y:% == x =$Rep y - x:% < y:% == x <$Rep y + before?(x:%,y:%) == before?(x,y)$Rep coerce(k:K):% == coerce(k)$Rep kernels x == [f.gen for f in terms x] coerce(x:R):% == (zero? x => 0; constantKernel(x)::%) @@ -493,7 +494,7 @@ Expression(R:OrderedSet): Exports == Implementation where Rep := K - x:% < y:% == x <$Rep y + before?(x:%,y:%) == before?(x,y)$Rep x:% = y:% == x =$Rep y coerce(k:K):% == k kernels x == [x pretend K] @@ -562,7 +563,7 @@ PolynomialAN2Expression():Target == Implementation where ++ Description: Lifting of maps to Expressions. ++ Date Created: 16 Jan 1989 ++ Date Last Updated: 22 Jan 1990 -ExpressionFunctions2(R:OrderedSet, S:OrderedSet): +ExpressionFunctions2(R: SetCategory, S: SetCategory): Exports == Implementation where K ==> Kernel R F2 ==> FunctionSpaceFunctions2(R, Expression R, S, Expression S) @@ -589,7 +590,7 @@ ExpressionFunctions2(R:OrderedSet, S:OrderedSet): ++ Date Last Updated: 23 May 1990 ++ Keywords: pattern, matching. FunctionSpaceAttachPredicates(R, F, D): Exports == Implementation where - R: OrderedSet + R: SetCategory F: FunctionSpace R D: Type @@ -639,7 +640,7 @@ FunctionSpaceAttachPredicates(R, F, D): Exports == Implementation where ++ Date Last Updated: 23 May 1990 ++ Keywords: pattern, matching. FunctionSpaceAssertions(R, F): Exports == Implementation where - R: OrderedSet + R: SetCategory F: FunctionSpace R K ==> Kernel F @@ -837,7 +838,7 @@ Pi(): Exports == Implementation where ++ integer coefficients to any Expression type. ++ Date Created: 21 Feb 1990 ++ Date Last Updated: 21 Feb 1990 -PiCoercions(R:Join(OrderedSet, IntegralDomain)): with +PiCoercions(R: IntegralDomain): with coerce: Pi -> Expression R ++ coerce(f) returns f as an Expression(R). == add |