Minor changes related mainly to the resolution of the variables, on checking the removal (also by back-navigating)

Author: jackbergus

include/database/LinearGSM.h

@@ -73,7 +73,16 @@ namespace gsm2 {
             const std::map<size_t, std::string>::const_iterator findLabelFromID(size_t k) const {
                 DEBUG_ASSERT(minRecordToContaimentLabel.begin()->first == 0);
                 auto it = minRecordToContaimentLabel.lower_bound(k);
-                if (it->first>k) it--;
+                if ((it == minRecordToContaimentLabel.end())) {
+                    if (!minRecordToContaimentLabel.empty()) {
+                        auto it2 = minRecordToContaimentLabel.end();
+                        return std::prev(it2);
+                    }else {
+                        return it;
+                    }
+                }
+                if ((it->first>k))
+                    it--;
                 return it;
             }
             const std::map<size_t, std::string>::const_iterator notALabel() const {
@@ -82,6 +91,15 @@ namespace gsm2 {
             const gsm2::tables::PhiTable::record* resolveRecord(size_t k) const {
                 DEBUG_ASSERT(minRecordToContaimentLabel.begin()->first == 0);
                 auto it = minRecordToContaimentLabel.lower_bound(k);
+                if ((it == minRecordToContaimentLabel.end())) {
+                    if (!minRecordToContaimentLabel.empty()) {
+                        auto it2 = minRecordToContaimentLabel.end();
+                        it2 = std::prev(it2);
+                        return &containment_tables.at(it->second).table.at(k-it2->first);
+                    }else {
+                        return nullptr;
+                    }
+                }
                 if (it->first>k) it--;
                 return &containment_tables.at(it->second).table.at(k-it->first);
             }

include/queries/closure.h

@@ -122,12 +122,12 @@ struct closure {
             for (const auto& [idX,object] : delta_updates_per_graph.at(i).delta_plus_db.O) {
                 if (delta_updates_per_graph.at(i).removed_objects.contains(idX))
                     continue;
-//                if (idX == 6)
+//                if (idX == 3)
 //                    std::cout << "HERE" << std::endl;
                 for (const auto& [edgelabel,records] : object.phi) {
                     size_t recordsId = 0;
                     for (const auto& record: records) {
-                        if (delta_updates_per_graph.at(i).removed_objects.contains(record.id)) {
+                        if (delta_updates_per_graph.at(i).hasXBeenRemoved(record.id)) {
 //                            std::cout << idX << "R.." << record.id <<std::endl;
                             recordsId++;
                             continue;
@@ -1306,15 +1306,16 @@ struct closure {
                     Interpret I(graph_id, pattern_id, pattern_result.first, it->second, table_offset, *this, pr.morphisms,
                                 forloading);
                     if (pattern.has_where) {
+//                        std::cout << "TGraph #" << graph_id << ": applying pattern " << pattern.pattern_name << " for node " << vertex << std::endl;
                         if ((I.interpret(pattern.where, 1).empty())) {
                             table_offset++;
                             continue; //next entry
                         }
                     }
 
-//                    std::cout << "Graph #" << graph_id << ": applying pattern " << pattern.pattern_name << " for node " << vertex << std::endl;
-//                    if ((vertex == 0) && (pattern.pattern_name == "p3"))
-//                        std::cout << "HERE" << std::endl;
+
+                    if ((vertex == 3) && (graph_id == 2))
+                        std::cout << "HERE" << std::endl;
                     for (const auto& operation : pattern.rwr_to) {
                         switch (operation.t) {
 

include/queries/delta_updates.h

@@ -77,8 +77,8 @@ struct delta_updates {
      */
     inline void set_removed(size_t default_val){
         size_t toRemove = getOrDefault(replacement_map, default_val, default_val);
-//        if ((toRemove == 8) || (default_val == 8))
-//            std::cerr << "EHRE" << std::endl;
+        if ((toRemove == 6) || (default_val == 6))
+            std::cerr << "EHRE" << std::endl;
         if (!newIterationInsertedObjects.contains(toRemove))
             removed_objects.insert(toRemove);
         else
@@ -89,6 +89,15 @@ struct delta_updates {
         removed_edges.insert(default_val);
     }
 
+    inline void expandInto(size_t val, std::set<size_t>& res) {
+        res.insert(val);
+        auto it = replacement_map.find(val);
+        if (it != replacement_map.end()) {
+            res.insert(it->second);
+            expandInto(it->second, res);
+        }
+    }
+
     /**
      * Determining that "dest" should replace "orig"
      * @param orig
@@ -132,6 +141,8 @@ struct delta_updates {
 
     void updateWith(const std::vector<delta_updates> &vector1);
 
+
+
     inline size_t replacedWith(size_t x) const {
         auto it = replacement_map.find(x);
         std::unordered_set<size_t> RB;

src/queries/closure.cpp

@@ -308,6 +308,8 @@ void closure::generate_materialised_view() {
                 size_t new_id = legacy_object_old_data.id;
                 auto& obj = updates.delta_plus_db.O[new_id];
                 obj.id = new_id;
+                if ((graphid== 2) && (legacy_object_old_data.id == 3))
+                    std::cout << "DREBUG" << std::endl;
                 obj.updateWith(legacy_object_old_data);
                 for (auto& [k, v] :obj.phi) {
                     i = 0;

src/scriptv2/ScriptAST.cpp

@@ -537,7 +537,7 @@ std::function<DPtr<script::structures::ScriptAST>(DPtr<script::structures::Scrip
 }
 
 DPtr<script::structures::ScriptAST> script::structures::ScriptAST::variableEval()  {
-//    if (string.contains("S.NN"))
+//    if (string.contains("*.TB"))
 //        std::cout << "DEBUG" << std::endl;
 //    auto it3 = globals.find(string);
     if (!idxers->contains(string)) {