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

Author: fwesselm

docs/src/options/definitions.md

@@ -341,3 +341,15 @@
 - Range: [1e-12, inf]
 - Default: 0.0001
 
+## qp\_iteration\_limit
+- Iteration limit for QP solver
+- Type: integer
+- Range: {0, 2147483647}
+- Default: 2147483647
+
+## qp\_nullspace\_limit
+- Nullspace limit for QP solver
+- Type: integer
+- Range: {0, 2147483647}
+- Default: 4000
+

docs/src/structures/enums.md

@@ -73,6 +73,8 @@ This defines the status of the model after a call to `run`
  * `kTimeLimit`: The run time limit has been reached
  * `kIterationLimit`: The iteration limit has been reached
  * `kSolutionLimit`: The MIP solver has reached the limit on the number of LPs solved
+ * `kInterrupt`: The solver has been interrupted by the user
+ * `kMemoryLimit`: The solver has been unable to allocate sufficient memory
  * `kUnknown`: The model status is unknown
 
 ## HighsBasisStatus

src/lp_data/HighsOptions.h

@@ -939,7 +939,7 @@ class HighsOptions : public HighsOptionsStruct {
     record_string = new OptionRecordString(
         "mip_improving_solution_file",
         "File for reporting improving MIP solutions: not reported for an empty "
-        "string \"\"",
+        "string \\\"\\\"",
         advanced, &mip_improving_solution_file, kHighsFilenameDefault);
     records.push_back(record_string);