Merge remote-tracking branch 'origin/v10-minor'

Author: scip-ci

CHANGELOG

@@ -71,6 +71,10 @@ Fixed bugs
 - avoid crash when initial IIS solve fails while reporting errors explicitly
 - fixed failure in nl writing on big endian machines
 
+Miscellaneous
+-------------
+
+- updated ampl/mp to version 4.0.4
 
 @section RN1000 SCIP 10.0.0
 ***************************

src/amplmp/include/mp/format.h

@@ -1645,8 +1645,8 @@ struct FormatSpec : AlignSpec {
   char type_;
 
   FormatSpec(
-    unsigned width = 0, char type = 0, wchar_t fill = ' ')
-  : AlignSpec(width, fill), flags_(0), precision_(-1), type_(type) {}
+    unsigned width = 0, char type = 0, wchar_t fill = ' ', int prec = -1)
+  : AlignSpec(width, fill), flags_(0), precision_(prec), type_(type) {}
 
   bool flag(unsigned f) const { return (flags_ & f) != 0; }
   int precision() const { return precision_; }
@@ -2344,9 +2344,20 @@ class SystemError : public internal::RuntimeError {
 template <typename Char>
 class BasicWriter {
  private:
-  // Output buffer.
+  /// Output buffer.
   Buffer<Char> &buffer_;
 
+   FormatSpec fmtspec_double_
+      {
+          0, 0, ' ',
+          std::numeric_limits<double>::max_digits10
+      };
+  FormatSpec fmtspec_long_double_
+       {
+           0, 0, ' ',
+           std::numeric_limits<long double>::max_digits10
+       };
+
   FMT_DISALLOW_COPY_AND_ASSIGN(BasicWriter);
 
   typedef typename internal::CharTraits<Char>::CharPtr CharPtr;
@@ -2548,7 +2559,7 @@ class BasicWriter {
   }
 
   BasicWriter &operator<<(double value) {
-    write_double(value, FormatSpec());
+    write_double(value, fmtspec_double_);
     return *this;
   }
 
@@ -2559,7 +2570,7 @@ class BasicWriter {
     \endrst
    */
   BasicWriter &operator<<(long double value) {
-    write_double(value, FormatSpec());
+    write_double(value, fmtspec_long_double_);
     return *this;
   }
 

src/amplmp/include/mp/nl-reader.h

@@ -2120,6 +2120,7 @@ class NLProblemBuilder {
     AddVariables(h);
     if (int n = h.num_common_exprs())
       builder_.AddCommonExprs(n);
+    builder_.NotifyObjChoice(h.num_objs, multiobj(), objno());
     int n_objs = resulting_nobj( h.num_objs );
     if (n_objs != 0)
       builder_.AddObjs( n_objs );
@@ -2533,13 +2534,19 @@ class NameProvider {
   /// Returns the name of the item at specified index.
   /// @param i2: if >=0,
   ///   from this index, generic name 2 is used
-  fmt::StringRef name(std::size_t index, std::size_t i2=-1);
+	/// @param any_empty: if non-0, set true if the read
+	///   name was empty (it is replaced by a standard name then).
+	fmt::StringRef name(
+			std::size_t index, std::size_t i2=-1, bool* was_empty=0);
 
   /// Return vector of names, length n.
   /// If number_read() < n, generic names are filled.
   /// @param i2: if >=0,
   ///   from this index, generic name 2 is used
-  std::vector<std::string> get_names(size_t n, size_t i2=-1);
+	/// @param any_empty: if non-0, true iff had any empty names
+	///   in the input (they were replaced by standard names then).
+	std::vector<std::string> get_names(
+			size_t n, size_t i2=-1, bool* p_any_empty=0);
 
 private:
   std::vector<const char *> names_;

src/amplmp/src/nl-reader.cpp

@@ -354,14 +354,22 @@ void mp::NameProvider::ReadNames(
 }
 
 fmt::StringRef mp::NameProvider::name(
-    std::size_t index, std::size_t i2) {
+		std::size_t index, std::size_t i2, bool* was_empty) {
   if (index + 1 < names_.size()) {
     const char *name = names_[index];
     const auto* pos1past = names_[index + 1] - 1;
     assert( ('\n' == *pos1past) || ('\r' == *pos1past));
     if (pos1past>name && '\r' == *(pos1past-1))            // Windows
       --pos1past;
-    return fmt::StringRef(name, pos1past - name);
+		while (isspace(*name) && name < pos1past)              // trim left
+			++name;
+		while (name < pos1past && isspace(*(pos1past-1)))      // trim right
+			--pos1past;
+		if (name < pos1past)
+			return fmt::StringRef(name, pos1past - name);
+		else
+			if (was_empty)
+				*was_empty = true;
   }
   writer_.clear();
   if (index>=i2)
@@ -376,11 +384,11 @@ size_t mp::NameProvider::number_read() const {
 }
 
 std::vector<std::string> mp::NameProvider::get_names(
-    size_t n, size_t i2) {
+		size_t n, size_t i2, bool* any_empty) {
   std::vector<std::string> result;
   result.reserve(n);
   for (size_t i=0; i<n; ++i)
-    result.push_back(name(i, i2));
+		result.push_back(name(i, i2, any_empty));
   return result;
 }
 

src/scip/reader_nl.cpp

@@ -3243,7 +3243,7 @@ SCIP_RETCODE SCIPincludeReaderNl(
          "reading/" READER_NAME "/comments", "should comments be written to nl files",
          NULL, FALSE, FALSE, NULL, NULL) );
 
-   SCIP_CALL( SCIPincludeExternalCodeInformation(scip, "AMPL/MP 4.0.3", "AMPL .nl file reader library (github.com/ampl/mp)") );
+   SCIP_CALL( SCIPincludeExternalCodeInformation(scip, "AMPL/MP 4.0.4", "AMPL .nl file reader library (github.com/ampl/mp)") );
 
    return SCIP_OKAY;
 }