Change to solveHandler in Numeric

Author: filikat

highs/ipm/hipo/factorhighs/HybridSolveHandler.h

@@ -9,11 +9,11 @@ class HybridSolveHandler : public SolveHandler {
   const std::vector<std::vector<Int>>& swaps_;
   const std::vector<std::vector<double>>& pivot_2x2_;
 
+ public:
   void forwardSolve(std::vector<double>& x) const override;
   void backwardSolve(std::vector<double>& x) const override;
   void diagSolve(std::vector<double>& x) const override;
 
- public:
   HybridSolveHandler(const Symbolic& S,
                      const std::vector<std::vector<double>>& sn_columns,
                      const std::vector<std::vector<Int>>& swaps,

highs/ipm/hipo/factorhighs/Numeric.cpp

@@ -21,8 +21,7 @@ Int Numeric::solve(std::vector<double>& x) const {
   HIPO_CLOCK_CREATE;
 
   // initialise solve handler
-  SH_.reset(
-      new HybridSolveHandler(*S_, *sn_columns_, swaps_, pivot_2x2_, *data_));
+  HybridSolveHandler SH(*S_, *sn_columns_, swaps_, pivot_2x2_, *data_);
 
   // permute rhs
   HIPO_CLOCK_START(2);
@@ -31,9 +30,9 @@ Int Numeric::solve(std::vector<double>& x) const {
 
   // solve
   HIPO_CLOCK_START(2);
-  SH_->forwardSolve(x);
-  SH_->diagSolve(x);
-  SH_->backwardSolve(x);
+  SH.forwardSolve(x);
+  SH.diagSolve(x);
+  SH.backwardSolve(x);
   HIPO_CLOCK_STOP(2, *data_, kTimeSolveSolve);
 
   // unpermute solution

highs/ipm/hipo/factorhighs/Numeric.h

@@ -28,9 +28,6 @@ class Numeric {
   // symbolic object
   const Symbolic* S_;
 
-  // object to handle solve phase in different formats
-  mutable std::unique_ptr<SolveHandler> SH_;
-
   DataCollector* data_ = nullptr;
 
   friend class Factorise;