From 6d93161de89559ad66be655a50d3a5001c208c90 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sun, 8 Feb 2009 01:44:04 +0000
Subject: 	Fix AW/66 	* algebra/zerodim.spad.pamphlet: Restore use
 of one? 	* algebra/updivp.spad.pamphlet: Likewise. 	*
 algebra/unifact.spad.pamphlet: Likewise. 	*
 algebra/triset.spad.pamphlet: Likewise. 	* algebra/tools.spad.pamphlet:
 Likewise. 	* algebra/suts.spad.pamphlet: Likewise. 	*
 algebra/sttaylor.spad.pamphlet: Likewise. 	*
 algebra/string.spad.pamphlet: Likewise. 	*
 algebra/sregset.spad.pamphlet: Likewise. 	* algebra/si.spad.pamphlet:
 Likewise. 	* algebra/sf.spad.pamphlet: Likewise. 	*
 algebra/riccati.spad.pamphlet: Likewise. 	* algebra/rf.spad.pamphlet:
 Likewise. 	* algebra/regset.spad.pamphlet: Likewise. 	*
 algebra/rderf.spad.pamphlet: Likewise. 	* algebra/rdeef.spad.pamphlet:
 Likewise. 	* algebra/quat.spad.pamphlet: Likewise. 	*
 algebra/puiseux.spad.pamphlet: Likewise. 	* algebra/pscat.spad.pamphlet:
 Likewise. 	* algebra/prtition.spad.pamphlet: Likewise. 	*
 algebra/prs.spad.pamphlet: Likewise. 	* algebra/primelt.spad.pamphlet:
 Likewise. 	* algebra/polycat.spad.pamphlet: Likewise. 	*
 algebra/poly.spad.pamphlet: Likewise. 	* algebra/polset.spad.pamphlet:
 Likewise. 	* algebra/pfo.spad.pamphlet: Likewise. 	*
 algebra/perm.spad.pamphlet: Likewise. 	* algebra/pattern.spad.pamphlet:
 Likewise. 	* algebra/padiclib.spad.pamphlet:Likewise. 	*
 algebra/openmath.spad.pamphlet: Likewise. 	* algebra/opalg.spad.pamphlet:
 Likewise. 	* algebra/op.spad.pamphlet: Likewise. 	*
 algebra/omerror.spad.pamphlet: Likewise. 	* algebra/oderf.spad.pamphlet:
 Likewise. 	* algebra/odeef.spad.pamphlet: Likewise. 	*
 algebra/oct.spad.pamphlet: Likewise. 	* algebra/nlinsol.spad.pamphlet:
 Likewise. 	* algebra/newpoly.spad.pamphlet: Likewise. 	*
 algebra/naalgc.spad.pamphlet: Likewise. 	* algebra/naalg.spad.pamphlet:
 Likewise. 	* algebra/multpoly.spad.pamphlet: Likewise. 	*
 algebra/mring.spad.pamphlet: Likewise. 	*
 algebra/modring.spad.pamphlet: Likewise. 	*
 algebra/moddfact.spad.pamphlet: Likewise. 	*
 algebra/mkfunc.spad.pamphlet: Likewise. 	*
 algebra/matstor.spad.pamphlet: Likewise. 	*
 algebra/matrix.spad.pamphlet: Likewise. 	*
 algebra/matcat.spad.pamphlet: Likewise. 	* algebra/manip.spad.pamphlet:
 Likewise. 	* algebra/lodof.spad.pamphlet: Likewise. 	*
 algebra/liouv.spad.pamphlet: Likewise. 	*
 algebra/laplace.spad.pamphlet: Likewise. 	*
 algebra/irexpand.spad.pamphlet: Likewise. 	* algebra/intrf.spad.pamphlet:
 Likewise. 	* algebra/intpm.spad.pamphlet: Likewise. 	*
 algebra/intfact.spad.pamphlet: Likewise. 	*
 algebra/integer.spad.pamphlet: Likewise. 	*
 algebra/intclos.spad.pamphlet: Likewise. 	*
 algebra/intaux.spad.pamphlet: Likewise. 	*
 algebra/intalg.spad.pamphlet: Likewise. 	* algebra/intaf.spad.pamphlet:
 Likewise. 	* algebra/gpol.spad.pamphlet: Likewise. 	*
 algebra/gpgcd.spad.pamphlet: Likewise. 	* algebra/gb.spad.pamphlet:
 Likewise. 	* algebra/gaussian.spad.pamphlet: Likewise. 	*
 algebra/galutil.spad.pamphlet: Likewise. 	*
 algebra/galpolyu.spad.pamphlet: Likewise. 	*
 algebra/galfact.spad.pamphlet: Likewise. 	*
 algebra/fspace.spad.pamphlet: Likewise. 	*
 algebra/fs2ups.spad.pamphlet: Likewise. 	*
 algebra/fs2expxp.spad.pamphlet: Likewise. 	* algebra/free.spad.pamphlet:
 Likewise. 	* algebra/fraction.spad.pamphlet: Likewise. 	*
 algebra/fr.spad.pamphlet: Likewise. 	* algebra/fparfrac.spad.pamphlet:
 Likewise. 	* algebra/fortran.spad.pamphlet: Likewise. 	*
 algebra/fmod.spad.pamphlet: Likewise. 	* algebra/float.spad.pamphlet:
 Likewise. 	* algebra/ffx.spad.pamphlet: Likewise. 	*
 algebra/ffnb.spad.pamphlet: Likewise. 	* algebra/ffcg.spad.pamphlet:
 Likewise. 	* algebra/ffcat.spad.pamphlet: Likewise. 	*
 algebra/exprode.spad.pamphlet: Likewise. 	* algebra/expr.spad.pamphlet:
 Likewise. 	* algebra/expexpan.spad.pamphlet: Likewise. 	*
 algebra/elemntry.spad.pamphlet: Likewise. 	*
 algebra/efupxs.spad.pamphlet: Likewise. 	* algebra/efuls.spad.pamphlet:
 Likewise. 	* algebra/e04routine.spad.pamphlet: Likewise. 	*
 algebra/e04agents.spad.pamphlet: Likewise. 	*
 algebra/divisor.spad.pamphlet: Likewise. 	*
 algebra/derham.spad.pamphlet: Likewise. 	*
 algebra/defintrf.spad.pamphlet: Likewise. 	*
 algebra/defintef.spad.pamphlet: Likewise. 	*
 algebra/defaults.spad.pamphlet: Likewise. 	*
 algebra/d03agents.spad.pamphlet: Likewise. 	*
 algebra/d01weights.spad.pamphlet: Likewise. 	*
 algebra/d01routine.spad.pamphlet: Likewise. 	*
 algebra/d01agents.spad.pamphlet: Likewise. 	* algebra/curve.spad.pamphlet:
 Likewise. 	* algebra/crfp.spad.pamphlet: Likewise. 	*
 algebra/cont.spad.pamphlet: Likewise. 	* algebra/constant.spad.pamphlet:
 Likewise. 	* algebra/complet.spad.pamphlet: Likewise. 	*
 algebra/combfunc.spad.pamphlet: Likewise. 	*
 algebra/catdef.spad.pamphlet: Likewise. 	* algebra/brill.spad.pamphlet:
 Likewise. 	* algebra/array1.spad.pamphlet: Likewise. 	*
 algebra/algfunc.spad.pamphlet: Likewise. 	*
 algebra/algfact.spad.pamphlet: Likewise.

