From c5930d65798935e68c8bc21a69b2b7a88bc2870f Mon Sep 17 00:00:00 2001 From: LukasBluebaum Date: Fri, 30 Oct 2020 11:18:30 +0100 Subject: [PATCH 1/2] New datasets, 1 new QA System, rename QAnswer --- pom.xml | 11 ++-- .../annotator/impl/qa/NLIWODBasedSystem.java | 4 +- src/main/properties/annotators.properties | 14 ++++-- src/main/properties/datasets.properties | 50 ++++++++++++++++++- .../database/schema/experiment-schema.sql | 8 +++ 5 files changed, 76 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index beb398806..f5e43573a 100644 --- a/pom.xml +++ b/pom.xml @@ -313,7 +313,7 @@ org.aksw.qa systems - 0.0.6-SNAPSHOT + 0.0.7-SNAPSHOT org.aksw.qa @@ -340,7 +340,7 @@ org.aksw.qa commons - 0.4.22 + 0.4.23 ch.qos.logback @@ -400,7 +400,7 @@ org.aksw.qa datasets - 0.5.17 + 0.5.18 @@ -425,6 +425,11 @@ jena-core 3.6.0 + + org.reflections + reflections + 0.9.12 + diff --git a/src/main/java/org/aksw/gerbil/annotator/impl/qa/NLIWODBasedSystem.java b/src/main/java/org/aksw/gerbil/annotator/impl/qa/NLIWODBasedSystem.java index 352b2122c..76e9a987e 100644 --- a/src/main/java/org/aksw/gerbil/annotator/impl/qa/NLIWODBasedSystem.java +++ b/src/main/java/org/aksw/gerbil/annotator/impl/qa/NLIWODBasedSystem.java @@ -38,8 +38,8 @@ public class NLIWODBasedSystem extends AbstractAnnotator implements QASystem { public static final String START_SYSTEM_NAME = "START"; public static final String YODA_SYSTEM_NAME = "YODA"; public static final String OKBQA_SYSTEM_NAME = "OKBQA"; - public static final String QANARY_SYSTEM_WIKIDATA_NAME = "wdaqua-core1 (wikidata)"; - public static final String QANARY_SYSTEM_DBPEDIA_NAME = "wdaqua-core1 (DBpedia)"; + public static final String QANARY_SYSTEM_WIKIDATA_NAME = "QAnswer (wikidata)"; + public static final String QANARY_SYSTEM_DBPEDIA_NAME = "QAnswer (DBpedia)"; public static final String GANSWER2_SYSTEM_NAME = "gAnswer2"; public static final String QUEPY = "QUEPY"; private static final int DEFAULT_WAITING_TIME = 60000; diff --git a/src/main/properties/annotators.properties b/src/main/properties/annotators.properties index bed3dfff9..1858b19a4 100644 --- a/src/main/properties/annotators.properties +++ b/src/main/properties/annotators.properties @@ -181,17 +181,17 @@ org.aksw.gerbil.annotators.definition.SINA.singleton=true #org.aksw.gerbil.annotators.definition.YODA.class=org.aksw.gerbil.annotator.impl.qa.NLIWODBasedSystem #org.aksw.gerbil.annotators.definition.YODA.constructorArgs=YODA #org.aksw.gerbil.annotators.definition.YODA.singleton=true -org.aksw.gerbil.annotators.definition.QANARYwiki.name=wdaqua-core1 (wikidata) +org.aksw.gerbil.annotators.definition.QANARYwiki.name=QAnswer (wikidata) org.aksw.gerbil.annotators.definition.QANARYwiki.experimentType=QA org.aksw.gerbil.annotators.definition.QANARYwiki.cacheable=true org.aksw.gerbil.annotators.definition.QANARYwiki.class=org.aksw.gerbil.annotator.impl.qa.NLIWODBasedSystem -org.aksw.gerbil.annotators.definition.QANARYwiki.constructorArgs=wdaqua-core1 (wikidata), http://qanswer-core1.univ-st-etienne.fr/gerbil +org.aksw.gerbil.annotators.definition.QANARYwiki.constructorArgs=QAnswer (wikidata), http://qanswer-core1.univ-st-etienne.fr/api/gerbil org.aksw.gerbil.annotators.definition.QANARYwiki.singleton=true -org.aksw.gerbil.annotators.definition.QANARYdbpedia.name=wdaqua-core1 (DBpedia) +org.aksw.gerbil.annotators.definition.QANARYdbpedia.name=QAnswer (DBpedia) org.aksw.gerbil.annotators.definition.QANARYdbpedia.experimentType=QA org.aksw.gerbil.annotators.definition.QANARYdbpedia.cacheable=true org.aksw.gerbil.annotators.definition.QANARYdbpedia.class=org.aksw.gerbil.annotator.impl.qa.NLIWODBasedSystem -org.aksw.gerbil.annotators.definition.QANARYdbpedia.constructorArgs=wdaqua-core1 (DBpedia), http://qanswer-core1.univ-st-etienne.fr/gerbil +org.aksw.gerbil.annotators.definition.QANARYdbpedia.constructorArgs=QAnswer (DBpedia), http://qanswer-core1.univ-st-etienne.fr/api/gerbil org.aksw.gerbil.annotators.definition.QANARYdbpedia.singleton=true org.aksw.gerbil.annotators.definition.OKBQA.name=OKBQA org.aksw.gerbil.annotators.definition.OKBQA.experimentType=QA @@ -235,6 +235,12 @@ org.aksw.gerbil.annotators.definition.SorokinQA.cacheable=true org.aksw.gerbil.annotators.definition.SorokinQA.class=org.aksw.gerbil.annotator.impl.qa.NLIWODBasedSystem org.aksw.gerbil.annotators.definition.SorokinQA.constructorArgs=SorokinQA org.aksw.gerbil.annotators.definition.SorokinQA.singleton=true +org.aksw.gerbil.annotators.definition.QAmp.name=QAmp +org.aksw.gerbil.annotators.definition.QAmp.experimentType=QA +org.aksw.gerbil.annotators.definition.QAmp.cacheable=true +org.aksw.gerbil.annotators.definition.QAmp.class=org.aksw.gerbil.annotator.impl.qa.NLIWODBasedSystem +org.aksw.gerbil.annotators.definition.QAmp.constructorArgs=QAmp +org.aksw.gerbil.annotators.definition.QAmp.singleton=true ### Tagme diff --git a/src/main/properties/datasets.properties b/src/main/properties/datasets.properties index 0ecb7bc63..d0c004583 100644 --- a/src/main/properties/datasets.properties +++ b/src/main/properties/datasets.properties @@ -120,7 +120,7 @@ org.aksw.gerbil.datasets.definition.Micro2013_2.experimentType=A2KB org.aksw.gerbil.datasets.definition.Micro2013_2.constructorArgs=${org.aksw.gerbil.datasets.Microposts2013DatasetConfig.test} -### N³ collection +### N� collection org.aksw.gerbil.datasets.N3_NEWS_100.file=${org.aksw.gerbil.DataPath}/datasets/N3/News-100.ttl org.aksw.gerbil.datasets.N3_REUTERS_128.file=${org.aksw.gerbil.DataPath}/datasets/N3/Reuters-128.ttl org.aksw.gerbil.datasets.N3_RSS_500.file=${org.aksw.gerbil.DataPath}/datasets/N3/RSS-500.ttl @@ -376,6 +376,18 @@ org.aksw.gerbil.datasets.definition.LCQUAD.cacheable=true org.aksw.gerbil.datasets.definition.LCQUAD.experimentType=QA org.aksw.gerbil.datasets.definition.LCQUAD.constructorArgs=LCQUAD +org.aksw.gerbil.datasets.definition.LCQUAD2_Train.name=LCQUAD2 Train +org.aksw.gerbil.datasets.definition.LCQUAD2_Train.class=org.aksw.gerbil.dataset.impl.qald.QALDDataset +org.aksw.gerbil.datasets.definition.LCQUAD2_Train.cacheable=true +org.aksw.gerbil.datasets.definition.LCQUAD2_Train.experimentType=QA +org.aksw.gerbil.datasets.definition.LCQUAD2_Train.constructorArgs=LCQUAD2_Train + +org.aksw.gerbil.datasets.definition.LCQUAD2_Test.name=LCQUAD2 Test +org.aksw.gerbil.datasets.definition.LCQUAD2_Test.class=org.aksw.gerbil.dataset.impl.qald.QALDDataset +org.aksw.gerbil.datasets.definition.LCQUAD2_Test.cacheable=true +org.aksw.gerbil.datasets.definition.LCQUAD2_Test.experimentType=QA +org.aksw.gerbil.datasets.definition.LCQUAD2_Test.constructorArgs=LCQUAD2_Test + org.aksw.gerbil.datasets.definition.SemSearch.name=DBpedia Entity SemSearch org.aksw.gerbil.datasets.definition.SemSearch.class=org.aksw.gerbil.dataset.impl.qald.QALDDataset org.aksw.gerbil.datasets.definition.SemSearch.cacheable=true @@ -414,4 +426,38 @@ org.aksw.gerbil.datasets.definition.QALD9_Test_Multilingual.cacheable=true org.aksw.gerbil.datasets.definition.QALD9_Test_Multilingual.experimentType=QA org.aksw.gerbil.datasets.definition.QALD9_Test_Multilingual.constructorArgs=QALD9_Test_Multilingual - +org.aksw.gerbil.datasets.definition.SimpleQuestions_Train.name=SimpleQuestionsWikidata Train +org.aksw.gerbil.datasets.definition.SimpleQuestions_Train.class=org.aksw.gerbil.dataset.impl.qald.QALDDataset +org.aksw.gerbil.datasets.definition.SimpleQuestions_Train.cacheable=true +org.aksw.gerbil.datasets.definition.SimpleQuestions_Train.experimentType=QA +org.aksw.gerbil.datasets.definition.SimpleQuestions_Train.constructorArgs=Simple_Question_Wikidata_Train + +org.aksw.gerbil.datasets.definition.SimpleQuestions_Test.name=SimpleQuestionsWikidata Test +org.aksw.gerbil.datasets.definition.SimpleQuestions_Test.class=org.aksw.gerbil.dataset.impl.qald.QALDDataset +org.aksw.gerbil.datasets.definition.SimpleQuestions_Test.cacheable=true +org.aksw.gerbil.datasets.definition.SimpleQuestions_Test.experimentType=QA +org.aksw.gerbil.datasets.definition.SimpleQuestions_Test.constructorArgs=Simple_Question_Wikidata_Test + +org.aksw.gerbil.datasets.definition.SimpleQuestions_Valid.name=SimpleQuestionsWikidata Valid +org.aksw.gerbil.datasets.definition.SimpleQuestions_Valid.class=org.aksw.gerbil.dataset.impl.qald.QALDDataset +org.aksw.gerbil.datasets.definition.SimpleQuestions_Valid.cacheable=true +org.aksw.gerbil.datasets.definition.SimpleQuestions_Valid.experimentType=QA +org.aksw.gerbil.datasets.definition.SimpleQuestions_Valid.constructorArgs=Simple_Question_Wikidata_Valid + +org.aksw.gerbil.datasets.definition.EventQA_DBpedia.name=EventQA (DBpedia) +org.aksw.gerbil.datasets.definition.EventQA_DBpedia.class=org.aksw.gerbil.dataset.impl.qald.QALDDataset +org.aksw.gerbil.datasets.definition.EventQA_DBpedia.cacheable=true +org.aksw.gerbil.datasets.definition.EventQA_DBpedia.experimentType=QA +org.aksw.gerbil.datasets.definition.EventQA_DBpedia.constructorArgs=EventQA_DBpedia + +org.aksw.gerbil.datasets.definition.EventQA_EventKG.name=EventQA (EventKG) +org.aksw.gerbil.datasets.definition.EventQA_EventKG.class=org.aksw.gerbil.dataset.impl.qald.QALDDataset +org.aksw.gerbil.datasets.definition.EventQA_EventKG.cacheable=true +org.aksw.gerbil.datasets.definition.EventQA_EventKG.experimentType=QA +org.aksw.gerbil.datasets.definition.EventQA_EventKG.constructorArgs=EventQA_EventKG + +org.aksw.gerbil.datasets.definition.Wdaqua_core0_logs.name=WDAquaCore0Logs +org.aksw.gerbil.datasets.definition.Wdaqua_core0_logs.class=org.aksw.gerbil.dataset.impl.qald.QALDDataset +org.aksw.gerbil.datasets.definition.Wdaqua_core0_logs.cacheable=true +org.aksw.gerbil.datasets.definition.Wdaqua_core0_logs.experimentType=QA +org.aksw.gerbil.datasets.definition.Wdaqua_core0_logs.constructorArgs=Wdaqua_Core0_Logs \ No newline at end of file diff --git a/src/main/resources/spring/database/schema/experiment-schema.sql b/src/main/resources/spring/database/schema/experiment-schema.sql index bf8512a36..993cfc382 100644 --- a/src/main/resources/spring/database/schema/experiment-schema.sql +++ b/src/main/resources/spring/database/schema/experiment-schema.sql @@ -50,3 +50,11 @@ subTaskId int NOT NULL, PRIMARY KEY (taskId, subTaskId) ); +-- Rename wdaqua-core1 dataset +UPDATE ExperimentTasks +SET annotatorName = 'QAnswer (wikidata)' +WHERE annotatorName = 'wdaqua-core1 (wikidata)'; + +UPDATE ExperimentTasks +SET annotatorName = 'QAnswer (DBpedia)' +WHERE annotatorName = 'wdaqua-core1 (DBpedia)'; From af5c70213556b3110f486ea65e9beed2993e202b Mon Sep 17 00:00:00 2001 From: LukasBluebaum Date: Tue, 8 Dec 2020 23:42:31 +0100 Subject: [PATCH 2/2] Comment out not reachable systems --- src/main/properties/annotators.properties | 60 +++++++++++------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main/properties/annotators.properties b/src/main/properties/annotators.properties index 1858b19a4..e3b0656e6 100644 --- a/src/main/properties/annotators.properties +++ b/src/main/properties/annotators.properties @@ -157,18 +157,18 @@ org.aksw.gerbil.annotators.definition.NERD.constructorArgs=${org.aksw.gerbil.ann #org.aksw.gerbil.annotators.definition.HAWK.class=org.aksw.gerbil.annotator.impl.qa.NLIWODBasedSystem #org.aksw.gerbil.annotators.definition.HAWK.constructorArgs=HAWK #org.aksw.gerbil.annotators.definition.HAWK.singleton=true -org.aksw.gerbil.annotators.definition.QAKIS.name=QAKIS -org.aksw.gerbil.annotators.definition.QAKIS.experimentType=QA -org.aksw.gerbil.annotators.definition.QAKIS.cacheable=true -org.aksw.gerbil.annotators.definition.QAKIS.class=org.aksw.gerbil.annotator.impl.qa.NLIWODBasedSystem -org.aksw.gerbil.annotators.definition.QAKIS.constructorArgs=QAKIS -org.aksw.gerbil.annotators.definition.QAKIS.singleton=true -org.aksw.gerbil.annotators.definition.SINA.name=SINA -org.aksw.gerbil.annotators.definition.SINA.experimentType=QA -org.aksw.gerbil.annotators.definition.SINA.cacheable=true -org.aksw.gerbil.annotators.definition.SINA.class=org.aksw.gerbil.annotator.impl.qa.NLIWODBasedSystem -org.aksw.gerbil.annotators.definition.SINA.constructorArgs=SINA -org.aksw.gerbil.annotators.definition.SINA.singleton=true +#org.aksw.gerbil.annotators.definition.QAKIS.name=QAKIS +#org.aksw.gerbil.annotators.definition.QAKIS.experimentType=QA +#org.aksw.gerbil.annotators.definition.QAKIS.cacheable=true +#org.aksw.gerbil.annotators.definition.QAKIS.class=org.aksw.gerbil.annotator.impl.qa.NLIWODBasedSystem +#org.aksw.gerbil.annotators.definition.QAKIS.constructorArgs=QAKIS +#org.aksw.gerbil.annotators.definition.QAKIS.singleton=true +#org.aksw.gerbil.annotators.definition.SINA.name=SINA +#org.aksw.gerbil.annotators.definition.SINA.experimentType=QA +#org.aksw.gerbil.annotators.definition.SINA.cacheable=true +#org.aksw.gerbil.annotators.definition.SINA.class=org.aksw.gerbil.annotator.impl.qa.NLIWODBasedSystem +#org.aksw.gerbil.annotators.definition.SINA.constructorArgs=SINA +#org.aksw.gerbil.annotators.definition.SINA.singleton=true #org.aksw.gerbil.annotators.definition.START.name=START #org.aksw.gerbil.annotators.definition.START.experimentType=QA #org.aksw.gerbil.annotators.definition.START.cacheable=true @@ -205,12 +205,12 @@ org.aksw.gerbil.annotators.definition.GANSWER2.cacheable=true org.aksw.gerbil.annotators.definition.GANSWER2.class=org.aksw.gerbil.annotator.impl.qa.NLIWODBasedSystem org.aksw.gerbil.annotators.definition.GANSWER2.constructorArgs=gAnswer2, http://59.108.48.18:8080/gAnswer2/api/qald.jsp org.aksw.gerbil.annotators.definition.GANSWER2.singleton=true -org.aksw.gerbil.annotators.definition.QUEPY.name=QUEPY -org.aksw.gerbil.annotators.definition.QUEPY.experimentType=QA -org.aksw.gerbil.annotators.definition.QUEPY.cacheable=true -org.aksw.gerbil.annotators.definition.QUEPY.class=org.aksw.gerbil.annotator.impl.qa.NLIWODBasedSystem -org.aksw.gerbil.annotators.definition.QUEPY.constructorArgs=QUEPY, http://quepy.machinalis.com/engine/get_query -org.aksw.gerbil.annotators.definition.QUEPY.singleton=true +#org.aksw.gerbil.annotators.definition.QUEPY.name=QUEPY +#org.aksw.gerbil.annotators.definition.QUEPY.experimentType=QA +#org.aksw.gerbil.annotators.definition.QUEPY.cacheable=true +#org.aksw.gerbil.annotators.definition.QUEPY.class=org.aksw.gerbil.annotator.impl.qa.NLIWODBasedSystem +#org.aksw.gerbil.annotators.definition.QUEPY.constructorArgs=QUEPY, http://quepy.machinalis.com/engine/get_query +#org.aksw.gerbil.annotators.definition.QUEPY.singleton=true org.aksw.gerbil.annotators.definition.Platypus.name=Platypus org.aksw.gerbil.annotators.definition.Platypus.experimentType=QA org.aksw.gerbil.annotators.definition.Platypus.cacheable=true @@ -223,18 +223,18 @@ org.aksw.gerbil.annotators.definition.TeBaQA.cacheable=true org.aksw.gerbil.annotators.definition.TeBaQA.class=org.aksw.gerbil.annotator.impl.qa.NLIWODBasedSystem org.aksw.gerbil.annotators.definition.TeBaQA.constructorArgs=TeBaQA org.aksw.gerbil.annotators.definition.TeBaQA.singleton=true -org.aksw.gerbil.annotators.definition.AskNow.name=AskNow -org.aksw.gerbil.annotators.definition.AskNow.experimentType=QA -org.aksw.gerbil.annotators.definition.AskNow.cacheable=true -org.aksw.gerbil.annotators.definition.AskNow.class=org.aksw.gerbil.annotator.impl.qa.NLIWODBasedSystem -org.aksw.gerbil.annotators.definition.AskNow.constructorArgs=AskNow -org.aksw.gerbil.annotators.definition.AskNow.singleton=true -org.aksw.gerbil.annotators.definition.SorokinQA.name=SorokinQA -org.aksw.gerbil.annotators.definition.SorokinQA.experimentType=QA -org.aksw.gerbil.annotators.definition.SorokinQA.cacheable=true -org.aksw.gerbil.annotators.definition.SorokinQA.class=org.aksw.gerbil.annotator.impl.qa.NLIWODBasedSystem -org.aksw.gerbil.annotators.definition.SorokinQA.constructorArgs=SorokinQA -org.aksw.gerbil.annotators.definition.SorokinQA.singleton=true +#org.aksw.gerbil.annotators.definition.AskNow.name=AskNow +#org.aksw.gerbil.annotators.definition.AskNow.experimentType=QA +#org.aksw.gerbil.annotators.definition.AskNow.cacheable=true +#org.aksw.gerbil.annotators.definition.AskNow.class=org.aksw.gerbil.annotator.impl.qa.NLIWODBasedSystem +#org.aksw.gerbil.annotators.definition.AskNow.constructorArgs=AskNow +#org.aksw.gerbil.annotators.definition.AskNow.singleton=true +#org.aksw.gerbil.annotators.definition.SorokinQA.name=SorokinQA +#org.aksw.gerbil.annotators.definition.SorokinQA.experimentType=QA +#org.aksw.gerbil.annotators.definition.SorokinQA.cacheable=true +#org.aksw.gerbil.annotators.definition.SorokinQA.class=org.aksw.gerbil.annotator.impl.qa.NLIWODBasedSystem +#org.aksw.gerbil.annotators.definition.SorokinQA.constructorArgs=SorokinQA +#org.aksw.gerbil.annotators.definition.SorokinQA.singleton=true org.aksw.gerbil.annotators.definition.QAmp.name=QAmp org.aksw.gerbil.annotators.definition.QAmp.experimentType=QA org.aksw.gerbil.annotators.definition.QAmp.cacheable=true