replace default constructor by constructor which takes pointer to mod…

…el as argument
FlexibleSUSY · Jun 11, 2015 · a0552e8 · a0552e8
1 parent c5afa54
commit a0552e8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/src/weinberg_angle_pointer.cpp b/src/weinberg_angle_pointer.cpp
@@ -58,11 +58,11 @@ Weinberg_angle_pointer::Derived_data::Derived_data()
  * and the precision goal to 1.0e-8 and
  * enables the SUSY contributions by default.
  */
-Weinberg_angle_pointer::Weinberg_angle_pointer()
+Weinberg_angle_pointer::Weinberg_angle_pointer(const CMSSM<Two_scale>* model_)
    : number_of_iterations(20)
    , number_of_loops(2)
    , precision_goal(1.0e-8)
-   , model(nullptr)
+   , model(model_)
    , susy_contributions(true)
    , derived_data()
 {

diff --git a/src/weinberg_angle_pointer.hpp b/src/weinberg_angle_pointer.hpp
@@ -31,7 +31,7 @@ namespace weinberg_angle {
  */
 class Weinberg_angle_pointer {
 public:
-    Weinberg_angle_pointer();
+    Weinberg_angle_pointer(const CMSSM<Two_scale>*);
    ~Weinberg_angle_pointer();
 
    void enable_susy_contributions();  ///< enable susy contributions

diff --git a/test/test_CMSSM_weinberg_angle_pointer.cpp b/test/test_CMSSM_weinberg_angle_pointer.cpp
@@ -208,8 +208,7 @@ BOOST_AUTO_TEST_CASE( test_derived_data )
    Weinberg_angle::Data data;
    setup_data(model, data);
 
-   Weinberg_angle_pointer wein;
-   wein.set_model_pointer(&model);
+   Weinberg_angle_pointer wein(&model);
    wein.calculate_derived_data();
 
    BOOST_CHECK_CLOSE_FRACTION(data.alpha_em_drbar, wein.derived_data.alpha_em_drbar, 1.0e-10);
@@ -261,8 +260,7 @@ BOOST_AUTO_TEST_CASE( test_delta_vb )
    setup_data(model, data);
    double delta_vb_1 = Weinberg_angle::calculate_delta_vb(outrho, outsin, data);
 
-   Weinberg_angle_pointer wein;
-   wein.set_model_pointer(&model);
+   Weinberg_angle_pointer wein(&model);
    wein.calculate_derived_data();
    double delta_vb_2 = wein.calculate_delta_vb(outrho, outsin);
 
@@ -287,8 +285,7 @@ BOOST_AUTO_TEST_CASE( test_delta_r )
    setup_data(model, data);
    double delta_r_1 = Weinberg_angle::calculate_delta_r(outrho, outsin, data);
 
-   Weinberg_angle_pointer wein;
-   wein.set_model_pointer(&model);
+   Weinberg_angle_pointer wein(&model);
    wein.calculate_derived_data();
    double delta_r_2 = wein.calculate_delta_r(outrho, outsin);
 
@@ -313,8 +310,7 @@ BOOST_AUTO_TEST_CASE( test_delta_rho )
    setup_data(model, data);
    double delta_rho_1 = Weinberg_angle::calculate_delta_rho(outrho, outsin, data);
 
-   Weinberg_angle_pointer wein;
-   wein.set_model_pointer(&model);
+   Weinberg_angle_pointer wein(&model);
    wein.calculate_derived_data();
    double delta_rho_2 = wein.calculate_delta_rho(outrho, outsin);
 
@@ -356,8 +352,7 @@ BOOST_AUTO_TEST_CASE( test_sin_theta )
 
    BOOST_MESSAGE("running calculation with Weinberg_angle_pointer ...");
    stopwatch.start();
-   Weinberg_angle_pointer pwein;
-   pwein.set_model_pointer(&model);
+   Weinberg_angle_pointer pwein(&model);
    pwein.set_number_of_iterations(maxTries);
    pwein.set_precision_goal(tol);
    double sin_theta_2;