From 3976d510b47e7ef57499203f8b35b62701aa5bb1 Mon Sep 17 00:00:00 2001 From: Wojciech Kusa Date: Mon, 16 Jan 2023 19:08:12 +1000 Subject: [PATCH 1/3] fix typo in folders names to 'protocols' for TAR 2019 --- 2019-TAR/Task1/Testing/DTA/{protocals => protocols}/CD008874.xml | 0 2019-TAR/Task1/Testing/DTA/{protocals => protocols}/CD009044.xml | 0 2019-TAR/Task1/Testing/DTA/{protocals => protocols}/CD011686.xml | 0 2019-TAR/Task1/Testing/DTA/{protocals => protocols}/CD012080.xml | 0 2019-TAR/Task1/Testing/DTA/{protocals => protocols}/CD012233.xml | 0 2019-TAR/Task1/Testing/DTA/{protocals => protocols}/CD012567.xml | 0 2019-TAR/Task1/Testing/DTA/{protocals => protocols}/CD012669.xml | 0 2019-TAR/Task1/Testing/DTA/{protocals => protocols}/CD012768.xml | 0 .../Testing/Intervention/{protocals => protocols}/CD000996.xml | 0 .../Testing/Intervention/{protocals => protocols}/CD001261.xml | 0 .../Testing/Intervention/{protocals => protocols}/CD004414.xml | 0 .../Testing/Intervention/{protocals => protocols}/CD006468.xml | 0 .../Testing/Intervention/{protocals => protocols}/CD007867.xml | 0 .../Testing/Intervention/{protocals => protocols}/CD009069.xml | 0 .../Testing/Intervention/{protocals => protocols}/CD009642.xml | 0 .../Testing/Intervention/{protocals => protocols}/CD010038.xml | 0 .../Testing/Intervention/{protocals => protocols}/CD010239.xml | 0 .../Testing/Intervention/{protocals => protocols}/CD010558.xml | 0 .../Testing/Intervention/{protocals => protocols}/CD010753.xml | 0 .../Testing/Intervention/{protocals => protocols}/CD011140.xml | 0 .../Testing/Intervention/{protocals => protocols}/CD011571.xml | 0 .../Testing/Intervention/{protocals => protocols}/CD011768.xml | 0 .../Testing/Intervention/{protocals => protocols}/CD011977.xml | 0 .../Testing/Intervention/{protocals => protocols}/CD012069.xml | 0 .../Testing/Intervention/{protocals => protocols}/CD012164.xml | 0 .../Testing/Intervention/{protocals => protocols}/CD012342.xml | 0 .../Testing/Intervention/{protocals => protocols}/CD012455.xml | 0 .../Testing/Intervention/{protocals => protocols}/CD012551.xml | 0 .../Task1/Testing/Prognosis/{protocals => protocols}/CD012661.xml | 0 .../Testing/Qualitative/{protocals => protocols}/CD011558.xml | 0 .../Testing/Qualitative/{protocals => protocols}/CD011787.xml | 0 31 files changed, 0 insertions(+), 0 deletions(-) rename 2019-TAR/Task1/Testing/DTA/{protocals => protocols}/CD008874.xml (100%) rename 2019-TAR/Task1/Testing/DTA/{protocals => protocols}/CD009044.xml (100%) rename 2019-TAR/Task1/Testing/DTA/{protocals => protocols}/CD011686.xml (100%) rename 2019-TAR/Task1/Testing/DTA/{protocals => protocols}/CD012080.xml (100%) rename 2019-TAR/Task1/Testing/DTA/{protocals => protocols}/CD012233.xml (100%) rename 2019-TAR/Task1/Testing/DTA/{protocals => protocols}/CD012567.xml (100%) rename 2019-TAR/Task1/Testing/DTA/{protocals => protocols}/CD012669.xml (100%) rename 2019-TAR/Task1/Testing/DTA/{protocals => protocols}/CD012768.xml (100%) rename 2019-TAR/Task1/Testing/Intervention/{protocals => protocols}/CD000996.xml (100%) rename 2019-TAR/Task1/Testing/Intervention/{protocals => protocols}/CD001261.xml (100%) rename 2019-TAR/Task1/Testing/Intervention/{protocals => protocols}/CD004414.xml (100%) rename 2019-TAR/Task1/Testing/Intervention/{protocals => protocols}/CD006468.xml (100%) rename 2019-TAR/Task1/Testing/Intervention/{protocals => protocols}/CD007867.xml (100%) rename 2019-TAR/Task1/Testing/Intervention/{protocals => protocols}/CD009069.xml (100%) rename 2019-TAR/Task1/Testing/Intervention/{protocals => protocols}/CD009642.xml (100%) rename 2019-TAR/Task1/Testing/Intervention/{protocals => protocols}/CD010038.xml (100%) rename 2019-TAR/Task1/Testing/Intervention/{protocals => protocols}/CD010239.xml (100%) rename 2019-TAR/Task1/Testing/Intervention/{protocals => protocols}/CD010558.xml (100%) rename 2019-TAR/Task1/Testing/Intervention/{protocals => protocols}/CD010753.xml (100%) rename 2019-TAR/Task1/Testing/Intervention/{protocals => protocols}/CD011140.xml (100%) rename 2019-TAR/Task1/Testing/Intervention/{protocals => protocols}/CD011571.xml (100%) rename 2019-TAR/Task1/Testing/Intervention/{protocals => protocols}/CD011768.xml (100%) rename 2019-TAR/Task1/Testing/Intervention/{protocals => protocols}/CD011977.xml (100%) rename 2019-TAR/Task1/Testing/Intervention/{protocals => protocols}/CD012069.xml (100%) rename 2019-TAR/Task1/Testing/Intervention/{protocals => protocols}/CD012164.xml (100%) rename 2019-TAR/Task1/Testing/Intervention/{protocals => protocols}/CD012342.xml (100%) rename 2019-TAR/Task1/Testing/Intervention/{protocals => protocols}/CD012455.xml (100%) rename 2019-TAR/Task1/Testing/Intervention/{protocals => protocols}/CD012551.xml (100%) rename 2019-TAR/Task1/Testing/Prognosis/{protocals => protocols}/CD012661.xml (100%) rename 2019-TAR/Task1/Testing/Qualitative/{protocals => protocols}/CD011558.xml (100%) rename 2019-TAR/Task1/Testing/Qualitative/{protocals => protocols}/CD011787.xml (100%) diff --git a/2019-TAR/Task1/Testing/DTA/protocals/CD008874.xml b/2019-TAR/Task1/Testing/DTA/protocols/CD008874.xml similarity index 100% rename from 2019-TAR/Task1/Testing/DTA/protocals/CD008874.xml rename to 2019-TAR/Task1/Testing/DTA/protocols/CD008874.xml diff --git a/2019-TAR/Task1/Testing/DTA/protocals/CD009044.xml b/2019-TAR/Task1/Testing/DTA/protocols/CD009044.xml similarity index 100% rename from 2019-TAR/Task1/Testing/DTA/protocals/CD009044.xml rename to 2019-TAR/Task1/Testing/DTA/protocols/CD009044.xml diff --git a/2019-TAR/Task1/Testing/DTA/protocals/CD011686.xml b/2019-TAR/Task1/Testing/DTA/protocols/CD011686.xml similarity index 100% rename from 2019-TAR/Task1/Testing/DTA/protocals/CD011686.xml rename to 2019-TAR/Task1/Testing/DTA/protocols/CD011686.xml diff --git a/2019-TAR/Task1/Testing/DTA/protocals/CD012080.xml b/2019-TAR/Task1/Testing/DTA/protocols/CD012080.xml similarity index 100% rename from 2019-TAR/Task1/Testing/DTA/protocals/CD012080.xml rename to 2019-TAR/Task1/Testing/DTA/protocols/CD012080.xml diff --git a/2019-TAR/Task1/Testing/DTA/protocals/CD012233.xml b/2019-TAR/Task1/Testing/DTA/protocols/CD012233.xml similarity index 100% rename from 2019-TAR/Task1/Testing/DTA/protocals/CD012233.xml rename to 2019-TAR/Task1/Testing/DTA/protocols/CD012233.xml diff --git a/2019-TAR/Task1/Testing/DTA/protocals/CD012567.xml b/2019-TAR/Task1/Testing/DTA/protocols/CD012567.xml similarity index 100% rename from 2019-TAR/Task1/Testing/DTA/protocals/CD012567.xml rename to 2019-TAR/Task1/Testing/DTA/protocols/CD012567.xml diff --git a/2019-TAR/Task1/Testing/DTA/protocals/CD012669.xml b/2019-TAR/Task1/Testing/DTA/protocols/CD012669.xml similarity index 100% rename from 2019-TAR/Task1/Testing/DTA/protocals/CD012669.xml rename to 2019-TAR/Task1/Testing/DTA/protocols/CD012669.xml diff --git a/2019-TAR/Task1/Testing/DTA/protocals/CD012768.xml b/2019-TAR/Task1/Testing/DTA/protocols/CD012768.xml similarity index 100% rename from 2019-TAR/Task1/Testing/DTA/protocals/CD012768.xml rename to 2019-TAR/Task1/Testing/DTA/protocols/CD012768.xml diff --git a/2019-TAR/Task1/Testing/Intervention/protocals/CD000996.xml b/2019-TAR/Task1/Testing/Intervention/protocols/CD000996.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Intervention/protocals/CD000996.xml rename to 2019-TAR/Task1/Testing/Intervention/protocols/CD000996.xml diff --git a/2019-TAR/Task1/Testing/Intervention/protocals/CD001261.xml b/2019-TAR/Task1/Testing/Intervention/protocols/CD001261.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Intervention/protocals/CD001261.xml rename to 2019-TAR/Task1/Testing/Intervention/protocols/CD001261.xml diff --git a/2019-TAR/Task1/Testing/Intervention/protocals/CD004414.xml b/2019-TAR/Task1/Testing/Intervention/protocols/CD004414.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Intervention/protocals/CD004414.xml rename to 2019-TAR/Task1/Testing/Intervention/protocols/CD004414.xml diff --git a/2019-TAR/Task1/Testing/Intervention/protocals/CD006468.xml b/2019-TAR/Task1/Testing/Intervention/protocols/CD006468.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Intervention/protocals/CD006468.xml rename to 2019-TAR/Task1/Testing/Intervention/protocols/CD006468.xml diff --git a/2019-TAR/Task1/Testing/Intervention/protocals/CD007867.xml b/2019-TAR/Task1/Testing/Intervention/protocols/CD007867.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Intervention/protocals/CD007867.xml rename to 2019-TAR/Task1/Testing/Intervention/protocols/CD007867.xml diff --git a/2019-TAR/Task1/Testing/Intervention/protocals/CD009069.xml b/2019-TAR/Task1/Testing/Intervention/protocols/CD009069.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Intervention/protocals/CD009069.xml rename to 2019-TAR/Task1/Testing/Intervention/protocols/CD009069.xml diff --git a/2019-TAR/Task1/Testing/Intervention/protocals/CD009642.xml b/2019-TAR/Task1/Testing/Intervention/protocols/CD009642.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Intervention/protocals/CD009642.xml rename to 2019-TAR/Task1/Testing/Intervention/protocols/CD009642.xml diff --git a/2019-TAR/Task1/Testing/Intervention/protocals/CD010038.xml b/2019-TAR/Task1/Testing/Intervention/protocols/CD010038.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Intervention/protocals/CD010038.xml rename to 2019-TAR/Task1/Testing/Intervention/protocols/CD010038.xml diff --git a/2019-TAR/Task1/Testing/Intervention/protocals/CD010239.xml b/2019-TAR/Task1/Testing/Intervention/protocols/CD010239.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Intervention/protocals/CD010239.xml rename to 2019-TAR/Task1/Testing/Intervention/protocols/CD010239.xml diff --git a/2019-TAR/Task1/Testing/Intervention/protocals/CD010558.xml b/2019-TAR/Task1/Testing/Intervention/protocols/CD010558.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Intervention/protocals/CD010558.xml rename to 2019-TAR/Task1/Testing/Intervention/protocols/CD010558.xml diff --git a/2019-TAR/Task1/Testing/Intervention/protocals/CD010753.xml b/2019-TAR/Task1/Testing/Intervention/protocols/CD010753.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Intervention/protocals/CD010753.xml rename to 2019-TAR/Task1/Testing/Intervention/protocols/CD010753.xml diff --git a/2019-TAR/Task1/Testing/Intervention/protocals/CD011140.xml b/2019-TAR/Task1/Testing/Intervention/protocols/CD011140.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Intervention/protocals/CD011140.xml rename to 2019-TAR/Task1/Testing/Intervention/protocols/CD011140.xml diff --git a/2019-TAR/Task1/Testing/Intervention/protocals/CD011571.xml b/2019-TAR/Task1/Testing/Intervention/protocols/CD011571.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Intervention/protocals/CD011571.xml rename to 2019-TAR/Task1/Testing/Intervention/protocols/CD011571.xml diff --git a/2019-TAR/Task1/Testing/Intervention/protocals/CD011768.xml b/2019-TAR/Task1/Testing/Intervention/protocols/CD011768.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Intervention/protocals/CD011768.xml rename to 2019-TAR/Task1/Testing/Intervention/protocols/CD011768.xml diff --git a/2019-TAR/Task1/Testing/Intervention/protocals/CD011977.xml b/2019-TAR/Task1/Testing/Intervention/protocols/CD011977.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Intervention/protocals/CD011977.xml rename to 2019-TAR/Task1/Testing/Intervention/protocols/CD011977.xml diff --git a/2019-TAR/Task1/Testing/Intervention/protocals/CD012069.xml b/2019-TAR/Task1/Testing/Intervention/protocols/CD012069.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Intervention/protocals/CD012069.xml rename to 2019-TAR/Task1/Testing/Intervention/protocols/CD012069.xml diff --git a/2019-TAR/Task1/Testing/Intervention/protocals/CD012164.xml b/2019-TAR/Task1/Testing/Intervention/protocols/CD012164.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Intervention/protocals/CD012164.xml rename to 2019-TAR/Task1/Testing/Intervention/protocols/CD012164.xml diff --git a/2019-TAR/Task1/Testing/Intervention/protocals/CD012342.xml b/2019-TAR/Task1/Testing/Intervention/protocols/CD012342.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Intervention/protocals/CD012342.xml rename to 2019-TAR/Task1/Testing/Intervention/protocols/CD012342.xml diff --git a/2019-TAR/Task1/Testing/Intervention/protocals/CD012455.xml b/2019-TAR/Task1/Testing/Intervention/protocols/CD012455.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Intervention/protocals/CD012455.xml rename to 2019-TAR/Task1/Testing/Intervention/protocols/CD012455.xml diff --git a/2019-TAR/Task1/Testing/Intervention/protocals/CD012551.xml b/2019-TAR/Task1/Testing/Intervention/protocols/CD012551.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Intervention/protocals/CD012551.xml rename to 2019-TAR/Task1/Testing/Intervention/protocols/CD012551.xml diff --git a/2019-TAR/Task1/Testing/Prognosis/protocals/CD012661.xml b/2019-TAR/Task1/Testing/Prognosis/protocols/CD012661.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Prognosis/protocals/CD012661.xml rename to 2019-TAR/Task1/Testing/Prognosis/protocols/CD012661.xml diff --git a/2019-TAR/Task1/Testing/Qualitative/protocals/CD011558.xml b/2019-TAR/Task1/Testing/Qualitative/protocols/CD011558.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Qualitative/protocals/CD011558.xml rename to 2019-TAR/Task1/Testing/Qualitative/protocols/CD011558.xml diff --git a/2019-TAR/Task1/Testing/Qualitative/protocals/CD011787.xml b/2019-TAR/Task1/Testing/Qualitative/protocols/CD011787.xml similarity index 100% rename from 2019-TAR/Task1/Testing/Qualitative/protocals/CD011787.xml rename to 2019-TAR/Task1/Testing/Qualitative/protocols/CD011787.xml From 920f13f20cd2cf5bbd257832ed38bbbe8bec526b Mon Sep 17 00:00:00 2001 From: Wojciech Kusa Date: Fri, 27 Jan 2023 10:06:38 +1000 Subject: [PATCH 2/3] fix: relative path import --- scripts/measures/tar_rulers.py | 6 +++--- scripts/measures/tar_rulers_2018.py | 6 +++--- scripts/seeker/topic_document_file_handler.py | 4 ++-- scripts/seeker/trec_qrel_handler.py | 6 +++--- scripts/tar_eval.py | 4 ++-- scripts/tar_eval_2018.py | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/measures/tar_rulers.py b/scripts/measures/tar_rulers.py index d6783a8..6430950 100644 --- a/scripts/measures/tar_rulers.py +++ b/scripts/measures/tar_rulers.py @@ -1,8 +1,8 @@ __author__ = "Leif Azzopardi" -from measures.eval_measures import CostBasedMeasure, AreaBasedMeasures, MAPBasedMeasures -from measures.eval_measures import DescriptionMeasures, CountBasedMeasures, GainBasedMeasures -from measures.eval_measures import LossBasedMeasures +from tar.scripts.measures.eval_measures import CostBasedMeasure, AreaBasedMeasures, MAPBasedMeasures +from tar.scripts.measures.eval_measures import DescriptionMeasures, CountBasedMeasures, GainBasedMeasures +from tar.scripts.measures.eval_measures import LossBasedMeasures class TarAggRuler(object): diff --git a/scripts/measures/tar_rulers_2018.py b/scripts/measures/tar_rulers_2018.py index 3a2b0a0..2684f06 100644 --- a/scripts/measures/tar_rulers_2018.py +++ b/scripts/measures/tar_rulers_2018.py @@ -1,8 +1,8 @@ __author__ = "Leif Azzopardi" -from measures.eval_measures_2018 import UtilityBasedMeasure, AreaBasedMeasures, MAPBasedMeasures -from measures.eval_measures_2018 import DescriptionMeasures, CountBasedMeasures, GainBasedMeasures -from measures.eval_measures_2018 import LossBasedMeasures, RecallBasedMeasures +from tar.scripts.measures.eval_measures_2018 import UtilityBasedMeasure, AreaBasedMeasures, MAPBasedMeasures +from tar.scripts.measures.eval_measures_2018 import DescriptionMeasures, CountBasedMeasures, GainBasedMeasures +from tar.scripts.measures.eval_measures_2018 import LossBasedMeasures, RecallBasedMeasures class TarAggRuler(object): diff --git a/scripts/seeker/topic_document_file_handler.py b/scripts/seeker/topic_document_file_handler.py index 7186cdd..994eeb0 100644 --- a/scripts/seeker/topic_document_file_handler.py +++ b/scripts/seeker/topic_document_file_handler.py @@ -1,8 +1,8 @@ __author__ = 'leifos' -from seeker.common_helpers import file_exists -from seeker.common_helpers import AutoVivification +from tar.scripts.seeker.common_helpers import file_exists +from tar.scripts.seeker.common_helpers import AutoVivification class TopicDocumentFileHandler(object): diff --git a/scripts/seeker/trec_qrel_handler.py b/scripts/seeker/trec_qrel_handler.py index 8ae809b..edb03ff 100644 --- a/scripts/seeker/trec_qrel_handler.py +++ b/scripts/seeker/trec_qrel_handler.py @@ -1,9 +1,9 @@ __author__ = 'leifos' -from seeker.common_helpers import file_exists -from seeker.common_helpers import AutoVivification -from seeker.topic_document_file_handler import TopicDocumentFileHandler +from tar.scripts.seeker.common_helpers import file_exists +from tar.scripts.seeker.common_helpers import AutoVivification +from tar.scripts.seeker.topic_document_file_handler import TopicDocumentFileHandler class TrecQrelHandler(TopicDocumentFileHandler): diff --git a/scripts/tar_eval.py b/scripts/tar_eval.py index 56f63c5..e0717b3 100644 --- a/scripts/tar_eval.py +++ b/scripts/tar_eval.py @@ -4,8 +4,8 @@ import os import sys import re -from measures.tar_rulers import TarRuler, TarAggRuler -from seeker.trec_qrel_handler import TrecQrelHandler +from tar.scripts.measures.tar_rulers import TarRuler, TarAggRuler +from tar.scripts.seeker.trec_qrel_handler import TrecQrelHandler def main(results_file, qrel_file): diff --git a/scripts/tar_eval_2018.py b/scripts/tar_eval_2018.py index 73ceb3c..f4adc6c 100644 --- a/scripts/tar_eval_2018.py +++ b/scripts/tar_eval_2018.py @@ -4,8 +4,8 @@ import sys import re import math -from measures.tar_rulers_2018 import TarRulerTask2, TarRulerTask1, TarAggRuler -from seeker.trec_qrel_handler import TrecQrelHandler +from tar.scripts.measures.tar_rulers_2018 import TarRulerTask2, TarRulerTask1, TarAggRuler +from tar.scripts.seeker.trec_qrel_handler import TrecQrelHandler def main(task, results_file, qrel_file): From 7b87a1a0773d2e108a64dc80da3cbfd073a1b798 Mon Sep 17 00:00:00 2001 From: Wojciech Kusa Date: Fri, 27 Jan 2023 10:07:17 +1000 Subject: [PATCH 3/3] Revert "fix: relative path import" This reverts commit 920f13f20cd2cf5bbd257832ed38bbbe8bec526b. --- scripts/measures/tar_rulers.py | 6 +++--- scripts/measures/tar_rulers_2018.py | 6 +++--- scripts/seeker/topic_document_file_handler.py | 4 ++-- scripts/seeker/trec_qrel_handler.py | 6 +++--- scripts/tar_eval.py | 4 ++-- scripts/tar_eval_2018.py | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/measures/tar_rulers.py b/scripts/measures/tar_rulers.py index 6430950..d6783a8 100644 --- a/scripts/measures/tar_rulers.py +++ b/scripts/measures/tar_rulers.py @@ -1,8 +1,8 @@ __author__ = "Leif Azzopardi" -from tar.scripts.measures.eval_measures import CostBasedMeasure, AreaBasedMeasures, MAPBasedMeasures -from tar.scripts.measures.eval_measures import DescriptionMeasures, CountBasedMeasures, GainBasedMeasures -from tar.scripts.measures.eval_measures import LossBasedMeasures +from measures.eval_measures import CostBasedMeasure, AreaBasedMeasures, MAPBasedMeasures +from measures.eval_measures import DescriptionMeasures, CountBasedMeasures, GainBasedMeasures +from measures.eval_measures import LossBasedMeasures class TarAggRuler(object): diff --git a/scripts/measures/tar_rulers_2018.py b/scripts/measures/tar_rulers_2018.py index 2684f06..3a2b0a0 100644 --- a/scripts/measures/tar_rulers_2018.py +++ b/scripts/measures/tar_rulers_2018.py @@ -1,8 +1,8 @@ __author__ = "Leif Azzopardi" -from tar.scripts.measures.eval_measures_2018 import UtilityBasedMeasure, AreaBasedMeasures, MAPBasedMeasures -from tar.scripts.measures.eval_measures_2018 import DescriptionMeasures, CountBasedMeasures, GainBasedMeasures -from tar.scripts.measures.eval_measures_2018 import LossBasedMeasures, RecallBasedMeasures +from measures.eval_measures_2018 import UtilityBasedMeasure, AreaBasedMeasures, MAPBasedMeasures +from measures.eval_measures_2018 import DescriptionMeasures, CountBasedMeasures, GainBasedMeasures +from measures.eval_measures_2018 import LossBasedMeasures, RecallBasedMeasures class TarAggRuler(object): diff --git a/scripts/seeker/topic_document_file_handler.py b/scripts/seeker/topic_document_file_handler.py index 994eeb0..7186cdd 100644 --- a/scripts/seeker/topic_document_file_handler.py +++ b/scripts/seeker/topic_document_file_handler.py @@ -1,8 +1,8 @@ __author__ = 'leifos' -from tar.scripts.seeker.common_helpers import file_exists -from tar.scripts.seeker.common_helpers import AutoVivification +from seeker.common_helpers import file_exists +from seeker.common_helpers import AutoVivification class TopicDocumentFileHandler(object): diff --git a/scripts/seeker/trec_qrel_handler.py b/scripts/seeker/trec_qrel_handler.py index edb03ff..8ae809b 100644 --- a/scripts/seeker/trec_qrel_handler.py +++ b/scripts/seeker/trec_qrel_handler.py @@ -1,9 +1,9 @@ __author__ = 'leifos' -from tar.scripts.seeker.common_helpers import file_exists -from tar.scripts.seeker.common_helpers import AutoVivification -from tar.scripts.seeker.topic_document_file_handler import TopicDocumentFileHandler +from seeker.common_helpers import file_exists +from seeker.common_helpers import AutoVivification +from seeker.topic_document_file_handler import TopicDocumentFileHandler class TrecQrelHandler(TopicDocumentFileHandler): diff --git a/scripts/tar_eval.py b/scripts/tar_eval.py index e0717b3..56f63c5 100644 --- a/scripts/tar_eval.py +++ b/scripts/tar_eval.py @@ -4,8 +4,8 @@ import os import sys import re -from tar.scripts.measures.tar_rulers import TarRuler, TarAggRuler -from tar.scripts.seeker.trec_qrel_handler import TrecQrelHandler +from measures.tar_rulers import TarRuler, TarAggRuler +from seeker.trec_qrel_handler import TrecQrelHandler def main(results_file, qrel_file): diff --git a/scripts/tar_eval_2018.py b/scripts/tar_eval_2018.py index f4adc6c..73ceb3c 100644 --- a/scripts/tar_eval_2018.py +++ b/scripts/tar_eval_2018.py @@ -4,8 +4,8 @@ import sys import re import math -from tar.scripts.measures.tar_rulers_2018 import TarRulerTask2, TarRulerTask1, TarAggRuler -from tar.scripts.seeker.trec_qrel_handler import TrecQrelHandler +from measures.tar_rulers_2018 import TarRulerTask2, TarRulerTask1, TarAggRuler +from seeker.trec_qrel_handler import TrecQrelHandler def main(task, results_file, qrel_file):