From 5bd2eee13e4d3b0adc9e142f91e5155ee7eb7c16 Mon Sep 17 00:00:00 2001 From: Filip Gralinski Date: Sat, 12 Sep 2020 10:45:24 +0200 Subject: [PATCH] Selecting metric and --show-preprocessed work in the diff mode --- src/GEval/LineByLine.hs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/GEval/LineByLine.hs b/src/GEval/LineByLine.hs index 4f83221..07b291c 100644 --- a/src/GEval/LineByLine.hs +++ b/src/GEval/LineByLine.hs @@ -557,6 +557,7 @@ runMostWorseningFeatures ordering otherOut spec bbdo = do runDiffGeneralized :: ResultOrdering -> FilePath -> GEvalSpecification -> (Maybe References -> ConduitT (LineRecord, LineRecord) Void (ResourceT IO) a) -> IO a runDiffGeneralized ordering otherOut spec consum = do dataSourceB <- checkAndGetDataSource True spec + let dataSourceB' = addSchemeSpecifics scheme dataSourceB ooss <- getSmartSourceSpec ((gesOutDirectory spec) (gesTestName spec)) "out.tsv" otherOut case ooss of Left NoSpecGiven -> throwM $ NoOutFile otherOut @@ -567,13 +568,15 @@ runDiffGeneralized ordering otherOut spec consum = do let dataSourceA = DataSource { dataSourceChallengeData = chDataSource, dataSourceOut = otherOutSource} - let sourceA = gevalLineByLineSource metric dataSourceA - let sourceB = gevalLineByLineSource metric dataSourceB + let dataSourceA' = addSchemeSpecifics scheme dataSourceA + let sourceA = gevalLineByLineSource metric dataSourceA' + let sourceB = gevalLineByLineSource metric dataSourceB' runResourceT $ runConduit $ ((getZipSource $ (,) <$> ZipSource sourceA <*> ZipSource sourceB) .| sorter ordering .| consum mReferences) where metric = gesMainMetric spec + scheme = gesMainScheme spec preprocess = gesPreprocess spec mSelector = gesSelector spec sorter KeepTheOriginalOrder = doNothing