Merge branch 'master' of ssh://gonito.net/geval

README.md

@@ -40,25 +40,25 @@ order to run `geval` you need to either add `$HOME/.local/bin` to
 
 If you see a message like this:
 
-   Configuring lzma-0.0.0.3...
+    Configuring lzma-0.0.0.3...
-   clang: warning: argument unused during compilation: '-nopie' [-Wunused-command-line-argument]
+    clang: warning: argument unused during compilation: '-nopie' [-Wunused-command-line-argument]
-   Cabal-simple_mPHDZzAJ_2.0.1.0_ghc-8.2.2: Missing dependency on a foreign
+    Cabal-simple_mPHDZzAJ_2.0.1.0_ghc-8.2.2: Missing dependency on a foreign
-   library:
+    library:
-   * Missing (or bad) header file: lzma.h
+    * Missing (or bad) header file: lzma.h
-   This problem can usually be solved by installing the system package that
+    This problem can usually be solved by installing the system package that
-   provides this library (you may need the "-dev" version). If the library is
+    provides this library (you may need the "-dev" version). If the library is
-   already installed but in a non-standard location then you can use the flags
+    already installed but in a non-standard location then you can use the flags
-   --extra-include-dirs= and --extra-lib-dirs= to specify where it is.
+    --extra-include-dirs= and --extra-lib-dirs= to specify where it is.
-   If the header file does exist, it may contain errors that are caught by the C
+    If the header file does exist, it may contain errors that are caught by the C
-   compiler at the preprocessing stage. In this case you can re-run configure
+    compiler at the preprocessing stage. In this case you can re-run configure
-   with the verbosity flag -v3 to see the error messages.
+    with the verbosity flag -v3 to see the error messages.
 
-It means that you need to install lzma library on your operating
+it means that you need to install lzma library on your operating
 system. The same might go for pkg-config. On macOS (it's more likely
 to happen on macOS, as these packages are usually installed out of box on Linux), you need to run:
 
-   brew install xz
+    brew install xz
-   brew install pkg-config
+    brew install pkg-config
 
 ### Plan B — just download the GEval binary
 
@@ -68,6 +68,13 @@ to happen on macOS, as these packages are usually installed out of box on Linux)
     chmod u+x geval
     ./geval --help
 
+If this binary does not work on your Linux (likely to happen on Arch Linux), try another one:
+
+    wget https://gonito.net/get/bin/geval-alt
+    mv geval-alt geval
+    chmod u+x geval
+    ./geval --help
+
 ## Quick tour
 
 Let's use GEval to evaluate machine translation (MT) systems (but keep

geval.cabal

@@ -1,5 +1,5 @@
 name:                geval
-version:             1.15.0.0
+version:             1.15.0.1
 synopsis:            Machine learning evaluation tools
 description:         Please see README.md
 homepage:            http://github.com/name/project

src/GEval/Core.hs

@@ -560,7 +560,7 @@ gevalCore' MAE _ = gevalCoreWithoutInput outParser outParser itemAbsoluteError a
 
 gevalCore' SMAPE _ = gevalCoreWithoutInput outParser outParser smape averageC (* 100.0)
   where outParser = getValue . TR.double
-        smape (exp, out) = (abs (exp-out)) / ((abs exp) + (abs out))
+        smape (exp, out) = (abs (exp-out)) `safeDoubleDiv` ((abs exp) + (abs out))
 
 gevalCore' Pearson _ = gevalCoreByCorrelationMeasure pearson
 gevalCore' Spearman _ = gevalCoreByCorrelationMeasure spearman

test/Spec.hs

@@ -86,7 +86,7 @@ main = hspec $ do
       runGEvalTest "mae-simple" `shouldReturnAlmost` 1.5
   describe "SMAPE" $ do
     it "simple test" $
-      runGEvalTest "smape-simple" `shouldReturnAlmost` 54.2222222222222222
+      runGEvalTest "smape-simple" `shouldReturnAlmost` 45.1851851851852
   describe "Spearman's rank correlation coefficient" $ do
     it "simple test" $ do
       runGEvalTest "spearman-simple" `shouldReturnAlmost` (- 0.5735)

test/smape-simple/smape-simple-solution/test-A/out.tsv

@@ -3,3 +3,4 @@
 -2.5
 3
 0.3
+0.0

test/smape-simple/smape-simple/test-A/expected.tsv

@@ -3,3 +3,4 @@
 0.0
 3
 1.2
+0.0