Several changes

1. Fixing typename in indexed_container

2. Fixing logic associated with expansion of var/obj/con components

Author: whart222

lib/coek/coek/api/indexed_container.hpp

@@ -61,7 +61,7 @@ class IndexedComponent {
     std::vector<refarg_types> reftmp;
 
    public:
-    using iterator = typename std::map<IndexVector, TYPE>;
+    using iterator = typename std::map<IndexVector, TYPE>::iterator;
     iterator begin() { return repn->value.begin(); }
     iterator end() { return repn->value.end(); }
 

lib/coek/coek/model/compact_model.cpp

@@ -247,9 +247,8 @@ void CompactModel::add(ConstraintSequence&& seq) { repn->constraints.push_back(s
 
 // Expand
 
-Model CompactModel::expand()
+Model CompactModel::expand_data()
 {
-    // std::cout << "CompactModel::expand()" << std::endl;
     Model model;
 
     for (auto& val : repn->data) {
@@ -316,6 +315,14 @@ Model CompactModel::expand()
         }
     }
 
+    return model;
+}
+
+Model CompactModel::expand()
+{
+    // std::cout << "CompactModel::expand()" << std::endl;
+    auto model = expand_data();
+
     // std::cout << "VARIABLES " << repn->variables.size() << std::endl;
     for (auto& val : repn->variables) {
         if (auto eval = std::get_if<Variable>(&val)) {

lib/coek/coek/model/compact_model.hpp

@@ -154,6 +154,7 @@ class CompactModel {
     void add(ConstraintSequence& seq);
     void add(ConstraintSequence&& seq);
 
+    Model expand_data();
     Model expand();
 
     void write(const std::string& filename);

lib/coek/coek/model/writer_lp.cpp

@@ -166,6 +166,9 @@ void print_repn(fmt::ostream& ostr, const QuadraticExpr& repn,
 
 class LPWriter {
    public:
+#ifdef COEK_WITH_COMPACT_MODEL
+    Model model_handle;
+#endif
     bool one_var_constant;
     std::unordered_map<size_t, size_t> vid;
     std::vector<Variable> variables;
@@ -250,9 +253,8 @@ void LPWriter::print_objectives(StreamType& ostr, CompactModel& model)
             print_objective(ostr, obj);
             ++n_obj;
         }
-        else {
-            auto& seq = std::get<ObjectiveSequence>(val);
-            for (auto& jt : seq) {
+        else if (auto eval = std::get_if<ObjectiveSequence>(&val)) {
+            for (auto& jt : *eval) {
                 print_objective(ostr, jt);
                 ++n_obj;
             }
@@ -290,14 +292,21 @@ void LPWriter::print_constraints(StreamType& ostr, CompactModel& model)
             print_constraint(ostr, c, ctr);
             ++ctr;
         }
-        else {
-            auto& seq = std::get<ConstraintSequence>(val);
-            for (auto& jt : seq) {
+        else if (auto cval = std::get_if<ConstraintSequence>(&val)) {
+            for (auto& jt : *cval) {
                 invconmap[jt.id()] = ctr;
                 print_constraint(ostr, jt, ctr);
                 ++ctr;
             }
         }
+        else if (auto cval = std::get_if<ConstraintMap>(&val)) {
+            //for (auto jt=cval->begin(); jt != cval->end(); ++jt) {
+            for (auto& [k,v] : *cval) {
+                invconmap[v.id()] = ctr;
+                print_constraint(ostr, v, ctr);
+                ++ctr;
+            }
+        }
     }
 }
 #endif
@@ -328,6 +337,7 @@ void LPWriter::collect_variables(Model& model)
 #ifdef COEK_WITH_COMPACT_MODEL
 void LPWriter::collect_variables(CompactModel& model)
 {
+    model_handle = model.expand_data();
     size_t ctr = 0;
     for (auto& val : model.repn->variables) {
         if (auto eval = std::get_if<Variable>(&val)) {
@@ -351,9 +361,40 @@ void LPWriter::collect_variables(CompactModel& model)
             invvarmap[ctr] = variables.size();
             ++ctr;
         }
-        else {
-            auto& seq = std::get<VariableSequence>(val);
-            for (auto& jt : seq) {
+        else if (auto eval = std::get_if<VariableSequence>(&val)) {
+            for (auto& jt : *eval) {
+                if (jt.fixed())
+                    continue;
+                variables.push_back(jt);
+                if (jt.is_binary())
+                    bvars[vid[jt.id()]] = jt.repn;
+                if (jt.is_integer())
+                    ivars[vid[jt.id()]] = jt.repn;
+
+                vid[jt.id()] = ctr;
+                invvarmap[ctr] = variables.size();
+                ++ctr;
+            }
+        }
+        else if (auto eval = std::get_if<VariableMap>(&val)) {
+            eval->expand();
+            for (auto& jt : *eval) {
+                if (jt.fixed())
+                    continue;
+                variables.push_back(jt);
+                if (jt.is_binary())
+                    bvars[vid[jt.id()]] = jt.repn;
+                if (jt.is_integer())
+                    ivars[vid[jt.id()]] = jt.repn;
+
+                vid[jt.id()] = ctr;
+                invvarmap[ctr] = variables.size();
+                ++ctr;
+            }
+        }
+        else if (auto eval = std::get_if<VariableArray>(&val)) {
+            eval->expand();
+            for (auto& jt : *eval) {
                 if (jt.fixed())
                     continue;
                 variables.push_back(jt);