Changed use of equilibration ibn simplex scaling to geomean

Author: jajhall

highs/lp_data/HConst.h

@@ -54,8 +54,8 @@ enum SimplexScaleStrategy {
   kSimplexScaleStrategyCost = kSimplexScaleStrategyMin,  // -1
   kSimplexScaleStrategyOff,                              // 0
   kSimplexScaleStrategyChoose,                           // 1
-  kSimplexScaleStrategyEquilibration,                    // 2
-  kSimplexScaleStrategyForcedEquilibration,              // 3
+  kSimplexScaleStrategyGeomean,                          // 2
+  kSimplexScaleStrategyForcedGeomean,                    // 3
   kSimplexScaleStrategyMaxValue,                         // 4
   kSimplexScaleStrategyMaxValueMatrixAndCost,            // 5
   kSimplexScaleStrategyMax = kSimplexScaleStrategyMaxValueMatrixAndCost

highs/lp_data/HighsOptions.h

@@ -851,11 +851,11 @@ class HighsOptions : public HighsOptionsStruct {
 
     record_int = new OptionRecordInt(
         "simplex_scale_strategy",
-        "Simplex scaling strategy: off / choose / equilibration (default) / "
+        "Simplex scaling strategy: off / choose / geometric mean (default) / "
         "forced "
-        "equilibration / max value (0/1/2/3/4)",
+        "geometric mean / max value / max value with cost scaling(0/1/2/3/4/5)",
         advanced, &simplex_scale_strategy, kSimplexScaleStrategyMin,
-        kSimplexScaleStrategyEquilibration, kSimplexScaleStrategyMax);
+        kSimplexScaleStrategyGeomean, kSimplexScaleStrategyMax);
     records.push_back(record_int);
 
     record_int = new OptionRecordInt(