casadi-bindings 2.1.0.1 → 2.1.3.0
raw patch · 11 files changed
+58/−17 lines, 11 filesdep ~casadi-bindings-core
Dependency ranges changed: casadi-bindings-core
Files
- casadi-bindings.cabal +2/−2
- src/Casadi/DMatrix.hs +5/−1
- src/Casadi/Function.hs +6/−2
- src/Casadi/GenericC.hs +7/−1
- src/Casadi/MX.hs +6/−1
- src/Casadi/MXFunction.hs +7/−1
- src/Casadi/Option.hs +0/−1
- src/Casadi/SX.hs +5/−1
- src/Casadi/SXElement.hs +5/−5
- src/Casadi/SXFunction.hs +7/−1
- src/Casadi/SharedObject.hs +8/−1
casadi-bindings.cabal view
@@ -1,5 +1,5 @@ name: casadi-bindings-version: 2.1.0.1+version: 2.1.3.0 synopsis: mid-level bindings to CasADi category: Numerical, Math description:@@ -57,7 +57,7 @@ vector, containers, casadi-bindings-internal == 0.1.1,- casadi-bindings-core == 2.1.0.0+ casadi-bindings-core == 2.1.3.0 default-language: Haskell2010 source-repository head
src/Casadi/DMatrix.hs view
@@ -1,7 +1,7 @@ {-# OPTIONS_GHC -Wall -fno-cse -fno-warn-orphans #-} module Casadi.DMatrix- ( DMatrix(), dcrs, dmm, dvector, ddata, ddiag+ ( DMatrix, dcrs, dmm, dvector, ddata, ddiag , ddense, dsparse, dtrans, dtriu, dtril , dsize, dsize1, dsize2, dnumel , dvertcat, dhorzcat, dveccat, dvertsplit, dhorzsplit@@ -16,6 +16,10 @@ import qualified Casadi.Core.Tools as C import Casadi.Overloading ( Fmod(..), ArcTan2(..), SymOrd(..) )++instance Show DMatrix where+ show x = unsafePerformIO (dmatrix_getDescription x)+ {-# NOINLINE show #-} -- | matrix matrix product dmm :: DMatrix -> DMatrix -> DMatrix
src/Casadi/Function.hs view
@@ -1,7 +1,7 @@ {-# OPTIONS_GHC -Wall -fno-cse -fno-warn-orphans #-} module Casadi.Function- ( C.MXFunction, C.Function, callMX, callSX, evalDMatrix+ ( C.Function, callMX, callSX, evalDMatrix , jacobian, gradient, derivative , generateCode, externalFunction ) where@@ -11,7 +11,6 @@ import System.IO.Unsafe ( unsafePerformIO ) import Control.Monad ( zipWithM_ ) -import qualified Casadi.Core.Classes.MXFunction as C import qualified Casadi.Core.Classes.IOInterfaceFunction as C import qualified Casadi.Core.Classes.Function as C import qualified Casadi.Core.Classes.ExternalFunction as C@@ -19,6 +18,11 @@ import Casadi.SX ( SX ) import Casadi.MX ( MX ) import Casadi.DMatrix ( DMatrix )+import Casadi.SharedObject ( castSharedObject )++instance Show C.Function where+ show x = show (castSharedObject x)+ {-# NOINLINE show #-} -- | call an MXFunction on symbolic inputs, getting symbolic outputs callMX :: C.FunctionClass f => f -> Vector MX -> Vector MX
src/Casadi/GenericC.hs view
@@ -1,4 +1,4 @@-{-# OPTIONS_GHC -Wall #-}+{-# OPTIONS_GHC -Wall -fno-warn-orphans -fno-cse #-} {-# Language FlexibleInstances #-} module Casadi.GenericC@@ -9,6 +9,12 @@ import Data.Vector ( Vector ) import Casadi.Core.Classes.Function ( Function ) import Casadi.Core.Classes.GenericType++import Casadi.SharedObject ( castSharedObject )++instance Show GenericType where+ show x = show (castSharedObject x)+ {-# NOINLINE show #-} class GenericC a where mkGeneric :: a -> IO GenericType
src/Casadi/MX.hs view
@@ -1,7 +1,7 @@ {-# OPTIONS_GHC -Wall -fno-cse -fno-warn-orphans #-} module Casadi.MX- ( MX(), sym, symV, symM, mm, trans, diag+ ( MX, sym, symV, symM, mm, trans, diag , gradient, jacobian -- , hessian , solve , expand@@ -25,9 +25,14 @@ import qualified Casadi.Core.Tools as C import Casadi.Overloading ( Fmod(..), ArcTan2(..), SymOrd(..) )+import Casadi.SharedObject ( castSharedObject ) instance Conjugate MX where conjugate = id++instance Show MX where+ show x = show (castSharedObject x)+ {-# NOINLINE show #-} sym :: String -> IO MX sym x = fmap castMX (mx_sym__5 x)
src/Casadi/MXFunction.hs view
@@ -1,4 +1,4 @@-{-# OPTIONS_GHC -Wall #-}+{-# OPTIONS_GHC -Wall -fno-warn-orphans -fno-cse #-} module Casadi.MXFunction ( C.MXFunction@@ -10,7 +10,13 @@ import qualified Casadi.Core.Classes.Function as C import qualified Casadi.Core.Classes.MXFunction as C+ import Casadi.MX ( MX )+import Casadi.SharedObject ( castSharedObject )++instance Show C.MXFunction where+ show x = show (castSharedObject x)+ {-# NOINLINE show #-} mxFunction :: Vector MX -> Vector MX -> IO C.MXFunction mxFunction = C.mxFunction__0
src/Casadi/Option.hs view
@@ -27,4 +27,3 @@ if has then optionsFunctionality_getOption f name >>= fromGeneric else return Nothing-
src/Casadi/SX.hs view
@@ -1,7 +1,7 @@ {-# OPTIONS_GHC -Wall -fno-cse -fno-warn-orphans #-} module Casadi.SX- ( SX(), ssym, ssymV, ssymM, smm, strans+ ( SX, ssym, ssymV, ssymM, smm, strans , sgradient, sjacobian, shessian, svector, sdiag , ssolve , sdata@@ -25,6 +25,10 @@ import qualified Casadi.Core.Tools as C import Casadi.Overloading ( Fmod(..), ArcTan2(..), SymOrd(..) )++instance Show SX where+ show x = unsafePerformIO (sx_getDescription x)+ {-# NOINLINE show #-} instance Conjugate SX where conjugate = id
src/Casadi/SXElement.hs view
@@ -1,20 +1,20 @@ {-# OPTIONS_GHC -Wall -fno-cse -fno-warn-orphans #-} module Casadi.SXElement- ( SXElement(), sxElement_sym+ ( SXElement, sxElement_sym ) where ---import qualified Data.Vector as V+import qualified Data.Vector as V import System.IO.Unsafe ( unsafePerformIO ) import Linear.Conjugate ( Conjugate(..) ) import Casadi.Core.Classes.SXElement ---import Casadi.SX ( svector )+import Casadi.SX ( svector ) import Casadi.Overloading ( Fmod(..), ArcTan2(..), SymOrd(..) ) ---instance Show SXElement where--- show = show . svector . V.singleton+instance Show SXElement where+ show x = show (svector (V.singleton x)) instance Conjugate SXElement where conjugate = id
src/Casadi/SXFunction.hs view
@@ -1,4 +1,4 @@-{-# OPTIONS_GHC -Wall #-}+{-# OPTIONS_GHC -Wall -fno-cse -fno-warn-orphans#-} module Casadi.SXFunction ( C.SXFunction@@ -12,7 +12,13 @@ import qualified Casadi.Core.Classes.Function as C import qualified Casadi.Core.Classes.SXFunction as C import qualified Casadi.Core.Classes.MXFunction as C+ import Casadi.SX ( SX )+import Casadi.SharedObject ( castSharedObject )++instance Show C.SXFunction where+ show x = show (castSharedObject x)+ {-# NOINLINE show #-} sxFunction :: Vector SX -> Vector SX -> IO C.SXFunction sxFunction = C.sxFunction__0
@@ -1,10 +1,17 @@-{-# OPTIONS_GHC -Wall #-}+{-# OPTIONS_GHC -Wall -fno-warn-orphans -fno-cse #-} module Casadi.SharedObject ( soInit+ , C.castSharedObject ) where +import System.IO.Unsafe ( unsafePerformIO )+ import qualified Casadi.Core.Classes.SharedObject as C soInit :: C.SharedObjectClass a => a -> IO () soInit = C.sharedObject_init__0++instance Show C.SharedObject where+ show x = unsafePerformIO (C.sharedObject_getDescription x)+ {-# NOINLINE show #-}