improve verbose output of two-scale solver

by writing name of constraint to the output
FlexibleSUSY · Oct 9, 2016 · c186aab · c186aab
1 parent 4ee3355
commit c186aab
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/src/two_scale_constraint.hpp b/src/two_scale_constraint.hpp
@@ -21,6 +21,7 @@
 
 #include "constraint.hpp"
 #include "logger.hpp"
+#include <string>
 #include <typeinfo>
 
 namespace flexiblesusy {
@@ -34,6 +35,7 @@ class Constraint<Two_scale> {
    virtual ~Constraint() {}
    virtual void apply() = 0;                    ///< apply constraint
    virtual double get_scale() const = 0;        ///< get scale where to apply
+   virtual std::string name() const { return "unknown constraint"; } ///< name of constraint
    virtual void set_model(Two_scale_model*) = 0; ///< set model where to apply the constraint
 };
 

diff --git a/src/two_scale_solver.cpp b/src/two_scale_solver.cpp
@@ -333,7 +333,7 @@ double RGFlow<Two_scale>::Constraint_slider::get_scale() {
 void RGFlow<Two_scale>::Constraint_slider::slide() {
    VERBOSE_MSG("> \trunning " << model->name() << " to scale " << constraint->get_scale() << " GeV");
    model->run_to(constraint->get_scale());
-   VERBOSE_MSG("> \tapplying constraint");
+   VERBOSE_MSG("> \tapplying " << constraint->name());
    constraint->apply();
 }
 

diff --git a/templates/two_scale_high_scale_constraint.hpp.in b/templates/two_scale_high_scale_constraint.hpp.in
@@ -38,9 +38,10 @@ public:
    @ModelName@_high_scale_constraint();
    @ModelName@_high_scale_constraint(@ModelName@<Two_scale>*);
    virtual ~@ModelName@_high_scale_constraint();
-   virtual void apply();
-   virtual double get_scale() const;
-   virtual void set_model(Two_scale_model*);
+   virtual void apply() override;
+   virtual double get_scale() const override;
+   virtual std::string name() const override { return "@ModelName@ high-scale constraint"; }
+   virtual void set_model(Two_scale_model*) override;
 
    void clear();
    double get_initial_scale_guess() const;

diff --git a/templates/two_scale_low_scale_constraint.hpp.in b/templates/two_scale_low_scale_constraint.hpp.in
@@ -40,9 +40,10 @@ public:
    @ModelName@_low_scale_constraint();
    @ModelName@_low_scale_constraint(@ModelName@<Two_scale>*, const softsusy::QedQcd&);
    virtual ~@ModelName@_low_scale_constraint();
-   virtual void apply();
-   virtual double get_scale() const;
-   virtual void set_model(Two_scale_model*);
+   virtual void apply() override;
+   virtual double get_scale() const override;
+   virtual std::string name() const override { return "@ModelName@ low-scale constraint"; }
+   virtual void set_model(Two_scale_model*) override;
 
    void clear();
    const Eigen::Matrix<std::complex<double>,3,3>& get_ckm();

diff --git a/templates/two_scale_susy_scale_constraint.hpp.in b/templates/two_scale_susy_scale_constraint.hpp.in
@@ -39,9 +39,10 @@ public:
    @ModelName@_susy_scale_constraint();
    @ModelName@_susy_scale_constraint(@ModelName@<Two_scale>*, const softsusy::QedQcd&);
    virtual ~@ModelName@_susy_scale_constraint();
-   virtual void apply();
-   virtual double get_scale() const;
-   virtual void set_model(Two_scale_model*);
+   virtual void apply() override;
+   virtual double get_scale() const override;
+   virtual std::string name() const override { return "@ModelName@ SUSY-scale constraint"; }
+   virtual void set_model(Two_scale_model*) override;
 
    void clear();
    double get_initial_scale_guess() const;