bindings-levmar 1.0.0.2 → 1.1
raw patch · 3 files changed
+25/−19 lines, 3 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
- Bindings.LevMar: type BestFitParameterIx = Int
+ Bindings.LevMar: type BestFitParameterIx = CInt
- Bindings.LevMar: type LevMarBCDer r = FunPtr (Model r) -> FunPtr (Jacobian r) -> Parameters r -> Measurements r -> NrOfParameters -> NrOfMeasurements -> LowerBounds r -> UpperBounds r -> MaxIterations -> Options r -> Info r -> Work r -> Covar r -> AData -> IO Int
+ Bindings.LevMar: type LevMarBCDer r = FunPtr (Model r) -> FunPtr (Jacobian r) -> Parameters r -> Measurements r -> NrOfParameters -> NrOfMeasurements -> LowerBounds r -> UpperBounds r -> MaxIterations -> Options r -> Info r -> Work r -> Covar r -> AData -> IO CInt
- Bindings.LevMar: type LevMarBCDif r = FunPtr (Model r) -> Parameters r -> Measurements r -> NrOfParameters -> NrOfMeasurements -> LowerBounds r -> UpperBounds r -> MaxIterations -> Options r -> Info r -> Work r -> Covar r -> AData -> IO Int
+ Bindings.LevMar: type LevMarBCDif r = FunPtr (Model r) -> Parameters r -> Measurements r -> NrOfParameters -> NrOfMeasurements -> LowerBounds r -> UpperBounds r -> MaxIterations -> Options r -> Info r -> Work r -> Covar r -> AData -> IO CInt
- Bindings.LevMar: type LevMarBLecDer r = FunPtr (Model r) -> FunPtr (Jacobian r) -> Parameters r -> Measurements r -> NrOfParameters -> NrOfMeasurements -> LowerBounds r -> UpperBounds r -> ConstraintsMatrix r -> ConstraintsVector r -> NrOfConstraints -> Weights r -> MaxIterations -> Options r -> Info r -> Work r -> Covar r -> AData -> IO Int
+ Bindings.LevMar: type LevMarBLecDer r = FunPtr (Model r) -> FunPtr (Jacobian r) -> Parameters r -> Measurements r -> NrOfParameters -> NrOfMeasurements -> LowerBounds r -> UpperBounds r -> ConstraintsMatrix r -> ConstraintsVector r -> NrOfConstraints -> Weights r -> MaxIterations -> Options r -> Info r -> Work r -> Covar r -> AData -> IO CInt
- Bindings.LevMar: type LevMarBLecDif r = FunPtr (Model r) -> Parameters r -> Measurements r -> NrOfParameters -> NrOfMeasurements -> LowerBounds r -> UpperBounds r -> ConstraintsMatrix r -> ConstraintsVector r -> NrOfConstraints -> Weights r -> MaxIterations -> Options r -> Info r -> Work r -> Covar r -> AData -> IO Int
+ Bindings.LevMar: type LevMarBLecDif r = FunPtr (Model r) -> Parameters r -> Measurements r -> NrOfParameters -> NrOfMeasurements -> LowerBounds r -> UpperBounds r -> ConstraintsMatrix r -> ConstraintsVector r -> NrOfConstraints -> Weights r -> MaxIterations -> Options r -> Info r -> Work r -> Covar r -> AData -> IO CInt
- Bindings.LevMar: type LevMarDer r = FunPtr (Model r) -> FunPtr (Jacobian r) -> Parameters r -> Measurements r -> NrOfParameters -> NrOfMeasurements -> MaxIterations -> Options r -> Info r -> Work r -> Covar r -> AData -> IO Int
+ Bindings.LevMar: type LevMarDer r = FunPtr (Model r) -> FunPtr (Jacobian r) -> Parameters r -> Measurements r -> NrOfParameters -> NrOfMeasurements -> MaxIterations -> Options r -> Info r -> Work r -> Covar r -> AData -> IO CInt
- Bindings.LevMar: type LevMarDif r = FunPtr (Model r) -> Parameters r -> Measurements r -> NrOfParameters -> NrOfMeasurements -> MaxIterations -> Options r -> Info r -> Work r -> Covar r -> AData -> IO Int
+ Bindings.LevMar: type LevMarDif r = FunPtr (Model r) -> Parameters r -> Measurements r -> NrOfParameters -> NrOfMeasurements -> MaxIterations -> Options r -> Info r -> Work r -> Covar r -> AData -> IO CInt
- Bindings.LevMar: type LevMarLecDer r = FunPtr (Model r) -> FunPtr (Jacobian r) -> Parameters r -> Measurements r -> NrOfParameters -> NrOfMeasurements -> ConstraintsMatrix r -> ConstraintsVector r -> NrOfConstraints -> MaxIterations -> Options r -> Info r -> Work r -> Covar r -> AData -> IO Int
+ Bindings.LevMar: type LevMarLecDer r = FunPtr (Model r) -> FunPtr (Jacobian r) -> Parameters r -> Measurements r -> NrOfParameters -> NrOfMeasurements -> ConstraintsMatrix r -> ConstraintsVector r -> NrOfConstraints -> MaxIterations -> Options r -> Info r -> Work r -> Covar r -> AData -> IO CInt
- Bindings.LevMar: type LevMarLecDif r = FunPtr (Model r) -> Parameters r -> Measurements r -> NrOfParameters -> NrOfMeasurements -> ConstraintsMatrix r -> ConstraintsVector r -> NrOfConstraints -> MaxIterations -> Options r -> Info r -> Work r -> Covar r -> AData -> IO Int
+ Bindings.LevMar: type LevMarLecDif r = FunPtr (Model r) -> Parameters r -> Measurements r -> NrOfParameters -> NrOfMeasurements -> ConstraintsMatrix r -> ConstraintsVector r -> NrOfConstraints -> MaxIterations -> Options r -> Info r -> Work r -> Covar r -> AData -> IO CInt
- Bindings.LevMar: type LevMarR2 r = FunPtr (Model r) -> Parameters r -> Measurements r -> NrOfParameters -> NrOfMeasurements -> AData -> Result r -> IO Int
+ Bindings.LevMar: type LevMarR2 r = FunPtr (Model r) -> Parameters r -> Measurements r -> NrOfParameters -> NrOfMeasurements -> AData -> Result r -> IO CInt
- Bindings.LevMar: type MaxIterations = Int
+ Bindings.LevMar: type MaxIterations = CInt
- Bindings.LevMar: type NrOfConstraints = Int
+ Bindings.LevMar: type NrOfConstraints = CInt
- Bindings.LevMar: type NrOfMeasurements = Int
+ Bindings.LevMar: type NrOfMeasurements = CInt
- Bindings.LevMar: type NrOfParameters = Int
+ Bindings.LevMar: type NrOfParameters = CInt
Files
- Bindings/LevMar.hsc +22/−16
- LICENSE +1/−1
- bindings-levmar.cabal +2/−2
Bindings/LevMar.hsc view
@@ -5,7 +5,7 @@ -------------------------------------------------------------------------------- -- | -- Module : Bindings.LevMar--- Copyright : (c) 2009-2010 Roel van Dijk & Bas van Dijk+-- Copyright : (c) 2009-2012 Roel van Dijk & Bas van Dijk -- License : BSD-style (see the file LICENSE) -- -- Maintainer : vandijk.roel@gmail.com, v.dijk.bas@gmail.com@@ -132,8 +132,14 @@ import Prelude ( negate, fromInteger, fromRational ) #endif -import Data.Int ( Int ) import System.IO ( IO )++import Foreign.C.Types ( CInt+#if __GLASGOW_HASKELL__ >= 704+ (..)+#endif+ )+ import Foreign.Ptr ( Ptr, FunPtr, freeHaskellFunPtr ) import Control.Exception ( bracket ) @@ -200,10 +206,10 @@ type Work = Ptr type Covar = Ptr type AData = Ptr ()-type NrOfParameters = Int-type NrOfMeasurements = Int-type NrOfConstraints = Int-type MaxIterations = Int+type NrOfParameters = CInt+type NrOfMeasurements = CInt+type NrOfConstraints = CInt+type MaxIterations = CInt --------------------------------------------------------------------------------@@ -248,7 +254,7 @@ -> Work r -> Covar r -> AData- -> IO Int+ -> IO CInt type LevMarDif r = FunPtr (Model r) -> Parameters r@@ -261,7 +267,7 @@ -> Work r -> Covar r -> AData- -> IO Int+ -> IO CInt type LevMarBCDer r = FunPtr (Model r) -> FunPtr (Jacobian r)@@ -277,7 +283,7 @@ -> Work r -> Covar r -> AData- -> IO Int+ -> IO CInt type LevMarBCDif r = FunPtr (Model r) -> Parameters r@@ -292,7 +298,7 @@ -> Work r -> Covar r -> AData- -> IO Int+ -> IO CInt type LevMarLecDer r = FunPtr (Model r) -> FunPtr (Jacobian r)@@ -309,7 +315,7 @@ -> Work r -> Covar r -> AData- -> IO Int+ -> IO CInt type LevMarLecDif r = FunPtr (Model r) -> Parameters r@@ -325,7 +331,7 @@ -> Work r -> Covar r -> AData- -> IO Int+ -> IO CInt type LevMarBLecDer r = FunPtr (Model r) -> FunPtr (Jacobian r)@@ -345,7 +351,7 @@ -> Work r -> Covar r -> AData- -> IO Int+ -> IO CInt type LevMarBLecDif r = FunPtr (Model r) -> Parameters r@@ -364,7 +370,7 @@ -> Work r -> Covar r -> AData- -> IO Int+ -> IO CInt --------------------------------------------------------------------------------@@ -412,7 +418,7 @@ -- Utils -------------------------------------------------------------------------------- -type BestFitParameterIx = Int+type BestFitParameterIx = CInt -- | Standard deviation. type LevMarStddev r = Covar r@@ -435,7 +441,7 @@ -> NrOfMeasurements -> AData -> Result r- -> IO Int+ -> IO CInt type Result = Ptr
LICENSE view
@@ -5,7 +5,7 @@ the GPL as detailed in levmar-2.4/LICENSE. The copyright of these files belong to Manolis Lourakis. -Copyright 2009–2011 Roel van Dijk, Bas van Dijk+Copyright 2009–2012 Roel van Dijk, Bas van Dijk All rights reserved.
bindings-levmar.cabal view
@@ -1,11 +1,11 @@ name: bindings-levmar-version: 1.0.0.2+version: 1.1 cabal-version: >= 1.6 build-type: Simple stability: provisional author: Roel van Dijk <vandijk.roel@gmail.com> & Bas van Dijk <v.dijk.bas@gmail.com> maintainer: Roel van Dijk <vandijk.roel@gmail.com> & Bas van Dijk <v.dijk.bas@gmail.com>-copyright: 2009–2011 Roel van Dijk & Bas van Dijk+copyright: 2009–2012 Roel van Dijk & Bas van Dijk license: OtherLicense license-file: LICENSE homepage: https://github.com/basvandijk/bindings-levmar