Tidied up header file directives

Author: jajhall

highs/pdlp/HiPdlpWrapper.h

@@ -15,10 +15,6 @@
 #include <cassert>
 
 #include "lp_data/HighsSolution.h"
-// #include "pdlp/cupdlp/cupdlp.h"
-
-// typedef enum CONSTRAINT_TYPE { EQ = 0, LEQ, GEQ, BOUND } constraint_type;
-
 HighsStatus solveLpHiPdlp(HighsLpSolverObject& solver_object);
 
 HighsStatus solveLpHiPdlp(const HighsOptions& options, HighsTimer& timer,

highs/pdlp/hipdlp/linalg.hpp

@@ -8,8 +8,8 @@
 /**@file pdlp/hipdlp/linalg.hpp
  * @brief
  */
-#ifndef LINALG_HPP
-#define LINALG_HPP
+#ifndef PDLP_HIPDLP_LINALG_HPP
+#define PDLP_HIPDLP_LINALG_HPP
 
 #include <vector>
 
@@ -52,4 +52,4 @@ std::vector<double> compute_row_norms(
     const HighsLp& lp, double p = std::numeric_limits<double>::infinity());
 }  // namespace linalg
 
-#endif  // LINALG_HPP
+#endif  // PDLP_HIPDLP_LINALG_HPP

highs/pdlp/hipdlp/logger.hpp

@@ -8,8 +8,8 @@
 /**@file pdlp/hipdlp/logger.hpp
  * @brief
  */
-#ifndef LOGGER_HPP
-#define LOGGER_HPP
+#ifndef PDLP_HIPDLP_LOGGER_HPP
+#define PDLP_HIPDLP_LOGGER_HPP
 
 #include <chrono>
 #include <fstream>
@@ -64,4 +64,4 @@ class Logger {
   std::ofstream log_file_;
 };
 
-#endif  // LOGGER_HPP
+#endif  // PDLP_HIPDLP_LOGGER_HPP

highs/pdlp/hipdlp/pdhg.hpp

@@ -8,8 +8,8 @@
 /**@file pdlp/hipdlp/pdhg.hpp
  * @brief
  */
-#ifndef PDHG_HPP
-#define PDHG_HPP
+#ifndef PDLP_HIPDLP_PDHG_HPP
+#define PDLP_HIPDLP_PDHG_HPP
 
 #include <algorithm>
 #include <cmath>

highs/pdlp/hipdlp/restart.hpp

@@ -9,8 +9,8 @@
  * @brief
  */
 // restart.hpp
-#ifndef RESTART_HPP
-#define RESTART_HPP
+#ifndef PDLP_HIPDLP_RESTART_HPP
+#define PDLP_HIPDLP_RESTART_HPP
 
 #include <cmath>
 #include <iostream>
@@ -55,4 +55,4 @@ class RestartScheme {
   double necessary_decay_factor_ = 0.8;
 };
 
-#endif  // RESTART_HPP
+#endif  // PDLP_HIPDLP_RESTART_HPP

highs/pdlp/hipdlp/scaling.hpp

@@ -8,8 +8,8 @@
 /**@file pdlp/hipdlp/scaling.hpp
  * @brief
  */
-#ifndef SCALING_HPP
-#define SCALING_HPP
+#ifndef PDLP_HIPDLP_SCALING_HPP
+#define PDLP_HIPDLP_SCALING_HPP
 
 #include <algorithm>
 #include <cmath>
@@ -55,4 +55,4 @@ class Scaling {
   double ComputeNorm(const double* values, int size, double norm_type) const;
 };
 
-#endif  // SCALING_HPP
+#endif  // PDLP_HIPDLP_SCALING_HPP

highs/pdlp/hipdlp/solver_results.hpp

@@ -8,8 +8,8 @@
 /**@file pdlp/hipdlp/solver_results.hpp
  * @brief
  */
-#ifndef SOLVER_RESULTS_HPP
-#define SOLVER_RESULTS_HPP
+#ifndef PDLP_HIPDLP_SOLVER_RESULTS_HPP
+#define PDLP_HIPDLP_SOLVER_RESULTS_HPP
 
 #include <vector>
 
@@ -64,4 +64,4 @@ struct SolverResults {
   double duality_gap_last_restart = 0.0;
 };
 
-#endif  // SOLVER_RESULTS_HPP
+#endif  // PDLP_HIPDLP_SOLVER_RESULTS_HPP

highs/pdlp/hipdlp/step.hpp

@@ -8,8 +8,8 @@
 /**@file pdlp/hipdlp/step.hpp
  * @brief
  */
-#ifndef STEP_H
-#define STEP_H
+#ifndef PDLP_HIPDLP_STEP_HPP
+#define PDLP_HIPDLP_STEP_HPP
 
 #include <vector>
 
@@ -86,4 +86,4 @@ bool UpdateIteratesMalitskyPock(
 
 }  // namespace step
 
-#endif  // STEP_HPP
+#endif  // PDLP_HIPDLP_STEP_HPP