aern2-real 0.2.7.0 → 0.2.8.0

raw patch · 4 files changed

+211/−176 lines, 4 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• aern2-real.cabal +2/−3
• changelog.md +2/−0
• src/AERN2/Real/Field.hs +2/−173
• src/AERN2/Real/FieldTH.hs +205/−0

@@ -3,11 +3,9 @@ -- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack------ hash: 5876d1cb06216bd03fa7525216359040a103cbaa847257f879df367b53fb413c  name:           aern2-real-version:        0.2.7.0+version:        0.2.8.0 synopsis:       Real numbers as sequences of MPBalls description:    Please see the README on GitHub at <https://github.com/michalkonecny/aern2/#readme> category:       Math@@ -35,6 +33,7 @@       AERN2.Real.Comparisons       AERN2.Real.Elementary       AERN2.Real.Field+      AERN2.Real.FieldTH       AERN2.Real.Limit       AERN2.Real.Tests       AERN2.Real.Type

@@ -1,5 +1,7 @@ # Change log for aern2-real +* v 0.2.8 2021-08-04+  * compatibility with ghc 9.0.1 * v 0.2.7 2021-06-02   * add RealNumber type class * v 0.2.6 2021-05-29

@@ -24,10 +24,11 @@ import qualified Prelude as P  import AERN2.MP.Ball-import AERN2.MP.Dyadic+-- import AERN2.MP.Dyadic  import AERN2.Real.Type import AERN2.Real.Comparisons ()+import AERN2.Real.FieldTH ()  {- field operations -} @@ -79,37 +80,6 @@   type PPowType (CSequence b) (CSequence e) = CSequence (PPowType b e)   ppow = lift2 ppow -$(declForTypes-  [[t| Integer |], [t| Int |], [t| Rational |]]-  (\ e -> [d|--  instance -    (CanPow b $e, HasOrderCertainly b Integer, HasEqCertainly b Integer, CanTestIsIntegerType b)-    =>-    CanPow (CSequence b) $e -    where-    type PowType (CSequence b) $e = CSequence (PowType b $e)-    pow = lift1T pow-    type PPowType (CSequence b) $e = CSequence (PPowType b $e)-    ppow = lift1T ppow--  |]))--$(declForTypes-  [[t| Integer |], [t| Int |], [t| Rational |]]-  (\ b -> [d|--  instance -    (CanPow $b e, HasOrderCertainly e Integer, CanTestIsIntegerType e, CanTestInteger e)-    =>-    CanPow $b (CSequence e) -    where-    type PowType $b (CSequence e) = CSequence (PowType $b e)-    pow = liftT1 pow-    type PPowType $b (CSequence e) = CSequence (PPowType $b e)-    ppow = liftT1 ppow-  |]))- --------------------------------------------------- --------------------------------------------------- -- MPBall and CN MPBall mixed-type arithmetic@@ -243,147 +213,6 @@   where   type DivType (CSequence b) (CN MPBall) = DivType (CN b) (CN MPBall)   divide s b = divide (s ? (getPrecision b)) b------------------------------------------------------------------------------------------------------------ Integer, Rational etc. mixed-type arithmetic-----------------------------------------------------------------------------------------------------------$(declForTypes-  [[t| Integer |], [t| Int |], [t| Rational |], [t| Dyadic |]]-  (\ t -> [d|--    instance-      (CanAddAsymmetric a $t)-      => -      CanAddAsymmetric (CSequence a) $t-      where-      type AddType (CSequence a) $t = CSequence (AddType a $t)-      add = lift1T add--    instance-      (CanAddAsymmetric a $t)-      => -      CanAddAsymmetric (CSequence a) (CN $t)-      where-      type AddType (CSequence a) (CN $t) = CSequence (AddType a $t)-      add = lift1T add--    instance-      (CanAddAsymmetric $t a)-      => -      CanAddAsymmetric $t (CSequence a)-      where-      type AddType $t (CSequence a) = CSequence (AddType $t a)-      add = liftT1 add--    instance-      (CanAddAsymmetric $t a)-      => -      CanAddAsymmetric (CN $t) (CSequence a)-      where-      type AddType (CN $t) (CSequence a) = CSequence (AddType $t a)-      add = liftT1 add--    instance-      (CanSub a $t)-      => -      CanSub (CSequence a) $t-      where-      type SubType (CSequence a) $t = CSequence (SubType a $t)-      sub = lift1T sub--    instance-      (CanSub a $t)-      => -      CanSub (CSequence a) (CN $t)-      where-      type SubType (CSequence a) (CN $t) = CSequence (SubType a $t)-      sub = lift1T sub--    instance-      (CanSub $t a)-      => -      CanSub $t (CSequence a)-      where-      type SubType $t (CSequence a) = CSequence (SubType $t a)-      sub = liftT1 sub--    instance-      (CanSub $t a)-      => -      CanSub (CN $t) (CSequence a)-      where-      type SubType (CN $t) (CSequence a) = CSequence (SubType $t a)-      sub = liftT1 sub--    instance-      (CanMulAsymmetric a $t, CanGiveUpIfVeryInaccurate (MulType a $t))-      => -      CanMulAsymmetric (CSequence a) $t-      where-      type MulType (CSequence a) $t = CSequence (MulType a $t)-      mul = lift1T mul--    instance-      (CanMulAsymmetric a $t, CanGiveUpIfVeryInaccurate (MulType a $t))-      => -      CanMulAsymmetric (CSequence a) (CN $t)-      where-      type MulType (CSequence a) (CN $t) = CSequence (MulType a $t)-      mul = lift1T mul--    instance-      (CanMulAsymmetric $t a, CanGiveUpIfVeryInaccurate (MulType $t a))-      => -      CanMulAsymmetric $t (CSequence a)-      where-      type MulType $t (CSequence a) = CSequence (MulType $t a)-      mul = liftT1 mul--    instance-      (CanMulAsymmetric $t a, CanGiveUpIfVeryInaccurate (MulType $t a))-      => -      CanMulAsymmetric (CN $t) (CSequence a)-      where-      type MulType (CN $t) (CSequence a) = CSequence (MulType $t a)-      mul = liftT1 mul--    instance-      (CanDiv a $t)-      => -      CanDiv (CSequence a) $t-      where-      type DivType (CSequence a) $t = CSequence (DivType a $t)-      divide = lift1T divide--    instance-      (CanDiv a $t)-      => -      CanDiv (CSequence a) (CN $t)-      where-      type DivType (CSequence a) (CN $t) = CSequence (DivType a $t)-      divide = lift1T divide--    instance-      (CanDiv $t a, CanTestZero a)-      => -      CanDiv $t (CSequence a)-      where-      type DivType $t (CSequence a) = CSequence (DivType $t a)-      divide = liftT1 divide--    instance-      (CanDiv $t a, CanTestZero a)-      => -      CanDiv (CN $t) (CSequence a)-      where-      type DivType (CN $t) (CSequence a) = CSequence (DivType $t a)-      divide = liftT1 divide--  |]))  {- Prelude Num, Real, Fractional instance -} 

