summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-06-21 20:38:17 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2015-06-21 20:38:34 +0200
commit79135b272877b2f5c8451787f083f914a25c1107 (patch)
tree61e429f307d6deddc59f4c2aef50f9fd925ac390
parentfb70a691c8879bb6fdfd2d3855e54aca34e07cd2 (diff)
downloadtrivmix-79135b272877b2f5c8451787f083f914a25c1107.tar
trivmix-79135b272877b2f5c8451787f083f914a25c1107.tar.gz
trivmix-79135b272877b2f5c8451787f083f914a25c1107.tar.bz2
trivmix-79135b272877b2f5c8451787f083f914a25c1107.tar.xz
trivmix-79135b272877b2f5c8451787f083f914a25c1107.zip
Fixed refinement
-rw-r--r--src/Trivmix/Types.hs4
-rw-r--r--trivmix.cabal2
-rw-r--r--trivmix.nix2
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
91-- sub = (-) 91-- sub = (-)
92 92
93instance Adjustable Level where 93instance Adjustable Level where
94 add (DB x) (DB y) = DB $ ((+) `on` linToDb) x y 94 add (DB x) (DB y) = DB $ dBToLin $ ((+) `on` linToDb) x y
95 add x y = x + y 95 add x y = x + y
96 sub (DB x) (DB y) = DB $ ((-) `on` linToDb) x y 96 sub (DB x) (DB y) = DB $ dBToLin $ ((-) `on` linToDb) x y
97 sub x y = x - y 97 sub x y = x - y
98 98
99doAdjustment :: Adjustable a => a -> Adjustment a -> a 99doAdjustment :: 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 @@
2-- documentation, see http://haskell.org/cabal/users-guide/ 2-- documentation, see http://haskell.org/cabal/users-guide/
3 3
4name: trivmix 4name: trivmix
5version: 2.5.3 5version: 2.5.4
6-- synopsis: 6-- synopsis:
7-- description: 7-- description:
8license: PublicDomain 8license: PublicDomain
diff --git a/trivmix.nix b/trivmix.nix
index d29bb48..35aa4f1 100644
--- a/trivmix.nix
+++ b/trivmix.nix
@@ -6,7 +6,7 @@
6 6
7cabal.mkDerivation (self: { 7cabal.mkDerivation (self: {
8 pname = "trivmix"; 8 pname = "trivmix";
9 version = "2.5.3"; 9 version = "2.5.4";
10 src = ./.; 10 src = ./.;
11 isLibrary = true; 11 isLibrary = true;
12 isExecutable = true; 12 isExecutable = true;