Clean up

Author: filikat

highs/ipm/hipo/ipm/Model.h

@@ -128,7 +128,7 @@ class Model {
   Int64 nzAS() const { return AS_nz_; }
   Int64 nzNElb() const { return NE_nz_lb_; }
   Int64 nzNEub() const { return NE_nz_ub_; }
-  bool free(Int i) const { return is_free_[i]; }
+  bool isFree(Int i) const { return is_free_[i]; }
 
   Int loadIntoIpx(ipx::LpSolver& lps) const;
 

highs/ipm/hipo/ipm/PreProcess.cpp

@@ -483,11 +483,11 @@ void PreprocessScaling::undo(PreprocessorPoint& point, const Model& model,
 
     // set variables that were ignored
     for (Int i = 0; i < n_post; ++i) {
-      if (!model.hasLb(i) || model.is_free_[i]) {
+      if (!model.hasLb(i) || model.isFree(i)) {
         point.xl[i] = kHighsInf;
         point.zl[i] = 0.0;
       }
-      if (!model.hasUb(i) || model.is_free_[i]) {
+      if (!model.hasUb(i) || model.isFree(i)) {
         point.xu[i] = kHighsInf;
         point.zu[i] = 0.0;
       }
@@ -561,11 +561,11 @@ void PreprocessFormulation::undo(PreprocessorPoint& point, const Model& model,
 
   // force unused entries to have correct value
   for (Int i = 0; i < n_pre; ++i) {
-    if (!model.hasLb(i) || model.is_free_[i]) {
+    if (!model.hasLb(i) || model.isFree(i)) {
       point.xl[i] = kHighsInf;
       point.zl[i] = 0.0;
     }
-    if (!model.hasUb(i) || model.is_free_[i]) {
+    if (!model.hasUb(i) || model.isFree(i)) {
       point.xu[i] = kHighsInf;
       point.zu[i] = 0.0;
     }