Skip to content

Updates for 0.12 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sharkdp merged 1 commit into from
Jun 20, 2018
Merged

Updates for 0.12 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"output"
],
"dependencies": {
"purescript-maybe": "^3.0.0"
"purescript-maybe": "^4.0.0"
},
"devDependencies": {
"purescript-psci-support": "^3.0.0",
"purescript-assert": "^3.0.0",
"purescript-quickcheck": "^4.0.0",
"purescript-numbers": "^5.0.0"
"purescript-psci-support": "^4.0.0",
"purescript-assert": "^4.0.0",
"purescript-quickcheck": "^5.0.0",
"purescript-numbers": "^6.0.0"
}
}
28 changes: 13 additions & 15 deletions test/Main.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
module Test.Main where

import Prelude hiding (min, max)
import Control.Monad.Eff (Eff)
import Control.Monad.Eff.Console (CONSOLE, log)
import Data.Decimal (Decimal, abs, fromInt, fromNumber, pow, fromString,
toNumber, toString, toFixed, acos, acosh, asin, asinh, atan, atanh,
atan2, ceil, cos, cosh, exp, floor, ln, log10, max,
min, modulo, round, truncated, sin, sinh, sqrt, tan, tanh, e, pi, gamma,
toSignificantDigits, isInteger, isFinite, factorial)
import Data.Maybe (Maybe(..))
import Test.Assert (ASSERT, assert)
import Control.Monad.Eff.Random (RANDOM())
import Control.Monad.Eff.Exception (EXCEPTION())
import Test.QuickCheck (QC(), quickCheck)
import Test.QuickCheck.Arbitrary (class Arbitrary, arbitrary)
import Data.Int as Int
import Data.Maybe (Maybe(..))
import Data.Number.Approximate ((≅))
import Effect (Effect)
import Effect.Console (log)
import Math as M
import Test.Assert (assert)
import Test.QuickCheck (quickCheck)
import Test.QuickCheck.Arbitrary (class Arbitrary, arbitrary)
Copy link
Contributor Author

@paulyoung paulyoung Jun 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for this import noise. My editor integration did this.

I purposefully preserved the formatting of the Prelude and Data.Decimal imports.


-- | Arbitrary instance for Decimal
newtype TestDecimal = TestDecimal Decimal
Expand All @@ -25,16 +23,16 @@ instance arbitraryDecimal ∷ Arbitrary TestDecimal where
arbitrary = (TestDecimal <<< fromNumber) <$> arbitrary

-- | Test if a simple function holds before and after converting to Decimal.
testFn ∷ ∀ eff. (Decimal → Decimal) → (Number → Number) → QC eff Unit
testFn ∷ (Decimal → Decimal) → (Number → Number) → Effect Unit
testFn f g = quickCheck (\(TestDecimal x) → toNumber (f x) ≅ (g (toNumber x)))

-- | Test if a binary relation holds before and after converting to Decimal.
testBinary ∷ ∀ eff. (Decimal → Decimal → Decimal)
testBinary ∷ (Decimal → Decimal → Decimal)
→ (Number → Number → Number)
→ QC eff Unit
→ Effect Unit
testBinary f g = quickCheck (\x y → toNumber ((fromNumber x) `f` (fromNumber y)) ≅ (x `g` y))

main ∷ ∀ eff. Eff (console ∷ CONSOLE, assert ∷ ASSERT, random ∷ RANDOM, exception ∷ EXCEPTION | eff) Unit
main ∷ Effect Unit
main = do
log "Simple arithmetic operations and conversions from Int"
let two = one + one
Expand Down Expand Up @@ -135,9 +133,9 @@ main = do
testFn cosh $ \x -> 0.5 * (M.exp x + M.exp (-x))
testFn sinh $ \x -> 0.5 * (M.exp x - M.exp (-x))
testFn tanh $ \x -> (M.exp x - M.exp (-x)) / (M.exp x + M.exp (-x))
testFn (asinh <<< sinh) id
testFn (acosh <<< cosh) id
testFn (atanh <<< tanh) id
testFn (asinh <<< sinh) identity
testFn (acosh <<< cosh) identity
testFn (atanh <<< tanh) identity
testBinary atan2 M.atan2
testBinary max M.max
testBinary min M.min
Expand Down