Adapt tests, models and example to commit b6aae12

FlexibleSUSY · Dec 21, 2016 · 775ee02 · 775ee02
1 parent b6aae12
commit 775ee02
Show file tree

Hide file tree

Showing 31 changed files with 51 additions and 51 deletions.
diff --git a/examples/customized-betas/MSSMcbs_two_scale_low_scale_constraint.cpp b/examples/customized-betas/MSSMcbs_two_scale_low_scale_constraint.cpp
@@ -108,7 +108,7 @@ double MSSMcbs_low_scale_constraint<Two_scale>::get_initial_scale_guess() const
    return initial_scale_guess;
 }
 
-void MSSMcbs_low_scale_constraint<Two_scale>::set_model(Two_scale_model* model_)
+void MSSMcbs_low_scale_constraint<Two_scale>::set_model(Model* model_)
 {
    model = cast_model<MSSMcbs<Two_scale>*>(model_);
 }

diff --git a/examples/customized-betas/MSSMcbs_two_scale_low_scale_constraint.hpp b/examples/customized-betas/MSSMcbs_two_scale_low_scale_constraint.hpp
@@ -39,7 +39,7 @@ class MSSMcbs_low_scale_constraint<Two_scale> : public Constraint<Two_scale> {
    virtual ~MSSMcbs_low_scale_constraint();
    virtual void apply();
    virtual double get_scale() const;
-   virtual void set_model(Two_scale_model*);
+   virtual void set_model(Model*);
 
    void clear();
    double get_initial_scale_guess() const;

diff --git a/examples/tower/MSSMD5O_MSSMRHN_two_scale_matching.cpp b/examples/tower/MSSMD5O_MSSMRHN_two_scale_matching.cpp
@@ -164,7 +164,7 @@ double MSSMD5O_MSSMRHN_matching::get_initial_scale_guess() const
    return initial_scale_guess;
 }
 
-void MSSMD5O_MSSMRHN_matching::set_models(Two_scale_model *lower_, Two_scale_model *upper_)
+void MSSMD5O_MSSMRHN_matching::set_models(Model *lower_, Model *upper_)
 {
     lower = cast_model<MSSMD5O<Two_scale>*>(lower_);
     upper = cast_model<MSSMRHN<Two_scale>*>(upper_);
@@ -285,7 +285,7 @@ double MSSMD5O_MSSMRHN_matching_up<Two_scale>::get_scale() const
 }
 
 void MSSMD5O_MSSMRHN_matching_up<Two_scale>::set_models(
-   Two_scale_model *lower, Two_scale_model *upper)
+   Model *lower, Model *upper)
 {
    matching.set_models(lower, upper);
 }
@@ -332,7 +332,7 @@ double MSSMD5O_MSSMRHN_matching_down<Two_scale>::get_scale() const
 }
 
 void MSSMD5O_MSSMRHN_matching_down<Two_scale>::set_models(
-   Two_scale_model *upper, Two_scale_model *lower)
+   Model *upper, Model *lower)
 {
    matching.set_models(lower, upper);
 }

