costMatrixInit in fluid in working yet flawed state. Fails to pass te…

…stParse?
explorable-viz · Oct 2, 2023 · b367935 · b367935
1 parent 82b5516
commit b367935
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/example/Util/DTW.purs b/example/Util/DTW.purs
@@ -1,10 +1,9 @@
 module Example.Util.DTW
-  ( NumInf(..)
-  , costMatrixInit
-  , distEuclid
-  , distanceDTWWindow
-  )
-  where
+   ( NumInf(..)
+   , costMatrixInit
+   , distEuclid
+   , distanceDTWWindow
+   ) where
 
 import Prelude
 

diff --git a/fluid/example/dtw/cost-matrix.fld b/fluid/example/dtw/cost-matrix.fld
@@ -1,8 +1,9 @@
 let abs x y = if x - y < 0 then negate (x - y) else (x - y);
+
     costMatrixInit rows cols window = 
       let ns = [0 .. rows];
           ms = [0 .. cols]
       in 
-        [| (n,m) | (n, m) in (ns, ms) |]
+        [| let initV = if ((abs n m )<= window) then FNum (abs n m) else Infty  in initV | (n, m) in (rows, cols) |]
 in costMatrixInit 3 4 1
 
diff --git a/test/Main.purs b/test/Main.purs
@@ -23,8 +23,9 @@ tests :: Array (String × Aff Unit)
 --    , test_linking
 --    ]
 tests = test_scratchpad
+
 test_scratchpad :: Array (String × Aff Unit)
-test_scratchpad = second void <$> many [ { file: "dtw/cost-matrix", fwd_expect: "forced fail" }] 1
+test_scratchpad = second void <$> many [ { file: "dtw/cost-matrix", fwd_expect: "forced fail" } ] 1
 
 test_desugaring :: Array (String × Aff Unit)
 test_desugaring = second void <$> many desugar_cases 1

diff --git a/test/Spec/Specs.purs b/test/Spec/Specs.purs
@@ -40,7 +40,7 @@ misc_cases =
    , { file: "range", fwd_expect: "((0, 0) : ((0, 1) : ((1, 0) : ((1, 1) : []))))" }
    , { file: "records", fwd_expect: "{a : 2, b : 6, c : 7, d : (5 : []), e : 7}" }
    , { file: "reverse", fwd_expect: "(2 : (1 : []))" }
-   , { file: "dtw/next-indices", fwd_expect: "((1, 1) : ((1, 2) : ((1, 3) : ((2, 1) : ((2, 2) : ((2, 3) : ((2, 4) : ((3, 1) : ((3, 2) : ((3, 3) : ((3, 4) : ((3, 5) : ((4, 2) : ((4, 3) : ((4, 4) : ((4, 5) : ((4, 6) : ((5, 3) : ((5, 4) : ((5, 5) : ((5, 6) : ((5, 7) : []))))))))))))))))))))))"}
+   , { file: "dtw/next-indices", fwd_expect: "((1, 1) : ((1, 2) : ((1, 3) : ((2, 1) : ((2, 2) : ((2, 3) : ((2, 4) : ((3, 1) : ((3, 2) : ((3, 3) : ((3, 4) : ((3, 5) : ((4, 2) : ((4, 3) : ((4, 4) : ((4, 5) : ((4, 6) : ((5, 3) : ((5, 4) : ((5, 5) : ((5, 6) : ((5, 7) : []))))))))))))))))))))))" }
    , { file: "dtw/cost-matrix", fwd_expect: "forced fail" }
    ]