diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-12-06 03:14:30 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-12-06 03:14:30 +0000 |
| commit | d14fd317bc282ba83762209a48632087e5036ebf (patch) | |
| tree | f13bc1e0e91ab9592f7fdfbc197f1ad49cab69e2 /src/algebra/numode.spad.pamphlet | |
| parent | c32856c7077d6220b6785b1e6e819b41ea4244be (diff) | |
| download | open-axiom-d14fd317bc282ba83762209a48632087e5036ebf.tar.gz | |
* interp/metalex.lisp (KEYWORDS): Include try.
* algebra/numode.spad.pamphlet: Change field try to tryValue.
* algebra/multsqfr.spad.pamphlet: Change identifier try to tryCount.
Diffstat (limited to 'src/algebra/numode.spad.pamphlet')
| -rw-r--r-- | src/algebra/numode.spad.pamphlet | 12 |
1 files changed, 6 insertions, 6 deletions
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 |