Commit 3708487f633c36ae16b3ecd837e0d2a197f6f865
1 parent
a635f911
Integrate code
Showing
2 changed files
with
7 additions
and
7 deletions
include/GModel.hpp
| @@ -163,7 +163,7 @@ protected: | @@ -163,7 +163,7 @@ protected: | ||
| 163 | std::vector<std::string> m_ids; //!< Identifiers to which model applies | 163 | std::vector<std::string> m_ids; //!< Identifiers to which model applies |
| 164 | std::vector<GModelPar*> m_pars; //!< Pointers to all model parameters | 164 | std::vector<GModelPar*> m_pars; //!< Pointers to all model parameters |
| 165 | bool m_has_ts; //!< Signals if TS is available | 165 | bool m_has_ts; //!< Signals if TS is available |
| 166 | - bool m_has_tscalc; //!< Signals if tscalc attribute is available | 166 | + bool m_has_tscalc; //!< Signals if tscalc attribute is available |
| 167 | bool m_tscalc; //!< Signals if TS should be computed | 167 | bool m_tscalc; //!< Signals if TS should be computed |
| 168 | double m_ts; //!< Test Statistic of the model | 168 | double m_ts; //!< Test Statistic of the model |
| 169 | }; | 169 | }; |
| @@ -304,8 +304,8 @@ const bool& GModel::tscalc(void) const | @@ -304,8 +304,8 @@ const bool& GModel::tscalc(void) const | ||
| 304 | inline | 304 | inline |
| 305 | void GModel::tscalc(const bool& tscalc) | 305 | void GModel::tscalc(const bool& tscalc) |
| 306 | { | 306 | { |
| 307 | - m_tscalc = tscalc; | ||
| 308 | - m_has_tscalc = true; | 307 | + m_tscalc = tscalc; |
| 308 | + m_has_tscalc = true; //!< Signals that tscalc is now available | ||
| 309 | return; | 309 | return; |
| 310 | } | 310 | } |
| 311 | 311 |
src/model/GModel.cpp
| @@ -554,10 +554,10 @@ void GModel::init_members(void) | @@ -554,10 +554,10 @@ void GModel::init_members(void) | ||
| 554 | m_scales.clear(); | 554 | m_scales.clear(); |
| 555 | m_ids.clear(); | 555 | m_ids.clear(); |
| 556 | m_pars.clear(); | 556 | m_pars.clear(); |
| 557 | - m_ts = 0.0; | ||
| 558 | - m_has_ts = false; | 557 | + m_ts = 0.0; |
| 558 | + m_has_ts = false; | ||
| 559 | m_has_tscalc = false; | 559 | m_has_tscalc = false; |
| 560 | - m_tscalc = false; | 560 | + m_tscalc = false; |
| 561 | 561 | ||
| 562 | // Return | 562 | // Return |
| 563 | return; | 563 | return; |
| @@ -579,7 +579,7 @@ void GModel::copy_members(const GModel& model) | @@ -579,7 +579,7 @@ void GModel::copy_members(const GModel& model) | ||
| 579 | m_pars = model.m_pars; | 579 | m_pars = model.m_pars; |
| 580 | m_ts = model.m_ts; | 580 | m_ts = model.m_ts; |
| 581 | m_has_ts = model.m_has_ts; | 581 | m_has_ts = model.m_has_ts; |
| 582 | - m_has_tscalc = model.m_has_tscalc; | 582 | + m_has_tscalc = model.m_has_tscalc; |
| 583 | m_tscalc = model.m_tscalc; | 583 | m_tscalc = model.m_tscalc; |
| 584 | 584 | ||
| 585 | // Return | 585 | // Return |