From 2f7d18e6146d0765dc926c7caba627ed633b373d Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Thu, 8 Oct 2015 09:46:23 +0100
Subject: [PATCH] Move FuncMinimizers to there own sub namesspace
re #13347
---
.../MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h | 2 ++
.../MantidCurveFitting/FuncMinimizers/DampingMinimizer.h | 7 ++++---
.../MantidCurveFitting/FuncMinimizers/DerivMinimizer.h | 2 ++
.../MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h | 9 +++++++++
.../FuncMinimizers/FRConjugateGradientMinimizer.h | 2 ++
.../FuncMinimizers/LevenbergMarquardtMDMinimizer.h | 2 ++
.../FuncMinimizers/LevenbergMarquardtMinimizer.h | 2 ++
.../FuncMinimizers/PRConjugateGradientMinimizer.h | 2 ++
.../MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h | 2 ++
.../FuncMinimizers/SteepestDescentMinimizer.h | 2 ++
.../CurveFitting/src/FuncMinimizers/BFGS_Minimizer.cpp | 2 ++
.../CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp | 5 ++++-
.../CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp | 2 ++
.../CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp | 2 ++
.../src/FuncMinimizers/FRConjugateGradientMinimizer.cpp | 2 ++
.../src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp | 2 ++
.../src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp | 2 ++
.../src/FuncMinimizers/PRConjugateGradientMinimizer.cpp | 2 ++
.../CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp | 2 ++
.../src/FuncMinimizers/SteepestDescentMinimizer.cpp | 3 +++
Framework/CurveFitting/test/BSplineTest.h | 2 +-
Framework/CurveFitting/test/CompositeFunctionTest.h | 1 +
Framework/CurveFitting/test/FuncMinimizers/BFGSTest.h | 1 +
.../test/FuncMinimizers/DampingMinimizerTest.h | 1 +
.../test/FuncMinimizers/FABADAMinimizerTest.h | 2 +-
.../test/FuncMinimizers/FRConjugateGradientTest.h | 1 +
.../test/FuncMinimizers/LevenbergMarquardtMDTest.h | 1 +
.../test/FuncMinimizers/LevenbergMarquardtTest.h | 1 +
.../test/FuncMinimizers/PRConjugateGradientTest.h | 1 +
Framework/CurveFitting/test/FuncMinimizers/SimplexTest.h | 1 +
Framework/CurveFitting/test/GaussianTest.h | 2 +-
Framework/CurveFitting/test/LeastSquaresTest.h | 1 +
Framework/CurveFitting/test/MultiDomainFunctionTest.h | 2 +-
33 files changed, 65 insertions(+), 8 deletions(-)
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h
index 29c4efa07b5..d95d370ee8f 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
/** Implementing Broyden-Fletcher-Goldfarb-Shanno (BFGS) algorithm
by wrapping the IFuncMinimizer interface around the GSL implementation of
this algorithm.
@@ -52,6 +53,7 @@ protected:
static Kernel::Logger &g_log;
};
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
index 4c8be89a8f2..ccadc518f5f 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
@@ -10,8 +10,9 @@
namespace Mantid {
namespace CurveFitting {
-
class CostFuncLeastSquares;
+namespace FuncMinimisers {
+
/**
Implements a least squares minimization algorithm with damping.
@@ -56,13 +57,13 @@ public:
private:
/// Pointer to the cost function. Must be the least squares.
- boost::shared_ptr<CostFuncLeastSquares> m_leastSquares;
+ boost::shared_ptr<CurveFitting::CostFuncLeastSquares> m_leastSquares;
/// Relative tolerance.
double m_relTol;
/// The damping mu parameter in the Levenberg-Marquardt method.
// double m_damping;
};
-
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h
index f894626253e..bc3277e6df2 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h
@@ -12,6 +12,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
/** A wrapper around the GSL functions implementing a minimizer using
derivatives.
Concrete classes must implement the getGSLMinimizerType() method.
@@ -94,6 +95,7 @@ private:
void initGSLMMin();
};
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h
index 751e195e233..e7d341910c4 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h
@@ -10,7 +10,14 @@
namespace Mantid {
namespace CurveFitting {
+/// Forward Declaration
class CostFuncLeastSquares;
+}
+}
+
+namespace Mantid {
+namespace CurveFitting {
+namespace FuncMinimisers {
/** FABADA : TODO: DESCRIPTION
@@ -88,6 +95,8 @@ private:
/// Maximum number of iterations
size_t m_max_iter;
};
+
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h
index 0444ff7d159..8d516e72aa4 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
/** Implementing Fletcher-Reeves flavour of the conjugate gradient algorithm
by wrapping the IFuncMinimizer interface around the GSL implementation of
this algorithm.
@@ -51,6 +52,7 @@ protected:
virtual const gsl_multimin_fdfminimizer_type *getGSLMinimizerType();
};
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h
index 5d39606ed1f..7e6bc6cb39d 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h
@@ -13,6 +13,7 @@ namespace CurveFitting {
class CostFuncLeastSquares;
+namespace FuncMinimisers {
/** Implementing Levenberg-Marquardt algorithm. Uses the normal system calculate
the corrections to the parameters. Expects a cost function that can evaluate
the value, the derivatives and the hessian matrix.
@@ -71,6 +72,7 @@ private:
std::vector<double> m_D;
};
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h
index a5af8ed9882..0431a6327bd 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h
@@ -11,6 +11,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
/** Implementing Levenberg-Marquardt by wrapping the IFuncMinimizer interface
around the GSL implementation of this algorithm.
@@ -79,6 +80,7 @@ private:
double m_relError;
};
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h
index 62e9fa704f4..1c3a308127c 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
/** Implementing Polak-Ribiere flavour of the conjugate gradient algorithm
by wrapping the IFuncMinimizer interface around the GSL implementation of
this algorithm.
@@ -49,6 +50,7 @@ protected:
virtual const gsl_multimin_fdfminimizer_type *getGSLMinimizerType();
};
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h
index 5ca099ae2b2..b52f4823fd5 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h
@@ -10,6 +10,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
/** Implementing Simplex by wrapping the IFuncMinimizer interface
around the GSL implementation of this algorithm.
@@ -87,6 +88,7 @@ private:
gsl_multimin_function gslContainer;
};
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h
index bd0a8073218..9c24fb6e34d 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h
@@ -9,6 +9,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
/** Implementing the steepest descent algorithm
by wrapping the IFuncMinimizer interface around the GSL implementation of
this algorithm.
@@ -51,6 +52,7 @@ protected:
static Kernel::Logger &g_log;
};
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/BFGS_Minimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/BFGS_Minimizer.cpp
index 42b3d6d1622..75067d25822 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/BFGS_Minimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/BFGS_Minimizer.cpp
@@ -10,6 +10,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
namespace {
/// static logger object
Kernel::Logger g_log("BFGS_Minimizer");
@@ -23,5 +24,6 @@ const gsl_multimin_fdfminimizer_type *BFGS_Minimizer::getGSLMinimizerType() {
return gsl_multimin_fdfminimizer_vector_bfgs2;
}
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp
index e666a42209a..4a408b9789c 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/DampingMinimizer.cpp
@@ -17,6 +17,8 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
+
namespace {
/// static logger
Kernel::Logger g_log("DampingMinimizer");
@@ -32,7 +34,7 @@ DampingMinimizer::DampingMinimizer(double relTol)
/// Initialize minimizer, i.e. pass a function to minimize.
void DampingMinimizer::initialize(API::ICostFunction_sptr function, size_t) {
- m_leastSquares = boost::dynamic_pointer_cast<CostFuncLeastSquares>(function);
+ m_leastSquares = boost::dynamic_pointer_cast<CurveFitting::CostFuncLeastSquares>(function);
if (!m_leastSquares) {
throw std::invalid_argument("Damping minimizer works only with least "
"squares. Different function was given.");
@@ -121,5 +123,6 @@ double DampingMinimizer::costFunctionVal() {
return m_leastSquares->val();
}
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp
index aad022b04ae..d94c82151bc 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/DerivMinimizer.cpp
@@ -6,6 +6,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
/** Used by the GSL to calculate the cost function.
* @param x :: Vector with parameters
@@ -173,5 +174,6 @@ void DerivMinimizer::setStopGradient(const double value) {
double DerivMinimizer::costFunctionVal() { return m_gslSolver->f; }
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp
index 6020760e963..28c6983e668 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp
@@ -31,6 +31,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
namespace {
// static logger object
@@ -641,5 +642,6 @@ void FABADAMinimizer::finalize() {
}
}
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/FRConjugateGradientMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/FRConjugateGradientMinimizer.cpp
index 99fe0c35f12..f8decf01d8e 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/FRConjugateGradientMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/FRConjugateGradientMinimizer.cpp
@@ -10,6 +10,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
namespace {
/// static logger
Kernel::Logger g_log("FRConjugateGradientMinimizer");
@@ -28,5 +29,6 @@ FRConjugateGradientMinimizer::getGSLMinimizerType() {
return gsl_multimin_fdfminimizer_conjugate_fr;
}
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp
index 7bfd0c587cb..b33c202472e 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMDMinimizer.cpp
@@ -17,6 +17,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
namespace {
/// static logger object
Kernel::Logger g_log("LevenbergMarquardMD");
@@ -287,5 +288,6 @@ double LevenbergMarquardtMDMinimizer::costFunctionVal() {
return m_leastSquares->val();
}
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
index bb409af97fd..e19ad6d29a6 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/LevenbergMarquardtMinimizer.cpp
@@ -17,6 +17,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
namespace {
// Get a reference to the logger
Kernel::Logger g_log("LevenbergMarquardtMinimizer");
@@ -141,5 +142,6 @@ void LevenbergMarquardtMinimizer::calCovarianceMatrix(double epsrel,
gsl_multifit_covar(m_gslSolver->J, epsrel, covar);
}
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/PRConjugateGradientMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/PRConjugateGradientMinimizer.cpp
index 88cf0bb80b5..8c4a96f8076 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/PRConjugateGradientMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/PRConjugateGradientMinimizer.cpp
@@ -10,6 +10,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
// clang-format off
///@cond nodoc
@@ -24,5 +25,6 @@ PRConjugateGradientMinimizer::getGSLMinimizerType() {
return gsl_multimin_fdfminimizer_conjugate_pr;
}
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp
index 22d734e9d95..a1e42154285 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/SimplexMinimizer.cpp
@@ -10,6 +10,7 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
namespace {
/// static logger
Kernel::Logger g_log("SimplexMinimizer");
@@ -117,5 +118,6 @@ void SimplexMinimizer::clearMemory() {
double SimplexMinimizer::costFunctionVal() { return m_gslSolver->fval; }
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/src/FuncMinimizers/SteepestDescentMinimizer.cpp b/Framework/CurveFitting/src/FuncMinimizers/SteepestDescentMinimizer.cpp
index 9b52e228062..6bdc8eda40f 100644
--- a/Framework/CurveFitting/src/FuncMinimizers/SteepestDescentMinimizer.cpp
+++ b/Framework/CurveFitting/src/FuncMinimizers/SteepestDescentMinimizer.cpp
@@ -10,6 +10,8 @@
namespace Mantid {
namespace CurveFitting {
+namespace FuncMinimisers {
+
namespace {
// Get a reference to the logger
Kernel::Logger g_log("SteepestDescentMinimizer");
@@ -24,5 +26,6 @@ SteepestDescentMinimizer::getGSLMinimizerType() {
return gsl_multimin_fdfminimizer_steepest_descent;
}
+} // namespace FuncMinimisers
} // namespace CurveFitting
} // namespace Mantid
diff --git a/Framework/CurveFitting/test/BSplineTest.h b/Framework/CurveFitting/test/BSplineTest.h
index a7bc5c20670..d8f27154137 100644
--- a/Framework/CurveFitting/test/BSplineTest.h
+++ b/Framework/CurveFitting/test/BSplineTest.h
@@ -345,7 +345,7 @@ private:
boost::shared_ptr<CostFuncLeastSquares> costFun(new CostFuncLeastSquares);
costFun->setFittingFunction(bsp, domain, values);
- LevenbergMarquardtMDMinimizer s;
+ FuncMinimisers::LevenbergMarquardtMDMinimizer s;
s.initialize(costFun);
TS_ASSERT(s.minimize());
return costFun->val();
diff --git a/Framework/CurveFitting/test/CompositeFunctionTest.h b/Framework/CurveFitting/test/CompositeFunctionTest.h
index 99a33d192fc..30a8837c179 100644
--- a/Framework/CurveFitting/test/CompositeFunctionTest.h
+++ b/Framework/CurveFitting/test/CompositeFunctionTest.h
@@ -28,6 +28,7 @@
using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::FuncMinimisers;
typedef Mantid::DataObjects::Workspace2D_sptr WS_type;
typedef Mantid::DataObjects::TableWorkspace_sptr TWS_type;
diff --git a/Framework/CurveFitting/test/FuncMinimizers/BFGSTest.h b/Framework/CurveFitting/test/FuncMinimizers/BFGSTest.h
index c7233dc2e79..0343e667771 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/BFGSTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/BFGSTest.h
@@ -10,6 +10,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::API;
class BFGSTestCostFunction : public ICostFunction {
diff --git a/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h b/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
index 9da641fd168..070031d0f6c 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/DampingMinimizerTest.h
@@ -14,6 +14,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::API;
class DampingMinimizerTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h b/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h
index 0027399d436..0ecece57b64 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/FABADAMinimizerTest.h
@@ -13,7 +13,7 @@
#include "MantidTestHelpers/FakeObjects.h"
#include "MantidKernel/Exception.h"
-using Mantid::CurveFitting::FABADAMinimizer;
+using Mantid::CurveFitting::FuncMinimisers::FABADAMinimizer;
using namespace Mantid::API;
using namespace Mantid;
using namespace Mantid::CurveFitting;
diff --git a/Framework/CurveFitting/test/FuncMinimizers/FRConjugateGradientTest.h b/Framework/CurveFitting/test/FuncMinimizers/FRConjugateGradientTest.h
index f1a6841a08b..12629afb2db 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/FRConjugateGradientTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/FRConjugateGradientTest.h
@@ -10,6 +10,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::API;
class FRConjugateGradientTestCostFunction : public ICostFunction {
diff --git a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
index 2c4a847c7a2..7ded8b10d3f 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtMDTest.h
@@ -14,6 +14,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::API;
class LevenbergMarquardtMDTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
index 79e3a84f078..322868c5e23 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/LevenbergMarquardtTest.h
@@ -14,6 +14,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::API;
class LevenbergMarquardtTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/FuncMinimizers/PRConjugateGradientTest.h b/Framework/CurveFitting/test/FuncMinimizers/PRConjugateGradientTest.h
index 4208adb298f..6f250d93aa4 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/PRConjugateGradientTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/PRConjugateGradientTest.h
@@ -10,6 +10,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::API;
class PRConjugateGradientTestCostFunction : public ICostFunction {
diff --git a/Framework/CurveFitting/test/FuncMinimizers/SimplexTest.h b/Framework/CurveFitting/test/FuncMinimizers/SimplexTest.h
index 4a4c660f5e6..6edf55ccb18 100644
--- a/Framework/CurveFitting/test/FuncMinimizers/SimplexTest.h
+++ b/Framework/CurveFitting/test/FuncMinimizers/SimplexTest.h
@@ -10,6 +10,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::API;
class SimplexTestCostFunction : public ICostFunction {
diff --git a/Framework/CurveFitting/test/GaussianTest.h b/Framework/CurveFitting/test/GaussianTest.h
index e8d53898385..1b59b3a3322 100644
--- a/Framework/CurveFitting/test/GaussianTest.h
+++ b/Framework/CurveFitting/test/GaussianTest.h
@@ -201,7 +201,7 @@ public:
costFun->setFittingFunction(fnWithBk, domain, values);
// TS_ASSERT_EQUALS(costFun->nParams(),3);
- LevenbergMarquardtMDMinimizer s;
+ FuncMinimisers::LevenbergMarquardtMDMinimizer s;
s.initialize(costFun);
TS_ASSERT(s.minimize());
diff --git a/Framework/CurveFitting/test/LeastSquaresTest.h b/Framework/CurveFitting/test/LeastSquaresTest.h
index 2b38ad0b891..a14f1e591c6 100644
--- a/Framework/CurveFitting/test/LeastSquaresTest.h
+++ b/Framework/CurveFitting/test/LeastSquaresTest.h
@@ -21,6 +21,7 @@
using namespace Mantid;
using namespace Mantid::CurveFitting;
+using namespace Mantid::CurveFitting::FuncMinimisers;
using namespace Mantid::API;
class LeastSquaresTest : public CxxTest::TestSuite {
diff --git a/Framework/CurveFitting/test/MultiDomainFunctionTest.h b/Framework/CurveFitting/test/MultiDomainFunctionTest.h
index 09a65c88819..434d3e5c518 100644
--- a/Framework/CurveFitting/test/MultiDomainFunctionTest.h
+++ b/Framework/CurveFitting/test/MultiDomainFunctionTest.h
@@ -162,7 +162,7 @@ public:
costFun->setFittingFunction(multi, domain, values);
TS_ASSERT_EQUALS(costFun->nParams(), 6);
- LevenbergMarquardtMDMinimizer s;
+ FuncMinimisers::LevenbergMarquardtMDMinimizer s;
s.initialize(costFun);
TS_ASSERT(s.minimize());
--
GitLab