rename ScopedTimer -> Scoped_Timer to match naming conventions

vasdommes · Jul 21, 2023 · fbeda46 · fbeda46
1 parent a5afbef
commit fbeda46
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/src/Timers.hxx b/src/Timers.hxx
@@ -173,12 +173,12 @@ private:
 
 // Simple RAII timer
 // start() in constructor, stop() in destructor
-struct ScopedTimer : boost::noncopyable
+struct Scoped_Timer : boost::noncopyable
 {
-  ScopedTimer(Timers &timers, const std::string &name)
+  Scoped_Timer(Timers &timers, const std::string &name)
       : my_timer(timers.add_and_start(name))
   {}
-  virtual ~ScopedTimer() { my_timer.stop(); }
+  virtual ~Scoped_Timer() { my_timer.stop(); }
 
 private:
   Timer &my_timer;

diff --git a/src/sdp_solve/SDP_Solver/run/compute_bilinear_pairings/compute_bilinear_pairings.cxx b/src/sdp_solve/SDP_Solver/run/compute_bilinear_pairings/compute_bilinear_pairings.cxx
@@ -24,7 +24,7 @@ void compute_bilinear_pairings(
              2> &A_Y,
   Timers &timers)
 {
-  ScopedTimer congruence_timer(timers, "run.bilinear_pairings");
+  Scoped_Timer congruence_timer(timers, "run.bilinear_pairings");
   compute_A_X_inv(block_info, X_cholesky, bases_blocks, A_X_inv);
 
   compute_A_Y(block_info, Y, bases_blocks, A_Y);

diff --git a/src/sdp_solve/SDP_Solver/run/compute_dual_residues_and_error.cxx b/src/sdp_solve/SDP_Solver/run/compute_dual_residues_and_error.cxx
@@ -11,7 +11,7 @@ void compute_dual_residues_and_error(
     &A_Y,
   Block_Vector &dual_residues, El::BigFloat &dual_error, Timers &timers)
 {
-  ScopedTimer dual_residues_timer(timers, "run.computeDualResidues");
+  Scoped_Timer dual_residues_timer(timers, "run.computeDualResidues");
 
   auto dual_residues_block(dual_residues.blocks.begin());
   auto primal_objective_c_block(sdp.primal_objective_c.blocks.begin());

diff --git a/src/sdp_solve/SDP_Solver/run/compute_primal_residues_and_error_P_Ax_X.cxx b/src/sdp_solve/SDP_Solver/run/compute_primal_residues_and_error_P_Ax_X.cxx
@@ -7,7 +7,7 @@ void compute_primal_residues_and_error_P_Ax_X(
   const Block_Diagonal_Matrix &X, Block_Diagonal_Matrix &primal_residues,
   El::BigFloat &primal_error, Timers &timers)
 {
-  ScopedTimer primal_residues_timer(timers, "run.computePrimalResidues");
+  Scoped_Timer primal_residues_timer(timers, "run.computePrimalResidues");
   constraint_matrix_weighted_sum(block_info, sdp, x, primal_residues);
   primal_residues -= X;
   primal_error = primal_residues.max_abs();

diff --git a/...solve/SDP_Solver/run/step/initialize_schur_complement_solver/compute_schur_complement.cxx b/...solve/SDP_Solver/run/step/initialize_schur_complement_solver/compute_schur_complement.cxx
@@ -22,7 +22,7 @@ void compute_schur_complement(
     &A_Y,
   Block_Diagonal_Matrix &schur_complement, Timers &timers)
 {
-  ScopedTimer schur_complement_timer(
+  Scoped_Timer schur_complement_timer(
     timers, "run.step.initializeSchurComplementSolver.schur_complement");
 
   auto schur_complement_block(schur_complement.blocks.begin());

diff --git a/...Solver/run/step/initialize_schur_complement_solver/initialize_schur_complement_solver.cxx b/...Solver/run/step/initialize_schur_complement_solver/initialize_schur_complement_solver.cxx
@@ -70,8 +70,8 @@ void initialize_schur_complement_solver(
   Block_Matrix &schur_off_diagonal, El::DistMatrix<El::BigFloat> &Q,
   Timers &timers)
 {
-  ScopedTimer initialize_timer(timers,
-                               "run.step.initializeSchurComplementSolver");
+  Scoped_Timer initialize_timer(timers,
+                                "run.step.initializeSchurComplementSolver");
   // The Schur complement matrix S: a Block_Diagonal_Matrix with one
   // block for each 0 <= j < J.  SchurComplement.blocks[j] has dimension
   // (d_j+1)*m_j*(m_j+1)/2

diff --git a/src/sdp_solve/SDP_Solver/run/step/initialize_schur_complement_solver/synchronize_Q.cxx b/src/sdp_solve/SDP_Solver/run/step/initialize_schur_complement_solver/synchronize_Q.cxx
@@ -23,7 +23,7 @@ namespace
 void synchronize_Q(El::DistMatrix<El::BigFloat> &Q,
                    const El::DistMatrix<El::BigFloat> &Q_group, Timers &timers)
 {
-  ScopedTimer synchronize_Q_buffers_timer(
+  Scoped_Timer synchronize_Q_buffers_timer(
     timers, "run.step.initializeSchurComplementSolver.Q.synchronize_Q");
 
   const int total_ranks(El::mpi::Size(El::mpi::COMM_WORLD));

diff --git a/src/sdp_solve/SDP_Solver/run/step/step.cxx b/src/sdp_solve/SDP_Solver/run/step/step.cxx
@@ -56,7 +56,7 @@ void SDP_Solver::step(
   El::BigFloat &beta_corrector, El::BigFloat &primal_step_length,
   El::BigFloat &dual_step_length, bool &terminate_now, Timers &timers)
 {
-  ScopedTimer step_timer(timers, "run.step");
+  Scoped_Timer step_timer(timers, "run.step");
   El::BigFloat beta_predictor;
 
   // Search direction: These quantities have the same structure