diff options
author | dos-reis <gdr@axiomatics.org> | 2010-08-15 06:37:37 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2010-08-15 06:37:37 +0000 |
commit | 48d0edb7ca718e2336c0e3d2417ec541d8008077 (patch) | |
tree | dbc115407dcad45287169ee5ad0b7e85897dcc6e | |
parent | f6a007e3df81c872452d5a271fbd5dabfa514cc1 (diff) | |
download | open-axiom-48d0edb7ca718e2336c0e3d2417ec541d8008077.tar.gz |
* algebra/float.spad.pamphlet (Float): Tidy.
* algebra/limitps.spad.pamphlet (ElementaryFunctionSign): Likewise.
* algebra/view2D.spad.pamphlet (TwoDimensionalViewport): Likewise.
* algebra/view2D.spad.pamphlet (ThreeDimensionalViewport): Likewise.
-rw-r--r-- | src/ChangeLog | 7 | ||||
-rw-r--r-- | src/algebra/float.spad.pamphlet | 6 | ||||
-rw-r--r-- | src/algebra/limitps.spad.pamphlet | 17 | ||||
-rw-r--r-- | src/algebra/view2D.spad.pamphlet | 2 | ||||
-rw-r--r-- | src/algebra/view3D.spad.pamphlet | 3 |
5 files changed, 24 insertions, 11 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8235e3d8..0160c81b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2010-08-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * algebra/float.spad.pamphlet (Float): Tidy. + * algebra/limitps.spad.pamphlet (ElementaryFunctionSign): Likewise. + * algebra/view2D.spad.pamphlet (TwoDimensionalViewport): Likewise. + * algebra/view2D.spad.pamphlet (ThreeDimensionalViewport): Likewise. + 2010-08-14 Gabriel Dos Reis <gdr@cs.tamu.edu> * lib/Makefile.in (libopen-axiom-core.$(LIBEXT)): Use LINK. diff --git a/src/algebra/float.spad.pamphlet b/src/algebra/float.spad.pamphlet index 32b0ae98..d8f7aa80 100644 --- a/src/algebra/float.spad.pamphlet +++ b/src/algebra/float.spad.pamphlet @@ -712,7 +712,7 @@ Float(): x = 0 => y = 0 => error "0**0 is undefined" y < 0 => error "division by 0" - y > 0 => 0 + 0 y = 0 => 1 y = 1 => x x = 1 => 1 @@ -724,7 +724,7 @@ Float(): x = 0 => r = 0 => error "0**0 is undefined" r < 0 => error "division by 0" - r > 0 => 0 + 0 r = 0 => 1 r = 1 => x x = 1 => 1 @@ -745,7 +745,7 @@ Float(): x = 0 => n = 0 => error "0**0 is undefined" n < 0 => error "division by 0" - n > 0 => 0 + 0 n = 0 => 1 n = 1 => x x = 1 => 1 diff --git a/src/algebra/limitps.spad.pamphlet b/src/algebra/limitps.spad.pamphlet index 280960db..5837ffa9 100644 --- a/src/algebra/limitps.spad.pamphlet +++ b/src/algebra/limitps.spad.pamphlet @@ -661,14 +661,15 @@ ElementaryFunctionSign(R,F): Exports == Implementation where (ua := retractIfCan(a)@Union(RF,"failed")) case RF => sign(uf::RF, x, ua::RF, st) eq : Equation F := equation(x :: F,a) - (u := limit(f,eq,st)) case "failed" => "failed" - u case OFE => - (n := whatInfinity(u::OFE)) ~= 0 => convert(n)@Z - (v := retract(u::OFE)@F) = 0 => - (s := psign(differentiate(f,x),x,a,st,m + 1)) case "failed"=> - "failed" - direction(st) * s::Z - sign v + u := limit(f,eq,st) + u case "failed" => "failed" + (n := whatInfinity(u@OFE)) ~= 0 => convert(n)@Z + v := retract(u@OFE)@F + v = 0 => + s := psign(differentiate(f,x),x,a,st,m + 1) + s case "failed"=> "failed" + direction(st) * s@Z + sign v smpsign p == (r := retractIfCan(p)@Union(R,"failed")) case R => sign(r::R) diff --git a/src/algebra/view2D.spad.pamphlet b/src/algebra/view2D.spad.pamphlet index d5b90a78..5d894871 100644 --- a/src/algebra/view2D.spad.pamphlet +++ b/src/algebra/view2D.spad.pamphlet @@ -1121,6 +1121,8 @@ TwoDimensionalViewport ():Exports == Implementation where sendI(VIEW,0$I)$Lisp -- no more types of things to write getI(VIEW)$Lisp -- acknowledge Filename + "" -- FIXME: We should be indicating failure + "" -- FIXME: We should be indicating failure @ \subsection{TEST VIEW2D} diff --git a/src/algebra/view3D.spad.pamphlet b/src/algebra/view3D.spad.pamphlet index 22b6d1cd..d1602fe1 100644 --- a/src/algebra/view3D.spad.pamphlet +++ b/src/algebra/view3D.spad.pamphlet @@ -691,6 +691,7 @@ ThreeDimensionalViewport(): Exports == Implementation where [ theta_sf, phi_sf, scale_sf, scaleX_sf, scaleY_sf, scaleZ_sf, deltaX_sf, deltaY_sf ] viewport.viewpoint + viewport.viewpoint viewpoint (viewport:%, viewpt:V):Void == viewport.viewpoint := viewpt @@ -871,6 +872,8 @@ ThreeDimensionalViewport(): Exports == Implementation where sendI(VIEW,0$I)$Lisp -- no more types of things to write getI(VIEW)$Lisp -- acknowledge Filename + "" -- FIXME: We should be indicating failure + "" -- FIXME: We should be indicating failure perspective (viewport,onOff) == if onOff = "on" then viewport.perspective.perspectiveField := yes |