fix incmode for gringo

potassco · Jun 18, 2024 · 9dab481 · 9dab481
1 parent 041e904
commit 9dab481
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/libclingo/clingo/clingocontrol.hh b/libclingo/clingo/clingocontrol.hh
@@ -254,6 +254,13 @@ public:
     bool blocked() override;
     std::string str();
     void assignExternal(Potassco::Atom_t ext, Potassco::Value_t) override;
+    void assignExternal(Symbol ext, Potassco::Value_t val) override {
+        update();
+        auto res = out_->find(ext);
+        if (res.second != nullptr && res.first != res.second->end() && res.first->hasUid()) {
+            assignExternal(res.first->uid(), val);
+        }
+    }
     Symbol getConst(std::string const &name) const override;
     bool isConflicting() const noexcept override;
     Potassco::AbstractStatistics const *statistics() const override;

diff --git a/libclingo/clingo/control.hh b/libclingo/clingo/control.hh
@@ -245,6 +245,7 @@ struct clingo_control {
     virtual Gringo::Symbol getConst(std::string const &name) const = 0;
     virtual bool blocked() = 0;
     virtual void assignExternal(Potassco::Atom_t ext, Potassco::Value_t val) = 0;
+    virtual void assignExternal(Gringo::Symbol ext, Potassco::Value_t val) = 0;
     virtual bool isConflicting() const noexcept = 0;
     virtual Potassco::AbstractStatistics const *statistics() const = 0;
     virtual void useEnumAssumption(bool enable) = 0;

diff --git a/libclingo/src/gringo_app.cc b/libclingo/src/gringo_app.cc
@@ -193,6 +193,13 @@ struct IncrementalControl : Control, private Output::ASPIFOutBackend {
         update();
         if (auto *b = out.backend()) { b->external(ext, val); }
     }
+    void assignExternal(Symbol ext, Potassco::Value_t val) override {
+        update();
+        auto res = out.find(ext);
+        if (res.second != nullptr && res.first != res.second->end() && res.first->hasUid()) {
+            assignExternal(res.first->uid(), val);
+        }
+    }
     SymbolicAtoms const &getDomain() const override { throw std::runtime_error("domain introspection not supported"); }
     ConfigProxy &getConf() override { throw std::runtime_error("configuration not supported"); }
     void registerPropagator(UProp, bool) override { throw std::runtime_error("theory propagators not supported"); }

diff --git a/libclingo/src/incmode.cc b/libclingo/src/incmode.cc
@@ -62,12 +62,6 @@ struct Incmode {
         return true;
     }
 
-    void assign_external_(Symbol sym, Potassco::Value_t val) {
-        auto &dom = ctl_.getDomain();
-        auto atm = dom.lookup(sym);
-        if (!dom.eq(atm, dom.end())) { ctl_.assignExternal(dom.literal(atm), val); }
-    }
-
     void run() {
         ctl_.add("check", {"t"}, "#external query(t).");
         imax = get_max();
@@ -79,14 +73,14 @@ struct Incmode {
             parts.reserve(2);
             parts.push_back({"check", {Symbol::createNum(step)}});
             if (step > 0) {
-                assign_external_(Symbol::createFun("query", {Symbol::createNum(step - 1)}), Potassco::Value_t::Release);
+                ctl_.assignExternal(Symbol::createFun("query", {Symbol::createNum(step - 1)}), Potassco::Value_t::Release);
                 parts.push_back({"step", {Symbol::createNum(step)}});
             }
             else {
                 parts.push_back({"base", {}});
             }
             ctl_.ground(parts, nullptr);
-            assign_external_(Symbol::createFun("query", {Symbol::createNum(step)}), Potassco::Value_t::True);
+            ctl_.assignExternal(Symbol::createFun("query", {Symbol::createNum(step)}), Potassco::Value_t::True);
             res = ctl_.solve({nullptr, 0}, 0)->get();
             step += 1;
         }