diff --git a/examples/tower/MSSMD5O_MSSMRHN_two_scale_matching.hpp b/examples/tower/MSSMD5O_MSSMRHN_two_scale_matching.hpp
@@ -40,7 +40,7 @@ class MSSMD5O_MSSMRHN_matching {
     void match_low_to_high_scale_model();
     void match_high_to_low_scale_model();
     double get_scale() const;
-    void set_models(Two_scale_model *lower, Two_scale_model *upper);
+    void set_models(Model *lower, Model *upper);
     double get_initial_scale_guess() const;
     void set_lower_input_parameters(const MSSMD5O_input_parameters&);
     void set_scale(double) {}
@@ -68,7 +68,7 @@ class MSSMD5O_MSSMRHN_matching_up<Two_scale> : public Matching<Two_scale> {
     MSSMD5O_MSSMRHN_matching_up(const MSSMD5O_input_parameters&);
     void match();
     double get_scale() const;
-    void set_models(Two_scale_model *lower, Two_scale_model *upper);
+    void set_models(Model *lower, Model *upper);
     double get_initial_scale_guess() const;
     void set_lower_input_parameters(const MSSMD5O_input_parameters&);
     void set_scale(double);
@@ -85,7 +85,7 @@ class MSSMD5O_MSSMRHN_matching_down<Two_scale> : public Matching<Two_scale> {
     MSSMD5O_MSSMRHN_matching_down(const MSSMD5O_input_parameters&);
     void match();
     double get_scale() const;
-    void set_models(Two_scale_model *upper, Two_scale_model *lower);
+    void set_models(Model *upper, Model *lower);
     double get_initial_scale_guess() const;
     void set_lower_input_parameters(const MSSMD5O_input_parameters&);
     void set_scale(double);

diff --git a/models/SoftsusyMSSM/SoftsusyMSSM_two_scale.cpp b/models/SoftsusyMSSM/SoftsusyMSSM_two_scale.cpp
@@ -21,7 +21,7 @@
 namespace flexiblesusy {
 
 SoftsusyMSSM<Two_scale>::SoftsusyMSSM()
-   : Two_scale_model()
+   : Model()
    , precision(1.0e-5)
 {
 }

diff --git a/models/SoftsusyMSSM/SoftsusyMSSM_two_scale.hpp b/models/SoftsusyMSSM/SoftsusyMSSM_two_scale.hpp
@@ -20,15 +20,15 @@
 #define SoftsusyMSSM_TWO_SCALE_H
 
 #include "SoftsusyMSSM.hpp"
-#include "two_scale_model.hpp"
+#include "model.hpp"
 #include "softsusy.h"
 
 namespace flexiblesusy {
 
 class Two_scale;
 
 template<>
-class SoftsusyMSSM<Two_scale>: public Two_scale_model, public softsusy::MssmSoftsusy {
+class SoftsusyMSSM<Two_scale>: public Model, public softsusy::MssmSoftsusy {
 public:
    SoftsusyMSSM();
    virtual ~SoftsusyMSSM();

diff --git a/models/SoftsusyMSSM/SoftsusyMSSM_two_scale_low_scale_constraint.cpp b/models/SoftsusyMSSM/SoftsusyMSSM_two_scale_low_scale_constraint.cpp
@@ -48,7 +48,7 @@ double SoftsusyMSSM_low_scale_constraint::get_scale() const
    return scale;
 }
 
-void SoftsusyMSSM_low_scale_constraint::set_model(Two_scale_model* model)
+void SoftsusyMSSM_low_scale_constraint::set_model(Model* model)
 {
    mssm = cast_model<SoftsusyMSSM<Two_scale>*>(model);
 }

diff --git a/models/SoftsusyMSSM/SoftsusyMSSM_two_scale_low_scale_constraint.hpp b/models/SoftsusyMSSM/SoftsusyMSSM_two_scale_low_scale_constraint.hpp
@@ -44,7 +44,7 @@ class SoftsusyMSSM_low_scale_constraint : public Constraint<Two_scale> {
    virtual ~SoftsusyMSSM_low_scale_constraint();
    virtual void apply();
    virtual double get_scale() const;
-   virtual void set_model(Two_scale_model*);
+   virtual void set_model(Model*);
 
 private:
    SoftsusyMSSM<Two_scale>* mssm;

diff --git a/models/SoftsusyMSSM/SoftsusyMSSM_two_scale_sugra_constraint.cpp b/models/SoftsusyMSSM/SoftsusyMSSM_two_scale_sugra_constraint.cpp
@@ -47,7 +47,7 @@ double SoftsusyMSSM_sugra_constraint::get_scale() const
    return mx_guess;
 }
 
-void SoftsusyMSSM_sugra_constraint::set_model(Two_scale_model* model)
+void SoftsusyMSSM_sugra_constraint::set_model(Model* model)
 {
    mssm = cast_model<SoftsusyMSSM<Two_scale>*>(model);
 }

diff --git a/models/SoftsusyMSSM/SoftsusyMSSM_two_scale_sugra_constraint.hpp b/models/SoftsusyMSSM/SoftsusyMSSM_two_scale_sugra_constraint.hpp
@@ -32,7 +32,7 @@ class SoftsusyMSSM_sugra_constraint : public Constraint<Two_scale> {
    virtual ~SoftsusyMSSM_sugra_constraint();
    virtual void apply();
    virtual double get_scale() const;
-   virtual void set_model(Two_scale_model*);
+   virtual void set_model(Model*);
 
 private:
    double mx_guess;

diff --git a/models/SoftsusyMSSM/SoftsusyMSSM_two_scale_susy_scale_constraint.cpp b/models/SoftsusyMSSM/SoftsusyMSSM_two_scale_susy_scale_constraint.cpp
@@ -55,7 +55,7 @@ double SoftsusyMSSM_susy_scale_constraint::get_scale() const
    return scale;
 }
 
-void SoftsusyMSSM_susy_scale_constraint::set_model(Two_scale_model* model)
+void SoftsusyMSSM_susy_scale_constraint::set_model(Model* model)
 {
    mssm = cast_model<SoftsusyMSSM<Two_scale>*>(model);
 }

diff --git a/models/SoftsusyMSSM/SoftsusyMSSM_two_scale_susy_scale_constraint.hpp b/models/SoftsusyMSSM/SoftsusyMSSM_two_scale_susy_scale_constraint.hpp
@@ -44,7 +44,7 @@ class SoftsusyMSSM_susy_scale_constraint : public Constraint<Two_scale> {
    virtual ~SoftsusyMSSM_susy_scale_constraint();
    virtual void apply();
    virtual double get_scale() const;
-   virtual void set_model(Two_scale_model*);
+   virtual void set_model(Model*);
 
 private:
    SoftsusyMSSM<Two_scale>* mssm;

diff --git a/models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale.cpp b/models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale.cpp
@@ -21,7 +21,7 @@
 namespace flexiblesusy {
 
 SoftsusyNMSSM<Two_scale>::SoftsusyNMSSM()
-   : Two_scale_model()
+   : Model()
    , precision(1.0e-5)
 {
 }

diff --git a/models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale.hpp b/models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale.hpp
@@ -20,15 +20,15 @@
 #define SoftsusyNMSSM_TWO_SCALE_H
 
 #include "SoftsusyNMSSM.hpp"
-#include "two_scale_model.hpp"
+#include "model.hpp"
 #include "nmssmsoftsusy.h"
 
 namespace flexiblesusy {
 
 class Two_scale;
 
 template<>
-class SoftsusyNMSSM<Two_scale>: public Two_scale_model, public softsusy::NmssmSoftsusy {
+class SoftsusyNMSSM<Two_scale>: public Model, public softsusy::NmssmSoftsusy {
 public:
    SoftsusyNMSSM();
    virtual ~SoftsusyNMSSM();

diff --git a/models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale_low_scale_constraint.cpp b/models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale_low_scale_constraint.cpp
@@ -48,7 +48,7 @@ double SoftsusyNMSSM_low_scale_constraint::get_scale() const
    return scale;
 }
 
-void SoftsusyNMSSM_low_scale_constraint::set_model(Two_scale_model* model)
+void SoftsusyNMSSM_low_scale_constraint::set_model(Model* model)
 {
    mssm = cast_model<SoftsusyNMSSM<Two_scale>*>(model);
 }

diff --git a/models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale_low_scale_constraint.hpp b/models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale_low_scale_constraint.hpp
@@ -44,7 +44,7 @@ class SoftsusyNMSSM_low_scale_constraint : public Constraint<Two_scale> {
    virtual ~SoftsusyNMSSM_low_scale_constraint();
    virtual void apply();
    virtual double get_scale() const;
-   virtual void set_model(Two_scale_model*);
+   virtual void set_model(Model*);
 
 private:
    SoftsusyNMSSM<Two_scale>* mssm;

diff --git a/models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale_sugra_constraint.cpp b/models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale_sugra_constraint.cpp
@@ -47,7 +47,7 @@ double SoftsusyNMSSM_sugra_constraint::get_scale() const
    return mx_guess;
 }
 
-void SoftsusyNMSSM_sugra_constraint::set_model(Two_scale_model* model)
+void SoftsusyNMSSM_sugra_constraint::set_model(Model* model)
 {
    mssm = cast_model<SoftsusyNMSSM<Two_scale>*>(model);
 }

diff --git a/models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale_sugra_constraint.hpp b/models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale_sugra_constraint.hpp
@@ -32,7 +32,7 @@ class SoftsusyNMSSM_sugra_constraint : public Constraint<Two_scale> {
    virtual ~SoftsusyNMSSM_sugra_constraint();
    virtual void apply();
    virtual double get_scale() const;
-   virtual void set_model(Two_scale_model*);
+   virtual void set_model(Model*);
 
 private:
    double mx_guess;

diff --git a/models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale_susy_scale_constraint.cpp b/models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale_susy_scale_constraint.cpp
@@ -55,7 +55,7 @@ double SoftsusyNMSSM_susy_scale_constraint::get_scale() const
    return scale;
 }
 
-void SoftsusyNMSSM_susy_scale_constraint::set_model(Two_scale_model* model)
+void SoftsusyNMSSM_susy_scale_constraint::set_model(Model* model)
 {
    snmssm = cast_model<SoftsusyNMSSM<Two_scale>*>(model);
 }

diff --git a/models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale_susy_scale_constraint.hpp b/models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale_susy_scale_constraint.hpp
@@ -44,7 +44,7 @@ class SoftsusyNMSSM_susy_scale_constraint : public Constraint<Two_scale> {
    virtual ~SoftsusyNMSSM_susy_scale_constraint();
    virtual void apply();
    virtual double get_scale() const;
-   virtual void set_model(Two_scale_model*);
+   virtual void set_model(Model*);
 
 private:
    SoftsusyNMSSM<Two_scale>* snmssm;

diff --git a/models/sm/sm_two_scale.hpp b/models/sm/sm_two_scale.hpp
@@ -21,7 +21,7 @@
 
 #include "rge.h"
 #include "linalg.h"
-#include "two_scale_model.hpp"
+#include "model.hpp"
 #include "sm.hpp"
 
 #include <iostream>
@@ -34,7 +34,7 @@ class Two_scale;
 std::ostream& operator <<(std::ostream&, const StandardModel<Two_scale>&);
 
 template<>
-class StandardModel<Two_scale>: public Two_scale_model, protected softsusy::RGE {
+class StandardModel<Two_scale>: public Model, protected softsusy::RGE {
 private:
    softsusy::DoubleMatrix yu, yd, ye; ///< Yukawa matrices for ups, downs and leptons
    softsusy::DoubleVector g;          ///< Gauge couplings (g1 = sqrt(5/3) g_Y)

diff --git a/models/sm/sm_two_scale_experimental_constraint.cpp b/models/sm/sm_two_scale_experimental_constraint.cpp
@@ -67,7 +67,7 @@ double StandardModel_exp_constraint::get_scale() const
    return Electroweak_constants::MZ;
 }
 
-void StandardModel_exp_constraint::set_model(Two_scale_model* model)
+void StandardModel_exp_constraint::set_model(Model* model)
 {
    sm = cast_model<StandardModel<Two_scale>*>(model);
 }

diff --git a/models/sm/sm_two_scale_experimental_constraint.hpp b/models/sm/sm_two_scale_experimental_constraint.hpp
@@ -43,7 +43,7 @@ class StandardModel_exp_constraint : public Constraint<Two_scale> {
    virtual ~StandardModel_exp_constraint();
    virtual void apply();
    virtual double get_scale() const;
-   virtual void set_model(Two_scale_model*);
+   virtual void set_model(Model*);
 
 private:
    StandardModel<Two_scale>* sm; ///< model to apply the constraints to

diff --git a/models/smcw/smcw_two_scale_gut_constraint.cpp b/models/smcw/smcw_two_scale_gut_constraint.cpp
@@ -37,7 +37,7 @@ double StandardModelCWGUTConstraint::get_scale() const
    return estimated_scale;
 }
 
-void StandardModelCWGUTConstraint::set_model(Two_scale_model* model)
+void StandardModelCWGUTConstraint::set_model(Model* model)
 {
    smcw = cast_model<StandardModelCW<Two_scale>*>(model);
 }

diff --git a/models/smcw/smcw_two_scale_gut_constraint.hpp b/models/smcw/smcw_two_scale_gut_constraint.hpp
@@ -31,7 +31,7 @@ class StandardModelCWGUTConstraint : public Constraint<Two_scale> {
    virtual ~StandardModelCWGUTConstraint();
    virtual void apply();
    virtual double get_scale() const;
-   virtual void set_model(Two_scale_model*);
+   virtual void set_model(Model*);
 
 private:
    double estimated_scale;

diff --git a/test/test_CMSSM_high_scale_constraint.cpp b/test/test_CMSSM_high_scale_constraint.cpp
@@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE( test_mx_calculation )
    CMSSM_high_scale_constraint<Two_scale> CMSSM_sugra_constraint(&m);
    SoftsusyMSSM_sugra_constraint mssm_sugra_constraint(pp);
 
-   mssm_sugra_constraint.set_model((Two_scale_model*)&s);
+   mssm_sugra_constraint.set_model((Model*)&s);
 
    CMSSM_sugra_constraint.update_scale();
    mssm_sugra_constraint.update_scale();

diff --git a/test/test_NMSSM_high_scale_constraint.cpp b/test/test_NMSSM_high_scale_constraint.cpp
@@ -88,7 +88,7 @@ BOOST_AUTO_TEST_CASE( test_mx_calculation )
    NMSSM_high_scale_constraint<Two_scale> NMSSM_sugra_constraint(&m);
    SoftsusyNMSSM_sugra_constraint snmssm_sugra_constraint(pp);
 
-   snmssm_sugra_constraint.set_model((Two_scale_model*)&s);
+   snmssm_sugra_constraint.set_model((Model*)&s);
 
    NMSSM_sugra_constraint.update_scale();
    snmssm_sugra_constraint.update_scale();

diff --git a/test/test_cast_model.cpp b/test/test_cast_model.cpp
@@ -4,12 +4,12 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include "two_scale_model.hpp"
+#include "model.hpp"
 #include "two_scale_constraint.hpp"
 
 using namespace flexiblesusy;
 
-class MyModel : public Two_scale_model {
+class MyModel : public Model {
 public:
    virtual ~MyModel() {}
    virtual void calculate_spectrum() {}
@@ -22,7 +22,7 @@ BOOST_AUTO_TEST_CASE( test_cast_model )
 {
    MyModel model;
 
-   Two_scale_model* model_ptr = &model;
+   Model* model_ptr = &model;
 
    MyModel* mymodel_ptr = cast_model<MyModel*>(model_ptr);
 

diff --git a/test/test_two_scale_running_precision.cpp b/test/test_two_scale_running_precision.cpp
@@ -1,6 +1,6 @@
 
+#include "model.hpp"
 #include "two_scale_solver.hpp"
-#include "two_scale_model.hpp"
 #include "two_scale_constraint.hpp"
 #include "two_scale_convergence_tester.hpp"
 #include "two_scale_running_precision.hpp"
@@ -62,7 +62,7 @@ class Static_convergence_tester : public Convergence_tester<Two_scale> {
    unsigned int iteration, maximum_iterations;
 };
 
-class Static_model: public Two_scale_model {
+class Static_model: public Model {
 public:
    Static_model() {}
    virtual ~Static_model() {}
@@ -79,7 +79,7 @@ class Static_constraint : public Constraint<Two_scale> {
    virtual ~Static_constraint() {}
    virtual void apply() {}
    virtual double get_scale() const { return scale; }
-   virtual void set_model(Two_scale_model*) {}
+   virtual void set_model(Model*) {}
 private:
    double scale;
 };

diff --git a/test/test_two_scale_sm_smcw_integration.cpp b/test/test_two_scale_sm_smcw_integration.cpp
@@ -1,6 +1,6 @@
+#include "model.hpp"
 #include "two_scale_solver.hpp"
 #include "two_scale_matching.hpp"
-#include "two_scale_model.hpp"
 #include "sm_two_scale.hpp"
 #include "sm_two_scale_experimental_constraint.hpp"
 #include "smcw_two_scale.hpp"
@@ -43,7 +43,7 @@ class Trivial_SM_SMCW_matching_condition_upwards: public Matching<Two_scale> {
    virtual double get_scale() const {
       return 3000;
    }
-   virtual void set_models(Two_scale_model* sm_, Two_scale_model* smcw_) {
+   virtual void set_models(Model* sm_, Model* smcw_) {
       sm = cast_model<StandardModel<Two_scale>*>(sm_);
       smcw = cast_model<StandardModelCW<Two_scale>*>(smcw_);
    }
@@ -73,7 +73,7 @@ class Trivial_SM_SMCW_matching_condition_downwards: public Matching<Two_scale> {
    virtual double get_scale() const {
       return 3000;
    }
-   virtual void set_models(Two_scale_model* smcw_, Two_scale_model* sm_) {
+   virtual void set_models(Model* smcw_, Model* sm_) {
       sm = cast_model<StandardModel<Two_scale>*>(sm_);
       smcw = cast_model<StandardModelCW<Two_scale>*>(smcw_);
    }
@@ -105,7 +105,7 @@ class Dynamic_SM_SMCW_matching_condition_downwards: public Matching<Two_scale> {
    virtual double get_scale() const {
       return scale;
    }
-   virtual void set_models(Two_scale_model* smcw_, Two_scale_model* sm_) {
+   virtual void set_models(Model* smcw_, Model* sm_) {
       sm = cast_model<StandardModel<Two_scale>*>(sm_);
       smcw = cast_model<StandardModelCW<Two_scale>*>(smcw_);
    }
@@ -143,7 +143,7 @@ class Dynamic_SM_SMCW_matching_condition_upwards: public Matching<Two_scale> {
    virtual double get_scale() const {
       return scale;
    }
-   virtual void set_models(Two_scale_model* sm_, Two_scale_model* smcw_) {
+   virtual void set_models(Model* sm_, Model* smcw_) {
       sm = cast_model<StandardModel<Two_scale>*>(sm_);
       smcw = cast_model<StandardModelCW<Two_scale>*>(smcw_);
    }