diff options
| author | dos-reis <gdr@axiomatics.org> | 2013-05-18 08:24:50 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2013-05-18 08:24:50 +0000 |
| commit | 12b29bbbfe86f81b415ffefe70262ebcc786f3b3 (patch) | |
| tree | 13b517eb23c93b66edb9d5ce86b657cabc535711 /src/algebra | |
| parent | 0611af2a9349c640402fded93ddc53f641af9967 (diff) | |
| download | open-axiom-12b29bbbfe86f81b415ffefe70262ebcc786f3b3.tar.gz | |
Remove parts from HomogeneousAggregate
Diffstat (limited to 'src/algebra')
| -rw-r--r-- | src/algebra/aggcat.spad.pamphlet | 7 | ||||
| -rw-r--r-- | src/algebra/permgrps.spad.pamphlet | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/algebra/aggcat.spad.pamphlet b/src/algebra/aggcat.spad.pamphlet index e4f53746..c2c8a429 100644 --- a/src/algebra/aggcat.spad.pamphlet +++ b/src/algebra/aggcat.spad.pamphlet @@ -114,12 +114,9 @@ HomogeneousAggregate(S:Type): Category == Aggregate with ++ count(p,u) returns the number of elements x in u ++ such that \axiom{p(x)} is true. For collections, ++ \axiom{count(p,u) = reduce(+,[1 for x in u | p(x)],0)}. - parts: % -> List S - ++ parts(u) returns a list of the consecutive elements of u. - ++ For collections, \axiom{parts([x,y,...,z]) = (x,y,...,z)}. members: % -> List S ++ members(u) returns a list of the consecutive elements of u. - ++ For collections, \axiom{parts([x,y,...,z]) = (x,y,...,z)}. + ++ For collections, \axiom{members([x,y,...,z]) = (x,y,...,z)}. if S has BasicType then count: (S,%) -> NonNegativeInteger ++ count(x,u) returns the number of occurrences of x in u. @@ -184,7 +181,7 @@ FiniteAggregate(S: Type): Category == Exports where ++ \axiom{count(p,u) = reduce(+,[1 for x in u | p(x)],0)}. members: % -> List S ++ \spad{members(u)} returns a list of the consecutive elements of u. - ++ For collections, \axiom{parts([x,y,...,z]) = (x,y,...,z)}. + ++ For collections, \axiom{members([x,y,...,z]) = (x,y,...,z)}. if S has BasicType then count: (S,%) -> NonNegativeInteger ++ \spad{count(x,u)} returns the number of occurrences diff --git a/src/algebra/permgrps.spad.pamphlet b/src/algebra/permgrps.spad.pamphlet index 6ca1efa4..eaaaf376 100644 --- a/src/algebra/permgrps.spad.pamphlet +++ b/src/algebra/permgrps.spad.pamphlet @@ -301,7 +301,7 @@ PermutationGroup(S:SetCategory): public == private where s : FSET S := brace() -- empty set !! for perm in group.gens repeat s := union(s, support perm) - parts s + members s orbitWithSvc ( group : L V NNI , point : NNI ) : REC == -- compute orbit with Schreier vector, "-2" means not in the orbit, @@ -590,7 +590,7 @@ PermutationGroup(S:SetCategory): public == private where gpset1 := initialize gp1 gpset2 := initialize gp2 empty? difference (gpset1, gpset2) => true - for el in parts gpset1 repeat + for el in members gpset1 repeat not member? (el, gp2) => return false true @@ -598,7 +598,7 @@ PermutationGroup(S:SetCategory): public == private where -- internal membership testing supp := pointList gp outlist := nil()$(L NNI) - mP : L S := parts support p + mP : L S := members support p for x in mP repeat not member? (x, supp) => return [ false , nil()$(L NNI) ] if flag then @@ -754,7 +754,7 @@ PermutationGroup(S:SetCategory): public == private where false orbit ( gp : % , startSet : FSET S ) : FSET FSET S == - startList : L S := parts startSet + startList : L S := members startSet outList := orbitInternal ( gp , startList ) outSet := brace()$(FSET FSET S) for i in 1..#outList repeat |