add minimal support for quadratic expressions

hlefebvr · Nov 19, 2024 · 3b13acb · 3b13acb
1 parent d8bbe91
commit 3b13acb
Show file tree

Hide file tree

Showing 29 changed files with 617 additions and 948 deletions.
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -220,6 +220,12 @@ add_library(idol STATIC
         src/mixed-integer/modeling/variables/VarVersion.cpp
         src/mixed-integer/modeling/constraints/CtrVersion.cpp
         include/idol/mixed-integer/modeling/expressions/QuadExpr.h
+        include/idol/mixed-integer/modeling/constraints/QCtr.h
+        include/idol/mixed-integer/modeling/constraints/QCtrVersion.h
+        include/idol/mixed-integer/modeling/constraints/TempQCtr.h
+        src/mixed-integer/modeling/constraints/TempQCtr.cpp
+        src/mixed-integer/modeling/constraints/QCtrVersion.cpp
+        src/mixed-integer/modeling/constraints/QCtr.cpp
 )
 
 find_package(OpenMP REQUIRED)

diff --git a/lib/include/idol/bilevel/optimizers/wrappers/MibS/Optimizers_MibS.h b/lib/include/idol/bilevel/optimizers/wrappers/MibS/Optimizers_MibS.h
@@ -57,8 +57,10 @@ class idol::Optimizers::Bilevel::MibS : public Optimizer {
     void build() override;
     void add(const Var &t_var) override;
     void add(const Ctr &t_ctr) override;
+    void add(const QCtr &t_ctr) override;
     void remove(const Var &t_var) override;
     void remove(const Ctr &t_ctr) override;
+    void remove(const QCtr &t_ctr) override;
     void update() override;
     void write(const std::string &t_name) override;
     void hook_optimize() override;

diff --git a/lib/include/idol/general/optimizers/Optimizer.h b/lib/include/idol/general/optimizers/Optimizer.h
@@ -16,6 +16,7 @@ namespace idol {
     class Model;
     class Var;
     class Ctr;
+    class QCtr;
     class Constant;
 
     namespace impl {
@@ -52,9 +53,11 @@ class idol::impl::Optimizer {
 
     virtual void add(const Var& t_var) = 0;
     virtual void add(const Ctr& t_ctr) = 0;
+    virtual void add(const QCtr& t_ctr) = 0;
 
     virtual void remove(const Var& t_var) = 0;
     virtual void remove(const Ctr& t_ctr) = 0;
+    virtual void remove(const QCtr& t_ctr) = 0;
 
     virtual void update() = 0;