make test compile

FlexibleSUSY · Jul 2, 2015 · 7cb9f17 · 7cb9f17
1 parent 53ac6b5
commit 7cb9f17
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/test/test_CMSSM_model.cpp b/test/test_CMSSM_model.cpp
@@ -2,6 +2,7 @@
 #define private public
 
 #include "CMSSM_two_scale_model.hpp"
+#include "CMSSM_two_scale_ewsb_solver.hpp"
 #include "test.h"
 #include "test_CMSSM.hpp"
 #include "softsusy.h"
@@ -1320,31 +1321,35 @@ void test_ewsb_solvers(CMSSM<Two_scale> model, MssmSoftsusy softSusy)
    const double BMu_ss = softSusy.displayM3Squared();
 
    // prepare solvers
-   CMSSM<Two_scale>::EWSB_args params = {&model, ewsb_loop_order};
+   CMSSM_two_scale_ewsb_solver ewsb_solver(&model);
+   ewsb_solver.set_loop_order(ewsb_loop_order);
+   ewsb_solver.set_number_of_iterations(number_of_ewsb_iterations);
+   ewsb_solver.set_precision(ewsb_iteration_precision);
+   CMSSM_two_scale_ewsb_solver::EWSB_args params = {&model, &ewsb_solver, ewsb_loop_order};
 
    EWSB_solver* solvers[] = {
       new Root_finder<2>(
-         CMSSM<Two_scale>::tadpole_equations, &params, number_of_ewsb_iterations,
+         CMSSM_two_scale_ewsb_solver::tadpole_equations, &params, number_of_ewsb_iterations,
          ewsb_iteration_precision, gsl_multiroot_fsolver_hybrid),
       new Root_finder<2>(
-         CMSSM<Two_scale>::tadpole_equations, &params, number_of_ewsb_iterations,
+         CMSSM_two_scale_ewsb_solver::tadpole_equations, &params, number_of_ewsb_iterations,
          ewsb_iteration_precision, gsl_multiroot_fsolver_hybrids),
       new Root_finder<2>(
-         CMSSM<Two_scale>::tadpole_equations, &params, number_of_ewsb_iterations,
+         CMSSM_two_scale_ewsb_solver::tadpole_equations, &params, number_of_ewsb_iterations,
          ewsb_iteration_precision, gsl_multiroot_fsolver_broyden),
       new Root_finder<2>(
-         CMSSM<Two_scale>::tadpole_equations, &params, number_of_ewsb_iterations,
+         CMSSM_two_scale_ewsb_solver::tadpole_equations, &params, number_of_ewsb_iterations,
          ewsb_iteration_precision, gsl_multiroot_fsolver_dnewton),
       new Fixed_point_iterator<2, fixed_point_iterator::Convergence_tester_relative>(
-         CMSSM<Two_scale>::ewsb_step, &params, number_of_ewsb_iterations,
+         CMSSM_two_scale_ewsb_solver::step, &params, number_of_ewsb_iterations,
          ewsb_iteration_precision),
       new Fixed_point_iterator<2, fixed_point_iterator::Convergence_tester_absolute>(
-         CMSSM<Two_scale>::ewsb_step, &params, number_of_ewsb_iterations,
+         CMSSM_two_scale_ewsb_solver::step, &params, number_of_ewsb_iterations,
          ewsb_iteration_precision)
    };
 
    double x_init[2];
-   model.ewsb_initial_guess(x_init);
+   ewsb_solver.initial_guess(x_init);
 
    // starting values for Mu, BMu
    const double Mu_0 = model.get_Mu();
@@ -1354,7 +1359,7 @@ void test_ewsb_solvers(CMSSM<Two_scale> model, MssmSoftsusy softSusy)
       model.set_Mu(Mu_0);
       model.set_BMu(BMu_0);
 
-      const int status = model.solve_ewsb_iteratively_with(solvers[i], x_init);
+      const int status = ewsb_solver.solve_iteratively_with(solvers[i], x_init);
 
       TEST_EQUALITY(status, EWSB_solver::SUCCESS);