@@ -0,0 +1,205 @@+{-# LANGUAGE TemplateHaskell #-}+{-# OPTIONS_GHC -Wno-orphans #-}+{-|+    Module      :  AERN2.Real.FieldTH+    Description :  field operations on CReal+    Copyright   :  (c) Michal Konecny+    License     :  BSD3++    Maintainer  :  mikkonecny@gmail.com+    Stability   :  experimental+    Portability :  portable++    Field operations on Cauchy Real numbers.+-}+module AERN2.Real.FieldTH+(+-- * field ops (`add`, `sub`, `mul`, `div`) for `CReal -> CReal -> CReal`+-- * field ops for `CReal -> t -> CReal` and `t -> CReal -> CReal` where `t` is `Int`, `Integer`, `Rational`, `Dyadic`+-- * field ops for `CReal -> MPBall -> MPBall` and `CReal -> CN MPBall -> CN MPBall`+)+where++import MixedTypesNumPrelude+-- import qualified Prelude as P++-- import AERN2.MP.Ball+import AERN2.MP.Dyadic++import AERN2.Real.Type+import AERN2.Real.Comparisons ()++{- field operations -}++$(declForTypes+  [[t| Integer |], [t| Int |], [t| Rational |]]+  (\ e -> [d|++  instance +    (CanPow b $e, HasOrderCertainly b Integer, HasEqCertainly b Integer, CanTestIsIntegerType b)+    =>+    CanPow (CSequence b) $e +    where+    type PowType (CSequence b) $e = CSequence (PowType b $e)+    pow = lift1T pow+    type PPowType (CSequence b) $e = CSequence (PPowType b $e)+    ppow = lift1T ppow++  |]))++$(declForTypes+  [[t| Integer |], [t| Int |], [t| Rational |]]+  (\ b -> [d|++  instance +    (CanPow $b e, HasOrderCertainly e Integer, CanTestIsIntegerType e, CanTestInteger e)+    =>+    CanPow $b (CSequence e) +    where+    type PowType $b (CSequence e) = CSequence (PowType $b e)+    pow = liftT1 pow+    type PPowType $b (CSequence e) = CSequence (PPowType $b e)+    ppow = liftT1 ppow+  |]))++---------------------------------------------------+---------------------------------------------------+-- Integer, Rational etc. mixed-type arithmetic+---------------------------------------------------+---------------------------------------------------+++$(declForTypes+  [[t| Integer |], [t| Int |], [t| Rational |], [t| Dyadic |]]+  (\ t -> [d|++    instance+      (CanAddAsymmetric a $t)+      => +      CanAddAsymmetric (CSequence a) $t+      where+      type AddType (CSequence a) $t = CSequence (AddType a $t)+      add = lift1T add++    instance+      (CanAddAsymmetric a $t)+      => +      CanAddAsymmetric (CSequence a) (CN $t)+      where+      type AddType (CSequence a) (CN $t) = CSequence (AddType a $t)+      add = lift1T add++    instance+      (CanAddAsymmetric $t a)+      => +      CanAddAsymmetric $t (CSequence a)+      where+      type AddType $t (CSequence a) = CSequence (AddType $t a)+      add = liftT1 add++    instance+      (CanAddAsymmetric $t a)+      => +      CanAddAsymmetric (CN $t) (CSequence a)+      where+      type AddType (CN $t) (CSequence a) = CSequence (AddType $t a)+      add = liftT1 add++    instance+      (CanSub a $t)+      => +      CanSub (CSequence a) $t+      where+      type SubType (CSequence a) $t = CSequence (SubType a $t)+      sub = lift1T sub++    instance+      (CanSub a $t)+      => +      CanSub (CSequence a) (CN $t)+      where+      type SubType (CSequence a) (CN $t) = CSequence (SubType a $t)+      sub = lift1T sub++    instance+      (CanSub $t a)+      => +      CanSub $t (CSequence a)+      where+      type SubType $t (CSequence a) = CSequence (SubType $t a)+      sub = liftT1 sub++    instance+      (CanSub $t a)+      => +      CanSub (CN $t) (CSequence a)+      where+      type SubType (CN $t) (CSequence a) = CSequence (SubType $t a)+      sub = liftT1 sub++    instance+      (CanMulAsymmetric a $t, CanGiveUpIfVeryInaccurate (MulType a $t))+      => +      CanMulAsymmetric (CSequence a) $t+      where+      type MulType (CSequence a) $t = CSequence (MulType a $t)+      mul = lift1T mul++    instance+      (CanMulAsymmetric a $t, CanGiveUpIfVeryInaccurate (MulType a $t))+      => +      CanMulAsymmetric (CSequence a) (CN $t)+      where+      type MulType (CSequence a) (CN $t) = CSequence (MulType a $t)+      mul = lift1T mul++    instance+      (CanMulAsymmetric $t a, CanGiveUpIfVeryInaccurate (MulType $t a))+      => +      CanMulAsymmetric $t (CSequence a)+      where+      type MulType $t (CSequence a) = CSequence (MulType $t a)+      mul = liftT1 mul++    instance+      (CanMulAsymmetric $t a, CanGiveUpIfVeryInaccurate (MulType $t a))+      => +      CanMulAsymmetric (CN $t) (CSequence a)+      where+      type MulType (CN $t) (CSequence a) = CSequence (MulType $t a)+      mul = liftT1 mul++    instance+      (CanDiv a $t)+      => +      CanDiv (CSequence a) $t+      where+      type DivType (CSequence a) $t = CSequence (DivType a $t)+      divide = lift1T divide++    instance+      (CanDiv a $t)+      => +      CanDiv (CSequence a) (CN $t)+      where+      type DivType (CSequence a) (CN $t) = CSequence (DivType a $t)+      divide = lift1T divide++    instance+      (CanDiv $t a, CanTestZero a)+      => +      CanDiv $t (CSequence a)+      where+      type DivType $t (CSequence a) = CSequence (DivType $t a)+      divide = liftT1 divide++    instance+      (CanDiv $t a, CanTestZero a)+      => +      CanDiv (CN $t) (CSequence a)+      where+      type DivType (CN $t) (CSequence a) = CSequence (DivType $t a)+      divide = liftT1 divide++  |]))+