From e499467d2c67f214b0871376b068c5b6fc7896a1 Mon Sep 17 00:00:00 2001 From: Alberto Ruiz Date: Fri, 10 Apr 2015 09:53:23 +0200 Subject: merge recent --- packages/base/src/Data/Packed/IO.hs | 1 - packages/base/src/Data/Packed/Internal/Numeric.hs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'packages/base/src/Data/Packed') diff --git a/packages/base/src/Data/Packed/IO.hs b/packages/base/src/Data/Packed/IO.hs index 85f1b37..b0999a8 100644 --- a/packages/base/src/Data/Packed/IO.hs +++ b/packages/base/src/Data/Packed/IO.hs @@ -22,7 +22,6 @@ import Text.Printf(printf) import Data.List(intersperse) import Data.Complex import Numeric.Vectorized(vectorScan,saveMatrix) -import Control.Applicative((<$>)) import Data.Packed.Internal {- | Creates a string from a matrix given a separator and a function to show each entry. Using diff --git a/packages/base/src/Data/Packed/Internal/Numeric.hs b/packages/base/src/Data/Packed/Internal/Numeric.hs index dc5724d..7a4dd29 100644 --- a/packages/base/src/Data/Packed/Internal/Numeric.hs +++ b/packages/base/src/Data/Packed/Internal/Numeric.hs @@ -240,7 +240,7 @@ instance Container Vector (Complex Float) --------------------------------------------------------------- -instance (Container Vector a) => Container Matrix a +instance (Fractional a, Element a, Container Vector a) => Container Matrix a where size' = size scale' x = liftMatrix (scale' x) -- cgit v1.2.3