Added subsolver clocks for primal simplex

Author: jajhall

highs/lp_data/HConst.h

@@ -305,6 +305,8 @@ enum SubSolverIndex : int {
   kSubSolverMip = 0,
   kSubSolverSimplexBasis,
   kSubSolverSimplexNoBasis,
+  kSubSolverPrimalSimplexBasis,
+  kSubSolverPrimalSimplexNoBasis,
   kSubSolverHipo,
   kSubSolverIpx,
   kSubSolverHipoAc,

highs/lp_data/HighsInterface.cpp

@@ -4329,6 +4329,8 @@ void HighsSubSolverCallTime::initialise() {
   this->name.assign(kSubSolverCount, "");
   this->name[kSubSolverSimplexBasis] = "Simplex (basis)";
   this->name[kSubSolverSimplexNoBasis] = "Simplex (no basis)";
+  this->name[kSubSolverPrimalSimplexBasis] = "Primal simplex (basis)";
+  this->name[kSubSolverPrimalSimplexNoBasis] = "Primal simplex (no basis)";
   this->name[kSubSolverHipo] = "HiPO";
   this->name[kSubSolverIpx] = "IPX";
   this->name[kSubSolverHipoAc] = "HiPO (AC)";

highs/mip/HighsMipAnalysis.cpp

@@ -102,6 +102,10 @@ void HighsMipAnalysis::mipTimerAdd(const HighsInt mip_clock,
                                    // , const HighsInt thread_id
 ) const {
   if (!analyse_mip_time) return;
+  if (num_call == 0) {
+    assert(time == 0);
+    return;
+  }
   HighsInt highs_timer_clock = mip_clocks.clock_[mip_clock];
   mip_clocks.timer_pointer_->add(highs_timer_clock, num_call, time);
 }