diff --git a/Modules/Pharmacokinetics/include/mitkDescriptivePharmacokineticBrixModel.h b/Modules/Pharmacokinetics/include/mitkDescriptivePharmacokineticBrixModel.h index 818cc01427..44c4f3fd8e 100644 --- a/Modules/Pharmacokinetics/include/mitkDescriptivePharmacokineticBrixModel.h +++ b/Modules/Pharmacokinetics/include/mitkDescriptivePharmacokineticBrixModel.h @@ -1,131 +1,143 @@ /*============================================================================ The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center (DKFZ) All rights reserved. Use of this source code is governed by a 3-clause BSD license that can be found in the LICENSE file. ============================================================================*/ #ifndef mitkDescriptivePharmacokineticBrixModel_h #define mitkDescriptivePharmacokineticBrixModel_h #include #include "mitkModelBase.h" #include "MitkPharmacokineticsExports.h" namespace mitk { class MITKPHARMACOKINETICS_EXPORT DescriptivePharmacokineticBrixModel : public ModelBase { public: typedef DescriptivePharmacokineticBrixModel Self; typedef ModelBase Superclass; typedef itk::SmartPointer< Self > Pointer; typedef itk::SmartPointer< const Self > ConstPointer; /** Method for creation through the object factory. */ itkFactorylessNewMacro(Self); itkCloneMacro(Self); /** Run-time type information (and related methods). */ itkTypeMacro(DescriptivePharmacokineticBrixModel, ModelBase); static const std::string MODEL_DISPLAY_NAME; static const std::string NAME_PARAMETER_A; static const std::string NAME_PARAMETER_kep; static const std::string NAME_PARAMETER_kel; - static const std::string NAME_PARAMETER_tlag; - static const std::string NAME_STATIC_PARAMETER_Tau; - static const std::string NAME_STATIC_PARAMETER_S0; + static const std::string NAME_PARAMETER_BAT; + + static const std::string NAME_STATIC_PARAMETER_tau; + static const std::string NAME_STATIC_PARAMETER_s0; static const std::string UNIT_PARAMETER_A; static const std::string UNIT_PARAMETER_kep; static const std::string UNIT_PARAMETER_kel; - static const std::string UNIT_PARAMETER_tlag; - static const std::string UNIT_STATIC_PARAMETER_Tau; - static const std::string UNIT_STATIC_PARAMETER_S0; + static const std::string UNIT_PARAMETER_BAT; + + static const std::string UNIT_STATIC_PARAMETER_tau; + static const std::string UNIT_STATIC_PARAMETER_s0; static const unsigned int POSITION_PARAMETER_A; static const unsigned int POSITION_PARAMETER_kep; static const unsigned int POSITION_PARAMETER_kel; - - //tlag in minutes - static const unsigned int POSITION_PARAMETER_tlag; + static const unsigned int POSITION_PARAMETER_BAT; static const unsigned int NUMBER_OF_PARAMETERS; + static const unsigned int NUMBER_OF_STATIC_PARAMETERS; + + static const std::string MODEL_TYPE; + + static const std::string X_AXIS_NAME; + + static const std::string X_AXIS_UNIT; + + static const std::string Y_AXIS_NAME; + + static const std::string Y_AXIS_UNIT; + itkSetMacro(Tau, double); itkGetConstReferenceMacro(Tau, double); itkSetMacro(S0, double); itkGetConstReferenceMacro(S0, double); std::string GetModelDisplayName() const override; std::string GetModelType() const override; std::string GetXAxisName() const override; std::string GetXAxisUnit() const override; std::string GetYAxisName() const override; std::string GetYAxisUnit() const override; ParameterNamesType GetParameterNames() const override; ParametersSizeType GetNumberOfParameters() const override; ParamterUnitMapType GetParameterUnits() const override; ParameterNamesType GetStaticParameterNames() const override; ParametersSizeType GetNumberOfStaticParameters() const override; ParamterUnitMapType GetStaticParameterUnits() const override; protected: DescriptivePharmacokineticBrixModel(); ~DescriptivePharmacokineticBrixModel() override; /** * Actual implementation of the clone method. This method should be reimplemeted * in subclasses to clone the extra required parameters. */ itk::LightObject::Pointer InternalClone() const override; ModelResultType ComputeModelfunction(const ParametersType& parameters) const override; void SetStaticParameter(const ParameterNameType& name, const StaticParameterValuesType& values) override; StaticParameterValuesType GetStaticParameterValue(const ParameterNameType& name) const override; void PrintSelf(std::ostream& os, ::itk::Indent indent) const override; private: /**injection time Tau in minutes [min]*/ double m_Tau; /**Value of the first time step, thus base value to scale the signal. * Default is 1.*/ double m_S0; //No copy constructor allowed DescriptivePharmacokineticBrixModel(const Self& source); void operator=(const Self&); //purposely not implemented }; } #endif diff --git a/Modules/Pharmacokinetics/src/Models/mitkDescriptivePharmacokineticBrixModel.cpp b/Modules/Pharmacokinetics/src/Models/mitkDescriptivePharmacokineticBrixModel.cpp index 438f0353c3..81aef2e2ba 100644 --- a/Modules/Pharmacokinetics/src/Models/mitkDescriptivePharmacokineticBrixModel.cpp +++ b/Modules/Pharmacokinetics/src/Models/mitkDescriptivePharmacokineticBrixModel.cpp @@ -1,263 +1,271 @@ /*============================================================================ The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center (DKFZ) All rights reserved. Use of this source code is governed by a 3-clause BSD license that can be found in the LICENSE file. ============================================================================*/ #include "mitkDescriptivePharmacokineticBrixModel.h" const std::string mitk::DescriptivePharmacokineticBrixModel::MODEL_DISPLAY_NAME = "Descriptive Pharmacokinetic Brix Model"; +const std::string mitk::DescriptivePharmacokineticBrixModel::MODEL_TYPE = +"Perfusion.MR"; + const std::string mitk::DescriptivePharmacokineticBrixModel::NAME_PARAMETER_A = "A"; -const std::string mitk::DescriptivePharmacokineticBrixModel::NAME_PARAMETER_kep = "kep"; -const std::string mitk::DescriptivePharmacokineticBrixModel::NAME_PARAMETER_kel = "kel"; -//tlag in minutes -const std::string mitk::DescriptivePharmacokineticBrixModel::NAME_PARAMETER_tlag = "tlag"; +const std::string mitk::DescriptivePharmacokineticBrixModel::NAME_PARAMETER_kep = "k_{e->p}"; +const std::string mitk::DescriptivePharmacokineticBrixModel::NAME_PARAMETER_kel = "k_{el}"; +const std::string mitk::DescriptivePharmacokineticBrixModel::NAME_PARAMETER_BAT = "BAT"; const std::string mitk::DescriptivePharmacokineticBrixModel::UNIT_PARAMETER_A = "a.u."; const std::string mitk::DescriptivePharmacokineticBrixModel::UNIT_PARAMETER_kep = "1/min"; const std::string mitk::DescriptivePharmacokineticBrixModel::UNIT_PARAMETER_kel = "1/min"; -//tlag in minutes -const std::string mitk::DescriptivePharmacokineticBrixModel::UNIT_PARAMETER_tlag = "min"; +const std::string mitk::DescriptivePharmacokineticBrixModel::UNIT_PARAMETER_BAT = "min"; -const std::string mitk::DescriptivePharmacokineticBrixModel::NAME_STATIC_PARAMETER_Tau = "Tau"; -const std::string mitk::DescriptivePharmacokineticBrixModel::NAME_STATIC_PARAMETER_S0 = "S0"; +const std::string mitk::DescriptivePharmacokineticBrixModel::NAME_STATIC_PARAMETER_tau = "Injection_time"; +const std::string mitk::DescriptivePharmacokineticBrixModel::NAME_STATIC_PARAMETER_s0 = "Pre_contrast_signal"; -const std::string mitk::DescriptivePharmacokineticBrixModel::UNIT_STATIC_PARAMETER_Tau = "min"; -const std::string mitk::DescriptivePharmacokineticBrixModel::UNIT_STATIC_PARAMETER_S0 = "I"; +const std::string mitk::DescriptivePharmacokineticBrixModel::UNIT_STATIC_PARAMETER_tau = "min"; +const std::string mitk::DescriptivePharmacokineticBrixModel::UNIT_STATIC_PARAMETER_s0 = "a.u."; const unsigned int mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_A = 0; const unsigned int mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_kep = 1; const unsigned int mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_kel = 2; -const unsigned int mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_tlag = 3; +const unsigned int mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_BAT = 3; const unsigned int mitk::DescriptivePharmacokineticBrixModel::NUMBER_OF_PARAMETERS = 4; +const unsigned int mitk::DescriptivePharmacokineticBrixModel::NUMBER_OF_STATIC_PARAMETERS = 2; + +const std::string mitk::DescriptivePharmacokineticBrixModel::X_AXIS_NAME = "Time"; +const std::string mitk::DescriptivePharmacokineticBrixModel::X_AXIS_UNIT = "s"; +const std::string mitk::DescriptivePharmacokineticBrixModel::Y_AXIS_NAME = "Signal"; +const std::string mitk::DescriptivePharmacokineticBrixModel::Y_AXIS_UNIT = "a.u."; + std::string mitk::DescriptivePharmacokineticBrixModel::GetModelDisplayName() const { return MODEL_DISPLAY_NAME; }; std::string mitk::DescriptivePharmacokineticBrixModel::GetModelType() const { - return "Perfusion.MR"; + return MODEL_TYPE; }; std::string mitk::DescriptivePharmacokineticBrixModel::GetXAxisName() const { - return "Time"; + return X_AXIS_NAME; }; std::string mitk::DescriptivePharmacokineticBrixModel::GetXAxisUnit() const { - return "s"; + return X_AXIS_UNIT; } std::string mitk::DescriptivePharmacokineticBrixModel::GetYAxisName() const { - return ""; + return Y_AXIS_NAME; }; std::string mitk::DescriptivePharmacokineticBrixModel::GetYAxisUnit() const { - return ""; + return Y_AXIS_UNIT; } mitk::DescriptivePharmacokineticBrixModel::DescriptivePharmacokineticBrixModel(): m_Tau(0), m_S0(1) { } mitk::DescriptivePharmacokineticBrixModel::~DescriptivePharmacokineticBrixModel() { } mitk::DescriptivePharmacokineticBrixModel::ParameterNamesType mitk::DescriptivePharmacokineticBrixModel::GetParameterNames() const { ParameterNamesType result; result.push_back(NAME_PARAMETER_A); result.push_back(NAME_PARAMETER_kep); result.push_back(NAME_PARAMETER_kel); - result.push_back(NAME_PARAMETER_tlag); + result.push_back(NAME_PARAMETER_BAT); return result; } mitk::DescriptivePharmacokineticBrixModel::ParametersSizeType mitk::DescriptivePharmacokineticBrixModel::GetNumberOfParameters() const { return NUMBER_OF_PARAMETERS; } mitk::DescriptivePharmacokineticBrixModel::ParamterUnitMapType mitk::DescriptivePharmacokineticBrixModel::GetParameterUnits() const { ParamterUnitMapType result; result.insert(std::make_pair(NAME_PARAMETER_A, UNIT_PARAMETER_A)); result.insert(std::make_pair(NAME_PARAMETER_kep, UNIT_PARAMETER_kep)); result.insert(std::make_pair(NAME_PARAMETER_kel, UNIT_PARAMETER_kel)); - result.insert(std::make_pair(NAME_PARAMETER_tlag, UNIT_PARAMETER_tlag)); + result.insert(std::make_pair(NAME_PARAMETER_BAT, UNIT_PARAMETER_BAT)); return result; }; mitk::DescriptivePharmacokineticBrixModel::ParameterNamesType mitk::DescriptivePharmacokineticBrixModel::GetStaticParameterNames() const { ParameterNamesType result; - result.push_back(NAME_STATIC_PARAMETER_Tau); - result.push_back(NAME_STATIC_PARAMETER_S0); + result.push_back(NAME_STATIC_PARAMETER_tau); + result.push_back(NAME_STATIC_PARAMETER_s0); return result; } mitk::DescriptivePharmacokineticBrixModel::ParamterUnitMapType mitk::DescriptivePharmacokineticBrixModel::GetStaticParameterUnits() const { ParamterUnitMapType result; - result.insert(std::make_pair(NAME_STATIC_PARAMETER_Tau, UNIT_STATIC_PARAMETER_Tau)); - result.insert(std::make_pair(NAME_STATIC_PARAMETER_S0, UNIT_STATIC_PARAMETER_S0)); + result.insert(std::make_pair(NAME_STATIC_PARAMETER_tau, UNIT_STATIC_PARAMETER_tau)); + result.insert(std::make_pair(NAME_STATIC_PARAMETER_s0, UNIT_STATIC_PARAMETER_s0)); return result; }; mitk::DescriptivePharmacokineticBrixModel::ParametersSizeType mitk::DescriptivePharmacokineticBrixModel::GetNumberOfStaticParameters() const { - return 2; + return NUMBER_OF_STATIC_PARAMETERS; } mitk::DescriptivePharmacokineticBrixModel::ModelResultType mitk::DescriptivePharmacokineticBrixModel::ComputeModelfunction(const ParametersType& parameters) const { if (m_TimeGrid.GetSize() == 0) { itkExceptionMacro("No Time Grid Set! Cannot Calculate Signal"); } if (m_Tau == 0) { itkExceptionMacro("Injection time is 0! Cannot Calculate Signal"); } ModelResultType signal(m_TimeGrid.GetSize()); double tx = 0; double amplitude = parameters[POSITION_PARAMETER_A]; double kel = parameters[POSITION_PARAMETER_kel]; double kep = parameters[POSITION_PARAMETER_kep]; - double tlag = parameters[POSITION_PARAMETER_tlag]; + double bat = parameters[POSITION_PARAMETER_BAT]; if (kep == kel) { itkExceptionMacro("(kep-kel) is 0! Cannot Calculate Signal"); } TimeGridType::const_iterator timeGridEnd = m_TimeGrid.end(); ModelResultType::iterator signalPos = signal.begin(); for (TimeGridType::const_iterator gridPos = m_TimeGrid.begin(); gridPos != timeGridEnd; ++gridPos, ++signalPos) { double t = (*gridPos) / 60.0; //convert from [sec] to [min] - if (t <= tlag) + if (t <= bat) { tx = 0; } - else if ((t > tlag) && (t < (m_Tau + tlag))) + else if ((t > bat) && (t < (m_Tau + bat))) { - tx = t - tlag; + tx = t - bat; } - else if (t >= (m_Tau + tlag)) + else if (t >= (m_Tau + bat)) { tx = m_Tau; } double kDiff = kep - kel; - double tDiff = t - tlag; + double tDiff = t - bat; double expkel = (kep * exp(-kel * tDiff)); double expkeltx = exp(kel * tx); double expkep = exp(-kep * tDiff); double expkeptx = exp(kep * tx); double value = 1 + (amplitude / m_Tau) * (((expkel / (kel * kDiff)) * (expkeltx - 1)) - (( expkep / kDiff) * (expkeptx - 1))); *signalPos = value * m_S0; } return signal; } void mitk::DescriptivePharmacokineticBrixModel::SetStaticParameter(const ParameterNameType& name, const StaticParameterValuesType& values) { - if (name == NAME_STATIC_PARAMETER_Tau) + if (name == NAME_STATIC_PARAMETER_tau) { SetTau(values[0]); } - if (name == NAME_STATIC_PARAMETER_S0) + if (name == NAME_STATIC_PARAMETER_s0) { SetS0(values[0]); } }; mitk::DescriptivePharmacokineticBrixModel::StaticParameterValuesType mitk::DescriptivePharmacokineticBrixModel::GetStaticParameterValue(const ParameterNameType& name) const { StaticParameterValuesType result; - if (name == NAME_STATIC_PARAMETER_Tau) + if (name == NAME_STATIC_PARAMETER_tau) { result.push_back(GetTau()); } - if (name == NAME_STATIC_PARAMETER_S0) + if (name == NAME_STATIC_PARAMETER_s0) { result.push_back(GetS0()); } return result; }; itk::LightObject::Pointer mitk::DescriptivePharmacokineticBrixModel::InternalClone() const { DescriptivePharmacokineticBrixModel::Pointer newClone = DescriptivePharmacokineticBrixModel::New(); newClone->SetTimeGrid(this->m_TimeGrid); newClone->SetTau(this->m_Tau); newClone->SetS0(this->m_S0); return newClone.GetPointer(); }; void mitk::DescriptivePharmacokineticBrixModel::PrintSelf(std::ostream& os, ::itk::Indent indent) const { Superclass::PrintSelf(os, indent); os << indent << "Tau (injection time): " << m_Tau; - os << indent << "S0 (base value): " << m_S0; + os << indent << "S0 (baseline value): " << m_S0; }; diff --git a/Modules/Pharmacokinetics/src/Models/mitkDescriptivePharmacokineticBrixModelFactory.cpp b/Modules/Pharmacokinetics/src/Models/mitkDescriptivePharmacokineticBrixModelFactory.cpp index 906a9bc909..14be13fc5b 100644 --- a/Modules/Pharmacokinetics/src/Models/mitkDescriptivePharmacokineticBrixModelFactory.cpp +++ b/Modules/Pharmacokinetics/src/Models/mitkDescriptivePharmacokineticBrixModelFactory.cpp @@ -1,90 +1,90 @@ /*============================================================================ The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center (DKFZ) All rights reserved. Use of this source code is governed by a 3-clause BSD license that can be found in the LICENSE file. ============================================================================*/ #include #include #include "mitkDescriptivePharmacokineticBrixModelFactory.h" #include "mitkDescriptivePharmacokineticBrixModelParameterizer.h" #include "mitkDescriptivePharmacokineticBrixModelValueBasedParameterizer.h" mitk::DescriptivePharmacokineticBrixModelFactory::DescriptivePharmacokineticBrixModelFactory() { }; mitk::DescriptivePharmacokineticBrixModelFactory::~DescriptivePharmacokineticBrixModelFactory() { }; mitk::ModelParameterizerBase::ParametersType mitk::DescriptivePharmacokineticBrixModelFactory::GetDefaultInitialParameterization() const { return DescriptivePharmacokineticBrixModelParameterizer::New()->GetDefaultInitialParameterization(); }; mitk::ModelParameterizerBase::Pointer mitk::DescriptivePharmacokineticBrixModelFactory::DoCreateParameterizer( const mitk::modelFit::ModelFitInfo* fit) const { mitk::ModelParameterizerBase::Pointer result; if (fit->fitType == ModelFitConstants::FIT_TYPE_VALUE_PIXELBASED()) { DescriptivePharmacokineticBrixModelParameterizer::Pointer modelParameterizer = DescriptivePharmacokineticBrixModelParameterizer::New(); modelFit::StaticParameterMap::ValueType tau = fit->staticParamMap.Get( - DescriptivePharmacokineticBrixModel::NAME_STATIC_PARAMETER_Tau); + DescriptivePharmacokineticBrixModel::NAME_STATIC_PARAMETER_tau); modelParameterizer->SetTau(tau[0]); mitk::ImageTimeSelector::Pointer imageTimeSelector = mitk::ImageTimeSelector::New(); imageTimeSelector->SetInput(fit->inputImage); imageTimeSelector->SetTimeNr(0); imageTimeSelector->UpdateLargestPossibleRegion(); mitk::DescriptivePharmacokineticBrixModelParameterizer::BaseImageType::Pointer baseImage; mitk::CastToItkImage(imageTimeSelector->GetOutput(), baseImage); modelParameterizer->SetBaseImage(baseImage); result = modelParameterizer.GetPointer(); } else if (fit->fitType == ModelFitConstants::FIT_TYPE_VALUE_ROIBASED()) { DescriptivePharmacokineticBrixModelValueBasedParameterizer::Pointer modelParameterizer = DescriptivePharmacokineticBrixModelValueBasedParameterizer::New(); modelFit::StaticParameterMap::ValueType tau = fit->staticParamMap.Get( - DescriptivePharmacokineticBrixModel::NAME_STATIC_PARAMETER_Tau); + DescriptivePharmacokineticBrixModel::NAME_STATIC_PARAMETER_tau); modelParameterizer->SetTau(tau[0]); if (!fit->inputData.ValueExists("ROI")) { mitkThrow() << "Cannot generate parameterizer for fit of type ROIbased. Input data with the lable \"ROI\" is missing in fit."; } ScalarListLookupTable::ValueType signal = fit->inputData.GetTableValue("ROI"); if (signal.empty()) { mitkThrow() << "Cannot generate parameterizer for fit of type ROIbased. Input data with the lable \"ROI\" is invalid: No values available."; } modelParameterizer->SetBaseValue(signal[0]); result = modelParameterizer.GetPointer(); } return result; }; diff --git a/Modules/Pharmacokinetics/src/Models/mitkDescriptivePharmacokineticBrixModelParameterizer.cpp b/Modules/Pharmacokinetics/src/Models/mitkDescriptivePharmacokineticBrixModelParameterizer.cpp index 9ca922d049..0b75907320 100644 --- a/Modules/Pharmacokinetics/src/Models/mitkDescriptivePharmacokineticBrixModelParameterizer.cpp +++ b/Modules/Pharmacokinetics/src/Models/mitkDescriptivePharmacokineticBrixModelParameterizer.cpp @@ -1,62 +1,62 @@ /*============================================================================ The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center (DKFZ) All rights reserved. Use of this source code is governed by a 3-clause BSD license that can be found in the LICENSE file. ============================================================================*/ #include #include "mitkDescriptivePharmacokineticBrixModel.h" #include "mitkDescriptivePharmacokineticBrixModelParameterizer.h" mitk::DescriptivePharmacokineticBrixModelParameterizer::StaticParameterMapType mitk::DescriptivePharmacokineticBrixModelParameterizer::GetGlobalStaticParameters() const { StaticParameterMapType result; StaticParameterValuesType values; values.push_back(m_Tau); - result.insert(std::make_pair(ModelType::NAME_STATIC_PARAMETER_Tau, values)); + result.insert(std::make_pair(ModelType::NAME_STATIC_PARAMETER_tau, values)); return result; }; mitk::DescriptivePharmacokineticBrixModelParameterizer::StaticParameterMapType mitk::DescriptivePharmacokineticBrixModelParameterizer::GetLocalStaticParameters( const IndexType& currentPosition) const { StaticParameterMapType result; double s0 = m_BaseImage->GetPixel(currentPosition); StaticParameterValuesType values; values.push_back(s0); - result.insert(std::make_pair(ModelType::NAME_STATIC_PARAMETER_S0, values)); + result.insert(std::make_pair(ModelType::NAME_STATIC_PARAMETER_s0, values)); return result; }; mitk::DescriptivePharmacokineticBrixModelParameterizer::ParametersType mitk::DescriptivePharmacokineticBrixModelParameterizer::GetDefaultInitialParameterization() const { ParametersType initialParameters; initialParameters.SetSize(4); initialParameters[mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_A] = 1.0; initialParameters[mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_kep] = 4.0; initialParameters[mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_kel] = 0.2; - initialParameters[mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_tlag] = 1.0; + initialParameters[mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_BAT] = 1.0; return initialParameters; } mitk::DescriptivePharmacokineticBrixModelParameterizer::DescriptivePharmacokineticBrixModelParameterizer() { }; mitk::DescriptivePharmacokineticBrixModelParameterizer::~DescriptivePharmacokineticBrixModelParameterizer() { }; diff --git a/Modules/Pharmacokinetics/src/Models/mitkDescriptivePharmacokineticBrixModelValueBasedParameterizer.cpp b/Modules/Pharmacokinetics/src/Models/mitkDescriptivePharmacokineticBrixModelValueBasedParameterizer.cpp index da6f2a4acd..767c1f42a0 100644 --- a/Modules/Pharmacokinetics/src/Models/mitkDescriptivePharmacokineticBrixModelValueBasedParameterizer.cpp +++ b/Modules/Pharmacokinetics/src/Models/mitkDescriptivePharmacokineticBrixModelValueBasedParameterizer.cpp @@ -1,61 +1,61 @@ /*============================================================================ The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center (DKFZ) All rights reserved. Use of this source code is governed by a 3-clause BSD license that can be found in the LICENSE file. ============================================================================*/ #include #include "mitkDescriptivePharmacokineticBrixModel.h" #include "mitkDescriptivePharmacokineticBrixModelValueBasedParameterizer.h" mitk::DescriptivePharmacokineticBrixModelValueBasedParameterizer::StaticParameterMapType mitk::DescriptivePharmacokineticBrixModelValueBasedParameterizer::GetGlobalStaticParameters() const { StaticParameterMapType result; StaticParameterValuesType values; values.push_back(m_Tau); - result.insert(std::make_pair(ModelType::NAME_STATIC_PARAMETER_Tau, values)); + result.insert(std::make_pair(ModelType::NAME_STATIC_PARAMETER_tau, values)); return result; }; mitk::DescriptivePharmacokineticBrixModelValueBasedParameterizer::StaticParameterMapType mitk::DescriptivePharmacokineticBrixModelValueBasedParameterizer::GetLocalStaticParameters( const IndexType&) const { StaticParameterMapType result; StaticParameterValuesType values; values.push_back(m_BaseValue); - result.insert(std::make_pair(ModelType::NAME_STATIC_PARAMETER_S0, values)); + result.insert(std::make_pair(ModelType::NAME_STATIC_PARAMETER_s0, values)); return result; }; mitk::DescriptivePharmacokineticBrixModelValueBasedParameterizer::ParametersType mitk::DescriptivePharmacokineticBrixModelValueBasedParameterizer::GetDefaultInitialParameterization() const { ParametersType initialParameters; initialParameters.SetSize(4); initialParameters[mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_A] = 1.0; initialParameters[mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_kep] = 4.0; initialParameters[mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_kel] = 0.2; - initialParameters[mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_tlag] = 1.0; + initialParameters[mitk::DescriptivePharmacokineticBrixModel::POSITION_PARAMETER_BAT] = 1.0; return initialParameters; } mitk::DescriptivePharmacokineticBrixModelValueBasedParameterizer::DescriptivePharmacokineticBrixModelValueBasedParameterizer() { }; mitk::DescriptivePharmacokineticBrixModelValueBasedParameterizer::~DescriptivePharmacokineticBrixModelValueBasedParameterizer() { };