diff --git a/solvers/mp2nl/mp2nlmodelapi.cc b/solvers/mp2nl/mp2nlmodelapi.cc index 218383e98..4e107806a 100644 --- 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 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(var_lbs_.size(), 0.0) }}; + suf_ref_ = MP2NLModelSuffix + {"ref", suf::VAR | suf::FLOAT, "", + { std::vector(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 +void MP2NLModelAPI::PrepareSOSConstraint( + const SOS_1or2_Constraint& sos, int sosno) { + assert(sosno); + assert(sosno<0 == (2==SOSType)); + for (size_t i=0; i +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 +void MP2NLModelAPI::Feed1Suffix( + const MP2NLModelSuffix& modelsuffix, SuffixWriterFactory& swf) { auto write1suf = [this](auto& sw, int kind, const auto& vals) { for (size_t i=0; iGetModelSuffix(sufname); - for (int kind=0; kind void FeedSuffixes(SuffixWriterFactory& ); + /// Prepare SOS suffixes + /// @todo Also PLSOS if we globalize them + void PrepareSOSSuffixes(); + + /// Prepare single SOS constraint + template + void PrepareSOSConstraint( + const SOS_1or2_Constraint& , int sosno); + + /// Feed all suffixes excl. .sosno, .ref + template + void FeedOriginalSuffixes(SuffixWriterFactory& ); + + /// Feed single suffix + template + void Feed1Suffix( + const MP2NLModelSuffix& , SuffixWriterFactory& ); + //////////////////// 14. ROW/COLUMN NAMES ETC ///////////////////// /** FeedRowAndObjNames: @@ -1431,6 +1436,7 @@ class MP2NLModelAPI ArrayRef var_types_; ArrayRef var_names_; // can be empty + MP2NLModelSuffix suf_sosno_, suf_ref_; /// @todo still need permutations of NL constraints? std::vector obj_info_, alg_con_info_, log_con_info_, sos_info_;