From 97ff659ceb94ecc0829ccd98af36382c942bb5f8 Mon Sep 17 00:00:00 2001 From: Dylan Harries Date: Tue, 3 Jan 2017 18:49:22 +1030 Subject: [PATCH] Simplify default constructors in constraint classes --- .../two_scale_high_scale_constraint.cpp.in | 8 ----- .../two_scale_high_scale_constraint.hpp.in | 8 ++--- .../two_scale_low_scale_constraint.cpp.in | 28 --------------- .../two_scale_low_scale_constraint.hpp.in | 34 ++++++++++--------- .../two_scale_susy_scale_constraint.cpp.in | 9 ----- .../two_scale_susy_scale_constraint.hpp.in | 10 +++--- 6 files changed, 27 insertions(+), 70 deletions(-) diff --git a/templates/two_scale_high_scale_constraint.cpp.in b/templates/two_scale_high_scale_constraint.cpp.in index 5c301eba5..ead8eb68b 100644 --- a/templates/two_scale_high_scale_constraint.cpp.in +++ b/templates/two_scale_high_scale_constraint.cpp.in @@ -54,14 +54,6 @@ namespace flexiblesusy { #define MODEL model #define MODELCLASSNAME @ModelName@ -@ModelName@_high_scale_constraint::@ModelName@_high_scale_constraint() - : Single_scale_constraint() - , scale(0.) - , initial_scale_guess(0.) - , model(0) -{ -} - @ModelName@_high_scale_constraint::@ModelName@_high_scale_constraint( @ModelName@* model_) : Single_scale_constraint() diff --git a/templates/two_scale_high_scale_constraint.hpp.in b/templates/two_scale_high_scale_constraint.hpp.in index 47f91cd87..ae261c078 100644 --- a/templates/two_scale_high_scale_constraint.hpp.in +++ b/templates/two_scale_high_scale_constraint.hpp.in @@ -35,7 +35,7 @@ class Two_scale; template<> class @ModelName@_high_scale_constraint : public Single_scale_constraint { public: - @ModelName@_high_scale_constraint(); + @ModelName@_high_scale_constraint() = default; @ModelName@_high_scale_constraint(@ModelName@*); virtual ~@ModelName@_high_scale_constraint(); virtual void apply() override; @@ -55,9 +55,9 @@ protected: bool check_non_perturbative(); private: - double scale; - double initial_scale_guess; - @ModelName@* model; + double scale{0.}; + double initial_scale_guess{0.}; + @ModelName@* model{nullptr}; }; } // namespace flexiblesusy diff --git a/templates/two_scale_low_scale_constraint.cpp.in b/templates/two_scale_low_scale_constraint.cpp.in index e0aad5e39..4cd9cd436 100644 --- a/templates/two_scale_low_scale_constraint.cpp.in +++ b/templates/two_scale_low_scale_constraint.cpp.in @@ -59,34 +59,6 @@ namespace flexiblesusy { #define ALPHA_EM_DRBAR alpha_em_drbar #define CALCULATE_DRBAR_MASSES() model->calculate_DRbar_masses() -@ModelName@_low_scale_constraint::@ModelName@_low_scale_constraint() - : Single_scale_constraint() - , scale(0.) - , initial_scale_guess(0.) - , model(0) - , qedqcd() - , ckm() - , pmns() - , MWDRbar(0.) - , MZDRbar(0.) - , AlphaS(0.) - , EDRbar(0.) - , ThetaWDRbar(0.) - , new_g1(0.) - , new_g2(0.) - , new_g3(0.) - , self_energy_w_at_mw(0.) - , threshold_corrections_loop_order(1) -{ - ckm << 1., 0., 0., - 0., 1., 0., - 0., 0., 1.; - - pmns << 1., 0., 0., - 0., 1., 0., - 0., 0., 1.; -} - @ModelName@_low_scale_constraint::@ModelName@_low_scale_constraint( @ModelName@* model_, const softsusy::QedQcd& qedqcd_) : Single_scale_constraint() diff --git a/templates/two_scale_low_scale_constraint.hpp.in b/templates/two_scale_low_scale_constraint.hpp.in index 1f3bbedf3..00660dca7 100644 --- a/templates/two_scale_low_scale_constraint.hpp.in +++ b/templates/two_scale_low_scale_constraint.hpp.in @@ -37,7 +37,7 @@ class Two_scale; template<> class @ModelName@_low_scale_constraint : public Single_scale_constraint { public: - @ModelName@_low_scale_constraint(); + @ModelName@_low_scale_constraint() = default; @ModelName@_low_scale_constraint(@ModelName@*, const softsusy::QedQcd&); virtual ~@ModelName@_low_scale_constraint(); virtual void apply() override; @@ -55,21 +55,23 @@ public: void set_threshold_corrections_loop_order(unsigned); ///< threshold corrections loop order private: - double scale; - double initial_scale_guess; - @ModelName@* model; - softsusy::QedQcd qedqcd; - Eigen::Matrix,3,3> ckm; - Eigen::Matrix,3,3> pmns; - Eigen::Matrix neutrinoDRbar; - double MWDRbar; - double MZDRbar; - double AlphaS; - double EDRbar; - double ThetaWDRbar; - double new_g1, new_g2, new_g3; - double self_energy_w_at_mw; - unsigned threshold_corrections_loop_order; ///< threshold corrections loop order + double scale{0.}; + double initial_scale_guess{0.}; + @ModelName@* model{nullptr}; + softsusy::QedQcd qedqcd{}; + Eigen::Matrix,3,3> ckm{Eigen::Matrix,3,3>::Identity()}; + Eigen::Matrix,3,3> pmns{Eigen::Matrix,3,3>::Identity()}; + Eigen::Matrix neutrinoDRbar{}; + double MWDRbar{0.}; + double MZDRbar{0.}; + double AlphaS{0.}; + double EDRbar{0.}; + double ThetaWDRbar{0.}; + double new_g1{0.}; + double new_g2{0.}; + double new_g3{0.}; + double self_energy_w_at_mw{0.}; + unsigned threshold_corrections_loop_order{1}; ///< threshold corrections loop order double calculate_theta_w(double); void calculate_threshold_corrections(); diff --git a/templates/two_scale_susy_scale_constraint.cpp.in b/templates/two_scale_susy_scale_constraint.cpp.in index 03bf01caa..ac395d9d6 100644 --- a/templates/two_scale_susy_scale_constraint.cpp.in +++ b/templates/two_scale_susy_scale_constraint.cpp.in @@ -50,15 +50,6 @@ namespace flexiblesusy { #define MODEL model #define MODELCLASSNAME @ModelName@ -@ModelName@_susy_scale_constraint::@ModelName@_susy_scale_constraint() - : Single_scale_constraint() - , scale(0.) - , initial_scale_guess(0.) - , model(0) - , qedqcd() -{ -} - @ModelName@_susy_scale_constraint::@ModelName@_susy_scale_constraint( @ModelName@* model_, const softsusy::QedQcd& qedqcd_) : Single_scale_constraint() diff --git a/templates/two_scale_susy_scale_constraint.hpp.in b/templates/two_scale_susy_scale_constraint.hpp.in index 5441dc025..c4c844675 100644 --- a/templates/two_scale_susy_scale_constraint.hpp.in +++ b/templates/two_scale_susy_scale_constraint.hpp.in @@ -36,7 +36,7 @@ class Two_scale; template<> class @ModelName@_susy_scale_constraint : public Single_scale_constraint { public: - @ModelName@_susy_scale_constraint(); + @ModelName@_susy_scale_constraint() = default; @ModelName@_susy_scale_constraint(@ModelName@*, const softsusy::QedQcd&); virtual ~@ModelName@_susy_scale_constraint(); virtual void apply() override; @@ -56,10 +56,10 @@ protected: void update_scale(); private: - double scale; - double initial_scale_guess; - @ModelName@* model; - softsusy::QedQcd qedqcd; + double scale{0.}; + double initial_scale_guess{0.}; + @ModelName@* model{nullptr}; + softsusy::QedQcd qedqcd{}; }; } // namespace flexiblesusy