---
 src/algebra/free.spad.pamphlet | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/algebra/free.spad.pamphlet')

diff --git a/src/algebra/free.spad.pamphlet b/src/algebra/free.spad.pamphlet
index 19bf701c..c57b4c64 100644
--- a/src/algebra/free.spad.pamphlet
+++ b/src/algebra/free.spad.pamphlet
@@ -238,10 +238,8 @@ FreeMonoid(S: SetCategory): FMcategory == FMdefinition where
         s:S ** n:NonNegativeInteger == makeTerm(s, n)
 
         f:$ * g:$ ==
---            one? f => g
-            (f = 1) => g
---            one? g => f
-            (g = 1) => f
+            one? f => g
+            one? g => f
             lg := listOfMonoms g
             ls := last(lf := listOfMonoms f)
             ls.gen = lg.first.gen =>
@@ -250,8 +248,7 @@ FreeMonoid(S: SetCategory): FMcategory == FMdefinition where
             makeMulti concat(lf, lg)
 
         overlap(la, ar) ==
---            one? la or one? ar => [la, 1, ar]
-            (la = 1) or (ar = 1) => [la, 1, ar]
+            one? la or one? ar => [la, 1, ar]
             lla := la0 := listOfMonoms la
             lar := listOfMonoms ar
             l:List(REC) := empty()
@@ -278,8 +275,7 @@ FreeMonoid(S: SetCategory): FMcategory == FMdefinition where
             [makeMulti la0, 1, makeMulti lar]
 
         divide(lar, a) ==
---            one? a => [lar, 1]
-            (a = 1) => [lar, 1]
+            one? a => [lar, 1]
             Na   : Integer := #(la := listOfMonoms a)
             Nlar : Integer := #(llar := listOfMonoms lar)
             l:List(REC) := empty()
-- 
cgit v1.2.3