From f7fe336be7d138d2209d0ffd2b521d0f3831e455 Mon Sep 17 00:00:00 2001 From: Jens Diewald Date: Tue, 11 Jun 2024 21:24:16 +0200 Subject: [PATCH 1/2] Correctly Report Invalid Row Names Otherwise, HiGHS may silently not write an MPS file when it runs into invalid row names and still return kOK. --- src/io/HMPSIO.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/io/HMPSIO.cpp b/src/io/HMPSIO.cpp index 69e906b66e..b6037d3624 100644 --- a/src/io/HMPSIO.cpp +++ b/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); From 347bde41d79a12cbfb8f464a96751156b16c4a2d Mon Sep 17 00:00:00 2001 From: JAJHall Date: Wed, 12 Jun 2024 12:35:07 +0100 Subject: [PATCH 2/2] Fixed obvious omission in docs/src/guide/basic.md --- docs/src/guide/basic.md | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/src/guide/basic.md b/docs/src/guide/basic.md index 764b99ecd4..30a4b9dcba 100644 --- a/docs/src/guide/basic.md +++ b/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