From 68ee78c1a740a9fc60f04a20b685d46a44570360 Mon Sep 17 00:00:00 2001 From: Gabriel Dos Reis Date: Sun, 17 Jan 2016 17:04:36 -0800 Subject: Rename Magma to FreeMagma A breeze, given previous compiler work. Renaming matches FriCAS's. --- src/algebra/Makefile.am | 2 +- src/algebra/Makefile.in | 2 +- src/algebra/exposed.lsp.pamphlet | 2 +- src/algebra/xlpoly.spad.pamphlet | 36 ++++++++++++++++++------------------ 4 files changed, 21 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am index 6d182dab..88c3a9fc 100644 --- a/src/algebra/Makefile.am +++ b/src/algebra/Makefile.am @@ -2375,7 +2375,7 @@ $(OUT)/POLY.$(FASLEXT): strap-2/INDE.$(FASLEXT) $(OUT)/FR2.$(FASLEXT): strap-2/COMPLEX.$(FASLEXT) oa_algebra_layer_9 = \ - DLP EAB IPADIC MAGMA QUEUE MATLIN \ + DLP EAB IPADIC FMAGMA QUEUE MATLIN \ FAMONOID CONTFRAC WP PERM PERMGRP DDFACT \ FSERIES FT IDPAG INFINITY LA \ OMLO ORTHPOL PRODUCT POLTOPOL SQMATRIX \ diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index 67e6a05f..25cd01a2 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -929,7 +929,7 @@ oa_algebra_layer_8_objects = \ $(addsuffix .$(FASLEXT),$(oa_algebra_layer_8))) oa_algebra_layer_9 = \ - DLP EAB IPADIC MAGMA QUEUE MATLIN \ + DLP EAB IPADIC FMAGMA QUEUE MATLIN \ FAMONOID CONTFRAC WP PERM PERMGRP DDFACT \ FSERIES FT IDPAG INFINITY LA \ OMLO ORTHPOL PRODUCT POLTOPOL SQMATRIX \ diff --git a/src/algebra/exposed.lsp.pamphlet b/src/algebra/exposed.lsp.pamphlet index 011793db..d3362bdf 100644 --- a/src/algebra/exposed.lsp.pamphlet +++ b/src/algebra/exposed.lsp.pamphlet @@ -882,7 +882,7 @@ (|LocalAlgebra| . LA) (|Localize| . LO) (|LyndonWord| . LWORD) - (|Magma| . MAGMA) + (|FreeMagma| . FMAGMA) (|MakeBinaryCompiledFunction| . MKBCFUNC) (|MakeUnaryCompiledFunction| . MKUCFUNC) (|MappingPackageInternalHacks1| . MAPHACK1) diff --git a/src/algebra/xlpoly.spad.pamphlet b/src/algebra/xlpoly.spad.pamphlet index 0ce1f1b0..8a153e51 100644 --- a/src/algebra/xlpoly.spad.pamphlet +++ b/src/algebra/xlpoly.spad.pamphlet @@ -10,12 +10,12 @@ \tableofcontents \eject -\section{domain MAGMA Magma} +\section{domain FMAGMA FreeMagma} -<>= +<>= import OrderedSet import RetractableTo -)abbrev domain MAGMA Magma +)abbrev domain FMAGMA FreeMagma ++ Author: Michel Petitot (petitot@lifl.fr). ++ Date Created: 91 ++ Date Last Updated: 7 Juillet 92 @@ -31,7 +31,7 @@ import RetractableTo ++ parenthesized words (binary trees over arbitrary symbols) ++ useful in \spadtype{LiePolynomial}. \newline Author: Michel Petitot (petitot@lifl.fr). -Magma(VarSet:OrderedSet):Public == Private where +FreeMagma(VarSet:OrderedSet):Public == Private where WORD ==> OrderedFreeMonoid(VarSet) EX ==> OutputForm @@ -42,7 +42,7 @@ Magma(VarSet:OrderedSet):Public == Private where ++ \axiom{first(x)} returns the first entry of the tree \axiom{x}. left : $ -> $ ++ \axiom{left(x)} returns left subtree of \axiom{x} or - ++ error if \axiomOpFrom{retractable?}{Magma}(\axiom{x}) is true. + ++ error if \axiomOpFrom{retractable?}{FreeMagma}(\axiom{x}) is true. length : $ -> PositiveInteger ++ \axiom{length(x)} returns the number of entries in \axiom{x}. lexico : ($,$) -> Boolean @@ -52,16 +52,16 @@ Magma(VarSet:OrderedSet):Public == Private where ++ its arguments. Thus this is not a total ordering. mirror : $ -> $ ++ \axiom{mirror(x)} returns the reversed word of \axiom{x}. - ++ That is \axiom{x} itself if \axiomOpFrom{retractable?}{Magma}(\axiom{x}) is true and + ++ That is \axiom{x} itself if \axiomOpFrom{retractable?}{FreeMagma}(\axiom{x}) is true and ++ \axiom{mirror(z) * mirror(y)} if \axiom{x} is \axiom{y*z}. rest : $ -> $ ++ \axiom{rest(x)} return \axiom{x} without the first entry or - ++ error if \axiomOpFrom{retractable?}{Magma}(\axiom{x}) is true. + ++ error if \axiomOpFrom{retractable?}{FreeMagma}(\axiom{x}) is true. retractable? : $ -> Boolean ++ \axiom{retractable?(x)} tests if \axiom{x} is a tree with only one entry. right : $ -> $ ++ \axiom{right(x)} returns right subtree of \axiom{x} or - ++ error if \axiomOpFrom{retractable?}{Magma}(\axiom{x}) is true. + ++ error if \axiomOpFrom{retractable?}{FreeMagma}(\axiom{x}) is true. varList : $ -> List VarSet ++ \axiom{varList(x)} returns the list of distinct entries of \axiom{x}. @@ -120,7 +120,7 @@ Magma(VarSet:OrderedSet):Public == Private where first x.left rest x == - x case VarSet => error "rest$Magma: inexistant rest" + x case VarSet => error "rest$FreeMagma: inexistant rest" lx:$ := x.left lx case VarSet => x.right [rest lx , x.right]$VWORD @@ -166,7 +166,7 @@ as well, and we call $C(f)$ an acyclic orbit. import OrderedSet import RetractableTo import Boolean -import Magma +import FreeMagma )abbrev domain LWORD LyndonWord ++ Author: Michel Petitot (petitot@lifl.fr). ++ Date Created: 91 @@ -188,7 +188,7 @@ import Magma ++ Parenthesized Lyndon words can be generated from symbols by using the following ++ rule: \axiom{[[a,b],c]} is a Lyndon word iff \axiom{a*b < c <= b} holds. ++ Lyndon words are internally represented by binary trees using the -++ \spadtype{Magma} domain constructor. +++ \spadtype{FreeMagma} domain constructor. ++ Two ordering are provided: lexicographic and ++ length-lexicographic. \newline ++ Author : Michel Petitot (petitot@lifl.fr). @@ -201,7 +201,7 @@ LyndonWord(VarSet:OrderedSet):Public == Private where OF ==> OutputForm ARRAY1==> OneDimensionalArray - Public == Join(OrderedSet,RetractableTo VarSet,CoercibleTo OFMON,CoercibleTo Magma VarSet) with + Public == Join(OrderedSet,RetractableTo VarSet,CoercibleTo OFMON,CoercibleTo FreeMagma VarSet) with retractable? : $ -> Boolean ++ \axiom{retractable?(x)} tests if \axiom{x} is a tree with only one entry. left : $ -> $ @@ -233,9 +233,9 @@ LyndonWord(VarSet:OrderedSet):Public == Private where ++ \axiom{LyndonWordsList(vl, n)} returns the list of Lyndon ++ words over the alphabet \axiom{vl}, up to order \axiom{n}. - Private == Magma(VarSet) add + Private == FreeMagma(VarSet) add -- Representation - Rep:= Magma(VarSet) + Rep:= FreeMagma(VarSet) -- Fonctions locales LetterList : OFMON -> List VarSet @@ -290,7 +290,7 @@ LyndonWord(VarSet:OrderedSet):Public == Private where lx < ly coerce(x:$):OF == bracket(x::OFMON::OF) - coerce(x:$):Magma VarSet == x::Rep + coerce(x:$):FreeMagma VarSet == x::Rep LyndonWordsList1 (vl,n) == -- a ameliorer !!!!!!!!!!! null vl => error "empty list" @@ -520,7 +520,7 @@ import LyndonWord ++ (Oxford science publications). \newline Author: Michel Petitot (petitot@lifl.fr). LiePolynomial(VarSet:OrderedSet, R:CommutativeRing) : Public == Private where - MAGMA ==> Magma(VarSet) + FMAGMA ==> FreeMagma(VarSet) LWORD ==> LyndonWord(VarSet) WORD ==> OrderedFreeMonoid(VarSet) XDPOLY ==> XDistributedPolynomial(VarSet,R) @@ -618,7 +618,7 @@ LiePolynomial(VarSet:OrderedSet, R:CommutativeRing) : Public == Private where r --definitions locales - makeLyndon(u,v) == (u::MAGMA * v::MAGMA) pretend LWORD + makeLyndon(u,v) == (u::FMAGMA * v::FMAGMA) pretend LWORD crw(u,v) == -- u et v sont des mots de Lyndon u = v => 0 @@ -1217,7 +1217,7 @@ LieExponentials(VarSet, R, Order): XDPcat == XDPdef where <<*>>= <> -<> +<> <> <> <> -- cgit v1.2.3