Merge branch 'latest' of https://github.com/ERGO-Code/HiGHS into neos…

…4LargeBnds

docs/src/guide/basic.md

@@ -20,14 +20,16 @@ and [classes](@ref classes-overview), and are referred to below.
 
 #### [Enums](@id guide-basic-enums)
 
-Enums are scalar identifier types that can take only a limited range of values.????
-
-#### The
-advantage using these classes is that many fewer parameters are
-needed when passing data to and from HiGHS. However, the use of
-classes is not necessary for the basic use of `highspy`. As with the
-`C` and `Fortran` interfaces, there are equivalent methods that use
-simple scalars and vectors of data.
+Enums are scalar identifier types that can take only a limited range of values.
+
+#### [Classes](@id guide-basic-classes) The advantage of using the
+native `C++` classes in HiGHS is that many fewer parameters are needed
+when passing data to and from HiGHS. The binding of the data members
+of these classes to `highspy` structures allows them to be used when
+calling HiGHS from Python, although they are not necessary for the
+basic use of `highspy`. As with the `C` and `Fortran` interfaces,
+there are equivalent methods that use simple scalars and vectors of
+data.
 
 ## Defining a model
 

src/io/HMPSIO.cpp

@@ -564,7 +564,7 @@ HighsStatus writeModelAsMps(const HighsOptions& options,
   HighsStatus row_name_status =
       normaliseNames(options.log_options, "row", lp.num_row_, local_row_names,
                      max_row_name_length);
-  if (row_name_status == HighsStatus::kError) return col_name_status;
+  if (row_name_status == HighsStatus::kError) return row_name_status;
   warning_found = row_name_status == HighsStatus::kWarning || warning_found;
 
   HighsInt max_name_length = std::max(max_col_name_length, max_row_name_length);