interpolation 0.1.1 → 0.1.1.1
raw patch · 2 files changed
+19/−18 lines, 2 filesdep ~comfort-arraydep ~lapackPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: comfort-array, lapack
API changes (from Hackage documentation)
Files
- example/Fit.hs +15/−14
- interpolation.cabal +4/−4
example/Fit.hs view
@@ -13,11 +13,12 @@ import qualified Numeric.LAPACK.Matrix.BandedHermitianPositiveDefinite as BandedSPD import qualified Numeric.LAPACK.Matrix.BandedHermitian as BandedHermitian+import qualified Numeric.LAPACK.Matrix.Array as ArrMatrix import qualified Numeric.LAPACK.Matrix as Matrix import qualified Numeric.LAPACK.Vector as Vector import qualified Type.Data.Num.Unary as Unary-import Type.Base.Proxy (Proxy(Proxy))+import Type.Base.Proxy (Proxy) import qualified Data.Array.Comfort.Storable as Array import qualified Data.Array.Comfort.Shape as Shape@@ -39,9 +40,9 @@ type BandedHermitianMatrix k =- BandedHermitian.BandedHermitian k Matrix.ZeroInt-type Matrix = Matrix.General Matrix.ZeroInt Matrix.ZeroInt-type Vector = Vector.Vector Matrix.ZeroInt+ BandedHermitian.BandedHermitian k Matrix.ShapeInt+type Matrix = Matrix.General Matrix.ShapeInt Matrix.ShapeInt+type Vector = Vector.Vector Matrix.ShapeInt type ShortVector k = Vector.Vector (ShapeStatic.ZeroBased k) @@ -68,10 +69,10 @@ basisMatrixSparse :: Type.T Double Double ny -> [Double] -> [Double] -> Matrix Double basisMatrixSparse typ xs txs =- Array.fromAssociations- (MatrixShape.general MatrixShape.RowMajor- (Shape.ZeroBased $ length txs)- (Shape.ZeroBased $ length $ Type.basisFunctions typ xs)) 0 $+ Matrix.fromRowMajor $+ Array.fromAssociations 0+ (Shape.ZeroBased $ length txs,+ Shape.ZeroBased $ length $ Type.basisFunctions typ xs) $ zipRowsWith (\k (j,x) -> ((k,j),x)) [0..] $ map (Type.sampleBasisFunctions typ xs) txs @@ -91,7 +92,7 @@ Type.T Double Double ny -> [Double] -> [(Double, Double)] -> Double matrixDiff typ xs target = let txs = map fst target- in snd $ Vector.argAbs1Maximum $+ in Vector.normInf $ ArrMatrix.toVector $ Matrix.sub (basisMatrixFull typ xs txs) (basisMatrixSparse typ xs txs)@@ -101,7 +102,7 @@ Int -> [[(Int, Double)]] -> [Double] -> Vector Double mulSparseMatrixVector size samples tys = Array.accumulate (+)- (Vector.constant (Matrix.zeroInt size) 0)+ (Vector.zero (Matrix.shapeInt size)) (zipRowsWith (\ty (k,y) -> (k, y*ty)) tys samples) {- ToDo:@@ -115,9 +116,9 @@ shortVector width xs = let i0 = minimum $ map fst xs in (i0,--- Array.fromAssociations (ShapeStatic.ZeroBased Proxy) 0 $- Array.reshape (ShapeStatic.ZeroBased Proxy) $- Array.fromAssociations (Matrix.zeroInt $ Unary.integralFromProxy width) 0 $+-- Array.fromAssociations 0 Shape.static $+ Array.reshape Shape.static $+ Array.fromAssociations 0 (Matrix.shapeInt $ Unary.integralFromProxy width) $ map (mapFst (subtract i0)) xs) bandedGramian ::@@ -125,7 +126,7 @@ Int -> Proxy (Unary.Succ k) -> [[(Int, Double)]] -> BandedHermitianMatrix k Double bandedGramian size width samples =- BandedHermitian.sumRank1 MatrixShape.ColumnMajor (Matrix.zeroInt size) $+ BandedHermitian.sumRank1 MatrixShape.ColumnMajor (Matrix.shapeInt size) $ map ((,) 1 . shortVector width) samples reifyPositive ::
interpolation.cabal view
@@ -1,5 +1,5 @@ Name: interpolation-Version: 0.1.1+Version: 0.1.1.1 License: BSD3 License-File: LICENSE Author: Henning Thielemann@@ -47,7 +47,7 @@ default: True Source-Repository this- Tag: 0.1.1+ Tag: 0.1.1.1 Type: darcs Location: http://hub.darcs.net/thielema/interpolation/ @@ -98,9 +98,9 @@ If flag(buildExamples) && flag(lapack) Build-Depends: interpolation,- lapack >=0.2.2 && <0.3,+ lapack >=0.3 && <0.4, tfp >=1.0 && <1.1,- comfort-array >=0.3 && <0.4,+ comfort-array >=0.4 && <0.5, random >=1.0 && <1.2, gnuplot >=0.5.6 && <0.6, utility-ht >=0.0.9 && <0.1,