pass options to the executer

gadelrab · May 9, 2019 · aea978c · aea978c
1 parent edf3473
commit aea978c
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 19 deletions.
diff --git a/Api/src/main/java/web/data/Query.java b/Api/src/main/java/web/data/Query.java
@@ -2,6 +2,7 @@
 
 
 import com.google.gson.Gson;
+import extendedsldnf.datastructure.TextualSource;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/Demo b/Demo
diff --git a/QueryRewriting/pom.xml b/QueryRewriting/pom.xml
@@ -190,6 +190,12 @@
             <groupId>factchecking</groupId>
             <artifactId>fact-spotting</artifactId>
             <version>1.0</version>
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>factchecking</groupId>-->
+<!--                    <artifactId>api</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
         </dependency>
 
         <dependency>
@@ -217,8 +223,12 @@
             <artifactId>slf4j-log4j12</artifactId>
             <version>1.7.25</version>
         </dependency>
-
-
+<!--        <dependency>-->
+<!--            <groupId>factchecking</groupId>-->
+<!--            <artifactId>api</artifactId>-->
+<!--            <version>1.0</version>-->
+<!--            <scope>compile</scope>-->
+<!--        </dependency>-->
 
 
     </dependencies>

diff --git a/QueryRewriting/src/main/java/checker/ExplanationsExtractor.java b/QueryRewriting/src/main/java/checker/ExplanationsExtractor.java
@@ -7,6 +7,7 @@
 import extendedsldnf.datastructure.IExtendedFacts;
 import extendedsldnf.datastructure.IQueryExplanations;
 import extendedsldnf.datastructure.InputQuery;
+import extendedsldnf.datastructure.TextualSource;
 import org.deri.iris.ConfigurationThreadLocalStorage;
 import org.deri.iris.api.basics.IQuery;
 import org.deri.iris.api.basics.IRule;
@@ -122,8 +123,9 @@ private ExplanationsExtractor() {
 
     }
 
-
-
+    public static synchronized ExplanationsExtractor getInstance(){
+        return explanationsExtractor;
+    }
 
     @Override
     public IQueryExplanations check(InputQuery query) {
@@ -154,8 +156,8 @@ public IQueryExplanations check(InputQuery query,Collection<IRule> specificRules
 
             RecSLDEvaluator evaluator ;
             EvaluatorFactory evaluatorFactory=new EvaluatorFactory(config);
-            List<IExtendedFacts> usedFactSources = getUsedFactResources(Arrays.asList("yago", "dbpedia"));
-            List<ITextConnector> usedTextualResources = getUsedTextualResources(Arrays.asList("wiki", "bing"));
+            List<IExtendedFacts> usedFactSources = getUsedFactResources(query.getKgs());//getUsedFactResources(Arrays.asList("yago", "dbpedia"));
+            List<ITextConnector> usedTextualResources = getUsedTextualResources(query.getTextualSources());//getUsedTextualResources(Arrays.asList("wiki", "bing"));
 //            evaluator = evaluatorFactory.getEvaluator(facts, rules);
             evaluator = evaluatorFactory.getEvaluator(usedFactSources, usedTextualResources, rules);
             IQueryExplanations relation = evaluator.getExplanation(query.getIQuery());
@@ -166,13 +168,9 @@ public IQueryExplanations check(InputQuery query,Collection<IRule> specificRules
         return null;
     }
 
-    private List<ITextConnector> getUsedTextualResources(List<String> strings) {
+    private List<ITextConnector> getUsedTextualResources(List<TextualSource> textualSources) {
         return Arrays.asList(new FactSpottingConnector(config));
     }
-
-    private List<IExtendedFacts> getUsedFactResources(List<String> strings) {
-        return facts;
-    }
 //
 //    @Override
 //    public IQueryExplanations check(Fact fact, Collection<IRule> ruleSet) {
@@ -196,9 +194,8 @@ private List<IExtendedFacts> getUsedFactResources(List<String> strings) {
 //
 //    }
 
-
-    public static synchronized ExplanationsExtractor getInstance(){
-        return explanationsExtractor;
+    private List<IExtendedFacts> getUsedFactResources(List<String> strings) {
+        return facts;
     }
 
 

diff --git a/QueryRewriting/src/main/java/extendedsldnf/datastructure/InputQuery.java b/QueryRewriting/src/main/java/extendedsldnf/datastructure/InputQuery.java
@@ -4,12 +4,20 @@
 import org.deri.iris.api.basics.IQuery;
 import utils.Converter;
 
+import java.util.List;
+
 public class InputQuery {
 
     private BinaryFact ntQuery;
     private  IQuery iQuery;
-int order;
-int label;
+    int order;
+    int label;
+
+
+    List<TextualSource> textualSources;
+    List<String> kgs;
+
+
 
 
     public InputQuery(IQuery query, int order,int label) {
@@ -40,6 +48,46 @@ public int getLabel() {
         return label;
     }
 
+    public BinaryFact getNtQuery() {
+        return ntQuery;
+    }
+
+    public void setNtQuery(BinaryFact ntQuery) {
+        this.ntQuery = ntQuery;
+    }
+
+    public IQuery getiQuery() {
+        return iQuery;
+    }
+
+    public void setiQuery(IQuery iQuery) {
+        this.iQuery = iQuery;
+    }
+
+    public void setOrder(int order) {
+        this.order = order;
+    }
+
+    public void setLabel(int label) {
+        this.label = label;
+    }
+
+    public List<TextualSource> getTextualSources() {
+        return textualSources;
+    }
+
+    public void setTextualSources(List<TextualSource> textualSources) {
+        this.textualSources = textualSources;
+    }
+
+    public List<String> getKgs() {
+        return kgs;
+    }
+
+    public void setKgs(List<String> kgs) {
+        this.kgs = kgs;
+    }
+
     @Override
     public String toString() {
         return

diff --git a/...src/main/java/web/data/TextualSource.java → ...dedsldnf/datastructure/TextualSource.java b/...src/main/java/web/data/TextualSource.java → ...dedsldnf/datastructure/TextualSource.java
@@ -1,4 +1,4 @@
-package web.data;
+package extendedsldnf.datastructure;
 
 public class TextualSource {
 

diff --git a/WebService2/app/controllers/Explanations.java b/WebService2/app/controllers/Explanations.java
@@ -70,6 +70,9 @@ public Result explain(){
 
         // parseRulesAs
 
+
+
+
         Parser parser=new Parser();
 
         List<IRule> ruleList=null;
@@ -81,8 +84,13 @@ public Result explain(){
             e.printStackTrace();
         }
 
+        InputQuery inputQuery=new InputQuery(new BinaryFact(q.getSubject(),q.getPredicate(),q.getObject()),0,0);
+
+        inputQuery.setTextualSources(q.getTextualSources());
+        inputQuery.setKg(q.getKg());
+
 
-        IQueryExplanations explanations = explanationsExtractor.check( new InputQuery(new BinaryFact(q.getSubject(),q.getPredicate(),q.getObject()),0,0),ruleList);
+        IQueryExplanations explanations = explanationsExtractor.check( inputQuery,ruleList);
         System.out.println(explanations);
         Gson gson=CustomGson.getInstance().getGson();