From 79135b272877b2f5c8451787f083f914a25c1107 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 21 Jun 2015 20:38:17 +0200 Subject: Fixed refinement --- src/Trivmix/Types.hs | 4 ++-- trivmix.cabal | 2 +- trivmix.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Trivmix/Types.hs b/src/Trivmix/Types.hs index 01418bf..9822449 100644 --- a/src/Trivmix/Types.hs +++ b/src/Trivmix/Types.hs @@ -91,9 +91,9 @@ class Adjustable a where -- sub = (-) instance Adjustable Level where - add (DB x) (DB y) = DB $ ((+) `on` linToDb) x y + add (DB x) (DB y) = DB $ dBToLin $ ((+) `on` linToDb) x y add x y = x + y - sub (DB x) (DB y) = DB $ ((-) `on` linToDb) x y + sub (DB x) (DB y) = DB $ dBToLin $ ((-) `on` linToDb) x y sub x y = x - y doAdjustment :: Adjustable a => a -> Adjustment a -> a diff --git a/trivmix.cabal b/trivmix.cabal index 54aad76..3f3da68 100644 --- a/trivmix.cabal +++ b/trivmix.cabal @@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/ name: trivmix -version: 2.5.3 +version: 2.5.4 -- synopsis: -- description: license: PublicDomain diff --git a/trivmix.nix b/trivmix.nix index d29bb48..35aa4f1 100644 --- a/trivmix.nix +++ b/trivmix.nix @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { pname = "trivmix"; - version = "2.5.3"; + version = "2.5.4"; src = ./.; isLibrary = true; isExecutable = true; -- cgit v1.2.3