diff options
Diffstat (limited to 'src/algebra')
| -rw-r--r-- | src/algebra/multsqfr.spad.pamphlet | 8 | ||||
| -rw-r--r-- | src/algebra/numode.spad.pamphlet | 12 | ||||
| -rw-r--r-- | src/algebra/twofact.spad.pamphlet | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/algebra/multsqfr.spad.pamphlet b/src/algebra/multsqfr.spad.pamphlet index b05b4bb9..7114c0f6 100644 --- a/src/algebra/multsqfr.spad.pamphlet +++ b/src/algebra/multsqfr.spad.pamphlet @@ -226,7 +226,7 @@ MultivariateSquareFree (E,OV,R,P) : C == T where intChoose(f:SUP,lvar:List(OV),ltry:List List R):Choice == degf:= degree f - try:NNI:=0 + tryCount:NNI:=0 nvr:=#lvar range:Z:=10 lfact1:List(FFE):=[] @@ -251,17 +251,17 @@ MultivariateSquareFree (E,OV,R,P) : C == T where d0:=compdegd lfact ---- inizialize lfact1 ---- - try=0 => + tryCount=0 => f1:=f0 lfact1:=lfact ctf1:=ctf lval1:=lval d1:=d0 - try:=1 + tryCount:=1 d0=d1 => return [f1,lval1,lfact1,ctf1]$Choice d0 < d1 => - try:=1 + tryCount:=1 f1:=f0 lfact1:=lfact ctf1:=ctf diff --git a/src/algebra/numode.spad.pamphlet b/src/algebra/numode.spad.pamphlet index 6e6be9bd..84415e34 100644 --- a/src/algebra/numode.spad.pamphlet +++ b/src/algebra/numode.spad.pamphlet @@ -116,7 +116,7 @@ NumericalOrdinaryDifferentialEquations(): Exports == Implementation where NNI ==> NonNegativeInteger VOID ==> Void OFORM ==> OutputForm - RK4STEP ==> Record(try:NF, did:NF, next:NF) + RK4STEP ==> Record(tryValue:NF, did:NF, next:NF) Exports ==> with --header definitions here @@ -203,11 +203,11 @@ NumericalOrdinaryDifferentialEquations(): Exports == Implementation where --compute the derivative derivs(dydx,y,x) --if overshoot, the set h accordingly - if (x + step.try - x2) > 0.0 then - step.try := x2 - x + if (x + step.tryValue - x2) > 0.0 then + step.tryValue := x2 - x --find the correct scaling for i in 1..m repeat - yscal(i) := abs(y(i)) + abs(step.try * dydx(i)) + tiny + yscal(i) := abs(y(i)) + abs(step.tryValue * dydx(i)) + tiny --take a quality controlled runge-kutta step rk4qclocal(y,dydx,nvar,x,step,eps,yscal,derivs ,t1,t2,t3,t4,t5,t6) @@ -216,7 +216,7 @@ NumericalOrdinaryDifferentialEquations(): Exports == Implementation where if (x-x2) >= 0.0 then leave --next stepsize to use - step.try := step.next + step.tryValue := step.next iter := iter + 1 --end nstep repeat if iter = (nstep+1) then @@ -255,7 +255,7 @@ NumericalOrdinaryDifferentialEquations(): Exports == Implementation where rk4qclocal(y,dydx,n,x,step,eps,yscal,derivs ,t1,t2,t3,ysav,dysav,ytemp) == xsav : NF := x - h : NF := step.try + h : NF := step.tryValue fcor : NF := 1.0/15.0 safety : NF := 0.9 grow : NF := -0.20 diff --git a/src/algebra/twofact.spad.pamphlet b/src/algebra/twofact.spad.pamphlet index 4b6a1525..667dbd5d 100644 --- a/src/algebra/twofact.spad.pamphlet +++ b/src/algebra/twofact.spad.pamphlet @@ -220,12 +220,12 @@ TwoFactorize(F) : C == T -- find the substitution for x look:Boolean:=true dm:=degree m - try:Integer:=min(5,size()$F) + tryCount:Integer:=min(5,size()$F) i:Integer:=0 lcm := leadingCoefficient m umv : R vval : F - while look and i < try repeat + while look and i < tryCount repeat vval := random()$F i:=i+1 zero? elt(lcm, vval) => "next value" |