diff --git a/fluid/lib/dtw.fld b/fluid/lib/dtw.fld index 5293e561e..736370262 100644 --- a/fluid/lib/dtw.fld +++ b/fluid/lib/dtw.fld @@ -3,7 +3,7 @@ let nextIndices n m window = j <- [max 1 (i - window) .. min m (i + window)]]; let costMatrixInit rows cols window = - [| let initV = if or (and (n == 1) (m == 1)) (and (abs n m <= window) (not (or (n == 1) (m == 1)))) + [| let initV = if ((n == 1) `and` (m == 1)) `or` ((abs n m <= window) `and` not ((n == 1) `or` (m == 1))) then FNum 0 else Infty in initV | (n, m) in (rows, cols) |]; @@ -19,7 +19,7 @@ let minAndPrev (i, j) im1 jm1 ijm1 = let extractPath indmatrix (i, j) = let traverser (n, m) matrix accum = - if and (n == 1) (m == 1) + if (n == 1) `and` (m == 1) then accum else traverser (matrix!(n, m)) matrix ((n - 1, m - 1) : accum) diff --git a/src/Ann.purs b/src/Ann.purs deleted file mode 100644 index 664a26c69..000000000 --- a/src/Ann.purs +++ /dev/null @@ -1,9 +0,0 @@ -module Ann where - -import Prelude - -erase :: forall t a. Functor t => t a -> Raw t -erase = (<$>) (const unit) - -type 𝔹 = Boolean -type Raw (c :: Type -> Type) = c Unit diff --git a/src/Module.purs b/src/Module.purs index 20cebe207..465dd2546 100644 --- a/src/Module.purs +++ b/src/Module.purs @@ -4,7 +4,6 @@ import Prelude import Affjax.ResponseFormat (string) import Affjax.Web (defaultRequest, printError, request) -import Ann (Raw) import Bindings (Var, (↦)) import Control.Monad.Error.Class (liftEither, throwError) import Control.Monad.Except (class MonadError) @@ -22,6 +21,7 @@ import Expr (ProgCxt(..)) import Graph (empty) as G import Graph.GraphImpl (GraphImpl) import Graph.GraphWriter (alloc, runWithGraphAllocT) +import Lattice (Raw) import Parse (module_, program) as P import Parsing (runParser) import Primitive.Defs (primitives) diff --git a/test/Util.purs b/test/Util.purs index abd567399..218fd477f 100644 --- a/test/Util.purs +++ b/test/Util.purs @@ -42,7 +42,7 @@ type TestConfig = type AffError m a = MonadAff m => MonadError Error m => m a logging :: Boolean -logging = true +logging = false test ∷ forall m. File -> ProgCxt Unit -> TestConfig -> (Int × Boolean) -> AffError m BenchRow test file progCxt tconfig (n × is_bench) = do