From 18e9a9573ba7c980f3013079654c479a0139acf9 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Mon, 13 Jul 2020 12:27:12 +0200
Subject: [PATCH] "Catalog" in American spelling
---
Core/StandardSamples/IFactory.h | 2 +-
.../ex01_BasicExamples/minimizer_settings.py | 4 +-
...izerCatalogue.cpp => MinimizerCatalog.cpp} | 26 +--
...inimizerCatalogue.h => MinimizerCatalog.h} | 14 +-
Fit/Minimizer/MinimizerFactory.cpp | 28 +--
Fit/Minimizer/MinimizerFactory.h | 10 +-
GUI/coregui/Models/GroupInfo.h | 2 +-
...InfoCatalogue.cpp => GroupInfoCatalog.cpp} | 18 +-
...roupInfoCatalogue.h => GroupInfoCatalog.h} | 16 +-
.../{ItemCatalogue.cpp => ItemCatalog.cpp} | 18 +-
.../Models/{ItemCatalogue.h => ItemCatalog.h} | 14 +-
GUI/coregui/Models/ItemFactory.cpp | 14 +-
GUI/coregui/Models/MinimizerItem.cpp | 6 +-
...Catalogue.cpp => MinimizerItemCatalog.cpp} | 16 +-
...ItemCatalogue.h => MinimizerItemCatalog.h} | 14 +-
GUI/coregui/Models/SessionDecorationModel.cpp | 10 +-
GUI/coregui/Models/SessionItemUtils.cpp | 12 +-
...tCatalogue.cpp => StandardTestCatalog.cpp} | 34 +--
...dTestCatalogue.h => StandardTestCatalog.h} | 20 +-
.../TestMachinery/StandardTestService.cpp | 2 +-
Tests/Functional/TestMachinery/TestUtils.cpp | 6 +-
Wrap/swig/libBornAgainFit.i | 4 +-
auto/Wrap/doxygen_core.i | 2 +-
auto/Wrap/doxygen_fit.i | 24 +--
auto/Wrap/libBornAgainFit.py | 96 ++++-----
auto/Wrap/libBornAgainFit_wrap.cpp | 196 +++++++++---------
26 files changed, 304 insertions(+), 304 deletions(-)
rename Fit/Minimizer/{MinimizerCatalogue.cpp => MinimizerCatalog.cpp} (72%)
rename Fit/Minimizer/{MinimizerCatalogue.h => MinimizerCatalog.h} (82%)
rename GUI/coregui/Models/{GroupInfoCatalogue.cpp => GroupInfoCatalog.cpp} (93%)
rename GUI/coregui/Models/{GroupInfoCatalogue.h => GroupInfoCatalog.h} (64%)
rename GUI/coregui/Models/{ItemCatalogue.cpp => ItemCatalog.cpp} (96%)
rename GUI/coregui/Models/{ItemCatalogue.h => ItemCatalog.h} (77%)
rename GUI/coregui/Models/{MinimizerItemCatalogue.cpp => MinimizerItemCatalog.cpp} (66%)
rename GUI/coregui/Models/{MinimizerItemCatalogue.h => MinimizerItemCatalog.h} (66%)
rename Tests/Functional/TestMachinery/{StandardTestCatalogue.cpp => StandardTestCatalog.cpp} (93%)
rename Tests/Functional/TestMachinery/{StandardTestCatalogue.h => StandardTestCatalog.h} (81%)
diff --git a/Core/StandardSamples/IFactory.h b/Core/StandardSamples/IFactory.h
index bd4cb4903f0..2c170cc2677 100644
--- a/Core/StandardSamples/IFactory.h
+++ b/Core/StandardSamples/IFactory.h
@@ -100,7 +100,7 @@ protected:
//! Returns new instance of class T.
//!
-//! This templated function is used in catalogues in form of a function pointer
+//! This templated function is used in catalogs in form of a function pointer
//! 'create_new<T>', with no function arguments supplied. Equivalently, we could
//! use a lambda function '[](){return new T;}'.
diff --git a/Examples/python/fitting/ex01_BasicExamples/minimizer_settings.py b/Examples/python/fitting/ex01_BasicExamples/minimizer_settings.py
index 2419a6f1a84..cba3e0038dc 100644
--- a/Examples/python/fitting/ex01_BasicExamples/minimizer_settings.py
+++ b/Examples/python/fitting/ex01_BasicExamples/minimizer_settings.py
@@ -75,10 +75,10 @@ def run_fitting():
real_data = create_real_data()
# prints info about available minimizers
- print(ba.MinimizerFactory().catalogueToString())
+ print(ba.MinimizerFactory().catalogToString())
# prints detailed info about available minimizers and their options
- print(ba.MinimizerFactory().catalogueDetailsToString())
+ print(ba.MinimizerFactory().catalogDetailsToString())
fit_objective = ba.FitObjective()
fit_objective.addSimulationAndData(get_simulation, real_data, 1.0)
diff --git a/Fit/Minimizer/MinimizerCatalogue.cpp b/Fit/Minimizer/MinimizerCatalog.cpp
similarity index 72%
rename from Fit/Minimizer/MinimizerCatalogue.cpp
rename to Fit/Minimizer/MinimizerCatalog.cpp
index ea624d372a6..53a49c0e2df 100644
--- a/Fit/Minimizer/MinimizerCatalogue.cpp
+++ b/Fit/Minimizer/MinimizerCatalog.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/Minimizer/MinimizerCatalogue.cpp
-//! @brief Implements class MinimizerCatalogue.
+//! @file Fit/Minimizer/MinimizerCatalog.cpp
+//! @brief Implements class MinimizerCatalog.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,12 +12,12 @@
//
// ************************************************************************** //
-#include "Fit/Minimizer/MinimizerCatalogue.h"
+#include "Fit/Minimizer/MinimizerCatalog.h"
#include "Fit/Tools/MinimizerUtils.h"
#include <boost/format.hpp>
#include <sstream>
-MinimizerCatalogue::MinimizerCatalogue()
+MinimizerCatalog::MinimizerCatalog()
{
addMinimizerInfo(MinimizerInfo::buildMinuit2Info());
addMinimizerInfo(MinimizerInfo::buildGSLMultiMinInfo());
@@ -27,9 +27,9 @@ MinimizerCatalogue::MinimizerCatalogue()
addMinimizerInfo(MinimizerInfo::buildTestMinimizerInfo());
}
-//! Returns multiline string representing catalogue content.
+//! Returns multiline string representing catalog content.
-std::string MinimizerCatalogue::toString() const
+std::string MinimizerCatalog::toString() const
{
const int text_width = 80;
std::ostringstream result;
@@ -45,7 +45,7 @@ std::string MinimizerCatalogue::toString() const
return result.str();
}
-std::vector<std::string> MinimizerCatalogue::minimizerNames() const
+std::vector<std::string> MinimizerCatalog::minimizerNames() const
{
std::vector<std::string> result;
for (const auto& info : m_minimizers)
@@ -56,7 +56,7 @@ std::vector<std::string> MinimizerCatalogue::minimizerNames() const
//! Returns list of algorithms defined for the minimizer with a given name.
-std::vector<std::string> MinimizerCatalogue::algorithmNames(const std::string& minimizerName) const
+std::vector<std::string> MinimizerCatalog::algorithmNames(const std::string& minimizerName) const
{
return minimizerInfo(minimizerName).algorithmNames();
}
@@ -64,27 +64,27 @@ std::vector<std::string> MinimizerCatalogue::algorithmNames(const std::string& m
//! Returns list of algorithm's descriptions for the minimizer with a given name .
std::vector<std::string>
-MinimizerCatalogue::algorithmDescriptions(const std::string& minimizerName) const
+MinimizerCatalog::algorithmDescriptions(const std::string& minimizerName) const
{
return minimizerInfo(minimizerName).algorithmDescriptions();
}
//! Returns info for minimizer with given name.
-const MinimizerInfo& MinimizerCatalogue::minimizerInfo(const std::string& minimizerName) const
+const MinimizerInfo& MinimizerCatalog::minimizerInfo(const std::string& minimizerName) const
{
for (const auto& info : m_minimizers)
if (info.name() == minimizerName)
return info;
- throw std::runtime_error("MinimizerCatalogue::minimizerInfo -> Error. "
+ throw std::runtime_error("MinimizerCatalog::minimizerInfo -> Error. "
"No minimizer with the name '"
+ minimizerName + "'");
}
-//! Adds minimizer info to the catalogue.
+//! Adds minimizer info to the catalog.
-void MinimizerCatalogue::addMinimizerInfo(const MinimizerInfo& info)
+void MinimizerCatalog::addMinimizerInfo(const MinimizerInfo& info)
{
m_minimizers.push_back(info);
}
diff --git a/Fit/Minimizer/MinimizerCatalogue.h b/Fit/Minimizer/MinimizerCatalog.h
similarity index 82%
rename from Fit/Minimizer/MinimizerCatalogue.h
rename to Fit/Minimizer/MinimizerCatalog.h
index 8ffc58aecf3..3839a7c70f1 100644
--- a/Fit/Minimizer/MinimizerCatalogue.h
+++ b/Fit/Minimizer/MinimizerCatalog.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/Minimizer/MinimizerCatalogue.h
-//! @brief Defines class MinimizerCatalogue.
+//! @file Fit/Minimizer/MinimizerCatalog.h
+//! @brief Defines class MinimizerCatalog.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_FIT_MINIMIZER_MINIMIZERCATALOGUE_H
-#define BORNAGAIN_FIT_MINIMIZER_MINIMIZERCATALOGUE_H
+#ifndef BORNAGAIN_FIT_MINIMIZER_MINIMIZERCATALOG_H
+#define BORNAGAIN_FIT_MINIMIZER_MINIMIZERCATALOG_H
#include "Fit/Minimizer/MinimizerInfo.h"
#include "Wrap/WinDllMacros.h"
@@ -34,10 +34,10 @@ Genetic | Default
Test | Default
*/
-class BA_CORE_API_ MinimizerCatalogue
+class BA_CORE_API_ MinimizerCatalog
{
public:
- MinimizerCatalogue();
+ MinimizerCatalog();
std::string toString() const;
@@ -54,4 +54,4 @@ private:
std::vector<MinimizerInfo> m_minimizers;
};
-#endif // BORNAGAIN_FIT_MINIMIZER_MINIMIZERCATALOGUE_H
+#endif // BORNAGAIN_FIT_MINIMIZER_MINIMIZERCATALOG_H
diff --git a/Fit/Minimizer/MinimizerFactory.cpp b/Fit/Minimizer/MinimizerFactory.cpp
index dda2f530692..dad7213af42 100644
--- a/Fit/Minimizer/MinimizerFactory.cpp
+++ b/Fit/Minimizer/MinimizerFactory.cpp
@@ -13,7 +13,7 @@
// ************************************************************************** //
#include "Fit/Minimizer/MinimizerFactory.h"
-#include "Fit/Minimizer/MinimizerCatalogue.h"
+#include "Fit/Minimizer/MinimizerCatalog.h"
#include "Fit/Minimizer/TestMinimizer.h"
#include "Fit/RootAdapter/GSLLevenbergMarquardtMinimizer.h"
#include "Fit/RootAdapter/GSLMultiMinimizer.h"
@@ -63,7 +63,7 @@ IMinimizer* MinimizerFactory::createMinimizer(const std::string& minimizerName,
<< minimizerName << "' or algorithm '" << algorithmType << "'" << std::endl;
ostr << "Possible names are:" << std::endl;
- ostr << catalogue().toString();
+ ostr << catalog().toString();
throw std::runtime_error(ostr.str());
}
@@ -73,31 +73,31 @@ IMinimizer* MinimizerFactory::createMinimizer(const std::string& minimizerName,
return result;
}
-void MinimizerFactory::printCatalogue()
+void MinimizerFactory::printCatalog()
{
- std::cout << catalogueToString() << std::endl;
+ std::cout << catalogToString() << std::endl;
}
-//! Returns multi-line string representing catalogue content: minimizer names and list of their
+//! Returns multi-line string representing catalog content: minimizer names and list of their
//! algorithms.
-std::string MinimizerFactory::catalogueToString()
+std::string MinimizerFactory::catalogToString()
{
- return catalogue().toString();
+ return catalog().toString();
}
-//! Returns multi-line string representing detailed catalogue content:
+//! Returns multi-line string representing detailed catalog content:
//! minimizer names, list of their algorithms and description, list of minimizer options.
-std::string MinimizerFactory::catalogueDetailsToString()
+std::string MinimizerFactory::catalogDetailsToString()
{
const int text_width = 80;
std::ostringstream result;
const std::string fmt("%-20s| %-65s\n");
- for (const auto& minimizerName : catalogue().minimizerNames()) {
+ for (const auto& minimizerName : catalog().minimizerNames()) {
// general info
- const MinimizerInfo& info = catalogue().minimizerInfo(minimizerName);
+ const MinimizerInfo& info = catalog().minimizerInfo(minimizerName);
result << std::string(text_width, '-') << "\n";
result << boost::format(fmt) % info.name() % info.description();
result << std::string(text_width, '-') << "\n";
@@ -128,8 +128,8 @@ std::string MinimizerFactory::catalogueDetailsToString()
return result.str();
}
-const MinimizerCatalogue& MinimizerFactory::catalogue()
+const MinimizerCatalog& MinimizerFactory::catalog()
{
- static MinimizerCatalogue s_catalogue = MinimizerCatalogue();
- return s_catalogue;
+ static MinimizerCatalog s_catalog = MinimizerCatalog();
+ return s_catalog;
}
diff --git a/Fit/Minimizer/MinimizerFactory.h b/Fit/Minimizer/MinimizerFactory.h
index 96cc34e66ad..b7e80b7fd98 100644
--- a/Fit/Minimizer/MinimizerFactory.h
+++ b/Fit/Minimizer/MinimizerFactory.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_FIT_MINIMIZER_MINIMIZERFACTORY_H
#define BORNAGAIN_FIT_MINIMIZER_MINIMIZERFACTORY_H
-#include "Fit/Minimizer/MinimizerCatalogue.h"
+#include "Fit/Minimizer/MinimizerCatalog.h"
#include "Wrap/WinDllMacros.h"
#include <string>
@@ -31,13 +31,13 @@ public:
const std::string& algorithmType = "",
const std::string& optionString = "");
- static void printCatalogue();
+ static void printCatalog();
- static std::string catalogueToString();
+ static std::string catalogToString();
- static std::string catalogueDetailsToString();
+ static std::string catalogDetailsToString();
- static const MinimizerCatalogue& catalogue();
+ static const MinimizerCatalog& catalog();
};
#endif // BORNAGAIN_FIT_MINIMIZER_MINIMIZERFACTORY_H
diff --git a/GUI/coregui/Models/GroupInfo.h b/GUI/coregui/Models/GroupInfo.h
index 7d8d082c995..ca549844dbb 100644
--- a/GUI/coregui/Models/GroupInfo.h
+++ b/GUI/coregui/Models/GroupInfo.h
@@ -51,7 +51,7 @@ private:
//!< Default model type for given group (i.e. FFCylinder for formfactor group)
QString m_defaultItemType;
- //!< Unique group name for GroupInfoCatalogue
+ //!< Unique group name for GroupInfoCatalog
QString m_groupType;
//!< Info will be sorted if true, otherwise order of insertion will be preserved
bool is_sorted;
diff --git a/GUI/coregui/Models/GroupInfoCatalogue.cpp b/GUI/coregui/Models/GroupInfoCatalog.cpp
similarity index 93%
rename from GUI/coregui/Models/GroupInfoCatalogue.cpp
rename to GUI/coregui/Models/GroupInfoCatalog.cpp
index 07c3a311384..ccc4f4373b1 100644
--- a/GUI/coregui/Models/GroupInfoCatalogue.cpp
+++ b/GUI/coregui/Models/GroupInfoCatalog.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/coregui/Models/GroupInfoCatalogue.cpp
-//! @brief Implements class GroupInfoCatalogue
+//! @file GUI/coregui/Models/GroupInfoCatalog.cpp
+//! @brief Implements class GroupInfoCatalog
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,10 +12,10 @@
//
// ************************************************************************** //
-#include "GUI/coregui/Models/GroupInfoCatalogue.h"
+#include "GUI/coregui/Models/GroupInfoCatalog.h"
#include "GUI/coregui/utils/GUIHelpers.h"
-GroupInfoCatalogue::GroupInfoCatalogue()
+GroupInfoCatalog::GroupInfoCatalog()
{
GroupInfo info("Form Factor");
info.add("AnisoPyramid", "Aniso Pyramid");
@@ -198,17 +198,17 @@ GroupInfoCatalogue::GroupInfoCatalogue()
addInfo(info);
}
-GroupInfo GroupInfoCatalogue::groupInfo(const QString& groupType) const
+GroupInfo GroupInfoCatalog::groupInfo(const QString& groupType) const
{
for (auto& info : m_groups)
if (info.groupType() == groupType)
return info;
- throw GUIHelpers::Error("GroupInfoCatalogue::groupInfo() -> Error. No such group '" + groupType
+ throw GUIHelpers::Error("GroupInfoCatalog::groupInfo() -> Error. No such group '" + groupType
+ "'");
}
-bool GroupInfoCatalogue::containsGroup(const QString& groupType) const
+bool GroupInfoCatalog::containsGroup(const QString& groupType) const
{
for (auto& info : m_groups)
if (info.groupType() == groupType)
@@ -217,10 +217,10 @@ bool GroupInfoCatalogue::containsGroup(const QString& groupType) const
return false;
}
-void GroupInfoCatalogue::addInfo(const GroupInfo& info)
+void GroupInfoCatalog::addInfo(const GroupInfo& info)
{
if (containsGroup(info.groupType()))
- throw GUIHelpers::Error("GroupInfoCatalogue::addInfo -> Error. Already exists '"
+ throw GUIHelpers::Error("GroupInfoCatalog::addInfo -> Error. Already exists '"
+ info.groupType() + "'");
m_groups.push_back(info);
diff --git a/GUI/coregui/Models/GroupInfoCatalogue.h b/GUI/coregui/Models/GroupInfoCatalog.h
similarity index 64%
rename from GUI/coregui/Models/GroupInfoCatalogue.h
rename to GUI/coregui/Models/GroupInfoCatalog.h
index 9b58faf326a..ad93331dff6 100644
--- a/GUI/coregui/Models/GroupInfoCatalogue.h
+++ b/GUI/coregui/Models/GroupInfoCatalog.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/coregui/Models/GroupInfoCatalogue.h
-//! @brief Defines class GroupInfoCatalogue
+//! @file GUI/coregui/Models/GroupInfoCatalog.h
+//! @brief Defines class GroupInfoCatalog
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,17 +12,17 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_GUI_COREGUI_MODELS_GROUPINFOCATALOGUE_H
-#define BORNAGAIN_GUI_COREGUI_MODELS_GROUPINFOCATALOGUE_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_GROUPINFOCATALOG_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_GROUPINFOCATALOG_H
#include "GUI/coregui/Models/GroupInfo.h"
-//! Catalogue to hold info for GroupProperty creation.
+//! Catalog to hold info for GroupProperty creation.
-class BA_CORE_API_ GroupInfoCatalogue
+class BA_CORE_API_ GroupInfoCatalog
{
public:
- GroupInfoCatalogue();
+ GroupInfoCatalog();
GroupInfo groupInfo(const QString& groupType) const;
@@ -33,4 +33,4 @@ private:
QVector<GroupInfo> m_groups;
};
-#endif // BORNAGAIN_GUI_COREGUI_MODELS_GROUPINFOCATALOGUE_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_GROUPINFOCATALOG_H
diff --git a/GUI/coregui/Models/ItemCatalogue.cpp b/GUI/coregui/Models/ItemCatalog.cpp
similarity index 96%
rename from GUI/coregui/Models/ItemCatalogue.cpp
rename to GUI/coregui/Models/ItemCatalog.cpp
index 0e6976d9ec3..7adcbe5c140 100644
--- a/GUI/coregui/Models/ItemCatalogue.cpp
+++ b/GUI/coregui/Models/ItemCatalog.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/coregui/Models/ItemCatalogue.cpp
-//! @brief Implements class ItemCatalogue
+//! @file GUI/coregui/Models/ItemCatalog.cpp
+//! @brief Implements class ItemCatalog
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
//
// ************************************************************************** //
-#include "GUI/coregui/Models/ItemCatalogue.h"
+#include "GUI/coregui/Models/ItemCatalog.h"
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/BackgroundItems.h"
#include "GUI/coregui/Models/BeamAngleItems.h"
@@ -66,7 +66,7 @@
#include "GUI/coregui/Models/VectorItem.h"
#include "GUI/coregui/utils/GUIHelpers.h"
-ItemCatalogue::ItemCatalogue()
+ItemCatalog::ItemCatalog()
{
init_top_item_types();
@@ -246,27 +246,27 @@ ItemCatalogue::ItemCatalogue()
add("DepthProbeInstrument", create_new<DepthProbeInstrumentItem>);
}
-bool ItemCatalogue::contains(const QString& modelType) const
+bool ItemCatalog::contains(const QString& modelType) const
{
return m_data.contains(modelType);
}
-std::unique_ptr<SessionItem> ItemCatalogue::create(const QString& modelType) const
+std::unique_ptr<SessionItem> ItemCatalog::create(const QString& modelType) const
{
return m_data.create(modelType);
}
-QStringList ItemCatalogue::validTopItemTypes() const
+QStringList ItemCatalog::validTopItemTypes() const
{
return m_valid_top_item_types;
}
-void ItemCatalogue::add(const QString& modelType, ItemCatalogue::factory_function_t f)
+void ItemCatalog::add(const QString& modelType, ItemCatalog::factory_function_t f)
{
m_data.registerItem(modelType, f);
}
-void ItemCatalogue::init_top_item_types()
+void ItemCatalog::init_top_item_types()
{
m_valid_top_item_types.clear();
diff --git a/GUI/coregui/Models/ItemCatalogue.h b/GUI/coregui/Models/ItemCatalog.h
similarity index 77%
rename from GUI/coregui/Models/ItemCatalogue.h
rename to GUI/coregui/Models/ItemCatalog.h
index 32e4580104d..d5d47810a9a 100644
--- a/GUI/coregui/Models/ItemCatalogue.h
+++ b/GUI/coregui/Models/ItemCatalog.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/coregui/Models/ItemCatalogue.h
-//! @brief Defines class ItemCatalogue
+//! @file GUI/coregui/Models/ItemCatalog.h
+//! @brief Defines class ItemCatalog
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,8 +12,8 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_GUI_COREGUI_MODELS_ITEMCATALOGUE_H
-#define BORNAGAIN_GUI_COREGUI_MODELS_ITEMCATALOGUE_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_ITEMCATALOG_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_ITEMCATALOG_H
#include "Core/StandardSamples/IFactory.h"
#include "Wrap/WinDllMacros.h"
@@ -22,12 +22,12 @@
class SessionItem;
-class BA_CORE_API_ ItemCatalogue
+class BA_CORE_API_ ItemCatalog
{
public:
using factory_function_t = std::function<SessionItem*()>;
- ItemCatalogue();
+ ItemCatalog();
bool contains(const QString& modelType) const;
@@ -43,4 +43,4 @@ private:
QStringList m_valid_top_item_types;
};
-#endif // BORNAGAIN_GUI_COREGUI_MODELS_ITEMCATALOGUE_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_ITEMCATALOG_H
diff --git a/GUI/coregui/Models/ItemFactory.cpp b/GUI/coregui/Models/ItemFactory.cpp
index 46088733099..e2cc2af4a67 100644
--- a/GUI/coregui/Models/ItemFactory.cpp
+++ b/GUI/coregui/Models/ItemFactory.cpp
@@ -13,28 +13,28 @@
// ************************************************************************** //
#include "GUI/coregui/Models/ItemFactory.h"
-#include "GUI/coregui/Models/ItemCatalogue.h"
+#include "GUI/coregui/Models/ItemCatalog.h"
#include "GUI/coregui/Models/SessionItem.h"
#include "GUI/coregui/utils/GUIHelpers.h"
namespace
{
-const ItemCatalogue& catalogue()
+const ItemCatalog& catalog()
{
- static ItemCatalogue item_catalogue;
- return item_catalogue;
+ static ItemCatalog item_catalog;
+ return item_catalog;
}
} // namespace
SessionItem* ItemFactory::CreateItem(const QString& model_name, SessionItem* parent)
{
- if (!catalogue().contains(model_name))
+ if (!catalog().contains(model_name))
throw GUIHelpers::Error("ItemFactory::createItem() -> Error: Model name does not exist: "
+ model_name);
- SessionItem* result = catalogue().create(model_name).release();
+ SessionItem* result = catalog().create(model_name).release();
if (parent)
parent->insertItem(-1, result);
@@ -48,5 +48,5 @@ SessionItem* ItemFactory::CreateEmptyItem()
QStringList ItemFactory::ValidTopItemTypes()
{
- return catalogue().validTopItemTypes();
+ return catalog().validTopItemTypes();
}
diff --git a/GUI/coregui/Models/MinimizerItem.cpp b/GUI/coregui/Models/MinimizerItem.cpp
index a5fa27830dd..bbfa72649c9 100644
--- a/GUI/coregui/Models/MinimizerItem.cpp
+++ b/GUI/coregui/Models/MinimizerItem.cpp
@@ -21,7 +21,7 @@
#include "Fit/RootAdapter/GeneticMinimizer.h"
#include "Fit/RootAdapter/Minuit2Minimizer.h"
#include "Fit/RootAdapter/SimAnMinimizer.h"
-#include "GUI/coregui/Models/MinimizerItemCatalogue.h"
+#include "GUI/coregui/Models/MinimizerItemCatalog.h"
MinimizerItem::MinimizerItem(const QString& model_type) : SessionItem(model_type) {}
@@ -76,7 +76,7 @@ const QString MinuitMinimizerItem::P_MAXFUNCTIONCALLS = QString::fromStdString("
MinuitMinimizerItem::MinuitMinimizerItem() : MinimizerItem("Minuit2")
{
- addProperty(P_ALGORITHMS, MinimizerItemCatalogue::algorithmCombo(modelType()).variant());
+ addProperty(P_ALGORITHMS, MinimizerItemCatalog::algorithmCombo(modelType()).variant());
addProperty(P_STRATEGY, 1)
->setToolTip("Minimization strategy (0-low, 1-medium, 2-high quality)");
@@ -115,7 +115,7 @@ const QString GSLMultiMinimizerItem::P_MAXITERATIONS = QString::fromStdString("M
GSLMultiMinimizerItem::GSLMultiMinimizerItem() : MinimizerItem("GSLMultiMin")
{
- addProperty(P_ALGORITHMS, MinimizerItemCatalogue::algorithmCombo(modelType()).variant());
+ addProperty(P_ALGORITHMS, MinimizerItemCatalog::algorithmCombo(modelType()).variant());
addProperty(P_MAXITERATIONS, 0)->setToolTip("Maximum number of iterations");
}
diff --git a/GUI/coregui/Models/MinimizerItemCatalogue.cpp b/GUI/coregui/Models/MinimizerItemCatalog.cpp
similarity index 66%
rename from GUI/coregui/Models/MinimizerItemCatalogue.cpp
rename to GUI/coregui/Models/MinimizerItemCatalog.cpp
index 24461fb871f..9cb4d1a6736 100644
--- a/GUI/coregui/Models/MinimizerItemCatalogue.cpp
+++ b/GUI/coregui/Models/MinimizerItemCatalog.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/coregui/Models/MinimizerItemCatalogue.cpp
-//! @brief Implements MinimizerItemCatalogue class
+//! @file GUI/coregui/Models/MinimizerItemCatalog.cpp
+//! @brief Implements MinimizerItemCatalog class
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,13 +12,13 @@
//
// ************************************************************************** //
-#include "GUI/coregui/Models/MinimizerItemCatalogue.h"
+#include "GUI/coregui/Models/MinimizerItemCatalog.h"
#include "Fit/Minimizer/MinimizerFactory.h"
#include "GUI/coregui/utils/GUIHelpers.h"
//! Returns ComboProperty representing list of algorithms defined for given minimizerType.
-ComboProperty MinimizerItemCatalogue::algorithmCombo(const QString& minimizerType)
+ComboProperty MinimizerItemCatalog::algorithmCombo(const QString& minimizerType)
{
ComboProperty result = ComboProperty() << algorithmNames(minimizerType);
result.setToolTips(algorithmDescriptions(minimizerType));
@@ -27,18 +27,18 @@ ComboProperty MinimizerItemCatalogue::algorithmCombo(const QString& minimizerTyp
//! Returns list of algorithm names defined for given minimizer.
-QStringList MinimizerItemCatalogue::algorithmNames(const QString& minimizerType)
+QStringList MinimizerItemCatalog::algorithmNames(const QString& minimizerType)
{
std::vector<std::string> algos =
- MinimizerFactory::catalogue().algorithmNames(minimizerType.toStdString());
+ MinimizerFactory::catalog().algorithmNames(minimizerType.toStdString());
return GUIHelpers::fromStdStrings(algos);
}
//! Returns list of algoritm descriptions defined for given minimizer.
-QStringList MinimizerItemCatalogue::algorithmDescriptions(const QString& minimizerType)
+QStringList MinimizerItemCatalog::algorithmDescriptions(const QString& minimizerType)
{
std::vector<std::string> descr =
- MinimizerFactory::catalogue().algorithmDescriptions(minimizerType.toStdString());
+ MinimizerFactory::catalog().algorithmDescriptions(minimizerType.toStdString());
return GUIHelpers::fromStdStrings(descr);
}
diff --git a/GUI/coregui/Models/MinimizerItemCatalogue.h b/GUI/coregui/Models/MinimizerItemCatalog.h
similarity index 66%
rename from GUI/coregui/Models/MinimizerItemCatalogue.h
rename to GUI/coregui/Models/MinimizerItemCatalog.h
index f405fe2c49b..9608458b83b 100644
--- a/GUI/coregui/Models/MinimizerItemCatalogue.h
+++ b/GUI/coregui/Models/MinimizerItemCatalog.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/coregui/Models/MinimizerItemCatalogue.h
-//! @brief Defines MinimizerItemCatalogue class
+//! @file GUI/coregui/Models/MinimizerItemCatalog.h
+//! @brief Defines MinimizerItemCatalog class
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,17 +12,17 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_GUI_COREGUI_MODELS_MINIMIZERITEMCATALOGUE_H
-#define BORNAGAIN_GUI_COREGUI_MODELS_MINIMIZERITEMCATALOGUE_H
+#ifndef BORNAGAIN_GUI_COREGUI_MODELS_MINIMIZERITEMCATALOG_H
+#define BORNAGAIN_GUI_COREGUI_MODELS_MINIMIZERITEMCATALOG_H
#include "GUI/coregui/Models/ComboProperty.h"
class MinimizerItem;
-//! The MinimizerItemCatalogue class is a static class to provide MinimizerItem
+//! The MinimizerItemCatalog class is a static class to provide MinimizerItem
//! with the list of available minimizers/algorithms.
-class BA_CORE_API_ MinimizerItemCatalogue
+class BA_CORE_API_ MinimizerItemCatalog
{
public:
static ComboProperty algorithmCombo(const QString& minimizerType);
@@ -32,4 +32,4 @@ private:
static QStringList algorithmDescriptions(const QString& minimizerType);
};
-#endif // BORNAGAIN_GUI_COREGUI_MODELS_MINIMIZERITEMCATALOGUE_H
+#endif // BORNAGAIN_GUI_COREGUI_MODELS_MINIMIZERITEMCATALOG_H
diff --git a/GUI/coregui/Models/SessionDecorationModel.cpp b/GUI/coregui/Models/SessionDecorationModel.cpp
index fd30e9b18a5..a8a7f3096a5 100644
--- a/GUI/coregui/Models/SessionDecorationModel.cpp
+++ b/GUI/coregui/Models/SessionDecorationModel.cpp
@@ -22,13 +22,13 @@
namespace
{
-struct IconCatalogue {
+struct IconCatalog {
QIcon gisasIcon;
QIcon offspecIcon;
QIcon specularIcon;
QIcon depthIcon;
- IconCatalogue()
+ IconCatalog()
{
gisasIcon.addPixmap(QPixmap(":/images/gisas_instrument.svg"), QIcon::Selected);
gisasIcon.addPixmap(QPixmap(":/images/gisas_instrument_shaded.svg"), QIcon::Normal);
@@ -41,9 +41,9 @@ struct IconCatalogue {
}
};
-IconCatalogue& iconCatalogue()
+IconCatalog& iconCatalog()
{
- static IconCatalogue result;
+ static IconCatalog result;
return result;
}
@@ -62,7 +62,7 @@ QVariant itemIcon(const SessionItem* item)
auto modelType = item->modelType();
- auto& icons = iconCatalogue();
+ auto& icons = iconCatalog();
if (modelType == "GISASInstrument") {
return QVariant(icons.gisasIcon);
diff --git a/GUI/coregui/Models/SessionItemUtils.cpp b/GUI/coregui/Models/SessionItemUtils.cpp
index 4027e22c2e5..2e639e1a2ae 100644
--- a/GUI/coregui/Models/SessionItemUtils.cpp
+++ b/GUI/coregui/Models/SessionItemUtils.cpp
@@ -13,7 +13,7 @@
// ************************************************************************** //
#include "GUI/coregui/Models/SessionItemUtils.h"
-#include "GUI/coregui/Models/GroupInfoCatalogue.h"
+#include "GUI/coregui/Models/GroupInfoCatalog.h"
#include "GUI/coregui/Models/MaterialItem.h"
#include "GUI/coregui/Models/SessionGraphicsItem.h"
#include "GUI/coregui/Models/SessionItem.h"
@@ -26,10 +26,10 @@
namespace
{
-const GroupInfoCatalogue& groupInfoCatalogue()
+const GroupInfoCatalog& groupInfoCatalog()
{
- static GroupInfoCatalogue s_catalogue = GroupInfoCatalogue();
- return s_catalogue;
+ static GroupInfoCatalog s_catalog = GroupInfoCatalog();
+ return s_catalog;
}
QStringList parents_with_abundance()
@@ -119,12 +119,12 @@ QVariant SessionItemUtils::CheckStateRole(const SessionItem& item)
bool SessionItemUtils::IsValidGroup(const QString& group_type)
{
- return groupInfoCatalogue().containsGroup(group_type);
+ return groupInfoCatalog().containsGroup(group_type);
}
GroupInfo SessionItemUtils::GetGroupInfo(const QString& group_type)
{
- return groupInfoCatalogue().groupInfo(group_type);
+ return groupInfoCatalog().groupInfo(group_type);
}
int SessionItemUtils::VariantType(const QVariant& variant)
diff --git a/Tests/Functional/TestMachinery/StandardTestCatalogue.cpp b/Tests/Functional/TestMachinery/StandardTestCatalog.cpp
similarity index 93%
rename from Tests/Functional/TestMachinery/StandardTestCatalogue.cpp
rename to Tests/Functional/TestMachinery/StandardTestCatalog.cpp
index 8af7b4170a3..34ab9413e70 100644
--- a/Tests/Functional/TestMachinery/StandardTestCatalogue.cpp
+++ b/Tests/Functional/TestMachinery/StandardTestCatalog.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Tests/Functional/TestMachinery/StandardTestCatalogue.cpp
-//! @brief Implements class StandardTestCatalogue.
+//! @file Tests/Functional/TestMachinery/StandardTestCatalog.cpp
+//! @brief Implements class StandardTestCatalog.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,11 +12,11 @@
//
// ************************************************************************** //
-#include "Tests/Functional/TestMachinery/StandardTestCatalogue.h"
+#include "Tests/Functional/TestMachinery/StandardTestCatalog.h"
#include "Fit/Tools/StringUtils.h"
#include <iostream>
-StandardTestCatalogue::StandardTestCatalogue()
+StandardTestCatalog::StandardTestCatalog()
{
add("FormFactors", "Test of all form factors defined", "MiniGISAS", "ParticleInTheAirBuilder",
2e-10);
@@ -326,51 +326,51 @@ StandardTestCatalogue::StandardTestCatalogue()
"HomogeneousMultilayerBuilder", 1e-10);
}
-//! Adds test description to the catalogue.
+//! Adds test description to the catalog.
-void StandardTestCatalogue::add(const std::string& test_name, const std::string& test_description,
+void StandardTestCatalog::add(const std::string& test_name, const std::string& test_description,
const std::string& simulation_name,
const std::string& sample_builder_name, double threshold)
{
if (contains(test_name))
- throw std::runtime_error("StandardTestCatalogue::add() -> Error. "
+ throw std::runtime_error("StandardTestCatalog::add() -> Error. "
"Existing item '"
+ test_name + "'");
- m_catalogue[test_name] = StandardTestInfo(test_name, test_description, simulation_name,
+ m_catalog[test_name] = StandardTestInfo(test_name, test_description, simulation_name,
sample_builder_name, threshold);
}
-void StandardTestCatalogue::add(const std::string& test_name, const std::string& test_description,
+void StandardTestCatalog::add(const std::string& test_name, const std::string& test_description,
std::initializer_list<std::string> simulation_names,
std::initializer_list<std::string> sample_builder_names,
double threshold)
{
if (contains(test_name))
- throw std::runtime_error("StandardTestCatalogue::add() -> Error. "
+ throw std::runtime_error("StandardTestCatalog::add() -> Error. "
"Existing item '"
+ test_name + "'");
- m_catalogue[test_name] =
+ m_catalog[test_name] =
StandardTestInfo(test_name, test_description, std::move(simulation_names),
std::move(sample_builder_names), threshold);
}
//! Returns test info for given test name.
-StandardTestInfo StandardTestCatalogue::testInfo(const std::string& test_name)
+StandardTestInfo StandardTestCatalog::testInfo(const std::string& test_name)
{
if (!contains(test_name))
- throw std::runtime_error("StandardTestCatalogue::testInfo() -> Error. No info for "
+ throw std::runtime_error("StandardTestCatalog::testInfo() -> Error. No info for "
"given name '"
+ test_name + "'");
- return m_catalogue[test_name];
+ return m_catalog[test_name];
}
-//! Returns true if catalogue contains info for test with given name.
+//! Returns true if catalog contains info for test with given name.
-bool StandardTestCatalogue::contains(const std::string& test_name)
+bool StandardTestCatalog::contains(const std::string& test_name)
{
- return m_catalogue.find(test_name) != m_catalogue.end();
+ return m_catalog.find(test_name) != m_catalog.end();
}
diff --git a/Tests/Functional/TestMachinery/StandardTestCatalogue.h b/Tests/Functional/TestMachinery/StandardTestCatalog.h
similarity index 81%
rename from Tests/Functional/TestMachinery/StandardTestCatalogue.h
rename to Tests/Functional/TestMachinery/StandardTestCatalog.h
index 38527457e45..b0701f93e81 100644
--- a/Tests/Functional/TestMachinery/StandardTestCatalogue.h
+++ b/Tests/Functional/TestMachinery/StandardTestCatalog.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Tests/Functional/TestMachinery/StandardTestCatalogue.h
-//! @brief Defines class StandardTestCatalogue.
+//! @file Tests/Functional/TestMachinery/StandardTestCatalog.h
+//! @brief Defines class StandardTestCatalog.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,21 +12,21 @@
//
// ************************************************************************** //
-#ifndef BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_STANDARDTESTCATALOGUE_H
-#define BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_STANDARDTESTCATALOGUE_H
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_STANDARDTESTCATALOG_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_STANDARDTESTCATALOG_H
#include "Tests/Functional/TestMachinery/StandardTestInfo.h"
#include "Wrap/WinDllMacros.h"
#include <map>
-//! @class StandardTestCatalogue
+//! @class StandardTestCatalog
//! @ingroup standard_samples
-//! @brief Catalogue with the description of standard functional tests.
+//! @brief Catalog with the description of standard functional tests.
-class BA_CORE_API_ StandardTestCatalogue
+class BA_CORE_API_ StandardTestCatalog
{
public:
- StandardTestCatalogue();
+ StandardTestCatalog();
StandardTestInfo testInfo(const std::string& test_name);
@@ -41,7 +41,7 @@ private:
std::initializer_list<std::string> simulation_names,
std::initializer_list<std::string> sample_builder_name, double threshold);
- std::map<std::string, StandardTestInfo> m_catalogue;
+ std::map<std::string, StandardTestInfo> m_catalog;
};
-#endif // BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_STANDARDTESTCATALOGUE_H
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_STANDARDTESTCATALOG_H
diff --git a/Tests/Functional/TestMachinery/StandardTestService.cpp b/Tests/Functional/TestMachinery/StandardTestService.cpp
index b94ccc77ea8..32acb63d51c 100644
--- a/Tests/Functional/TestMachinery/StandardTestService.cpp
+++ b/Tests/Functional/TestMachinery/StandardTestService.cpp
@@ -19,7 +19,7 @@
#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "Core/StandardSamples/SimulationFactory.h"
#include "Tests/Functional/TestMachinery/IFunctionalTest.h"
-#include "Tests/Functional/TestMachinery/StandardTestCatalogue.h"
+#include "Tests/Functional/TestMachinery/StandardTestCatalog.h"
#include "Tests/Functional/TestMachinery/TestUtils.h"
#include <iostream>
diff --git a/Tests/Functional/TestMachinery/TestUtils.cpp b/Tests/Functional/TestMachinery/TestUtils.cpp
index 6d3b6851b3a..4fa8a71d2c6 100644
--- a/Tests/Functional/TestMachinery/TestUtils.cpp
+++ b/Tests/Functional/TestMachinery/TestUtils.cpp
@@ -15,17 +15,17 @@
#include "Tests/Functional/TestMachinery/TestUtils.h"
#include "BABuild.h"
#include "Core/Instrument/IntensityDataFunctions.h"
-#include "Tests/Functional/TestMachinery/StandardTestCatalogue.h"
+#include "Tests/Functional/TestMachinery/StandardTestCatalog.h"
#include <cstdlib>
#include <iostream>
StandardTestInfo TestUtils::testInfo(int argc, char** argv)
{
- static StandardTestCatalogue catalogue = StandardTestCatalogue();
+ static StandardTestCatalog catalog = StandardTestCatalog();
std::string test_name = argc > 1 ? std::string(argv[1]) : std::string();
- return catalogue.testInfo(test_name);
+ return catalog.testInfo(test_name);
}
bool TestUtils::isTheSame(const OutputData<double>& dat, const OutputData<double>& ref,
diff --git a/Wrap/swig/libBornAgainFit.i b/Wrap/swig/libBornAgainFit.i
index 9dc8fed0cdf..84c611010a7 100644
--- a/Wrap/swig/libBornAgainFit.i
+++ b/Wrap/swig/libBornAgainFit.i
@@ -65,7 +65,7 @@ import_array();
#include "Fit/Kernel/Parameter.h"
#include "Fit/Kernel/Parameters.h"
#include "Fit/Minimizer/IMinimizer.h"
-#include "Fit/Minimizer/MinimizerCatalogue.h"
+#include "Fit/Minimizer/MinimizerCatalog.h"
#include "Fit/Minimizer/MinimizerFactory.h"
#include "Fit/Kernel/PyCallback.h"
@@ -84,7 +84,7 @@ import_array();
%include "Fit/Kernel/MinimizerResult.h"
%include "Fit/Kernel/Minimizer.h"
%include "Fit/Minimizer/IMinimizer.h"
-%include "Fit/Minimizer/MinimizerCatalogue.h"
+%include "Fit/Minimizer/MinimizerCatalog.h"
%include "Fit/Minimizer/MinimizerFactory.h"
%include "extendFit.i"
diff --git a/auto/Wrap/doxygen_core.i b/auto/Wrap/doxygen_core.i
index 557e2bf1efc..9d34e63ceda 100644
--- a/auto/Wrap/doxygen_core.i
+++ b/auto/Wrap/doxygen_core.i
@@ -20273,7 +20273,7 @@ Generate vertices of centered ellipse with given semi-axes at height z.
Returns new instance of class T.
-This templated function is used in catalogues in form of a function pointer 'create_new<T>', with no function arguments supplied. Equivalently, we could use a lambda function '[](){return new T;}'.
+This templated function is used in catalogs in form of a function pointer 'create_new<T>', with no function arguments supplied. Equivalently, we could use a lambda function '[](){return new T;}'.
";
diff --git a/auto/Wrap/doxygen_fit.i b/auto/Wrap/doxygen_fit.i
index 37ef27473d4..c666eea58c0 100644
--- a/auto/Wrap/doxygen_fit.i
+++ b/auto/Wrap/doxygen_fit.i
@@ -397,36 +397,36 @@ Finds minimum of user objective function (to be called from Python).
";
-// File: classMinimizerCatalogue.xml
-%feature("docstring") MinimizerCatalogue "
+// File: classMinimizerCatalog.xml
+%feature("docstring") MinimizerCatalog "
Hard-coded information about all minimizers available.
-C++ includes: MinimizerCatalogue.h
+C++ includes: MinimizerCatalog.h
";
-%feature("docstring") MinimizerCatalogue::MinimizerCatalogue "MinimizerCatalogue::MinimizerCatalogue()
+%feature("docstring") MinimizerCatalog::MinimizerCatalog "MinimizerCatalog::MinimizerCatalog()
";
-%feature("docstring") MinimizerCatalogue::toString "std::string MinimizerCatalogue::toString() const
+%feature("docstring") MinimizerCatalog::toString "std::string MinimizerCatalog::toString() const
-Returns multiline string representing catalogue content.
+Returns multiline string representing catalog content.
";
-%feature("docstring") MinimizerCatalogue::minimizerNames "std::vector< std::string > MinimizerCatalogue::minimizerNames() const
+%feature("docstring") MinimizerCatalog::minimizerNames "std::vector< std::string > MinimizerCatalog::minimizerNames() const
";
-%feature("docstring") MinimizerCatalogue::algorithmNames "std::vector< std::string > MinimizerCatalogue::algorithmNames(const std::string &minimizerName) const
+%feature("docstring") MinimizerCatalog::algorithmNames "std::vector< std::string > MinimizerCatalog::algorithmNames(const std::string &minimizerName) const
Returns list of algorithms defined for the minimizer with a given name.
";
-%feature("docstring") MinimizerCatalogue::algorithmDescriptions "std::vector< std::string > MinimizerCatalogue::algorithmDescriptions(const std::string &minimizerName) const
+%feature("docstring") MinimizerCatalog::algorithmDescriptions "std::vector< std::string > MinimizerCatalog::algorithmDescriptions(const std::string &minimizerName) const
Returns list of algorithm's descriptions for the minimizer with a given name .
";
-%feature("docstring") MinimizerCatalogue::minimizerInfo "const MinimizerInfo & MinimizerCatalogue::minimizerInfo(const std::string &minimizerName) const
+%feature("docstring") MinimizerCatalog::minimizerInfo "const MinimizerInfo & MinimizerCatalog::minimizerInfo(const std::string &minimizerName) const
Returns info for minimizer with given name.
";
@@ -1459,10 +1459,10 @@ Returns new string which is lower case of text.
// File: IMinimizer_8h.xml
-// File: MinimizerCatalogue_8cpp.xml
+// File: MinimizerCatalog_8cpp.xml
-// File: MinimizerCatalogue_8h.xml
+// File: MinimizerCatalog_8h.xml
// File: MinimizerFactory_8cpp.xml
diff --git a/auto/Wrap/libBornAgainFit.py b/auto/Wrap/libBornAgainFit.py
index 47fefc9f14c..10a838417ac 100644
--- a/auto/Wrap/libBornAgainFit.py
+++ b/auto/Wrap/libBornAgainFit.py
@@ -2169,13 +2169,13 @@ class IMinimizer(object):
# Register IMinimizer in _libBornAgainFit:
_libBornAgainFit.IMinimizer_swigregister(IMinimizer)
-class MinimizerCatalogue(object):
+class MinimizerCatalog(object):
r"""
Hard-coded information about all minimizers available.
- C++ includes: MinimizerCatalogue.h
+ C++ includes: MinimizerCatalog.h
"""
@@ -2184,63 +2184,63 @@ class MinimizerCatalogue(object):
def __init__(self):
r"""
- __init__(MinimizerCatalogue self) -> MinimizerCatalogue
- MinimizerCatalogue::MinimizerCatalogue()
+ __init__(MinimizerCatalog self) -> MinimizerCatalog
+ MinimizerCatalog::MinimizerCatalog()
"""
- _libBornAgainFit.MinimizerCatalogue_swiginit(self, _libBornAgainFit.new_MinimizerCatalogue())
+ _libBornAgainFit.MinimizerCatalog_swiginit(self, _libBornAgainFit.new_MinimizerCatalog())
def toString(self):
r"""
- toString(MinimizerCatalogue self) -> std::string
- std::string MinimizerCatalogue::toString() const
+ toString(MinimizerCatalog self) -> std::string
+ std::string MinimizerCatalog::toString() const
- Returns multiline string representing catalogue content.
+ Returns multiline string representing catalog content.
"""
- return _libBornAgainFit.MinimizerCatalogue_toString(self)
+ return _libBornAgainFit.MinimizerCatalog_toString(self)
def minimizerNames(self):
r"""
- minimizerNames(MinimizerCatalogue self) -> vector_string_t
- std::vector< std::string > MinimizerCatalogue::minimizerNames() const
+ minimizerNames(MinimizerCatalog self) -> vector_string_t
+ std::vector< std::string > MinimizerCatalog::minimizerNames() const
"""
- return _libBornAgainFit.MinimizerCatalogue_minimizerNames(self)
+ return _libBornAgainFit.MinimizerCatalog_minimizerNames(self)
def algorithmNames(self, minimizerName):
r"""
- algorithmNames(MinimizerCatalogue self, std::string const & minimizerName) -> vector_string_t
- std::vector< std::string > MinimizerCatalogue::algorithmNames(const std::string &minimizerName) const
+ algorithmNames(MinimizerCatalog self, std::string const & minimizerName) -> vector_string_t
+ std::vector< std::string > MinimizerCatalog::algorithmNames(const std::string &minimizerName) const
Returns list of algorithms defined for the minimizer with a given name.
"""
- return _libBornAgainFit.MinimizerCatalogue_algorithmNames(self, minimizerName)
+ return _libBornAgainFit.MinimizerCatalog_algorithmNames(self, minimizerName)
def algorithmDescriptions(self, minimizerName):
r"""
- algorithmDescriptions(MinimizerCatalogue self, std::string const & minimizerName) -> vector_string_t
- std::vector< std::string > MinimizerCatalogue::algorithmDescriptions(const std::string &minimizerName) const
+ algorithmDescriptions(MinimizerCatalog self, std::string const & minimizerName) -> vector_string_t
+ std::vector< std::string > MinimizerCatalog::algorithmDescriptions(const std::string &minimizerName) const
Returns list of algorithm's descriptions for the minimizer with a given name .
"""
- return _libBornAgainFit.MinimizerCatalogue_algorithmDescriptions(self, minimizerName)
+ return _libBornAgainFit.MinimizerCatalog_algorithmDescriptions(self, minimizerName)
def minimizerInfo(self, minimizerName):
r"""
- minimizerInfo(MinimizerCatalogue self, std::string const & minimizerName) -> MinimizerInfo const &
- const MinimizerInfo & MinimizerCatalogue::minimizerInfo(const std::string &minimizerName) const
+ minimizerInfo(MinimizerCatalog self, std::string const & minimizerName) -> MinimizerInfo const &
+ const MinimizerInfo & MinimizerCatalog::minimizerInfo(const std::string &minimizerName) const
Returns info for minimizer with given name.
"""
- return _libBornAgainFit.MinimizerCatalogue_minimizerInfo(self, minimizerName)
- __swig_destroy__ = _libBornAgainFit.delete_MinimizerCatalogue
+ return _libBornAgainFit.MinimizerCatalog_minimizerInfo(self, minimizerName)
+ __swig_destroy__ = _libBornAgainFit.delete_MinimizerCatalog
-# Register MinimizerCatalogue in _libBornAgainFit:
-_libBornAgainFit.MinimizerCatalogue_swigregister(MinimizerCatalogue)
+# Register MinimizerCatalog in _libBornAgainFit:
+_libBornAgainFit.MinimizerCatalog_swigregister(MinimizerCatalog)
class MinimizerFactory(object):
r"""
@@ -2261,24 +2261,24 @@ class MinimizerFactory(object):
return _libBornAgainFit.MinimizerFactory_createMinimizer(*args)
@staticmethod
- def printCatalogue():
- r"""printCatalogue()"""
- return _libBornAgainFit.MinimizerFactory_printCatalogue()
+ def printCatalog():
+ r"""printCatalog()"""
+ return _libBornAgainFit.MinimizerFactory_printCatalog()
@staticmethod
- def catalogueToString():
- r"""catalogueToString() -> std::string"""
- return _libBornAgainFit.MinimizerFactory_catalogueToString()
+ def catalogToString():
+ r"""catalogToString() -> std::string"""
+ return _libBornAgainFit.MinimizerFactory_catalogToString()
@staticmethod
- def catalogueDetailsToString():
- r"""catalogueDetailsToString() -> std::string"""
- return _libBornAgainFit.MinimizerFactory_catalogueDetailsToString()
+ def catalogDetailsToString():
+ r"""catalogDetailsToString() -> std::string"""
+ return _libBornAgainFit.MinimizerFactory_catalogDetailsToString()
@staticmethod
- def catalogue():
- r"""catalogue() -> MinimizerCatalogue"""
- return _libBornAgainFit.MinimizerFactory_catalogue()
+ def catalog():
+ r"""catalog() -> MinimizerCatalog"""
+ return _libBornAgainFit.MinimizerFactory_catalog()
def __init__(self):
r"""
@@ -2300,21 +2300,21 @@ def MinimizerFactory_createMinimizer(*args):
r"""MinimizerFactory_createMinimizer(std::string const & minimizerName, std::string const & algorithmType="", std::string const & optionString="") -> IMinimizer"""
return _libBornAgainFit.MinimizerFactory_createMinimizer(*args)
-def MinimizerFactory_printCatalogue():
- r"""MinimizerFactory_printCatalogue()"""
- return _libBornAgainFit.MinimizerFactory_printCatalogue()
+def MinimizerFactory_printCatalog():
+ r"""MinimizerFactory_printCatalog()"""
+ return _libBornAgainFit.MinimizerFactory_printCatalog()
-def MinimizerFactory_catalogueToString():
- r"""MinimizerFactory_catalogueToString() -> std::string"""
- return _libBornAgainFit.MinimizerFactory_catalogueToString()
+def MinimizerFactory_catalogToString():
+ r"""MinimizerFactory_catalogToString() -> std::string"""
+ return _libBornAgainFit.MinimizerFactory_catalogToString()
-def MinimizerFactory_catalogueDetailsToString():
- r"""MinimizerFactory_catalogueDetailsToString() -> std::string"""
- return _libBornAgainFit.MinimizerFactory_catalogueDetailsToString()
+def MinimizerFactory_catalogDetailsToString():
+ r"""MinimizerFactory_catalogDetailsToString() -> std::string"""
+ return _libBornAgainFit.MinimizerFactory_catalogDetailsToString()
-def MinimizerFactory_catalogue():
- r"""MinimizerFactory_catalogue() -> MinimizerCatalogue"""
- return _libBornAgainFit.MinimizerFactory_catalogue()
+def MinimizerFactory_catalog():
+ r"""MinimizerFactory_catalog() -> MinimizerCatalog"""
+ return _libBornAgainFit.MinimizerFactory_catalog()
class ParametersIterator(object):
diff --git a/auto/Wrap/libBornAgainFit_wrap.cpp b/auto/Wrap/libBornAgainFit_wrap.cpp
index 9355e2dffbc..2ba957261a8 100644
--- a/auto/Wrap/libBornAgainFit_wrap.cpp
+++ b/auto/Wrap/libBornAgainFit_wrap.cpp
@@ -3071,7 +3071,7 @@ namespace Swig {
#define SWIGTYPE_p_Fit__Parameter swig_types[3]
#define SWIGTYPE_p_Fit__Parameters swig_types[4]
#define SWIGTYPE_p_IMinimizer swig_types[5]
-#define SWIGTYPE_p_MinimizerCatalogue swig_types[6]
+#define SWIGTYPE_p_MinimizerCatalog swig_types[6]
#define SWIGTYPE_p_MinimizerFactory swig_types[7]
#define SWIGTYPE_p_MinimizerInfo swig_types[8]
#define SWIGTYPE_p_PyCallback swig_types[9]
@@ -5963,7 +5963,7 @@ SWIGINTERN void std_vector_Sl_std_string_Sg__insert__SWIG_1(std::vector< std::st
#include "Fit/Kernel/Parameter.h"
#include "Fit/Kernel/Parameters.h"
#include "Fit/Minimizer/IMinimizer.h"
-#include "Fit/Minimizer/MinimizerCatalogue.h"
+#include "Fit/Minimizer/MinimizerCatalog.h"
#include "Fit/Minimizer/MinimizerFactory.h"
#include "Fit/Kernel/PyCallback.h"
@@ -21262,22 +21262,22 @@ SWIGINTERN PyObject *IMinimizer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyO
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *_wrap_new_MinimizerCatalogue(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_new_MinimizerCatalog(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- MinimizerCatalogue *result = 0 ;
+ MinimizerCatalog *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "new_MinimizerCatalogue", 0, 0, 0)) SWIG_fail;
- result = (MinimizerCatalogue *)new MinimizerCatalogue();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_MinimizerCatalogue, SWIG_POINTER_NEW | 0 );
+ if (!SWIG_Python_UnpackTuple(args, "new_MinimizerCatalog", 0, 0, 0)) SWIG_fail;
+ result = (MinimizerCatalog *)new MinimizerCatalog();
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_MinimizerCatalog, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
}
-SWIGINTERN PyObject *_wrap_MinimizerCatalogue_toString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MinimizerCatalog_toString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- MinimizerCatalogue *arg1 = (MinimizerCatalogue *) 0 ;
+ MinimizerCatalog *arg1 = (MinimizerCatalog *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
@@ -21285,12 +21285,12 @@ SWIGINTERN PyObject *_wrap_MinimizerCatalogue_toString(PyObject *SWIGUNUSEDPARM(
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MinimizerCatalogue, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MinimizerCatalog, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerCatalogue_toString" "', argument " "1"" of type '" "MinimizerCatalogue const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerCatalog_toString" "', argument " "1"" of type '" "MinimizerCatalog const *""'");
}
- arg1 = reinterpret_cast< MinimizerCatalogue * >(argp1);
- result = ((MinimizerCatalogue const *)arg1)->toString();
+ arg1 = reinterpret_cast< MinimizerCatalog * >(argp1);
+ result = ((MinimizerCatalog const *)arg1)->toString();
resultobj = SWIG_From_std_string(static_cast< std::string >(result));
return resultobj;
fail:
@@ -21298,9 +21298,9 @@ fail:
}
-SWIGINTERN PyObject *_wrap_MinimizerCatalogue_minimizerNames(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MinimizerCatalog_minimizerNames(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- MinimizerCatalogue *arg1 = (MinimizerCatalogue *) 0 ;
+ MinimizerCatalog *arg1 = (MinimizerCatalog *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
@@ -21308,12 +21308,12 @@ SWIGINTERN PyObject *_wrap_MinimizerCatalogue_minimizerNames(PyObject *SWIGUNUSE
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MinimizerCatalogue, 0 | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MinimizerCatalog, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerCatalogue_minimizerNames" "', argument " "1"" of type '" "MinimizerCatalogue const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerCatalog_minimizerNames" "', argument " "1"" of type '" "MinimizerCatalog const *""'");
}
- arg1 = reinterpret_cast< MinimizerCatalogue * >(argp1);
- result = ((MinimizerCatalogue const *)arg1)->minimizerNames();
+ arg1 = reinterpret_cast< MinimizerCatalog * >(argp1);
+ result = ((MinimizerCatalog const *)arg1)->minimizerNames();
resultobj = swig::from(static_cast< std::vector< std::string,std::allocator< std::string > > >(result));
return resultobj;
fail:
@@ -21321,9 +21321,9 @@ fail:
}
-SWIGINTERN PyObject *_wrap_MinimizerCatalogue_algorithmNames(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MinimizerCatalog_algorithmNames(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- MinimizerCatalogue *arg1 = (MinimizerCatalogue *) 0 ;
+ MinimizerCatalog *arg1 = (MinimizerCatalog *) 0 ;
std::string *arg2 = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
@@ -21331,24 +21331,24 @@ SWIGINTERN PyObject *_wrap_MinimizerCatalogue_algorithmNames(PyObject *SWIGUNUSE
PyObject *swig_obj[2] ;
std::vector< std::string,std::allocator< std::string > > result;
- if (!SWIG_Python_UnpackTuple(args, "MinimizerCatalogue_algorithmNames", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MinimizerCatalogue, 0 | 0 );
+ if (!SWIG_Python_UnpackTuple(args, "MinimizerCatalog_algorithmNames", 2, 2, swig_obj)) SWIG_fail;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MinimizerCatalog, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerCatalogue_algorithmNames" "', argument " "1"" of type '" "MinimizerCatalogue const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerCatalog_algorithmNames" "', argument " "1"" of type '" "MinimizerCatalog const *""'");
}
- arg1 = reinterpret_cast< MinimizerCatalogue * >(argp1);
+ arg1 = reinterpret_cast< MinimizerCatalog * >(argp1);
{
std::string *ptr = (std::string *)0;
res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MinimizerCatalogue_algorithmNames" "', argument " "2"" of type '" "std::string const &""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MinimizerCatalog_algorithmNames" "', argument " "2"" of type '" "std::string const &""'");
}
if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MinimizerCatalogue_algorithmNames" "', argument " "2"" of type '" "std::string const &""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MinimizerCatalog_algorithmNames" "', argument " "2"" of type '" "std::string const &""'");
}
arg2 = ptr;
}
- result = ((MinimizerCatalogue const *)arg1)->algorithmNames((std::string const &)*arg2);
+ result = ((MinimizerCatalog const *)arg1)->algorithmNames((std::string const &)*arg2);
resultobj = swig::from(static_cast< std::vector< std::string,std::allocator< std::string > > >(result));
if (SWIG_IsNewObj(res2)) delete arg2;
return resultobj;
@@ -21358,9 +21358,9 @@ fail:
}
-SWIGINTERN PyObject *_wrap_MinimizerCatalogue_algorithmDescriptions(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MinimizerCatalog_algorithmDescriptions(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- MinimizerCatalogue *arg1 = (MinimizerCatalogue *) 0 ;
+ MinimizerCatalog *arg1 = (MinimizerCatalog *) 0 ;
std::string *arg2 = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
@@ -21368,24 +21368,24 @@ SWIGINTERN PyObject *_wrap_MinimizerCatalogue_algorithmDescriptions(PyObject *SW
PyObject *swig_obj[2] ;
std::vector< std::string,std::allocator< std::string > > result;
- if (!SWIG_Python_UnpackTuple(args, "MinimizerCatalogue_algorithmDescriptions", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MinimizerCatalogue, 0 | 0 );
+ if (!SWIG_Python_UnpackTuple(args, "MinimizerCatalog_algorithmDescriptions", 2, 2, swig_obj)) SWIG_fail;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MinimizerCatalog, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerCatalogue_algorithmDescriptions" "', argument " "1"" of type '" "MinimizerCatalogue const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerCatalog_algorithmDescriptions" "', argument " "1"" of type '" "MinimizerCatalog const *""'");
}
- arg1 = reinterpret_cast< MinimizerCatalogue * >(argp1);
+ arg1 = reinterpret_cast< MinimizerCatalog * >(argp1);
{
std::string *ptr = (std::string *)0;
res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MinimizerCatalogue_algorithmDescriptions" "', argument " "2"" of type '" "std::string const &""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MinimizerCatalog_algorithmDescriptions" "', argument " "2"" of type '" "std::string const &""'");
}
if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MinimizerCatalogue_algorithmDescriptions" "', argument " "2"" of type '" "std::string const &""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MinimizerCatalog_algorithmDescriptions" "', argument " "2"" of type '" "std::string const &""'");
}
arg2 = ptr;
}
- result = ((MinimizerCatalogue const *)arg1)->algorithmDescriptions((std::string const &)*arg2);
+ result = ((MinimizerCatalog const *)arg1)->algorithmDescriptions((std::string const &)*arg2);
resultobj = swig::from(static_cast< std::vector< std::string,std::allocator< std::string > > >(result));
if (SWIG_IsNewObj(res2)) delete arg2;
return resultobj;
@@ -21395,9 +21395,9 @@ fail:
}
-SWIGINTERN PyObject *_wrap_MinimizerCatalogue_minimizerInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MinimizerCatalog_minimizerInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- MinimizerCatalogue *arg1 = (MinimizerCatalogue *) 0 ;
+ MinimizerCatalog *arg1 = (MinimizerCatalog *) 0 ;
std::string *arg2 = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
@@ -21405,24 +21405,24 @@ SWIGINTERN PyObject *_wrap_MinimizerCatalogue_minimizerInfo(PyObject *SWIGUNUSED
PyObject *swig_obj[2] ;
MinimizerInfo *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "MinimizerCatalogue_minimizerInfo", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MinimizerCatalogue, 0 | 0 );
+ if (!SWIG_Python_UnpackTuple(args, "MinimizerCatalog_minimizerInfo", 2, 2, swig_obj)) SWIG_fail;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MinimizerCatalog, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerCatalogue_minimizerInfo" "', argument " "1"" of type '" "MinimizerCatalogue const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MinimizerCatalog_minimizerInfo" "', argument " "1"" of type '" "MinimizerCatalog const *""'");
}
- arg1 = reinterpret_cast< MinimizerCatalogue * >(argp1);
+ arg1 = reinterpret_cast< MinimizerCatalog * >(argp1);
{
std::string *ptr = (std::string *)0;
res2 = SWIG_AsPtr_std_string(swig_obj[1], &ptr);
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MinimizerCatalogue_minimizerInfo" "', argument " "2"" of type '" "std::string const &""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MinimizerCatalog_minimizerInfo" "', argument " "2"" of type '" "std::string const &""'");
}
if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MinimizerCatalogue_minimizerInfo" "', argument " "2"" of type '" "std::string const &""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MinimizerCatalog_minimizerInfo" "', argument " "2"" of type '" "std::string const &""'");
}
arg2 = ptr;
}
- result = (MinimizerInfo *) &((MinimizerCatalogue const *)arg1)->minimizerInfo((std::string const &)*arg2);
+ result = (MinimizerInfo *) &((MinimizerCatalog const *)arg1)->minimizerInfo((std::string const &)*arg2);
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_MinimizerInfo, 0 | 0 );
if (SWIG_IsNewObj(res2)) delete arg2;
return resultobj;
@@ -21432,20 +21432,20 @@ fail:
}
-SWIGINTERN PyObject *_wrap_delete_MinimizerCatalogue(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_MinimizerCatalog(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- MinimizerCatalogue *arg1 = (MinimizerCatalogue *) 0 ;
+ MinimizerCatalog *arg1 = (MinimizerCatalog *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MinimizerCatalogue, SWIG_POINTER_DISOWN | 0 );
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_MinimizerCatalog, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_MinimizerCatalogue" "', argument " "1"" of type '" "MinimizerCatalogue *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_MinimizerCatalog" "', argument " "1"" of type '" "MinimizerCatalog *""'");
}
- arg1 = reinterpret_cast< MinimizerCatalogue * >(argp1);
+ arg1 = reinterpret_cast< MinimizerCatalog * >(argp1);
delete arg1;
resultobj = SWIG_Py_Void();
return resultobj;
@@ -21454,14 +21454,14 @@ fail:
}
-SWIGINTERN PyObject *MinimizerCatalogue_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *MinimizerCatalog_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
- SWIG_TypeNewClientData(SWIGTYPE_p_MinimizerCatalogue, SWIG_NewClientData(obj));
+ SWIG_TypeNewClientData(SWIGTYPE_p_MinimizerCatalog, SWIG_NewClientData(obj));
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *MinimizerCatalogue_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *MinimizerCatalog_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
return SWIG_Python_InitShadowInstance(args);
}
@@ -21649,11 +21649,11 @@ fail:
}
-SWIGINTERN PyObject *_wrap_MinimizerFactory_printCatalogue(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MinimizerFactory_printCatalog(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- if (!SWIG_Python_UnpackTuple(args, "MinimizerFactory_printCatalogue", 0, 0, 0)) SWIG_fail;
- MinimizerFactory::printCatalogue();
+ if (!SWIG_Python_UnpackTuple(args, "MinimizerFactory_printCatalog", 0, 0, 0)) SWIG_fail;
+ MinimizerFactory::printCatalog();
resultobj = SWIG_Py_Void();
return resultobj;
fail:
@@ -21661,12 +21661,12 @@ fail:
}
-SWIGINTERN PyObject *_wrap_MinimizerFactory_catalogueToString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MinimizerFactory_catalogToString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::string result;
- if (!SWIG_Python_UnpackTuple(args, "MinimizerFactory_catalogueToString", 0, 0, 0)) SWIG_fail;
- result = MinimizerFactory::catalogueToString();
+ if (!SWIG_Python_UnpackTuple(args, "MinimizerFactory_catalogToString", 0, 0, 0)) SWIG_fail;
+ result = MinimizerFactory::catalogToString();
resultobj = SWIG_From_std_string(static_cast< std::string >(result));
return resultobj;
fail:
@@ -21674,12 +21674,12 @@ fail:
}
-SWIGINTERN PyObject *_wrap_MinimizerFactory_catalogueDetailsToString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MinimizerFactory_catalogDetailsToString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::string result;
- if (!SWIG_Python_UnpackTuple(args, "MinimizerFactory_catalogueDetailsToString", 0, 0, 0)) SWIG_fail;
- result = MinimizerFactory::catalogueDetailsToString();
+ if (!SWIG_Python_UnpackTuple(args, "MinimizerFactory_catalogDetailsToString", 0, 0, 0)) SWIG_fail;
+ result = MinimizerFactory::catalogDetailsToString();
resultobj = SWIG_From_std_string(static_cast< std::string >(result));
return resultobj;
fail:
@@ -21687,13 +21687,13 @@ fail:
}
-SWIGINTERN PyObject *_wrap_MinimizerFactory_catalogue(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_MinimizerFactory_catalog(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
- MinimizerCatalogue *result = 0 ;
+ MinimizerCatalog *result = 0 ;
- if (!SWIG_Python_UnpackTuple(args, "MinimizerFactory_catalogue", 0, 0, 0)) SWIG_fail;
- result = (MinimizerCatalogue *) &MinimizerFactory::catalogue();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_MinimizerCatalogue, 0 | 0 );
+ if (!SWIG_Python_UnpackTuple(args, "MinimizerFactory_catalog", 0, 0, 0)) SWIG_fail;
+ result = (MinimizerCatalog *) &MinimizerFactory::catalog();
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_MinimizerCatalog, 0 | 0 );
return resultobj;
fail:
return NULL;
@@ -22658,52 +22658,52 @@ static PyMethodDef SwigMethods[] = {
"\n"
""},
{ "IMinimizer_swigregister", IMinimizer_swigregister, METH_O, NULL},
- { "new_MinimizerCatalogue", _wrap_new_MinimizerCatalogue, METH_NOARGS, "\n"
- "new_MinimizerCatalogue() -> MinimizerCatalogue\n"
- "MinimizerCatalogue::MinimizerCatalogue()\n"
+ { "new_MinimizerCatalog", _wrap_new_MinimizerCatalog, METH_NOARGS, "\n"
+ "new_MinimizerCatalog() -> MinimizerCatalog\n"
+ "MinimizerCatalog::MinimizerCatalog()\n"
"\n"
""},
- { "MinimizerCatalogue_toString", _wrap_MinimizerCatalogue_toString, METH_O, "\n"
- "MinimizerCatalogue_toString(MinimizerCatalogue self) -> std::string\n"
- "std::string MinimizerCatalogue::toString() const\n"
+ { "MinimizerCatalog_toString", _wrap_MinimizerCatalog_toString, METH_O, "\n"
+ "MinimizerCatalog_toString(MinimizerCatalog self) -> std::string\n"
+ "std::string MinimizerCatalog::toString() const\n"
"\n"
- "Returns multiline string representing catalogue content. \n"
+ "Returns multiline string representing catalog content. \n"
"\n"
""},
- { "MinimizerCatalogue_minimizerNames", _wrap_MinimizerCatalogue_minimizerNames, METH_O, "\n"
- "MinimizerCatalogue_minimizerNames(MinimizerCatalogue self) -> vector_string_t\n"
- "std::vector< std::string > MinimizerCatalogue::minimizerNames() const\n"
+ { "MinimizerCatalog_minimizerNames", _wrap_MinimizerCatalog_minimizerNames, METH_O, "\n"
+ "MinimizerCatalog_minimizerNames(MinimizerCatalog self) -> vector_string_t\n"
+ "std::vector< std::string > MinimizerCatalog::minimizerNames() const\n"
"\n"
""},
- { "MinimizerCatalogue_algorithmNames", _wrap_MinimizerCatalogue_algorithmNames, METH_VARARGS, "\n"
- "MinimizerCatalogue_algorithmNames(MinimizerCatalogue self, std::string const & minimizerName) -> vector_string_t\n"
- "std::vector< std::string > MinimizerCatalogue::algorithmNames(const std::string &minimizerName) const\n"
+ { "MinimizerCatalog_algorithmNames", _wrap_MinimizerCatalog_algorithmNames, METH_VARARGS, "\n"
+ "MinimizerCatalog_algorithmNames(MinimizerCatalog self, std::string const & minimizerName) -> vector_string_t\n"
+ "std::vector< std::string > MinimizerCatalog::algorithmNames(const std::string &minimizerName) const\n"
"\n"
"Returns list of algorithms defined for the minimizer with a given name. \n"
"\n"
""},
- { "MinimizerCatalogue_algorithmDescriptions", _wrap_MinimizerCatalogue_algorithmDescriptions, METH_VARARGS, "\n"
- "MinimizerCatalogue_algorithmDescriptions(MinimizerCatalogue self, std::string const & minimizerName) -> vector_string_t\n"
- "std::vector< std::string > MinimizerCatalogue::algorithmDescriptions(const std::string &minimizerName) const\n"
+ { "MinimizerCatalog_algorithmDescriptions", _wrap_MinimizerCatalog_algorithmDescriptions, METH_VARARGS, "\n"
+ "MinimizerCatalog_algorithmDescriptions(MinimizerCatalog self, std::string const & minimizerName) -> vector_string_t\n"
+ "std::vector< std::string > MinimizerCatalog::algorithmDescriptions(const std::string &minimizerName) const\n"
"\n"
"Returns list of algorithm's descriptions for the minimizer with a given name . \n"
"\n"
""},
- { "MinimizerCatalogue_minimizerInfo", _wrap_MinimizerCatalogue_minimizerInfo, METH_VARARGS, "\n"
- "MinimizerCatalogue_minimizerInfo(MinimizerCatalogue self, std::string const & minimizerName) -> MinimizerInfo const &\n"
- "const MinimizerInfo & MinimizerCatalogue::minimizerInfo(const std::string &minimizerName) const\n"
+ { "MinimizerCatalog_minimizerInfo", _wrap_MinimizerCatalog_minimizerInfo, METH_VARARGS, "\n"
+ "MinimizerCatalog_minimizerInfo(MinimizerCatalog self, std::string const & minimizerName) -> MinimizerInfo const &\n"
+ "const MinimizerInfo & MinimizerCatalog::minimizerInfo(const std::string &minimizerName) const\n"
"\n"
"Returns info for minimizer with given name. \n"
"\n"
""},
- { "delete_MinimizerCatalogue", _wrap_delete_MinimizerCatalogue, METH_O, "delete_MinimizerCatalogue(MinimizerCatalogue self)"},
- { "MinimizerCatalogue_swigregister", MinimizerCatalogue_swigregister, METH_O, NULL},
- { "MinimizerCatalogue_swiginit", MinimizerCatalogue_swiginit, METH_VARARGS, NULL},
+ { "delete_MinimizerCatalog", _wrap_delete_MinimizerCatalog, METH_O, "delete_MinimizerCatalog(MinimizerCatalog self)"},
+ { "MinimizerCatalog_swigregister", MinimizerCatalog_swigregister, METH_O, NULL},
+ { "MinimizerCatalog_swiginit", MinimizerCatalog_swiginit, METH_VARARGS, NULL},
{ "MinimizerFactory_createMinimizer", _wrap_MinimizerFactory_createMinimizer, METH_VARARGS, "MinimizerFactory_createMinimizer(std::string const & minimizerName, std::string const & algorithmType=\"\", std::string const & optionString=\"\") -> IMinimizer"},
- { "MinimizerFactory_printCatalogue", _wrap_MinimizerFactory_printCatalogue, METH_NOARGS, "MinimizerFactory_printCatalogue()"},
- { "MinimizerFactory_catalogueToString", _wrap_MinimizerFactory_catalogueToString, METH_NOARGS, "MinimizerFactory_catalogueToString() -> std::string"},
- { "MinimizerFactory_catalogueDetailsToString", _wrap_MinimizerFactory_catalogueDetailsToString, METH_NOARGS, "MinimizerFactory_catalogueDetailsToString() -> std::string"},
- { "MinimizerFactory_catalogue", _wrap_MinimizerFactory_catalogue, METH_NOARGS, "MinimizerFactory_catalogue() -> MinimizerCatalogue"},
+ { "MinimizerFactory_printCatalog", _wrap_MinimizerFactory_printCatalog, METH_NOARGS, "MinimizerFactory_printCatalog()"},
+ { "MinimizerFactory_catalogToString", _wrap_MinimizerFactory_catalogToString, METH_NOARGS, "MinimizerFactory_catalogToString() -> std::string"},
+ { "MinimizerFactory_catalogDetailsToString", _wrap_MinimizerFactory_catalogDetailsToString, METH_NOARGS, "MinimizerFactory_catalogDetailsToString() -> std::string"},
+ { "MinimizerFactory_catalog", _wrap_MinimizerFactory_catalog, METH_NOARGS, "MinimizerFactory_catalog() -> MinimizerCatalog"},
{ "new_MinimizerFactory", _wrap_new_MinimizerFactory, METH_NOARGS, "\n"
"new_MinimizerFactory() -> MinimizerFactory\n"
"\n"
@@ -22732,7 +22732,7 @@ static swig_type_info _swigt__p_Fit__MinimizerResult = {"_p_Fit__MinimizerResult
static swig_type_info _swigt__p_Fit__Parameter = {"_p_Fit__Parameter", "Fit::Parameter *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_Fit__Parameters = {"_p_Fit__Parameters", "Fit::Parameters *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_IMinimizer = {"_p_IMinimizer", "IMinimizer *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_MinimizerCatalogue = {"_p_MinimizerCatalogue", "MinimizerCatalogue *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_MinimizerCatalog = {"_p_MinimizerCatalog", "MinimizerCatalog *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_MinimizerFactory = {"_p_MinimizerFactory", "MinimizerFactory *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_MinimizerInfo = {"_p_MinimizerInfo", "MinimizerInfo *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_PyCallback = {"_p_PyCallback", "PyCallback *", 0, 0, (void*)0, 0};
@@ -22782,7 +22782,7 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_Fit__Parameter,
&_swigt__p_Fit__Parameters,
&_swigt__p_IMinimizer,
- &_swigt__p_MinimizerCatalogue,
+ &_swigt__p_MinimizerCatalog,
&_swigt__p_MinimizerFactory,
&_swigt__p_MinimizerInfo,
&_swigt__p_PyCallback,
@@ -22832,7 +22832,7 @@ static swig_cast_info _swigc__p_Fit__MinimizerResult[] = { {&_swigt__p_Fit__Min
static swig_cast_info _swigc__p_Fit__Parameter[] = { {&_swigt__p_Fit__Parameter, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_Fit__Parameters[] = { {&_swigt__p_Fit__Parameters, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IMinimizer[] = { {&_swigt__p_IMinimizer, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_MinimizerCatalogue[] = { {&_swigt__p_MinimizerCatalogue, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_MinimizerCatalog[] = { {&_swigt__p_MinimizerCatalog, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_MinimizerFactory[] = { {&_swigt__p_MinimizerFactory, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_MinimizerInfo[] = { {&_swigt__p_MinimizerInfo, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_PyCallback[] = { {&_swigt__p_PyCallback, 0, 0, 0},{0, 0, 0, 0}};
@@ -22882,7 +22882,7 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_Fit__Parameter,
_swigc__p_Fit__Parameters,
_swigc__p_IMinimizer,
- _swigc__p_MinimizerCatalogue,
+ _swigc__p_MinimizerCatalog,
_swigc__p_MinimizerFactory,
_swigc__p_MinimizerInfo,
_swigc__p_PyCallback,
--
GitLab