levmar 1.2.1.5 → 1.2.1.6

raw patch · 2 files changed

+15/−10 lines, 2 filesdep ~basedep ~hmatrixdep ~vector

Dependency ranges changed: base, hmatrix, vector

Files

• Numeric/LevMar.hs +11/−6
• levmar.cabal +4/−4

@@ -64,7 +64,7 @@ import Foreign.Ptr           ( Ptr, nullPtr ) import Foreign.ForeignPtr    ( ForeignPtr, newForeignPtr_, withForeignPtr ) import Foreign.Storable      ( Storable )-import Prelude               ( Enum, Fractional, RealFrac, Float, Double+import Prelude               ( Num, Enum, Fractional, RealFrac, Float, Double                              , fromIntegral, toEnum, (-), (*), error, floor                              ) import System.IO             ( IO )@@ -85,9 +85,14 @@ #endif  -- from hmatrix:-import Data.Packed.Matrix    ( Matrix, Element, flatten, rows, reshape )-import Numeric.Container     ( Container )-import Numeric.LinearAlgebra ( {- Instances for Matrix -} )+#if MIN_VERSION_hmatrix(0,17,0)+import Numeric.LinearAlgebra.Data ( Matrix, flatten, rows, reshape )+import Numeric.LinearAlgebra      ( Container, Element )+#else+import Data.Packed.Matrix         ( Matrix, Element, flatten, rows, reshape )+import Numeric.Container          ( Container )+import Numeric.LinearAlgebra      ( {- Instances for Matrix -} )+#endif  -- from vector: import           Data.Vector.Storable       ( Vector )@@ -233,7 +238,7 @@   boxConstrained && (all $ zipWith (<=) (fromJust mLowBs) (fromJust mUpBs)) @ -}-gen_levmar :: forall r. (Storable r, RealFrac r, Element r)+gen_levmar :: forall r. (RealFrac r, Element r)            => LevMarDer r            -> LevMarDif r            -> LevMarBCDer r@@ -462,7 +467,7 @@     , linearConstraints :: !(Maybe (LinearConstraints r)) -- ^ Optional linear constraints     } deriving (Read, Show, Typeable) -deriving instance (Eq r, Container Vector r) => Eq (Constraints r)+deriving instance (Eq r, Container Vector r, Num r) => Eq (Constraints r)  -- | Linear constraints consisting of a constraints matrix, @k><m@ and --   a right hand constraints vector, of length @k@ where @m@ is the number of

@@ -1,5 +1,5 @@ name:          levmar-version:       1.2.1.5+version:       1.2.1.6 cabal-version: >= 1.6 build-type:    Simple stability:     experimental@@ -46,10 +46,10 @@   Location: git://github.com/basvandijk/levmar.git  library-  build-depends: base                 >= 3     && < 4.9+  build-depends: base                 >= 3     && < 4.10                , bindings-levmar      >= 1.1   && < 1.2-               , hmatrix              >= 0.12  && < 0.17-               , vector               >= 0.8   && < 0.11+               , hmatrix              >= 0.12  && < 0.18+               , vector               >= 0.8   && < 0.12   exposed-modules: Numeric.LevMar   other-modules: Bindings.LevMar.CurryFriendly   ghc-options: -Wall