mirror of
https://gitlab.com/sheaf/metabrush.git
synced 2024-11-27 09:24:08 +00:00
Split up succFP etc into separate module
This commit is contained in:
parent
34c129d72a
commit
60ebf7886f
|
@ -115,6 +115,7 @@ library
|
||||||
, Math.Bezier.Stroke.EnvelopeEquation
|
, Math.Bezier.Stroke.EnvelopeEquation
|
||||||
, Math.Differentiable
|
, Math.Differentiable
|
||||||
, Math.Epsilon
|
, Math.Epsilon
|
||||||
|
, Math.Float.Utils
|
||||||
, Math.Interval
|
, Math.Interval
|
||||||
, Math.Linear
|
, Math.Linear
|
||||||
, Math.Linear.Solve
|
, Math.Linear.Solve
|
||||||
|
|
76
brush-strokes/src/lib/Math/Float/Utils.hs
Normal file
76
brush-strokes/src/lib/Math/Float/Utils.hs
Normal file
|
@ -0,0 +1,76 @@
|
||||||
|
{-# LANGUAGE AllowAmbiguousTypes #-}
|
||||||
|
{-# LANGUAGE ScopedTypeVariables #-}
|
||||||
|
|
||||||
|
module Math.Float.Utils
|
||||||
|
( FPBits(..)
|
||||||
|
, nextAfter, succFP, prevFP
|
||||||
|
)
|
||||||
|
where
|
||||||
|
|
||||||
|
-- base
|
||||||
|
import Data.Bits
|
||||||
|
( Bits((.&.), shiftL) )
|
||||||
|
import Data.Word
|
||||||
|
( Word32, Word64 )
|
||||||
|
import GHC.Float
|
||||||
|
( castFloatToWord32 , castWord32ToFloat
|
||||||
|
, castDoubleToWord64, castWord64ToDouble
|
||||||
|
)
|
||||||
|
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
class ( RealFloat f, Num b, Bits b ) => FPBits f b | f -> b, b -> f where
|
||||||
|
toBits :: f -> b
|
||||||
|
fromBits :: b -> f
|
||||||
|
-- | Size in bytes.
|
||||||
|
sizeOf :: Int
|
||||||
|
|
||||||
|
instance FPBits Float Word32 where
|
||||||
|
toBits = castFloatToWord32
|
||||||
|
fromBits = castWord32ToFloat
|
||||||
|
sizeOf = 4
|
||||||
|
|
||||||
|
instance FPBits Double Word64 where
|
||||||
|
toBits = castDoubleToWord64
|
||||||
|
fromBits = castWord64ToDouble
|
||||||
|
sizeOf = 8
|
||||||
|
|
||||||
|
|
||||||
|
{-# SPECIALISE nextAfter :: Float -> Float -> Float #-}
|
||||||
|
{-# SPECIALISE nextAfter :: Double -> Double -> Double #-}
|
||||||
|
{-# INLINEABLE nextAfter #-}
|
||||||
|
-- | @nextAfter a b@ computes the next floating-point value after @a@
|
||||||
|
-- in the direction of @b@.
|
||||||
|
nextAfter :: forall f b. FPBits f b => f -> f -> f
|
||||||
|
nextAfter a b
|
||||||
|
| isNaN a
|
||||||
|
= a
|
||||||
|
| isNaN b
|
||||||
|
= b
|
||||||
|
| a == b
|
||||||
|
= b
|
||||||
|
| otherwise
|
||||||
|
= let !res_bits
|
||||||
|
| a == 0
|
||||||
|
, let !sgn_mask = 1 `shiftL` ( sizeOf @f * 8 - 1 )
|
||||||
|
= ( toBits b .&. sgn_mask ) + 1
|
||||||
|
| ( a < b ) == ( a > 0 )
|
||||||
|
= toBits a + 1
|
||||||
|
| otherwise
|
||||||
|
= toBits a - 1
|
||||||
|
in fromBits res_bits
|
||||||
|
|
||||||
|
{-# SPECIALISE succFP :: Float -> Float #-}
|
||||||
|
{-# SPECIALISE succFP :: Double -> Double #-}
|
||||||
|
{-# INLINEABLE succFP #-}
|
||||||
|
-- | The next floating-point number.
|
||||||
|
succFP :: forall f b. FPBits f b => f -> f
|
||||||
|
succFP x = nextAfter x (1/0)
|
||||||
|
|
||||||
|
|
||||||
|
{-# SPECIALISE prevFP :: Float -> Float #-}
|
||||||
|
{-# SPECIALISE prevFP :: Double -> Double #-}
|
||||||
|
{-# INLINEABLE prevFP #-}
|
||||||
|
-- | The previous floating-point number.
|
||||||
|
prevFP :: forall f b. FPBits f b => f -> f
|
||||||
|
prevFP x = nextAfter x (-1/0)
|
|
@ -1,77 +1,17 @@
|
||||||
{-# LANGUAGE AllowAmbiguousTypes #-}
|
{-# LANGUAGE AllowAmbiguousTypes #-}
|
||||||
{-# LANGUAGE ScopedTypeVariables #-}
|
{-# LANGUAGE ScopedTypeVariables #-}
|
||||||
|
|
||||||
module Math.Interval.FMA ( addI, subI, prodI, divI, posPowI ) where
|
module Math.Interval.FMA
|
||||||
|
( addI, subI, prodI, divI, posPowI )
|
||||||
|
where
|
||||||
|
|
||||||
-- base
|
-- base
|
||||||
import Data.Bits
|
|
||||||
( Bits((.&.), shiftL) )
|
|
||||||
import Data.Word
|
|
||||||
( Word32, Word64 )
|
|
||||||
import GHC.Exts
|
import GHC.Exts
|
||||||
( Double(D#), fmsubDouble#, fnmaddDouble# )
|
( Double(D#), fmsubDouble#, fnmaddDouble# )
|
||||||
import GHC.Float
|
|
||||||
( castFloatToWord32 , castWord32ToFloat
|
|
||||||
, castDoubleToWord64, castWord64ToDouble
|
|
||||||
)
|
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
-- brush-strokes
|
||||||
|
import Math.Float.Utils
|
||||||
class ( RealFloat f, Num b, Bits b ) => FPBits f b | f -> b, b -> f where
|
( prevFP, succFP )
|
||||||
toBits :: f -> b
|
|
||||||
fromBits :: b -> f
|
|
||||||
-- | Size in bytes.
|
|
||||||
sizeOf :: Int
|
|
||||||
|
|
||||||
instance FPBits Float Word32 where
|
|
||||||
toBits = castFloatToWord32
|
|
||||||
fromBits = castWord32ToFloat
|
|
||||||
sizeOf = 4
|
|
||||||
|
|
||||||
instance FPBits Double Word64 where
|
|
||||||
toBits = castDoubleToWord64
|
|
||||||
fromBits = castWord64ToDouble
|
|
||||||
sizeOf = 8
|
|
||||||
|
|
||||||
|
|
||||||
{-# SPECIALISE nextAfter :: Float -> Float -> Float #-}
|
|
||||||
{-# SPECIALISE nextAfter :: Double -> Double -> Double #-}
|
|
||||||
{-# INLINEABLE nextAfter #-}
|
|
||||||
-- | @nextAfter a b@ computes the next floating-point value after @a@
|
|
||||||
-- in the direction of @b@.
|
|
||||||
nextAfter :: forall f b. FPBits f b => f -> f -> f
|
|
||||||
nextAfter a b
|
|
||||||
| isNaN a
|
|
||||||
= a
|
|
||||||
| isNaN b
|
|
||||||
= b
|
|
||||||
| a == b
|
|
||||||
= b
|
|
||||||
| otherwise
|
|
||||||
= let !res_bits
|
|
||||||
| a == 0
|
|
||||||
, let !sgn_mask = 1 `shiftL` ( sizeOf @f * 8 - 1 )
|
|
||||||
= ( toBits b .&. sgn_mask ) + 1
|
|
||||||
| ( a < b ) == ( a > 0 )
|
|
||||||
= toBits a + 1
|
|
||||||
| otherwise
|
|
||||||
= toBits a - 1
|
|
||||||
in fromBits res_bits
|
|
||||||
|
|
||||||
{-# SPECIALISE succFP :: Float -> Float #-}
|
|
||||||
{-# SPECIALISE succFP :: Double -> Double #-}
|
|
||||||
{-# INLINEABLE succFP #-}
|
|
||||||
-- | The next floating-point number.
|
|
||||||
succFP :: forall f b. FPBits f b => f -> f
|
|
||||||
succFP x = nextAfter x (1/0)
|
|
||||||
|
|
||||||
|
|
||||||
{-# SPECIALISE prevFP :: Float -> Float #-}
|
|
||||||
{-# SPECIALISE prevFP :: Double -> Double #-}
|
|
||||||
{-# INLINEABLE prevFP #-}
|
|
||||||
-- | The previous floating-point number.
|
|
||||||
prevFP :: forall f b. FPBits f b => f -> f
|
|
||||||
prevFP x = nextAfter x (-1/0)
|
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue