diff options
author | dos-reis <gdr@axiomatics.org> | 2009-02-08 01:44:04 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2009-02-08 01:44:04 +0000 |
commit | 6d93161de89559ad66be655a50d3a5001c208c90 (patch) | |
tree | 30e165f0c3cf7d8eb28fae9fa9fc9dcf0acd3ab8 /src/algebra/e04routine.spad.pamphlet | |
parent | 2fbcd8bc4f97cc3e534e11414f5a12dbc08edf2d (diff) | |
download | open-axiom-6d93161de89559ad66be655a50d3a5001c208c90.tar.gz |
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.
Diffstat (limited to 'src/algebra/e04routine.spad.pamphlet')
-rw-r--r-- | src/algebra/e04routine.spad.pamphlet | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/algebra/e04routine.spad.pamphlet b/src/algebra/e04routine.spad.pamphlet index 876f969d..b0f4e6f6 100644 --- a/src/algebra/e04routine.spad.pamphlet +++ b/src/algebra/e04routine.spad.pamphlet @@ -166,8 +166,7 @@ e04fdfAnnaType(): NumericalOptimizationCategory == Result add n:NNI := #(variables(args)) nn:INT := n lw:INT := --- one?(nn) => 9+5*m - (nn = 1) => 9+5*m + one?(nn) => 9+5*m nn*(7+n+2*m+((nn-1) quo 2)$INT)+3*m x := mat(args.init,n) ArgsFn := vector([edf2ef(i)$ExpertSystemToolsPackage for i in argsFn])$VEF @@ -278,8 +277,7 @@ e04gcfAnnaType(): NumericalOptimizationCategory == Result add m:NNI := #(argsFn) n:NNI := #(variables(args)) lw:INT := --- one?(n) => 11+5*m - (n = 1) => 11+5*m + one?(n) => 11+5*m 2*n*(4+n+m)+3*m x := mat(args.init,n) ArgsFn := vector([edf2ef(i)$ExpertSystemToolsPackage for i in argsFn])$VEF @@ -339,10 +337,8 @@ e04jafAnnaType(): NumericalOptimizationCategory == Result add bound(a:LOCDF,b:LOCDF):Integer == empty?(concat(a,b)) => 1 --- one?(#(removeDuplicates(a))) and zero?(first(a)) => 2 - (#(removeDuplicates(a)) = 1) and zero?(first(a)) => 2 --- one?(#(removeDuplicates(a))) and one?(#(removeDuplicates(b))) => 3 - (#(removeDuplicates(a)) = 1) and (#(removeDuplicates(b)) = 1) => 3 + one?(#(removeDuplicates(a))) and zero?(first(a)) => 2 + one?(#(removeDuplicates(a))) and one?(#(removeDuplicates(b))) => 3 0 measure(R:RoutinesTable,args:NOA) == |