MP2NL: SOS constraints #237

ampl · Oct 30, 2024 · 705a892 · 705a892
1 parent b54b78e
commit 705a892
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 45 deletions.
diff --git a/solvers/mp2nl/mp2nlmodelapi.cc b/solvers/mp2nl/mp2nlmodelapi.cc
@@ -943,24 +943,62 @@ void MP2NLModelAPI::FeedInitialDualGuesses(IDGWriter& igw) {
 }
 
 
-/** Feed suffixes.
-     *
-     *  For constraints, assume ordering:
-     *  first algebraic, then logical.
-   *
-   *  Implementation: write all non-0 entries (0 is the default.)
-   *      while (....) {
-   *        auto sw = swf.StartIntSuffix(  // or ...DblSuffix
-   *          suf_name, kind, n_nonzeros);
-   *        for (int i=0; i<n_nonzeros; ++i)
-   *          sw.Write(index[i], value[i]);
-   *      }
-     */
 template <class SuffixWriterFactory>
 void MP2NLModelAPI::FeedSuffixes(SuffixWriterFactory& swf) {
-  // @todo SOS constraints
+  PrepareSOSSuffixes();
+  FeedOriginalSuffixes(swf);
+  // Custom suffixes: SOS
+  Feed1Suffix(suf_sosno_, swf);
+  Feed1Suffix(suf_ref_, swf);
+}
+
+void MP2NLModelAPI::PrepareSOSSuffixes() {
+  suf_sosno_ = MP2NLModelSuffix
+      {"sosno", suf::VAR, "", { std::vector<double>(var_lbs_.size(), 0.0) }};
+  suf_ref_ = MP2NLModelSuffix
+      {"ref", suf::VAR | suf::FLOAT, "",
+                              { std::vector<double>(var_lbs_.size(), 0.0) }};
+  int sosno = 0;
+  for (const auto& sos: sos_info_) {
+    ++sosno;
+    if (StaticItemTypeID::ID_SOS1Constraint == sos.GetStaticTypeID())
+      PrepareSOSConstraint(*(const SOS1Constraint*)sos.GetPItem(), sosno);
+    else {
+      assert(StaticItemTypeID::ID_SOS2Constraint == sos.GetStaticTypeID());
+      PrepareSOSConstraint(*(const SOS2Constraint*)sos.GetPItem(), -sosno);
+    }
+  }
+}
+
+template <int SOSType>
+void MP2NLModelAPI::PrepareSOSConstraint(
+    const SOS_1or2_Constraint<SOSType>& sos, int sosno) {
+  assert(sosno);
+  assert(sosno<0 == (2==SOSType));
+  for (size_t i=0; i<sos.get_vars().size(); ++i) {
+    auto v = sos.get_vars()[i];
+    assert(!suf_sosno_.values_[0][v]);   // single .sosno for all SOS
+    suf_sosno_.values_[0][v] = sosno;
+    suf_ref_.values_[0][v] = sos.get_weights()[i];
+  }
+}
+
+
+template <class SuffixWriterFactory>
+void MP2NLModelAPI::FeedOriginalSuffixes(SuffixWriterFactory& swf) {
   auto p_qc = p_nlsi_->GetCallbacks();
   auto suffixnames = p_qc->GetSuffixNames();
+  for (const auto& sufname: suffixnames) {
+    if ("sosno" != sufname && "ref" != sufname) {
+      auto modelsuffix = p_qc->GetModelSuffix(sufname);
+      Feed1Suffix(modelsuffix, swf);
+    }
+  }
+}
+
+template <class SuffixWriterFactory>
+void MP2NLModelAPI::Feed1Suffix(
+    const MP2NLModelSuffix& modelsuffix, SuffixWriterFactory& swf) {
   auto write1suf = [this](auto& sw, int kind, const auto& vals) {
     for (size_t i=0; i<vals.size(); ++i) {
       if (auto val = vals[i]) {
@@ -971,21 +1009,19 @@ void MP2NLModelAPI::FeedSuffixes(SuffixWriterFactory& swf) {
       }
     }
   };
-  for (const auto& sufname: suffixnames) {
-    auto modelsuffix = p_qc->GetModelSuffix(sufname);
-    for (int kind=0; kind<modelsuffix.values_.size(); ++kind) {
-      const auto& vals = modelsuffix.values_[kind];
-      if (vals.size()) {                 // even all-0 suffixes
-        auto nnz = std::count_if(vals.begin(), vals.end(),
-                                 [](auto n){ return bool(n); });
-        if (modelsuffix.flags_ & suf::FLOAT) {
-          auto sw = swf.StartDblSuffix(sufname.c_str(),
-                                       kind | suf::FLOAT, nnz);
-          write1suf(sw, kind, vals);
-        } else {
-          auto sw = swf.StartIntSuffix(sufname.c_str(), kind, nnz);
-          write1suf(sw, kind, vals);
-        }
+  for (int kind=0; kind<(int)modelsuffix.values_.size(); ++kind) {
+    const auto& vals = modelsuffix.values_[kind];
+    if (vals.size()) {                 // even all-0 suffixes
+      auto nnz = std::count_if(vals.begin(), vals.end(),
+                               [](auto n){ return bool(n); });
+      if (modelsuffix.flags_ & suf::FLOAT) {
+        auto sw = swf.StartDblSuffix(modelsuffix.name_.c_str(),
+                                     kind | suf::FLOAT, nnz);
+        write1suf(sw, kind, vals);
+      } else {
+        auto sw = swf.StartIntSuffix(modelsuffix.name_.c_str(),
+                                     kind, nnz);
+        write1suf(sw, kind, vals);
       }
     }
   }

diff --git a/solvers/mp2nl/mp2nlmodelapi.h b/solvers/mp2nl/mp2nlmodelapi.h
@@ -312,9 +312,9 @@ class MP2NLModelAPI
   /// piecewise-linear expressions.
   /// @note Set ``option pl_linearize 0;`` in AMPL if the solver
   ///   supports PL natively.
-  ACCEPT_CONSTRAINT(SOS1Constraint, NotAccepted, CG_SOS)
+  ACCEPT_CONSTRAINT(SOS1Constraint, Recommended, CG_SOS)
   void AddConstraint(const SOS1Constraint& cc);
-  ACCEPT_CONSTRAINT(SOS2Constraint, NotAccepted, CG_SOS)
+  ACCEPT_CONSTRAINT(SOS2Constraint, Recommended, CG_SOS)
   void AddConstraint(const SOS2Constraint& cc);
 
 
@@ -849,23 +849,28 @@ class MP2NLModelAPI
 
 
   ///////////////////// 13. SUFFIXES /////////////////////
-  /** Feed suffixes.
-     *
-     *  For constraints, assume ordering:
-     *  first algebraic, then logical.
-   *
-   *  Implementation: write all non-0 entries (0 is the default.)
-   *      while (....) {
-   *        auto sw = swf.StartIntSuffix(  // or ...DblSuffix
-   *          suf_name, kind, n_nonzeros);
-   *        for (int i=0; i<n_nonzeros; ++i)
-   *          sw.Write(index[i], value[i]);
-   *      }
-     */
-  /// @todo SOS constraints
+  /// @note We feed SOS constraints here as well.
   template <class SuffixWriterFactory>
   void FeedSuffixes(SuffixWriterFactory& );
 
+  /// Prepare SOS suffixes
+  /// @todo Also PLSOS if we globalize them
+  void PrepareSOSSuffixes();
+
+  /// Prepare single SOS constraint
+  template <int SOSType>
+  void PrepareSOSConstraint(
+      const SOS_1or2_Constraint<SOSType>& , int sosno);
+
+  /// Feed all suffixes excl. .sosno, .ref
+  template <class SuffixWriterFactory>
+  void FeedOriginalSuffixes(SuffixWriterFactory& );
+
+  /// Feed single suffix
+  template <class SuffixWriterFactory>
+  void Feed1Suffix(
+      const MP2NLModelSuffix& , SuffixWriterFactory& );
+
 
   //////////////////// 14. ROW/COLUMN NAMES ETC /////////////////////
   /** FeedRowAndObjNames:
@@ -1431,6 +1436,7 @@ class MP2NLModelAPI
   ArrayRef<var::Type> var_types_;
   ArrayRef<const char*> var_names_;                 // can be empty
 
+  MP2NLModelSuffix suf_sosno_, suf_ref_;
 
   /// @todo still need permutations of NL constraints?
   std::vector<ItemInfo> obj_info_, alg_con_info_, log_con_info_, sos_info_;