diff --git a/GUI/coregui/Models/ItemCatalogue.cpp b/GUI/coregui/Models/ItemCatalogue.cpp index 4721fa00d2d8203ad5af7e3fbb94cd4c1f7fb6b0..fa616a20b6c5872fa169f1c0abc8d38500bd1bba 100644 --- a/GUI/coregui/Models/ItemCatalogue.cpp +++ b/GUI/coregui/Models/ItemCatalogue.cpp @@ -64,7 +64,6 @@ #include "SpecularDataItem.h" #include "SphericalDetectorItem.h" #include "TransformationItem.h" -#include "VarianceFunctionItems.h" #include "VectorItem.h" ItemCatalogue::ItemCatalogue() @@ -244,9 +243,6 @@ ItemCatalogue::ItemCatalogue() add(Constants::ProjectionContainerType, create_new<ProjectionContainerItem>); add(Constants::DepthProbeInstrumentType, create_new<DepthProbeInstrumentItem>); - - add(Constants::VarianceConstantFunctionType, create_new<VarianceConstantFunctionItem>); - add(Constants::VarianceSimFunctionType, create_new<VarianceSimFunctionItem>); } bool ItemCatalogue::contains(const QString& modelType) const diff --git a/GUI/coregui/Models/MinimizerItem.cpp b/GUI/coregui/Models/MinimizerItem.cpp index caa88399551ac91f9ef62e717762b3e5ee27ef53..c21ce0e20cd566080744201212335364c3b4c5fb 100644 --- a/GUI/coregui/Models/MinimizerItem.cpp +++ b/GUI/coregui/Models/MinimizerItem.cpp @@ -16,7 +16,6 @@ #include "GSLLevenbergMarquardtMinimizer.h" #include "GSLMultiMinimizer.h" #include "GeneticMinimizer.h" -#include "IIntensityFunction.h" #include "MinimizerConstants.h" #include "MinimizerItemCatalogue.h" #include "Minuit2Minimizer.h" @@ -24,17 +23,6 @@ #include "ObjectiveMetricUtils.h" #include "SimAnMinimizer.h" #include "TestMinimizer.h" -#include "VarianceFunctionItems.h" -#include "VarianceFunctions.h" - -namespace -{ -const QString none_fun = "None"; -const QString sqrt_fun = "sqrt"; -const QString log10_fun = "log"; -} // namespace - -// ---------------------------------------------------------------------------- MinimizerItem::MinimizerItem(const QString& model_type) : SessionItem(model_type) {} diff --git a/GUI/coregui/Models/MinimizerItem.h b/GUI/coregui/Models/MinimizerItem.h index d305437a7cb5b0e1a1482d92c80d0c4848400eef..c75721f22f692df9b2f71f696061402b8e7c5f2f 100644 --- a/GUI/coregui/Models/MinimizerItem.h +++ b/GUI/coregui/Models/MinimizerItem.h @@ -18,8 +18,6 @@ #include "SessionItem.h" class IMinimizer; -class IIntensityFunction; -class IVarianceFunction; class ObjectiveMetric; //! The MinimizerItem class is the base item to hold minimizer settings. diff --git a/GUI/coregui/Models/VarianceFunctionItems.cpp b/GUI/coregui/Models/VarianceFunctionItems.cpp deleted file mode 100644 index 3e30be9db50e836af1a2adb5cfaeeb9e93a88ee5..0000000000000000000000000000000000000000 --- a/GUI/coregui/Models/VarianceFunctionItems.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// ************************************************************************** // -// -// BornAgain: simulate and fit scattering at grazing incidence -// -//! @file GUI/coregui/Models/VarianceFunctionItems.cpp -//! @brief Implements classes VarianceFunctionItems -//! -//! @homepage http://www.bornagainproject.org -//! @license GNU General Public License v3 or higher (see COPYING) -//! @copyright Forschungszentrum Jülich GmbH 2018 -//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS) -// -// ************************************************************************** // - -#include "VarianceFunctionItems.h" -#include "item_constants.h" -#include "VarianceFunctions.h" - -IVarianceFunctionItem::IVarianceFunctionItem(const QString& model_type) - : SessionItem(model_type) -{ - -} - -VarianceConstantFunctionItem::VarianceConstantFunctionItem() - : IVarianceFunctionItem(Constants::VarianceConstantFunctionType) -{ - setToolTip("Leaves residual value unnormalized"); - -} - -std::unique_ptr<IVarianceFunction> VarianceConstantFunctionItem::createVarianceFunction() const -{ - return std::make_unique<VarianceConstantFunction>(); -} - -const QString VarianceSimFunctionItem::P_EPSILON = "epsilon"; - -VarianceSimFunctionItem::VarianceSimFunctionItem() - : IVarianceFunctionItem(Constants::VarianceSimFunctionType) -{ - setToolTip("Normalizes residual on max(sim, epsilon)"); - addProperty(P_EPSILON, 1.0)->setToolTip(QStringLiteral( - "Defines threshold on simulated amplitude in max(sim, epsilon)")); -} - -std::unique_ptr<IVarianceFunction> VarianceSimFunctionItem::createVarianceFunction() const -{ - return std::make_unique<VarianceSimFunction>(getItemValue(P_EPSILON).toDouble()); -} diff --git a/GUI/coregui/Models/VarianceFunctionItems.h b/GUI/coregui/Models/VarianceFunctionItems.h deleted file mode 100644 index 1f1df68a629b2d37c0acac7cd806b5f7c349543f..0000000000000000000000000000000000000000 --- a/GUI/coregui/Models/VarianceFunctionItems.h +++ /dev/null @@ -1,51 +0,0 @@ -// ************************************************************************** // -// -// BornAgain: simulate and fit scattering at grazing incidence -// -//! @file GUI/coregui/Models/VarianceFunctionItems.h -//! @brief Defines classes VarianceFunctionItems -//! -//! @homepage http://www.bornagainproject.org -//! @license GNU General Public License v3 or higher (see COPYING) -//! @copyright Forschungszentrum Jülich GmbH 2018 -//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS) -// -// ************************************************************************** // - -#ifndef VARIANTFUNCTIONITEMS_H -#define VARIANTFUNCTIONITEMS_H - -#include "SessionItem.h" -#include <QString> -#include <memory> - -class IVarianceFunction; - -//! Base class for variance in Minimizer's residual settings. - -class BA_CORE_API_ IVarianceFunctionItem : public SessionItem -{ -public: - virtual std::unique_ptr<IVarianceFunction> createVarianceFunction() const = 0; -protected: - IVarianceFunctionItem(const QString& model_type); -}; - -class BA_CORE_API_ VarianceConstantFunctionItem : public IVarianceFunctionItem -{ -public: - VarianceConstantFunctionItem(); - - std::unique_ptr<IVarianceFunction> createVarianceFunction() const; -}; - -class BA_CORE_API_ VarianceSimFunctionItem : public IVarianceFunctionItem -{ -public: - static const QString P_EPSILON; - VarianceSimFunctionItem(); - - std::unique_ptr<IVarianceFunction> createVarianceFunction() const; -}; - -#endif // VARIANTFUNCTIONITEMS_H