diff --git a/AERN-RnToRm.cabal b/AERN-RnToRm.cabal --- a/AERN-RnToRm.cabal +++ b/AERN-RnToRm.cabal @@ -1,5 +1,5 @@ Name: AERN-RnToRm -Version: 0.5 +Version: 0.5.0.1 Cabal-Version: >= 1.2 Build-Type: Simple License: BSD3 @@ -33,11 +33,11 @@ with Taylor Models is included in the paper . . - Simple examples of usage can be found in folder @demos@ + Simple examples of usage can be found in folder @examples@ and a test suite can be run via the module in the folder @tests@. Extra-source-files: - demos/Demo.hs demos/ISin3.hs + examples/Demo.hs examples/ISin3.hs tests/RunPolynomTests.hs ChangeLog diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +0.5.0.1: 29 July 2009: renamed "demos" fodler to "examples" 0.5.0: 28 July 2009 * Made the testing harness more generic so that it can be used for any base. Also a readable report is produced for each diff --git a/demos/Demo.hs b/demos/Demo.hs deleted file mode 100644 --- a/demos/Demo.hs +++ /dev/null @@ -1,117 +0,0 @@ -{-| - Module : Main - Description : simple examples of using AERN-RnToRm - Copyright : (c) Michal Konecny - License : BSD3 - - Maintainer : mik@konecny.aow.cz - Stability : experimental - Portability : portable - - Simple examples of using AERN-RnToRm. --} -module Main where - -import qualified Data.Number.ER.RnToRm as AERNFunc -import qualified Data.Number.ER.BasicTypes.DomainBox as DBox - -import qualified Data.Number.ER.Real as AERN - -import Data.Number.ER.Misc - -type B = AERN.BM -- use machine double as a basis -type RA = AERN.RA B -type IRA = AERN.IRA B -type FAPWP = AERNFunc.FAPWP B - --- function f(x) = x for x in [0,1]: -x :: FAPWP -x = - AERNFunc.setMaxDegree 2 $ - AERNFunc.proj (DBox.fromAscList [(0,(0) AERN.\/ 1)]) 0 --- function f(x1) = x1 for x1 in [0,1]: -x1 :: FAPWP -x1 = - AERNFunc.setMaxDegree 2 $ - AERNFunc.proj (DBox.fromAscList [(1,(0) AERN.\/ 1)]) 1 - --- domains combined automatically: -fn1 :: FAPWP -fn1 = 2*x + x1 - --- ensure the piecewise representation has 4 segments: -fn1depth2 :: FAPWP -fn1depth2 = AERNFunc.bisectUnbisectDepth 2 fn1 - --- apply sine pointwise to the function enclosure: -fn2 :: FAPWP -fn2 = --- AERN.sin 10 fn1depth2 - AERN.sin 15 fn1depth2 - --- evaluate the function at point x = 0.1, x1 = 0.1: -fn2at0101 :: IRA -[fn2at0101] = - AERNFunc.eval (DBox.fromList [(0,0.1), (1,0.1)]) fn2 - --- partially evaluate fn2 at x1 = 1: -fn3 :: FAPWP -fn3 = AERNFunc.partialEval (DBox.fromList [(1,1)]) fn2 - --- integrate fn3 by x with value 1 at origin x = 1: -fn4 :: FAPWP -fn4 = - AERNFunc.integrate ix fn2 var span origin value - where - ix = 2 -- effort index - var = 0 - span = DBox.noinfo -- integrate over the whole domain - origin = 1 - value = 1 - --- integrate fn2 by x1 with value (1 - x) at origin x1 = 0: -fn5 :: FAPWP -fn5 = - AERNFunc.integrate ix fn2 var span origin value - where - ix = 2 -- effort index - var = 1 - span = DBox.noinfo -- integrate over the whole domain - origin = 0 - value = 1 - x - - -main = - do - AERN.initialiseBaseArithmetic (0 :: RA) - putStrLn "****************************************" - putStrLn "Testing polynomial enclosure arithmetic:" - putStrLn "****************************************" - putStrLn "**** Projections:" - putStrLn $ - "x =\n " ++ show x - putStrLn $ - "\nx1 =\n " ++ show x1 - putStrLn "\n**** Merging domains:" - putStrLn $ - "2*x + x1 =\n " ++ showHead 12 fn1 - putStrLn "\n**** Bisection depth 2:" - putStrLn $ - "2*x + x1 =\n " ++ showHead 17 fn1depth2 - putStrLn "\n**** Elementary functions:" - putStrLn $ - "sin(2*x + x1) =\n " ++ showHead 17 fn2 - putStrLn "\n**** Evaluation:" - putStrLn $ - "sin(2*x + x1)[x = 0.1, x1 = 0.1] = sin(0.3) = \n " ++ show fn2at0101 - putStrLn "\n**** Partial evaluation:" - putStrLn $ - "sin(2*x + x1)[x1 = 1] = sin(5*x + 1) = \n " ++ showHead 15 fn3 - putStrLn "\n**** Integration of 1-dim function:" - putStrLn $ - "f(x) = (Int sin(2*x + 1) dx) [f(1) = 1] =\n " ++ showHead 15 fn4 - putStrLn "\n**** Integration of 2-dim function:" - putStrLn $ - "f(x,x1) = (Int sin(2*x + x1) dx1) [f(x,1) = 1 - x] =\n " ++ showHead 17 fn5 - -showHead n = showFirstLastLines n 0 diff --git a/demos/ISin3.hs b/demos/ISin3.hs deleted file mode 100644 --- a/demos/ISin3.hs +++ /dev/null @@ -1,54 +0,0 @@ -{-# LANGUAGE CPP #-} -{-# LANGUAGE UndecidableInstances #-} -{-# LANGUAGE TypeOperators #-} -{-# LANGUAGE DeriveDataTypeable #-} -module Main - -where - -import qualified Data.Number.ER.Real as AERN -import qualified Data.Number.ER.RnToRm as AERNFunc -import Data.Number.ER.BasicTypes -import Data.Number.ER.Misc -import Data.Number.ER.RnToRm.TestingDefs - -import Data.Maybe -import qualified Data.List as List -import qualified Data.Map as Map - -#ifdef USE_MPFR -type B = AERN.BMPFR -- use MPFR floats -#else -type B = AERN.BAP -- use pure Haskell floats ---type B = AERN.BMAP -- use combination of double and pure Haskell floats -#endif -type RA = AERN.RA B -type IRA = AERN.IRA B - -main = - do - AERN.initialiseBaseArithmetic (0 :: RA) - putStrLn $ "ix = " ++ show ix ++ "; deg = " ++ show deg ++ "; gran = " ++ show gran --- putStrLn $ "sin(sin(sin(x))) = " ++ show sin3 --- putStrLn $ "integ(sin(sin(sin(x)))dx = " ++ show integrSin3 - putStrLn $ "integ_0^1(sin(sin(sin(x)))dx] = " ++ show result - putStrLn $ " precision = " ++ show (AERN.getPrecision result) - where - result = - head $ AERNFunc.eval (AERNFunc.unary 1) integrSin3 - integrSin3 = - AERNFunc.integrateUnary 0 sin3 (0 AERN.\/ 1) 0 [0] - ix = 100 - deg = 50 - size = 1000 - gran = 5000 - depth = 0 - sin3 = - AERN.sin ix $ - AERN.sin ix $ - AERN.sin ix $ - AERNFunc.bisectUnbisectDepth depth $ - AERNFunc.bisectUnbisectDepth depth $ - AERNFunc.setMaxSize size $ - AERNFunc.setMaxDegree deg fapwUPX0 - diff --git a/examples/Demo.hs b/examples/Demo.hs new file mode 100644 --- /dev/null +++ b/examples/Demo.hs @@ -0,0 +1,117 @@ +{-| + Module : Main + Description : simple examples of using AERN-RnToRm + Copyright : (c) Michal Konecny + License : BSD3 + + Maintainer : mik@konecny.aow.cz + Stability : experimental + Portability : portable + + Simple examples of using AERN-RnToRm. +-} +module Main where + +import qualified Data.Number.ER.RnToRm as AERNFunc +import qualified Data.Number.ER.BasicTypes.DomainBox as DBox + +import qualified Data.Number.ER.Real as AERN + +import Data.Number.ER.Misc + +type B = AERN.BM -- use machine double as a basis +type RA = AERN.RA B +type IRA = AERN.IRA B +type FAPWP = AERNFunc.FAPWP B + +-- function f(x) = x for x in [0,1]: +x :: FAPWP +x = + AERNFunc.setMaxDegree 2 $ + AERNFunc.proj (DBox.fromAscList [(0,(0) AERN.\/ 1)]) 0 +-- function f(x1) = x1 for x1 in [0,1]: +x1 :: FAPWP +x1 = + AERNFunc.setMaxDegree 2 $ + AERNFunc.proj (DBox.fromAscList [(1,(0) AERN.\/ 1)]) 1 + +-- domains combined automatically: +fn1 :: FAPWP +fn1 = 2*x + x1 + +-- ensure the piecewise representation has 4 segments: +fn1depth2 :: FAPWP +fn1depth2 = AERNFunc.bisectUnbisectDepth 2 fn1 + +-- apply sine pointwise to the function enclosure: +fn2 :: FAPWP +fn2 = +-- AERN.sin 10 fn1depth2 + AERN.sin 15 fn1depth2 + +-- evaluate the function at point x = 0.1, x1 = 0.1: +fn2at0101 :: IRA +[fn2at0101] = + AERNFunc.eval (DBox.fromList [(0,0.1), (1,0.1)]) fn2 + +-- partially evaluate fn2 at x1 = 1: +fn3 :: FAPWP +fn3 = AERNFunc.partialEval (DBox.fromList [(1,1)]) fn2 + +-- integrate fn3 by x with value 1 at origin x = 1: +fn4 :: FAPWP +fn4 = + AERNFunc.integrate ix fn2 var span origin value + where + ix = 2 -- effort index + var = 0 + span = DBox.noinfo -- integrate over the whole domain + origin = 1 + value = 1 + +-- integrate fn2 by x1 with value (1 - x) at origin x1 = 0: +fn5 :: FAPWP +fn5 = + AERNFunc.integrate ix fn2 var span origin value + where + ix = 2 -- effort index + var = 1 + span = DBox.noinfo -- integrate over the whole domain + origin = 0 + value = 1 - x + + +main = + do + AERN.initialiseBaseArithmetic (0 :: RA) + putStrLn "****************************************" + putStrLn "Testing polynomial enclosure arithmetic:" + putStrLn "****************************************" + putStrLn "**** Projections:" + putStrLn $ + "x =\n " ++ show x + putStrLn $ + "\nx1 =\n " ++ show x1 + putStrLn "\n**** Merging domains:" + putStrLn $ + "2*x + x1 =\n " ++ showHead 12 fn1 + putStrLn "\n**** Bisection depth 2:" + putStrLn $ + "2*x + x1 =\n " ++ showHead 17 fn1depth2 + putStrLn "\n**** Elementary functions:" + putStrLn $ + "sin(2*x + x1) =\n " ++ showHead 17 fn2 + putStrLn "\n**** Evaluation:" + putStrLn $ + "sin(2*x + x1)[x = 0.1, x1 = 0.1] = sin(0.3) = \n " ++ show fn2at0101 + putStrLn "\n**** Partial evaluation:" + putStrLn $ + "sin(2*x + x1)[x1 = 1] = sin(5*x + 1) = \n " ++ showHead 15 fn3 + putStrLn "\n**** Integration of 1-dim function:" + putStrLn $ + "f(x) = (Int sin(2*x + 1) dx) [f(1) = 1] =\n " ++ showHead 15 fn4 + putStrLn "\n**** Integration of 2-dim function:" + putStrLn $ + "f(x,x1) = (Int sin(2*x + x1) dx1) [f(x,1) = 1 - x] =\n " ++ showHead 17 fn5 + +showHead n = showFirstLastLines n 0 diff --git a/examples/ISin3.hs b/examples/ISin3.hs new file mode 100644 --- /dev/null +++ b/examples/ISin3.hs @@ -0,0 +1,54 @@ +{-# LANGUAGE CPP #-} +{-# LANGUAGE UndecidableInstances #-} +{-# LANGUAGE TypeOperators #-} +{-# LANGUAGE DeriveDataTypeable #-} +module Main + +where + +import qualified Data.Number.ER.Real as AERN +import qualified Data.Number.ER.RnToRm as AERNFunc +import Data.Number.ER.BasicTypes +import Data.Number.ER.Misc +import Data.Number.ER.RnToRm.TestingDefs + +import Data.Maybe +import qualified Data.List as List +import qualified Data.Map as Map + +#ifdef USE_MPFR +type B = AERN.BMPFR -- use MPFR floats +#else +type B = AERN.BAP -- use pure Haskell floats +--type B = AERN.BMAP -- use combination of double and pure Haskell floats +#endif +type RA = AERN.RA B +type IRA = AERN.IRA B + +main = + do + AERN.initialiseBaseArithmetic (0 :: RA) + putStrLn $ "ix = " ++ show ix ++ "; deg = " ++ show deg ++ "; gran = " ++ show gran +-- putStrLn $ "sin(sin(sin(x))) = " ++ show sin3 +-- putStrLn $ "integ(sin(sin(sin(x)))dx = " ++ show integrSin3 + putStrLn $ "integ_0^1(sin(sin(sin(x)))dx] = " ++ show result + putStrLn $ " precision = " ++ show (AERN.getPrecision result) + where + result = + head $ AERNFunc.eval (AERNFunc.unary 1) integrSin3 + integrSin3 = + AERNFunc.integrateUnary 0 sin3 (0 AERN.\/ 1) 0 [0] + ix = 100 + deg = 50 + size = 1000 + gran = 5000 + depth = 0 + sin3 = + AERN.sin ix $ + AERN.sin ix $ + AERN.sin ix $ + AERNFunc.bisectUnbisectDepth depth $ + AERNFunc.bisectUnbisectDepth depth $ + AERNFunc.setMaxSize size $ + AERNFunc.setMaxDegree deg fapwUPX0 +