diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-08-31 22:09:16 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-08-31 22:09:16 +0000 |
| commit | 25f1c7c591229dcd84d651542e33a24fc13f837c (patch) | |
| tree | 04749229244fac305566d75320b8f9fc70d7ebab /src/algebra | |
| parent | c7514825ba2dfd72261b2049d826c36b2e5c0593 (diff) | |
| download | open-axiom-25f1c7c591229dcd84d651542e33a24fc13f837c.tar.gz | |
* algebra/stream.spad.pamphlet (Stream): Remove duplicate of concat.
* algebra/naalgc.spad.pamphlet (FramedNonAssociativeAlgebra):
disambiguate coordinates.
Diffstat (limited to 'src/algebra')
| -rw-r--r-- | src/algebra/equation2.spad.pamphlet | 6 | ||||
| -rw-r--r-- | src/algebra/naalgc.spad.pamphlet | 2 | ||||
| -rw-r--r-- | src/algebra/stream.spad.pamphlet | 6 |
3 files changed, 2 insertions, 12 deletions
diff --git a/src/algebra/equation2.spad.pamphlet b/src/algebra/equation2.spad.pamphlet index 7aad51f6..169df9ed 100644 --- a/src/algebra/equation2.spad.pamphlet +++ b/src/algebra/equation2.spad.pamphlet @@ -143,12 +143,6 @@ Equation(S: Type): public == private where Rep := Record(lhs: S, rhs: S) eq1,eq2: $ s : S - if S has IntegralDomain then - factorAndSplit eq == - (S has factor : S -> Factored S) => - eq0 := rightZero eq - [equation(rcf.factor,0) for rcf in factors factor lhs eq0] - [eq] l:S = r:S == [l, r] equation(l, r) == [l, r] -- hack! See comment above. lhs eqn == eqn.lhs diff --git a/src/algebra/naalgc.spad.pamphlet b/src/algebra/naalgc.spad.pamphlet index f6b470c1..2eee8450 100644 --- a/src/algebra/naalgc.spad.pamphlet +++ b/src/algebra/naalgc.spad.pamphlet @@ -1199,7 +1199,7 @@ FramedNonAssociativeAlgebra(R:CommutativeRing): rightDiscriminant() == rightDiscriminant basis() leftRegularRepresentation x == leftRegularRepresentation(x, basis()) rightRegularRepresentation x == rightRegularRepresentation(x, basis()) - coordinates x == coordinates(x, basis()) + coordinates(x: %) == coordinates(x, basis()) represents(v:Vector R):%== represents(v, basis()) coordinates(v:Vector %) == diff --git a/src/algebra/stream.spad.pamphlet b/src/algebra/stream.spad.pamphlet index ea503c3d..0879aad5 100644 --- a/src/algebra/stream.spad.pamphlet +++ b/src/algebra/stream.spad.pamphlet @@ -886,7 +886,7 @@ Stream(S): Exports == Implementation where concat(frst x,concat(rst x,s)) concat(x:%,y:%) == delay - empty? x => copy y + empty? x => y concat(frst x,concat(rst x, y)) concat l == delay @@ -1098,10 +1098,6 @@ Stream(S): Exports == Implementation where gen(f,s) == delay(ss:=f s; concat(ss, gen(f,ss))) generate(f,s)==concat(s,gen(f,s)) - concat(x:%,y:%) ==delay - empty? x => y - concat(frst x,concat(rst x,y)) - swhilee:(S -> Boolean,%) -> % swhilee(p,x) == delay empty? x => empty() |