Merged updates from upstream.

4 files changed, 94 insertions, 76 deletions

diff --git a/src/uk/ac/ox/cs/pagoda/endomorph/Clique.java b/src/uk/ac/ox/cs/pagoda/endomorph/Clique.java
index 1c269ea..9b0d88e 100644
--- a/src/uk/ac/ox/cs/pagoda/endomorph/Clique.java
+++ b/src/uk/ac/ox/cs/pagoda/endomorph/Clique.java
@@ -1,11 +1,11 @@
 package uk.ac.ox.cs.pagoda.endomorph;
 
+import uk.ac.ox.cs.pagoda.summary.NodeTuple;
+
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import uk.ac.ox.cs.pagoda.summary.NodeTuple;
-
 public class Clique {
         NodeTuple representative; 
         Set<NodeTuple> nodeTuples = null; 
@@ -13,6 +13,7 @@ public class Clique {
         public Clique(NodeTuple u) {
                 nodeTuples = new HashSet<NodeTuple>(); 
                 representative = u;
+                nodeTuples.add(u);
         }
 
         public boolean addNodeTuple(NodeTuple nodeTuple) {
diff --git a/src/uk/ac/ox/cs/pagoda/endomorph/plan/OpenEndMultiThreadPlan.java b/src/uk/ac/ox/cs/pagoda/endomorph/plan/OpenEndMultiThreadPlan.java
index 8c7ce6a..862fdc8 100644
--- a/src/uk/ac/ox/cs/pagoda/endomorph/plan/OpenEndMultiThreadPlan.java
+++ b/src/uk/ac/ox/cs/pagoda/endomorph/plan/OpenEndMultiThreadPlan.java
@@ -1,88 +1,81 @@
 package uk.ac.ox.cs.pagoda.endomorph.plan;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import uk.ac.ox.cs.pagoda.endomorph.DependencyGraph;
 import uk.ac.ox.cs.pagoda.endomorph.Clique;
+import uk.ac.ox.cs.pagoda.endomorph.DependencyGraph;
 import uk.ac.ox.cs.pagoda.query.AnswerTuple;
 import uk.ac.ox.cs.pagoda.reasoner.full.Checker;
 import uk.ac.ox.cs.pagoda.reasoner.full.HermitChecker;
 import uk.ac.ox.cs.pagoda.util.Utility;
 
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.atomic.AtomicInteger;
+
 public class OpenEndMultiThreadPlan implements CheckPlan {
         
-        Checker checker; 
-        DependencyGraph dGraph; 
-
+        Checker checker;
+        DependencyGraph dGraph;
+        //      Clique[] topo;
+//      AtomicInteger open, end;
+        ConcurrentLinkedDeque<Clique> topo;
+        Set<Clique> validated, falsified;
+        AtomicInteger counter = new AtomicInteger();
+        
         public OpenEndMultiThreadPlan(Checker checker, DependencyGraph dGraph) {
-                this.checker = checker; 
+                this.checker = checker;
                 this.dGraph = dGraph;
         }
-        
-//      Clique[] topo;
-//      AtomicInteger open, end; 
-        ConcurrentLinkedDeque<Clique> topo; 
-        
-        Set<Clique> validated, falsified; 
-        
+
         @Override
         public int check() {
                 Collection<Clique> cliques = dGraph.getTopologicalOrder();
 //              topo = new LinkedBlockingDeque<Clique>(cliques);
-                topo = new ConcurrentLinkedDeque<Clique>(cliques); 
-                
+                topo = new ConcurrentLinkedDeque<Clique>(cliques);
+
 //              topo = new Clique[cliques.size()];
-//              int index = 0; 
+//              int index = 0;
 //              for (Clique clique: cliques) topo[index++] = clique;
-//              open = new AtomicInteger(); 
-//              end = new AtomicInteger(cliques.size() - 1); 
-                        
-//              validated = Collections.synchronizedSet(new HashSet<Clique>()); 
+//              open = new AtomicInteger();
+//              end = new AtomicInteger(cliques.size() - 1);
+
+//              validated = Collections.synchronizedSet(new HashSet<Clique>());
 //              falsified = Collections.synchronizedSet(new HashSet<Clique>());
-                validated = Collections.newSetFromMap(new ConcurrentHashMap<Clique, Boolean>()); 
-                falsified = Collections.newSetFromMap(new ConcurrentHashMap<Clique, Boolean>()); 
+                validated = Collections.newSetFromMap(new ConcurrentHashMap<Clique, Boolean>());
+                falsified = Collections.newSetFromMap(new ConcurrentHashMap<Clique, Boolean>());
 
-                int numOfThreads = 10; 
-                Collection<Thread> threads = new LinkedList<Thread>(); 
-                for (int i = 0; i < numOfThreads; ++i) 
+                int numOfThreads = 10;
+                Collection<Thread> threads = new LinkedList<Thread>();
+                for(int i = 0; i < numOfThreads; ++i)
                         threads.add(new Thread(new SubThread(new HermitChecker(checker), i)));
-                
+
                 for (Thread thread: threads) thread.start();
-                
+
                 for (Thread thread: threads) {
                         try {
                                 thread.join();
                         } catch (InterruptedException e) {
                                 e.printStackTrace();
-                        } 
+                        }
                 }
-                
-                Utility.logDebug("HermiT was called " + counter.get() + " times."); 
-                
-                int count = 0; 
+
+                Utility.logDebug("HermiT was called " + counter.get() + " times.");
+
+                int count = 0;
                 for (Clique c: dGraph.getTopologicalOrder()) {
                         if (validated.contains(c))
-                                count += c.getNodeTuples().size() + 1; 
+                                count += c.getNodeTuples().size();
                 }
-                return count;           
+                return count;
         }
 
         private void setMarkCascadely(Clique clique, Set<Clique> marked, Map<Clique, Collection<Clique>> edges) {
-                marked.add(clique); 
+                marked.add(clique);
                 if (edges.containsKey(clique))
                         for (Clique c: edges.get(clique))
-                                if (!marked.contains(c)) 
+                                if(!marked.contains(c))
                                         setMarkCascadely(c, marked, edges);
         }
-        
-        AtomicInteger counter = new AtomicInteger(); 
 
         class SubThread implements Runnable {
                 
diff --git a/src/uk/ac/ox/cs/pagoda/endomorph/plan/OpenEndPlan.java b/src/uk/ac/ox/cs/pagoda/endomorph/plan/OpenEndPlan.java
index 19d567a..3294c31 100644
--- a/src/uk/ac/ox/cs/pagoda/endomorph/plan/OpenEndPlan.java
+++ b/src/uk/ac/ox/cs/pagoda/endomorph/plan/OpenEndPlan.java
@@ -17,37 +17,39 @@ public class OpenEndPlan implements CheckPlan {
         public static final int TIME_OUT_MIN = 1; 
         
         Checker checker; 
-        DependencyGraph dGraph; 
-        QueryRecord m_record; 
-
+        DependencyGraph dGraph;
+        QueryRecord m_record;
+        int m_answerArity;
+        Set<Clique> validated = new HashSet<Clique>();
+        Set<Clique> falsified = new HashSet<Clique>();
+        Set<AnswerTuple> passedAnswers = new HashSet<AnswerTuple>();
         public OpenEndPlan(Checker checker, DependencyGraph dGraph, QueryRecord record) {
-                this.checker = checker; 
+                this.checker = checker;
                 this.dGraph = dGraph;
-                m_record = record; 
+                m_record = record;
+                m_answerArity = record.getAnswerVariables().length;
         }
         
         @Override
         public int check() {
-                Deque<Clique> topo = new LinkedList<Clique>(dGraph.getTopologicalOrder());
+                LinkedList<Clique> topo = new LinkedList<Clique>(dGraph.getTopologicalOrder());
                 Utility.logInfo("Entrances: " + dGraph.getEntrances().size() + " Exists: " + dGraph.getExits().size()); 
-                Set<Clique> validated = new HashSet<Clique>(); 
-                Set<Clique> falsified = new HashSet<Clique>(); 
 
                 boolean flag = true;
-                Clique clique; 
-                Timer t = new Timer(); 
-                
+                Clique clique;
+                Timer t = new Timer();
 
-                AnswerTuple answerTuple; 
+                AnswerTuple answerTuple;
                 while (!topo.isEmpty()) { 
                         if (flag) {
-                                clique = topo.removeFirst(); 
+                                clique = topo.removeFirst();
+                                if(redundant(clique)) continue;
                                 if (validated.contains(clique)) continue; 
                                 if (falsified.contains(clique)) { flag = false; continue; }
                                 Utility.logDebug("start checking front ... " + (answerTuple = clique.getRepresentative().getAnswerTuple())); 
                                 if (checker.check(answerTuple)) {
                                         Utility.logDebug(answerTuple.toString() + " is verified.");
-                                        setMarkCascadely(clique, validated, dGraph.getOutGoingEdges()); 
+                                        setMarkCascadelyValidated(clique); 
                                 }
                                 else {
                                         falsified.add(clique);
@@ -58,12 +60,12 @@ public class OpenEndPlan implements CheckPlan {
                                 clique = topo.removeLast(); 
                                 if (falsified.contains(clique)) continue; 
                                 if (validated.contains(clique)) { flag = true; continue; }
-                                Utility.logDebug("start checking back ... " + (answerTuple = clique.getRepresentative().getAnswerTuple())); 
-                                if (!checker.check(answerTuple)) 
-                                        setMarkCascadely(clique, falsified, dGraph.getInComingEdges()); 
+                                Utility.logDebug("start checking back ... " + (answerTuple = clique.getRepresentative().getAnswerTuple()));
+                                if(!checker.check(answerTuple))
+                                        setMarkCascadelyFasified(clique); 
                                 else {
                                         Utility.logDebug(answerTuple.toString() + " is verified.");
-                                        validated.add(clique);
+                                        addProjections(clique); 
                                         flag = true; 
                                 }
                         }
@@ -76,9 +78,8 @@ public class OpenEndPlan implements CheckPlan {
                 Collection<AnswerTuple> validAnswers = new LinkedList<AnswerTuple>(); 
                 for (Clique c: dGraph.getTopologicalOrder()) 
                         if (validated.contains(c)) {
-                                count += c.getNodeTuples().size() + 1;
-                                validAnswers.add(c.getRepresentative().getAnswerTuple()); 
-                                
+                                count += c.getNodeTuples().size();
+//                              validAnswers.add(c.getRepresentative().getAnswerTuple()); 
                                 for (NodeTuple nodeTuple: c.getNodeTuples()) {
                                         ans = nodeTuple.getAnswerTuple(); 
                                         validAnswers.add(ans);
@@ -91,12 +92,35 @@ public class OpenEndPlan implements CheckPlan {
                 return count;           
         }
 
-        private void setMarkCascadely(Clique clique, Set<Clique> marked, Map<Clique, Collection<Clique>> edges) {
-                marked.add(clique); 
+        private boolean redundant(Clique clique) {
+                for(NodeTuple nodeTuple : clique.getNodeTuples())
+                        if(!passedAnswers.contains(AnswerTuple.getInstance(nodeTuple.getAnswerTuple(), m_answerArity)))
+                                return false;
+                return true;
+        }
+
+        private void addProjections(Clique clique) {
+                for(NodeTuple nodeTuple : clique.getNodeTuples())
+                        passedAnswers.add(AnswerTuple.getInstance(nodeTuple.getAnswerTuple(), m_answerArity));
+        }
+
+        private void setMarkCascadelyValidated(Clique clique) {
+                validated.add(clique);
+                addProjections(clique);
+                Map<Clique, Collection<Clique>> edges = dGraph.getOutGoingEdges(); 
                 if (edges.containsKey(clique))
                         for (Clique c: edges.get(clique))
-                                if (!marked.contains(c)) 
-                                        setMarkCascadely(c, marked, edges);
+                                if(!validated.contains(c))
+                                        setMarkCascadelyValidated(c);
+        }
+
+        private void setMarkCascadelyFasified(Clique clique) {
+                falsified.add(clique);
+                Map<Clique, Collection<Clique>> edges = dGraph.getInComingEdges();
+                if(edges.containsKey(clique))
+                        for(Clique c : edges.get(clique))
+                                if(!falsified.contains(c))
+                                        setMarkCascadelyFasified(c);
         }
 
 }
diff --git a/src/uk/ac/ox/cs/pagoda/endomorph/plan/PlainPlan.java b/src/uk/ac/ox/cs/pagoda/endomorph/plan/PlainPlan.java
index d6067d0..5e1a700 100644
--- a/src/uk/ac/ox/cs/pagoda/endomorph/plan/PlainPlan.java
+++ b/src/uk/ac/ox/cs/pagoda/endomorph/plan/PlainPlan.java
@@ -1,12 +1,12 @@
 package uk.ac.ox.cs.pagoda.endomorph.plan;
 
-import java.util.Set;
-
 import uk.ac.ox.cs.pagoda.endomorph.Clique;
 import uk.ac.ox.cs.pagoda.reasoner.full.Checker;
 import uk.ac.ox.cs.pagoda.summary.NodeTuple;
 import uk.ac.ox.cs.pagoda.util.Utility;
 
+import java.util.Set;
+
 public class PlainPlan implements CheckPlan {
         
         Checker checker; 
@@ -22,7 +22,7 @@ public class PlainPlan implements CheckPlan {
                 int count = 0; 
                 for (Clique clique: toCheck)
                         if (checker.check(clique.getRepresentative().getAnswerTuple())) {
-                                count += clique.getNodeTuples().size() + 1; 
+                                count += clique.getNodeTuples().size(); 
                                 for (NodeTuple nodeTuple: clique.getNodeTuples()) 
                                         Utility.logDebug(nodeTuple.getAnswerTuple().toString());
                         }