Merge branch 'add-new-system-tests-for-next-and-call' of https://github.com/nus-cs3203/team20-win-spa-20s1 into add-new-system-tests-for-next-and-call

Author: Ruicong Zhu

Team20/Code20/AutoTester/AutoTester.vcxproj.user

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerCommandArguments> ..\Tests\Sample_source.txt ..\Tests\Sample_queries.txt ..\..\Tests20\out.xml</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments> ..\..\Tests20\iteration2\system_test_1_source.txt ..\..\Tests20\system_test_1_queries.txt ..\..\Tests20\out.xml</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerCommandArguments> ..\Tests\Sample_source.txt ..\Tests\Sample_queries.txt ..\..\Tests20\out.xml</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments> ..\..\Tests20\iteration2\system_test_1_source.txt ..\..\Tests20\system_test_1_queries.txt ..\..\Tests20\out.xml</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
-</Project>
+</Project>

Team20/Code20/UnitTesting/TestPQLEvaluator.cpp

@@ -393,7 +393,7 @@ TEST_METHOD(TestEvaluationTable_Slice) {
      | 1 |
    */
   EvaluationTable expected = EvaluationTable(new TABLE({{"s", {"1"}}}));
-  EvaluationTable actual = table.slice({"s"});
+  EvaluationTable actual = table.sliceSymbols({"s"});
   Assert::IsTrue(expected == actual);
 
   /* Two columns, one unique entry
@@ -402,7 +402,7 @@ TEST_METHOD(TestEvaluationTable_Slice) {
      | 1 | 2 |
    */
   expected = EvaluationTable(new TABLE({{"s", {"1"}}, {"a", {"2"}}}));
-  actual = table.slice({"s", "a"});
+  actual = table.sliceSymbols({"s", "a"});
   Assert::IsTrue(expected == actual);
 
   /* Three columns, multiple unique entries
@@ -413,7 +413,7 @@ TEST_METHOD(TestEvaluationTable_Slice) {
    */
   expected = EvaluationTable(
       new TABLE({{"s", {"1", "1"}}, {"a", {"2", "2"}}, {"v", {"w", "x"}}}));
-  actual = table.slice({"s", "a", "v"});
+  actual = table.sliceSymbols({"s", "a", "v"});
   Assert::IsTrue(expected == actual);
 
   /* Three columns, multiple unique entries
@@ -426,7 +426,7 @@ TEST_METHOD(TestEvaluationTable_Slice) {
   expected = EvaluationTable(new TABLE({{"s", {"1", "1", "1"}},
                                         {"v", {"w", "x", "x"}},
                                         {"p", {"gonna", "give", "up"}}}));
-  actual = table.slice({"s", "v", "p"});
+  actual = table.sliceSymbols({"s", "v", "p"});
   Assert::IsTrue(expected == actual);
 }
 

Team20/Code20/source/DispatcherGraph.cpp

@@ -13,15 +13,16 @@ void DispatcherGraph::addDispatcher(ClauseDispatcher *dispatcher) {
   if (contains(dispatcher)) {
     throw "Error: dispatcher already exists in graph";
   }
-  if (!symbols.empty()) {
+  if (!symbolsToClauseDispatchersMap.empty()) {
     ensureHasOneCommonSymbolWith(dispatcher);
   }
   adjacencyList[dispatcher] = EDGES();
   for (const auto &symbol : dispatcher->getSymbols()) {
     if (!contains(symbol)) {
-      symbols[symbol] = CLAUSE_DISPATCHER_SET();
+      symbolsToClauseDispatchersMap[symbol] = CLAUSE_DISPATCHER_SET();
     }
-    for (const auto &associatedDispatcher : symbols[symbol]) {
+    for (const auto &associatedDispatcher :
+         symbolsToClauseDispatchersMap[symbol]) {
       int weight = countCommonSymbols(dispatcher, associatedDispatcher) * 2;
       adjacencyList.at(dispatcher)
           .insert(Edge{
@@ -35,7 +36,8 @@ void DispatcherGraph::addDispatcher(ClauseDispatcher *dispatcher) {
               weight,
           });
     }
-    symbols.at(symbol).insert(dispatcher);
+    symbolsToClauseDispatchersMap.at(symbol).insert(dispatcher);
+    symbols.insert(symbol);
   }
   totalPriority += dispatcher->dispatchPriority();
 }
@@ -53,7 +55,7 @@ int DispatcherGraph::countCommonSymbols(ClauseDispatcher *first,
 
 void DispatcherGraph::ensureSymbolsNotContainedInOtherGraph(
     const DispatcherGraph *otherGraph) const {
-  for (const auto &symbolPair : symbols) {
+  for (const auto &symbolPair : symbolsToClauseDispatchersMap) {
     if (otherGraph->contains(symbolPair.first)) {
       throw "ERROR: There exists common symbol between the two graphs";
     }
@@ -63,7 +65,7 @@ void DispatcherGraph::ensureSymbolsNotContainedInOtherGraph(
 void DispatcherGraph::ensureHasOneCommonSymbolWith(
     ClauseDispatcher *dispatcher) const {
   for (const auto &symbol : dispatcher->getSymbols()) {
-    if (mapContains(symbols, symbol)) {
+    if (mapContains(symbolsToClauseDispatchersMap, symbol)) {
       return;
     }
   }
@@ -80,15 +82,18 @@ void DispatcherGraph::merge(DispatcherGraph &otherGraph,
   for (const auto &[clause, edges] : otherGraph.adjacencyList) {
     adjacencyList[clause].insert(edges.begin(), edges.end());
   }
-  for (const auto &[symbol, clauses] : otherGraph.symbols) {
-    symbols[symbol].insert(clauses.begin(), clauses.end());
+  for (const auto &[symbol, clauses] :
+       otherGraph.symbolsToClauseDispatchersMap) {
+    symbolsToClauseDispatchersMap[symbol].insert(clauses.begin(),
+                                                 clauses.end());
   }
   totalPriority += otherGraph.totalPriority;
+  symbols.insert(otherGraph.symbols.begin(), otherGraph.symbols.end());
   addDispatcher(dispatcher);
 }
 
 bool DispatcherGraph::contains(SYMBOL symbol) const {
-  return mapContains(symbols, symbol);
+  return mapContains(symbolsToClauseDispatchersMap, symbol);
 }
 
 bool DispatcherGraph::contains(ClauseDispatcher *clauseDispatcher) const {
@@ -97,7 +102,8 @@ bool DispatcherGraph::contains(ClauseDispatcher *clauseDispatcher) const {
 
 int DispatcherGraph::priority() { return totalPriority; }
 
-EvaluationTable DispatcherGraph::evaluate() {
+EvaluationTable
+DispatcherGraph::evaluate(std::unordered_set<SYMBOL> selectedSymbols) {
   typedef std::pair<int, ClauseDispatcher *> PQ_NODE;
   auto compare = [](PQ_NODE &node1, PQ_NODE &node2) {
     return node1.first < node2.first;
@@ -135,6 +141,22 @@ EvaluationTable DispatcherGraph::evaluate() {
     if (table.rowCount() == 0) {
       return table;
     }
+    auto symbolDeleted = false;
+    for (const auto &symbol : dispatcher->getSymbols()) {
+      if (mapContains(symbolsToClauseDispatchersMap, symbol) &&
+          setContains(symbolsToClauseDispatchersMap.at(symbol), dispatcher)) {
+        symbolsToClauseDispatchersMap.at(symbol).erase(dispatcher);
+        if (symbolsToClauseDispatchersMap.at(symbol).empty() &&
+            !setContains(selectedSymbols, symbol)) {
+          symbols.erase(symbol);
+          symbolDeleted = true;
+          symbolsToClauseDispatchersMap.erase(symbol);
+        }
+      }
+    }
+    if (symbolDeleted)
+      table = table.sliceSymbols(symbols);
+
     for (const auto &e : adjacencyList.at(dispatcher)) {
       int pqWeight = e.weight + e.neighbour->dispatchPriority();
       pq.push(PQ_NODE{pqWeight, e.neighbour});
@@ -145,5 +167,6 @@ EvaluationTable DispatcherGraph::evaluate() {
 };
 
 bool DispatcherGraph::operator==(const DispatcherGraph &other) const {
-  return adjacencyList == other.adjacencyList && symbols == other.symbols;
+  return adjacencyList == other.adjacencyList &&
+         symbolsToClauseDispatchersMap == other.symbolsToClauseDispatchersMap;
 }

Team20/Code20/source/DispatcherGraph.h

@@ -52,9 +52,10 @@ struct DispatcherGraph {
   /** @brief Evaluates the `ClauseDispatcher`s in an efficient manner.
    * Clauses are evaluated based on their estimated ease of evaluation and their
    * common synonyms with clauses that have already already evaluated.
+   *  @param selectedSymbols symbols that are selected in the query
    *  @return evaluation table that is the result from evaluating the clauses.
    */
-  EvaluationTable evaluate();
+  EvaluationTable evaluate(std::unordered_set<SYMBOL> selectedSymbols);
 
   bool DispatcherGraph::operator==(const DispatcherGraph &other) const;
 
@@ -63,8 +64,10 @@ struct DispatcherGraph {
   typedef std::unordered_map<SYMBOL, CLAUSE_DISPATCHER_SET> SYMBOLS_MAP;
   typedef std::unordered_set<Edge> EDGES;
   typedef std::unordered_map<ClauseDispatcher *, EDGES> ADJACACENCY_LIST;
+  typedef std::unordered_set<SYMBOL> SYMBOL_SET;
   ADJACACENCY_LIST adjacencyList;
-  SYMBOLS_MAP symbols;
+  SYMBOLS_MAP symbolsToClauseDispatchersMap;
+  SYMBOL_SET symbols;
   int totalPriority;
 
   int countCommonSymbols(ClauseDispatcher *first, ClauseDispatcher *second);