From 1e444ca3ec6ef06d612dc73118373cadfb39f381 Mon Sep 17 00:00:00 2001 From: Filip Gralinski Date: Mon, 24 Aug 2015 22:32:09 +0200 Subject: [PATCH] refactor gevalCore --- src/GEval/Core.hs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/GEval/Core.hs b/src/GEval/Core.hs index 431496f..994b5c8 100644 --- a/src/GEval/Core.hs +++ b/src/GEval/Core.hs @@ -114,9 +114,17 @@ geval gevalSpec = do metric = gesMetric gevalSpec gevalCore :: Metric -> String -> String -> IO (MetricValue) -gevalCore MSE expectedFilePath outFilePath = do +gevalCore RMSE expectedFilePath outFilePath = do + mse <- gevalCore MSE expectedFilePath outFilePath + return $ mse ** 0.5 + +gevalCore metric expectedFilePath outFilePath = do unlessM (D.doesFileExist expectedFilePath) $ throwM $ NoExpectedFile expectedFilePath unlessM (D.doesFileExist outFilePath) $ throwM $ NoOutFile outFilePath + gevalCore' metric expectedFilePath outFilePath + +gevalCore' :: Metric -> String -> String -> IO (MetricValue) +gevalCore' MSE expectedFilePath outFilePath = runResourceT $ (getZipSource $ (,) <$> ZipSource (items expectedFilePath) @@ -124,9 +132,6 @@ gevalCore MSE expectedFilePath outFilePath = do $$ (CL.map itemError =$ averageC) -gevalCore RMSE expectedFilePath outFilePath = do - mse <- gevalCore MSE expectedFilePath outFilePath - return $ mse ** 0.5 averageC :: MonadResource m => Sink Double m Double averageC = getZipSink