diff --git a/Core/TestMachinery/CoreFutest.cpp b/Core/TestMachinery/CoreTest.cpp
similarity index 89%
rename from Core/TestMachinery/CoreFutest.cpp
rename to Core/TestMachinery/CoreTest.cpp
index e4022b7daca5f9cc25bf7ecf7cc316114927744a..65cbd2fd4e59bf13d487a9530c23268a06e40ba4 100644
--- a/Core/TestMachinery/CoreFutest.cpp
+++ b/Core/TestMachinery/CoreTest.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Core/TestMachinery/CoreFutest.cpp
-//! @brief Implements class CoreFutest.
+//! @file Core/TestMachinery/CoreTest.cpp
+//! @brief Implements class CoreTest.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -13,7 +13,7 @@
//
// ************************************************************************** //
-#include "CoreFutest.h"
+#include "CoreTest.h"
#include "GISASSimulation.h"
#include "IntensityDataFunctions.h"
#include "TestConfig.h"
@@ -22,7 +22,7 @@
#include "OutputDataIOHelper.h"
#include "Utils.h"
-CoreFutest::CoreFutest(
+CoreTest::CoreTest(
const std::string& name, const std::string& description, GISASSimulation* simulation,
double threshold)
: IFutest(name, description)
@@ -32,13 +32,13 @@ CoreFutest::CoreFutest(
{
}
-CoreFutest::~CoreFutest()
+CoreTest::~CoreTest()
{
delete m_simulation;
delete m_reference;
}
-void CoreFutest::runTest()
+void CoreTest::runTest()
{
if (!m_simulation)
throw NullPointerException(
@@ -54,7 +54,7 @@ void CoreFutest::runTest()
}
}
-int CoreFutest::analyseResults()
+int CoreTest::analyseResults()
{
// Run simulation.
const std::unique_ptr<OutputData<double>>
@@ -77,7 +77,7 @@ int CoreFutest::analyseResults()
return m_result;
}
-void CoreFutest::printResults(std::ostream& ostr) const
+void CoreTest::printResults(std::ostream& ostr) const
{
ostr << getFormattedInfoString();
ostr << Utils::String::getScientificDoubleString(m_difference);
@@ -97,14 +97,14 @@ void CoreFutest::printResults(std::ostream& ostr) const
}
//! Constructs file name to save results. Strip gzip extention if necessary.
-std::string CoreFutest::getSimulationResultsFileNameAndPath() const
+std::string CoreTest::getSimulationResultsFileNameAndPath() const
{
std::string result = Utils::FileSystem::GetJoinPath(
FAILED_TESTS_DIR, "ref_" + getName() + ".int.gz");
return result;
}
-OutputData<double>* CoreFutest::getIntensityData() const
+OutputData<double>* CoreTest::getIntensityData() const
{
if (m_simulation)
return m_simulation->getDetectorIntensity();
diff --git a/Core/TestMachinery/CoreFutest.h b/Core/TestMachinery/CoreTest.h
similarity index 87%
rename from Core/TestMachinery/CoreFutest.h
rename to Core/TestMachinery/CoreTest.h
index eebb23bf71f6271f7f439bb317e74c1a6c5791f2..dfeb571a3862abd31ab93d54178be930b95e5f1e 100644
--- a/Core/TestMachinery/CoreFutest.h
+++ b/Core/TestMachinery/CoreTest.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Core/TestMachinery/CoreFutest.h
-//! @brief Declares class CoreFutest.
+//! @file Core/TestMachinery/CoreTest.h
+//! @brief Declares class CoreTest.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -22,18 +22,18 @@
class GISASSimulation;
-//! @class CoreFutest
+//! @class CoreTest
//! @ingroup standard_samples
//! @brief Core functional test compares results of the standard simulation with
//! reference intensity data. Normally invoked by FunctionalMultiTest.
-class BA_CORE_API_ CoreFutest : public IFutest
+class BA_CORE_API_ CoreTest : public IFutest
{
public:
- CoreFutest(
+ CoreTest(
const std::string& name, const std::string& description, GISASSimulation* simulation,
double threshold);
- virtual ~CoreFutest();
+ virtual ~CoreTest();
virtual void runTest();
virtual int analyseResults();
diff --git a/Core/TestMachinery/PySuiteFutest.cpp b/Core/TestMachinery/PySuiteTest.cpp
similarity index 90%
rename from Core/TestMachinery/PySuiteFutest.cpp
rename to Core/TestMachinery/PySuiteTest.cpp
index e2ce28c011ae0376a6353d60fcda40275c60b2e0..379ce16998d55657d2bf055ab1192e7f78abbe17 100644
--- a/Core/TestMachinery/PySuiteFutest.cpp
+++ b/Core/TestMachinery/PySuiteTest.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Core/TestMachinery/PySuiteFutest.cpp
-//! @brief Implements class PySuiteFutest
+//! @file Core/TestMachinery/PySuiteTest.cpp
+//! @brief Implements class PySuiteTest
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -26,9 +26,9 @@
#include "FileSystem.h"
#include "TestConfig.h"
#include "Utils.h"
-#include "PySuiteFutest.h"
+#include "PySuiteTest.h"
-PySuiteFutest::PySuiteFutest(
+PySuiteTest::PySuiteTest(
const std::string& name, const std::string& description,
GISASSimulation* reference_simulation, double threshold)
: IFutest(name, description)
@@ -41,13 +41,13 @@ PySuiteFutest::PySuiteFutest(
{
}
-PySuiteFutest::~PySuiteFutest()
+PySuiteTest::~PySuiteTest()
{
delete m_reference_simulation;
delete m_domain_simulation;
}
-void PySuiteFutest::runTest()
+void PySuiteTest::runTest()
{
assert(m_reference_simulation);
m_reference_simulation->runSimulation();
@@ -74,7 +74,7 @@ void PySuiteFutest::runTest()
(void)script_result; // ignore return value
}
-int PySuiteFutest::analyseResults()
+int PySuiteTest::analyseResults()
{
const std::unique_ptr<OutputData<double> > P_domain_data(
IntensityDataIOFactory::readOutputData(m_output_filename+".int"));
@@ -90,7 +90,7 @@ int PySuiteFutest::analyseResults()
return m_result;
}
-void PySuiteFutest::printResults(std::ostream& ostr) const
+void PySuiteTest::printResults(std::ostream& ostr) const
{
ostr << getFormattedInfoString();
ostr << Utils::String::getScientificDoubleString(m_difference);
@@ -98,7 +98,7 @@ void PySuiteFutest::printResults(std::ostream& ostr) const
ostr << "--> " << getPySuiteFileNameAndPath();
}
-std::string PySuiteFutest::getPySuiteFileNameAndPath() const
+std::string PySuiteTest::getPySuiteFileNameAndPath() const
{
std::string result
= Utils::FileSystem::GetJoinPath(FAILED_TESTS_DIR, m_pyscript_filename);
diff --git a/Core/TestMachinery/PySuiteFutest.h b/Core/TestMachinery/PySuiteTest.h
similarity index 83%
rename from Core/TestMachinery/PySuiteFutest.h
rename to Core/TestMachinery/PySuiteTest.h
index ba62013b59bad1cb6bf3e38b13f1da8f37c0b3ee..61201ef60bd63fb7edaec796f02e77de33e5be1f 100644
--- a/Core/TestMachinery/PySuiteFutest.h
+++ b/Core/TestMachinery/PySuiteTest.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Core/TestMachinery/PySuiteFutest.h
-//! @brief Declares class PySuiteFutest
+//! @file Core/TestMachinery/PySuiteTest.h
+//! @brief Declares class PySuiteTest
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -23,16 +23,16 @@
class GISASSimulation;
-//! @class PySuiteFutest
+//! @class PySuiteTest
//! @ingroup standard_samples
//! @brief Test whether Python dumps yields the same image as a direct computation.
-class BA_CORE_API_ PySuiteFutest : public IFutest
+class BA_CORE_API_ PySuiteTest : public IFutest
{
public:
- PySuiteFutest(const std::string& name, const std::string& description,
+ PySuiteTest(const std::string& name, const std::string& description,
GISASSimulation* reference_simulation, double threshold);
- virtual ~PySuiteFutest();
+ virtual ~PySuiteTest();
virtual void runTest();
virtual int analyseResults();
diff --git a/Fit/StandardFits/IMinimizerFutest.cpp b/Fit/StandardFits/IMinimizerTest.cpp
similarity index 85%
rename from Fit/StandardFits/IMinimizerFutest.cpp
rename to Fit/StandardFits/IMinimizerTest.cpp
index 8f45499e135b500ef7bb3cf04d8c9c2ee7abda5c..944eab0964f28ee3941bc7fc50823d63df58d541 100644
--- a/Fit/StandardFits/IMinimizerFutest.cpp
+++ b/Fit/StandardFits/IMinimizerTest.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/StandardFits/IMinimizerFutest.cpp
-//! @brief Implements class IMinimizerFutest.
+//! @file Fit/StandardFits/IMinimizerTest.cpp
+//! @brief Implements class IMinimizerTest.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -19,18 +19,18 @@
#include "SimulationFactory.h"
#include "OutputData.h"
#include "FitSuite.h"
-#include "IMinimizerFutest.h"
+#include "IMinimizerTest.h"
#include "MinimizerFactory.h"
#include <memory>
#include <boost/format.hpp>
-IMinimizerFutest::TestParameter::TestParameter(const std::string &name, double real_value,
+IMinimizerTest::TestParameter::TestParameter(const std::string &name, double real_value,
double start_value)
: m_name(name), m_real_value(real_value), m_start_value(start_value), m_found_value(0.0)
{
}
-IMinimizerFutest::IMinimizerFutest(const std::string &minimizer_name,
+IMinimizerTest::IMinimizerTest(const std::string &minimizer_name,
const std::string &minimizer_algorithm)
: m_minimizer_name(minimizer_name)
, m_minimizer_algorithm(minimizer_algorithm)
@@ -45,7 +45,7 @@ IMinimizerFutest::IMinimizerFutest(const std::string &minimizer_name,
}
-void IMinimizerFutest::runTest()
+void IMinimizerTest::runTest()
{
std::unique_ptr<ISample> sample(createSample());
for (size_t i = 0; i < m_parameters.size(); ++i) {
@@ -69,7 +69,7 @@ void IMinimizerFutest::runTest()
}
}
-int IMinimizerFutest::analyseResults()
+int IMinimizerTest::analyseResults()
{
for (size_t i = 0; i < m_parameters.size(); ++i) {
double diff = std::abs(m_parameters[i].m_found_value - m_parameters[i].m_real_value)
@@ -85,13 +85,13 @@ int IMinimizerFutest::analyseResults()
return m_result;
}
-void IMinimizerFutest::setParameterTolerance(double value)
+void IMinimizerTest::setParameterTolerance(double value)
{
m_parameter_tolerance = value;
}
-std::unique_ptr<FitSuite> IMinimizerFutest::createFitSuite()
+std::unique_ptr<FitSuite> IMinimizerTest::createFitSuite()
{
std::unique_ptr<FitSuite> result(new FitSuite());
result->initPrint(10);
@@ -107,21 +107,21 @@ std::unique_ptr<FitSuite> IMinimizerFutest::createFitSuite()
return std::move(result);
}
-std::unique_ptr<ISample> IMinimizerFutest::createSample()
+std::unique_ptr<ISample> IMinimizerTest::createSample()
{
SampleBuilderFactory builderFactory;
std::unique_ptr<ISample> result(builderFactory.createSample(m_sample_builder_name));
return std::move(result);
}
-std::unique_ptr<GISASSimulation> IMinimizerFutest::createSimulation()
+std::unique_ptr<GISASSimulation> IMinimizerTest::createSimulation()
{
SimulationFactory simRegistry;
std::unique_ptr<GISASSimulation> result(simRegistry.createItem(m_simulation_name));
return std::move(result);
}
-std::unique_ptr<OutputData<double> > IMinimizerFutest::createOutputData(
+std::unique_ptr<OutputData<double> > IMinimizerTest::createOutputData(
const GISASSimulation *simulation)
{
std::unique_ptr<OutputData<double> > result(simulation->getDetectorIntensity());
diff --git a/Fit/StandardFits/IMinimizerFutest.h b/Fit/StandardFits/IMinimizerTest.h
similarity index 87%
rename from Fit/StandardFits/IMinimizerFutest.h
rename to Fit/StandardFits/IMinimizerTest.h
index 83e1276db2a2374092feb71816128e3c787c13b7..1f5c60b4579bcd0dea68be9f833a6a440987978d 100644
--- a/Fit/StandardFits/IMinimizerFutest.h
+++ b/Fit/StandardFits/IMinimizerTest.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/StandardFits/IMinimizerFutest.h
-//! @brief Declares class IMinimizerFutest.
+//! @file Fit/StandardFits/IMinimizerTest.h
+//! @brief Declares class IMinimizerTest.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -26,16 +26,16 @@ class FitSuite;
class ISample;
class GISASSimulation;
-//! @class IMinimizerFutest
+//! @class IMinimizerTest
//! @ingroup standard_samples
//! @brief Basic class for all minimizer functional tests
-class BA_CORE_API_ IMinimizerFutest : public IFutest
+class BA_CORE_API_ IMinimizerTest : public IFutest
{
public:
- IMinimizerFutest(const std::string &minimizer_name,
+ IMinimizerTest(const std::string &minimizer_name,
const std::string &minimizer_algorithm = std::string());
- virtual ~IMinimizerFutest(){}
+ virtual ~IMinimizerTest(){}
void runTest();
int analyseResults();
diff --git a/Fit/StandardFits/MinimizerFutests.cpp b/Fit/StandardFits/MinimizerTests.cpp
similarity index 85%
rename from Fit/StandardFits/MinimizerFutests.cpp
rename to Fit/StandardFits/MinimizerTests.cpp
index 4c3e7326c794f6388302fa09ac4d57d1662af983..a9f9c60feb6d186109480eace8dde6c1157eecc9 100644
--- a/Fit/StandardFits/MinimizerFutests.cpp
+++ b/Fit/StandardFits/MinimizerTests.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/StandardFits/MinimizerFutests.cpp
-//! @brief Implements classes MinimizerFutests.
+//! @file Fit/StandardFits/MinimizerTests.cpp
+//! @brief Implements classes MinimizerTests.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -13,36 +13,36 @@
//
// ************************************************************************** //
-#include "MinimizerFutests.h"
+#include "MinimizerTests.h"
#include "FitSuite.h"
#include "FitKernel.h"
#include "MinimizerFactory.h"
Minuit2MigradTest::Minuit2MigradTest()
- : IMinimizerFutest("Minuit2", "Migrad")
+ : IMinimizerTest("Minuit2", "Migrad")
{}
Minuit2FumiliTest::Minuit2FumiliTest()
- : IMinimizerFutest("Minuit2", "Fumili")
+ : IMinimizerTest("Minuit2", "Fumili")
{}
GSLLevenbergMarquardtTest::GSLLevenbergMarquardtTest()
- : IMinimizerFutest("GSLLMA")
+ : IMinimizerTest("GSLLMA")
{}
GSLMultiMinBFGSTest::GSLMultiMinBFGSTest()
- : IMinimizerFutest("GSLMultiMin", "BFGS")
+ : IMinimizerTest("GSLMultiMin", "BFGS")
{}
GSLMultiMinSteepestDescentTest::GSLMultiMinSteepestDescentTest()
- : IMinimizerFutest("GSLMultiMin", "SteepestDescent")
+ : IMinimizerTest("GSLMultiMin", "SteepestDescent")
{}
GSLSimulatedAnnealingTest::GSLSimulatedAnnealingTest()
- : IMinimizerFutest("GSLSimAn")
+ : IMinimizerTest("GSLSimAn")
{}
std::unique_ptr<FitSuite> GSLSimulatedAnnealingTest::createFitSuite()
@@ -66,7 +66,7 @@ std::unique_ptr<FitSuite> GSLSimulatedAnnealingTest::createFitSuite()
GeneticTest::GeneticTest()
- : IMinimizerFutest("Genetic")
+ : IMinimizerTest("Genetic")
{}
std::unique_ptr<FitSuite> GeneticTest::createFitSuite()
diff --git a/Fit/StandardFits/MinimizerFutests.h b/Fit/StandardFits/MinimizerTests.h
similarity index 72%
rename from Fit/StandardFits/MinimizerFutests.h
rename to Fit/StandardFits/MinimizerTests.h
index 50a0e3efc309f280d2e062f48a86a68a4cc49b30..9185a890d9f6ed787ad921de3047c05702771a1a 100644
--- a/Fit/StandardFits/MinimizerFutests.h
+++ b/Fit/StandardFits/MinimizerTests.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Fit/StandardFits/MinimizerFutests.h
-//! @brief Declares classes MinimizerFutests.
+//! @file Fit/StandardFits/MinimizerTests.h
+//! @brief Declares classes MinimizerTests.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -16,45 +16,45 @@
#ifndef MINIMIZERFUNCTIONALTESTS_H
#define MINIMIZERFUNCTIONALTESTS_H
-#include "IMinimizerFutest.h"
+#include "IMinimizerTest.h"
//! basic test of Minuit2/Migrad minimizer
-class Minuit2MigradTest : public IMinimizerFutest
+class Minuit2MigradTest : public IMinimizerTest
{
public:
Minuit2MigradTest();
};
//! basic test of Minuit2/Fumili minimizer
-class Minuit2FumiliTest : public IMinimizerFutest
+class Minuit2FumiliTest : public IMinimizerTest
{
public:
Minuit2FumiliTest();
};
//! basic test of GSL/LMA minimizer
-class GSLLevenbergMarquardtTest : public IMinimizerFutest
+class GSLLevenbergMarquardtTest : public IMinimizerTest
{
public:
GSLLevenbergMarquardtTest();
};
//! basic test of GSL/BFGS minimizer
-class GSLMultiMinBFGSTest : public IMinimizerFutest
+class GSLMultiMinBFGSTest : public IMinimizerTest
{
public:
GSLMultiMinBFGSTest();
};
//! basic test of GSL/SteepestDescent minimizer
-class GSLMultiMinSteepestDescentTest : public IMinimizerFutest
+class GSLMultiMinSteepestDescentTest : public IMinimizerTest
{
public:
GSLMultiMinSteepestDescentTest();
};
//! basic test of GSL/SimulatedAnnealing minimizer
-class GSLSimulatedAnnealingTest : public IMinimizerFutest
+class GSLSimulatedAnnealingTest : public IMinimizerTest
{
public:
GSLSimulatedAnnealingTest();
@@ -63,7 +63,7 @@ protected:
};
//! basic test of Genetic minimizer
-class GeneticTest : public IMinimizerFutest
+class GeneticTest : public IMinimizerTest
{
public:
GeneticTest();
diff --git a/Fit/StandardFits/RectDetectorFitTest.cpp b/Fit/StandardFits/RectDetectorFitTest.cpp
index 20cf523fb58195978229fb746aa8695a4d82d4fa..2bed77cf34db03c17b928f52451d5568e57caf9e 100644
--- a/Fit/StandardFits/RectDetectorFitTest.cpp
+++ b/Fit/StandardFits/RectDetectorFitTest.cpp
@@ -22,7 +22,7 @@
#include <memory>
RectDetectorFitTest::RectDetectorFitTest()
- : IMinimizerFutest("Minuit2", "Migrad")
+ : IMinimizerTest("Minuit2", "Migrad")
{
}
diff --git a/Fit/StandardFits/RectDetectorFitTest.h b/Fit/StandardFits/RectDetectorFitTest.h
index a4521b235a3991ef7e3f88201356dd096e9f9936..49ea09c9ec251dff37aa11511a43a8d6da4ca93c 100644
--- a/Fit/StandardFits/RectDetectorFitTest.h
+++ b/Fit/StandardFits/RectDetectorFitTest.h
@@ -16,7 +16,7 @@
#ifndef RECTDETECTORFITTEST_H
#define RECTDETECTORFITTEST_H
-#include "IMinimizerFutest.h"
+#include "IMinimizerTest.h"
#include "OutputData.h"
#include <vector>
@@ -29,7 +29,7 @@ class GISASSimulation;
//! @ingroup standard_samples
//! @brief Fit of simulation with rectangular detector. The detector is cropped, masks are applied.
-class BA_CORE_API_ RectDetectorFitTest : public IMinimizerFutest
+class BA_CORE_API_ RectDetectorFitTest : public IMinimizerTest
{
public:
RectDetectorFitTest();
diff --git a/Fit/StandardFits/StandardFitsFactory.cpp b/Fit/StandardFits/StandardFitsFactory.cpp
index 407e0a2b209818c54c1c37cfb85110b56a304163..1354f89623a13dc99498f9c78d7a38184186579b 100644
--- a/Fit/StandardFits/StandardFitsFactory.cpp
+++ b/Fit/StandardFits/StandardFitsFactory.cpp
@@ -1,6 +1,6 @@
#include "StandardFitsFactory.h"
-#include "MinimizerFutests.h"
+#include "MinimizerTests.h"
#include "RectDetectorFitTest.h"
#include <boost/format.hpp>
diff --git a/GUI/coregui/utils/GUIFutest.cpp b/GUI/coregui/utils/GUITest.cpp
similarity index 89%
rename from GUI/coregui/utils/GUIFutest.cpp
rename to GUI/coregui/utils/GUITest.cpp
index 051291512c08c91d2708fa34926fc765423ae3bf..f3f6778fb629d4838e7a7eb961e38f98a4ef6870 100644
--- a/GUI/coregui/utils/GUIFutest.cpp
+++ b/GUI/coregui/utils/GUITest.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/coregui/utils/GUIFutest.cpp
-//! @brief Implements class GUIFutest
+//! @file GUI/coregui/utils/GUITest.cpp
+//! @brief Implements class GUITest
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -14,7 +14,7 @@
//
// ************************************************************************** //
-#include "GUIFutest.h"
+#include "GUITest.h"
#include "SimulationFactory.h"
#include "GUIObjectBuilder.h"
#include "InstrumentModel.h"
@@ -32,7 +32,7 @@
#include <QDebug>
-GUIFutest::GUIFutest(const std::string &name, const std::string &description,
+GUITest::GUITest(const std::string &name, const std::string &description,
GISASSimulation *reference_simulation, double threshold)
: IFutest(name, description)
, m_reference_simulation(reference_simulation)
@@ -42,13 +42,13 @@ GUIFutest::GUIFutest(const std::string &name, const std::string &description,
{
}
-GUIFutest::~GUIFutest()
+GUITest::~GUITest()
{
delete m_reference_simulation;
delete m_domain_simulation;
}
-void GUIFutest::runTest()
+void GUITest::runTest()
{
if (!m_reference_simulation) {
throw NullPointerException(
@@ -61,7 +61,7 @@ void GUIFutest::runTest()
m_domain_simulation->runSimulation();
}
-int GUIFutest::analyseResults()
+int GUITest::analyseResults()
{
const std::unique_ptr<OutputData<double> > P_domain_data(m_domain_simulation->getDetectorIntensity());
const std::unique_ptr<OutputData<double> > P_reference_data(
@@ -71,7 +71,7 @@ int GUIFutest::analyseResults()
return m_result;
}
-void GUIFutest::printResults(std::ostream &ostr) const
+void GUITest::printResults(std::ostream &ostr) const
{
ostr << getFormattedInfoString();
ostr << Utils::String::getScientificDoubleString(m_difference);
@@ -79,7 +79,7 @@ void GUIFutest::printResults(std::ostream &ostr) const
//! returns new simulation from
-void GUIFutest::createDomainSimulation()
+void GUITest::createDomainSimulation()
{
assert(m_reference_simulation->getSample());
diff --git a/GUI/coregui/utils/GUIFutest.h b/GUI/coregui/utils/GUITest.h
similarity index 91%
rename from GUI/coregui/utils/GUIFutest.h
rename to GUI/coregui/utils/GUITest.h
index 06832a84f020e3e8d123366957b46450c2ee1f07..f04393526449bda31e6218f5fb6f23991644f0f2 100644
--- a/GUI/coregui/utils/GUIFutest.h
+++ b/GUI/coregui/utils/GUITest.h
@@ -30,12 +30,12 @@ class GISASSimulation;
//! the one obtained through domain->GUI->domain convertion. Normally invoked by
//! FunctionalMultiTest.
-class BA_CORE_API_ GUIFutest : public IFutest
+class BA_CORE_API_ GUITest : public IFutest
{
public:
- GUIFutest(const std::string &name, const std::string &description,
+ GUITest(const std::string &name, const std::string &description,
GISASSimulation *reference_simulation, double threshold);
- virtual ~GUIFutest();
+ virtual ~GUITest();
virtual void runTest();
virtual int analyseResults();
diff --git a/Tests/Functional/Core/CoreSuite.cpp b/Tests/Functional/Core/CoreSuite.cpp
index 0e13fb4826c9696cf81b3d6ebf7a3d464c07b377..45b0f9dabe1194095d8575a37dfa4d0a2c51ed1d 100644
--- a/Tests/Functional/Core/CoreSuite.cpp
+++ b/Tests/Functional/Core/CoreSuite.cpp
@@ -14,13 +14,13 @@
// ************************************************************************** //
#include "FutestSuite.h"
-#include "CoreFutest.h"
+#include "CoreTest.h"
class CoreSuite : public FutestSuite
{
public:
CoreSuite() { setName("CoreSuite"); }
- IFutest* getFutest() const { return new CoreFutest(
+ IFutest* getFutest() const { return new CoreTest(
getTestName(), getTestDescription(), getSimulation(), getTestThreshold() ); }
};
diff --git a/Tests/Functional/Fit/FitSuite.cpp b/Tests/Functional/Fit/FitSuite.cpp
index 874d5b5891e28c36e5d478c3ed45d5090f0dcd1d..0a058b656385c290797609205ad4b8a06e412c07 100644
--- a/Tests/Functional/Fit/FitSuite.cpp
+++ b/Tests/Functional/Fit/FitSuite.cpp
@@ -13,7 +13,7 @@
//
// ************************************************************************** //
-#include "IMinimizerFutest.h"
+#include "IMinimizerTest.h"
#include "StandardFitsFactory.h"
#include <memory>
diff --git a/Tests/Functional/GUI/GUISuite.cpp b/Tests/Functional/GUI/GUISuite.cpp
index 3fd90828d06992897efea5df3e4bbcd644757540..d403f78801edec5336a4c2b2ee79043a007af8ce 100644
--- a/Tests/Functional/GUI/GUISuite.cpp
+++ b/Tests/Functional/GUI/GUISuite.cpp
@@ -15,13 +15,13 @@
// ************************************************************************** //
#include "FutestSuite.h"
-#include "GUIFutest.h"
+#include "GUITest.h"
class GUISuite : public FutestSuite
{
public:
GUISuite() { setName("GUISuite"); }
- IFutest* getFutest() const { return new GUIFutest(
+ IFutest* getFutest() const { return new GUITest(
getTestName(), getTestDescription(), getSimulation(), getTestThreshold()); }
};
diff --git a/Tests/Functional/PyCore/suite/PySuite.cpp b/Tests/Functional/PyCore/suite/PySuite.cpp
index 1702c98c090be0954c46f7a6a843bab6fbf3cded..ecc8801a91308df8746c77c6c63b9b0d0975fc02 100644
--- a/Tests/Functional/PyCore/suite/PySuite.cpp
+++ b/Tests/Functional/PyCore/suite/PySuite.cpp
@@ -14,13 +14,13 @@
// ************************************************************************** //
#include "FutestSuite.h"
-#include "PySuiteFutest.h"
+#include "PySuiteTest.h"
class PySuite : public FutestSuite
{
public:
PySuite() { setName("PySuite"); }
- IFutest* getFutest() const { return new PySuiteFutest(
+ IFutest* getFutest() const { return new PySuiteTest(
getTestName(), getTestDescription(), getSimulation(), getTestThreshold()); }
};
diff --git a/auto/Wrap/doxygen_core.i b/auto/Wrap/doxygen_core.i
index 1c34461d25f831f802db14da3862384672723ca2..1e0599974ea5238ed5051b38992e4e02ef35487c 100644
--- a/auto/Wrap/doxygen_core.i
+++ b/auto/Wrap/doxygen_core.i
@@ -732,30 +732,6 @@ Sets convolution mode.
";
-// File: classCoreFutest.xml
-%feature("docstring") CoreFutest "
-
-Core functional test compares results of the standard simulation with reference intensity data. Normally invoked by FunctionalMultiTest.
-
-C++ includes: CoreFutest.h
-";
-
-%feature("docstring") CoreFutest::CoreFutest "CoreFutest::CoreFutest(const std::string &name, const std::string &description, GISASSimulation *simulation, double threshold)
-";
-
-%feature("docstring") CoreFutest::~CoreFutest "CoreFutest::~CoreFutest()
-";
-
-%feature("docstring") CoreFutest::runTest "void CoreFutest::runTest()
-";
-
-%feature("docstring") CoreFutest::analyseResults "int CoreFutest::analyseResults()
-";
-
-%feature("docstring") CoreFutest::printResults "void CoreFutest::printResults(std::ostream &ostr) const
-";
-
-
// File: classCoreShellBoxRotateZandYBuilder.xml
%feature("docstring") CoreShellBoxRotateZandYBuilder "
@@ -786,6 +762,30 @@ C++ includes: CoreShellParticleBuilder.h
";
+// File: classCoreTest.xml
+%feature("docstring") CoreTest "
+
+Core functional test compares results of the standard simulation with reference intensity data. Normally invoked by FunctionalMultiTest.
+
+C++ includes: CoreTest.h
+";
+
+%feature("docstring") CoreTest::CoreTest "CoreTest::CoreTest(const std::string &name, const std::string &description, GISASSimulation *simulation, double threshold)
+";
+
+%feature("docstring") CoreTest::~CoreTest "CoreTest::~CoreTest()
+";
+
+%feature("docstring") CoreTest::runTest "void CoreTest::runTest()
+";
+
+%feature("docstring") CoreTest::analyseResults "int CoreTest::analyseResults()
+";
+
+%feature("docstring") CoreTest::printResults "void CoreTest::printResults(std::ostream &ostr) const
+";
+
+
// File: classCosineRippleBuilder.xml
%feature("docstring") CosineRippleBuilder "
@@ -10791,33 +10791,33 @@ finalize report to the simulation
";
-// File: classPySuiteFutest.xml
-%feature("docstring") PySuiteFutest "
+// File: classPySuiteTest.xml
+%feature("docstring") PySuiteTest "
Test whether Python dumps yields the same image as a direct computation.
-C++ includes: PySuiteFutest.h
+C++ includes: PySuiteTest.h
";
-%feature("docstring") PySuiteFutest::PySuiteFutest "PySuiteFutest::PySuiteFutest(const std::string &name, const std::string &description, GISASSimulation *reference_simulation, double threshold)
+%feature("docstring") PySuiteTest::PySuiteTest "PySuiteTest::PySuiteTest(const std::string &name, const std::string &description, GISASSimulation *reference_simulation, double threshold)
";
-%feature("docstring") PySuiteFutest::~PySuiteFutest "PySuiteFutest::~PySuiteFutest()
+%feature("docstring") PySuiteTest::~PySuiteTest "PySuiteTest::~PySuiteTest()
";
-%feature("docstring") PySuiteFutest::runTest "void PySuiteFutest::runTest()
+%feature("docstring") PySuiteTest::runTest "void PySuiteTest::runTest()
";
-%feature("docstring") PySuiteFutest::analyseResults "int PySuiteFutest::analyseResults()
+%feature("docstring") PySuiteTest::analyseResults "int PySuiteTest::analyseResults()
";
-%feature("docstring") PySuiteFutest::getOutputData "const OutputData<double>* PySuiteFutest::getOutputData() const
+%feature("docstring") PySuiteTest::getOutputData "const OutputData<double>* PySuiteTest::getOutputData() const
";
-%feature("docstring") PySuiteFutest::getDifference "double PySuiteFutest::getDifference() const
+%feature("docstring") PySuiteTest::getDifference "double PySuiteTest::getDifference() const
";
-%feature("docstring") PySuiteFutest::printResults "void PySuiteFutest::printResults(std::ostream &ostr) const
+%feature("docstring") PySuiteTest::printResults "void PySuiteTest::printResults(std::ostream &ostr) const
";
@@ -14737,10 +14737,10 @@ Returns concatenated rotation (first right, then left).
// File: TwoDimLatticeBuilder_8h.xml
-// File: CoreFutest_8cpp.xml
+// File: CoreTest_8cpp.xml
-// File: CoreFutest_8h.xml
+// File: CoreTest_8h.xml
// File: FutestInfo_8cpp.xml
@@ -14770,10 +14770,10 @@ Returns concatenated rotation (first right, then left).
// File: IRegistry_8h.xml
-// File: PySuiteFutest_8cpp.xml
+// File: PySuiteTest_8cpp.xml
-// File: PySuiteFutest_8h.xml
+// File: PySuiteTest_8h.xml
// File: SubtestRegistry_8cpp.xml
diff --git a/auto/Wrap/doxygen_fit.i b/auto/Wrap/doxygen_fit.i
index b4b2a15accc0e998904914c7650ddb6b41a49f00..26517dbfa1fcbc0c707c3de400be2181062c30c1 100644
--- a/auto/Wrap/doxygen_fit.i
+++ b/auto/Wrap/doxygen_fit.i
@@ -1053,7 +1053,7 @@ C++ includes: FitSuiteStrategies.h
basic test of Genetic minimizer
-C++ includes: MinimizerFutests.h
+C++ includes: MinimizerTests.h
";
%feature("docstring") GeneticTest::GeneticTest "GeneticTest::GeneticTest()
@@ -1065,7 +1065,7 @@ C++ includes: MinimizerFutests.h
basic test of GSL/LMA minimizer
-C++ includes: MinimizerFutests.h
+C++ includes: MinimizerTests.h
";
%feature("docstring") GSLLevenbergMarquardtTest::GSLLevenbergMarquardtTest "GSLLevenbergMarquardtTest::GSLLevenbergMarquardtTest()
@@ -1077,7 +1077,7 @@ C++ includes: MinimizerFutests.h
basic test of GSL/BFGS minimizer
-C++ includes: MinimizerFutests.h
+C++ includes: MinimizerTests.h
";
%feature("docstring") GSLMultiMinBFGSTest::GSLMultiMinBFGSTest "GSLMultiMinBFGSTest::GSLMultiMinBFGSTest()
@@ -1089,7 +1089,7 @@ C++ includes: MinimizerFutests.h
basic test of GSL/SteepestDescent minimizer
-C++ includes: MinimizerFutests.h
+C++ includes: MinimizerTests.h
";
%feature("docstring") GSLMultiMinSteepestDescentTest::GSLMultiMinSteepestDescentTest "GSLMultiMinSteepestDescentTest::GSLMultiMinSteepestDescentTest()
@@ -1101,7 +1101,7 @@ C++ includes: MinimizerFutests.h
basic test of GSL/SimulatedAnnealing minimizer
-C++ includes: MinimizerFutests.h
+C++ includes: MinimizerTests.h
";
%feature("docstring") GSLSimulatedAnnealingTest::GSLSimulatedAnnealingTest "GSLSimulatedAnnealingTest::GSLSimulatedAnnealingTest()
@@ -1298,27 +1298,27 @@ return name of the minimization algorithm
";
-// File: classIMinimizerFutest.xml
-%feature("docstring") IMinimizerFutest "
+// File: classIMinimizerTest.xml
+%feature("docstring") IMinimizerTest "
Basic class for all minimizer functional tests.
-C++ includes: IMinimizerFutest.h
+C++ includes: IMinimizerTest.h
";
-%feature("docstring") IMinimizerFutest::IMinimizerFutest "IMinimizerFutest::IMinimizerFutest(const std::string &minimizer_name, const std::string &minimizer_algorithm=std::string())
+%feature("docstring") IMinimizerTest::IMinimizerTest "IMinimizerTest::IMinimizerTest(const std::string &minimizer_name, const std::string &minimizer_algorithm=std::string())
";
-%feature("docstring") IMinimizerFutest::~IMinimizerFutest "virtual IMinimizerFutest::~IMinimizerFutest()
+%feature("docstring") IMinimizerTest::~IMinimizerTest "virtual IMinimizerTest::~IMinimizerTest()
";
-%feature("docstring") IMinimizerFutest::runTest "void IMinimizerFutest::runTest()
+%feature("docstring") IMinimizerTest::runTest "void IMinimizerTest::runTest()
";
-%feature("docstring") IMinimizerFutest::analyseResults "int IMinimizerFutest::analyseResults()
+%feature("docstring") IMinimizerTest::analyseResults "int IMinimizerTest::analyseResults()
";
-%feature("docstring") IMinimizerFutest::setParameterTolerance "void IMinimizerFutest::setParameterTolerance(double value)
+%feature("docstring") IMinimizerTest::setParameterTolerance "void IMinimizerTest::setParameterTolerance(double value)
";
@@ -1641,7 +1641,7 @@ Prints fit results.
basic test of Minuit2/Fumili minimizer
-C++ includes: MinimizerFutests.h
+C++ includes: MinimizerTests.h
";
%feature("docstring") Minuit2FumiliTest::Minuit2FumiliTest "Minuit2FumiliTest::Minuit2FumiliTest()
@@ -1653,7 +1653,7 @@ C++ includes: MinimizerFutests.h
basic test of Minuit2/Migrad minimizer
-C++ includes: MinimizerFutests.h
+C++ includes: MinimizerTests.h
";
%feature("docstring") Minuit2MigradTest::Minuit2MigradTest "Minuit2MigradTest::Minuit2MigradTest()
@@ -1957,10 +1957,10 @@ C++ includes: StandardFitsFactory.h
";
-// File: classIMinimizerFutest_1_1TestParameter.xml
-%feature("docstring") IMinimizerFutest::TestParameter "";
+// File: classIMinimizerTest_1_1TestParameter.xml
+%feature("docstring") IMinimizerTest::TestParameter "";
-%feature("docstring") IMinimizerFutest::TestParameter::TestParameter "IMinimizerFutest::TestParameter::TestParameter(const std::string &name, double real_value, double start_value)
+%feature("docstring") IMinimizerTest::TestParameter::TestParameter "IMinimizerTest::TestParameter::TestParameter(const std::string &name, double real_value, double start_value)
";
@@ -2138,16 +2138,16 @@ C++ includes: StandardFitsFactory.h
// File: ROOTSimAnMinimizer_8h.xml
-// File: IMinimizerFutest_8cpp.xml
+// File: IMinimizerTest_8cpp.xml
-// File: IMinimizerFutest_8h.xml
+// File: IMinimizerTest_8h.xml
-// File: MinimizerFutests_8cpp.xml
+// File: MinimizerTests_8cpp.xml
-// File: MinimizerFutests_8h.xml
+// File: MinimizerTests_8h.xml
// File: RectDetectorFitTest_8cpp.xml