new dir Fit/Suite

Fit/Kernel/MinimizerFactory.cpp

@@ -13,11 +13,11 @@
 //  ************************************************************************************************
 
 #include "Fit/Kernel/MinimizerFactory.h"
-#include "Fit/Adapter/GSLLevenbergMarquardtMinimizer.h"
-#include "Fit/Adapter/GSLMultiMinimizer.h"
-#include "Fit/Adapter/GeneticMinimizer.h"
-#include "Fit/Adapter/Minuit2Minimizer.h"
-#include "Fit/Adapter/SimAnMinimizer.h"
+#include "Fit/Suite/GSLLevenbergMarquardtMinimizer.h"
+#include "Fit/Suite/GSLMultiMinimizer.h"
+#include "Fit/Suite/GeneticMinimizer.h"
+#include "Fit/Suite/Minuit2Minimizer.h"
+#include "Fit/Suite/SimAnMinimizer.h"
 #include <boost/format.hpp>
 #include <iomanip>
 #include <iostream>

Fit/Adapter/GSLLevenbergMarquardtMinimizer.cpp → Fit/Suite/GSLLevenbergMarquardtMinimizer.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Fit/Adapter/GSLLevenbergMarquardtMinimizer.cpp
+//! @file      Fit/Suite/GSLLevenbergMarquardtMinimizer.cpp
 //! @brief     Implements class GSLLevenbergMarquardtMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/Adapter/GSLLevenbergMarquardtMinimizer.h"
-#include "Fit/Adapter/GSLMultiMinimizer.h"
+#include "Fit/Suite/GSLLevenbergMarquardtMinimizer.h"
+#include "Fit/Suite/GSLMultiMinimizer.h"
 #include "Fit/Tools/MinimizerUtil.h"
 #include "Fit/Tools/StringUtil.h"
 #include <stdexcept>

Fit/Adapter/GSLLevenbergMarquardtMinimizer.h → Fit/Suite/GSLLevenbergMarquardtMinimizer.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Fit/Adapter/GSLLevenbergMarquardtMinimizer.h
+//! @file      Fit/Suite/GSLLevenbergMarquardtMinimizer.h
 //! @brief     Declares class GSLLevenbergMarquardtMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_FIT_ADAPTER_GSLLEVENBERGMARQUARDTMINIMIZER_H
-#define BORNAGAIN_FIT_ADAPTER_GSLLEVENBERGMARQUARDTMINIMIZER_H
+#ifndef BORNAGAIN_FIT_SUITE_GSLLEVENBERGMARQUARDTMINIMIZER_H
+#define BORNAGAIN_FIT_SUITE_GSLLEVENBERGMARQUARDTMINIMIZER_H
 
 #include "Fit/Adapter/MinimizerAdapter.h"
 
@@ -62,4 +62,4 @@ private:
     std::unique_ptr<ROOT::Math::GSLNLSMinimizer> m_gsl_minimizer;
 };
 
-#endif // BORNAGAIN_FIT_ADAPTER_GSLLEVENBERGMARQUARDTMINIMIZER_H
+#endif // BORNAGAIN_FIT_SUITE_GSLLEVENBERGMARQUARDTMINIMIZER_H

Fit/Adapter/GSLMultiMinimizer.cpp → Fit/Suite/GSLMultiMinimizer.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Fit/Adapter/GSLMultiMinimizer.cpp
+//! @file      Fit/Suite/GSLMultiMinimizer.cpp
 //! @brief     Implements class GSLMultiMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/Adapter/GSLMultiMinimizer.h"
+#include "Fit/Suite/GSLMultiMinimizer.h"
 #include "Fit/Tools/MinimizerUtil.h"
 #include <string>
 

Fit/Adapter/GSLMultiMinimizer.h → Fit/Suite/GSLMultiMinimizer.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Fit/Adapter/GSLMultiMinimizer.h
+//! @file      Fit/Suite/GSLMultiMinimizer.h
 //! @brief     Declares class GSLMultiMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_FIT_ADAPTER_GSLMULTIMINIMIZER_H
-#define BORNAGAIN_FIT_ADAPTER_GSLMULTIMINIMIZER_H
+#ifndef BORNAGAIN_FIT_SUITE_GSLMULTIMINIMIZER_H
+#define BORNAGAIN_FIT_SUITE_GSLMULTIMINIMIZER_H
 
 #include "Fit/Adapter/MinimizerAdapter.h"
 
@@ -52,4 +52,4 @@ private:
     std::unique_ptr<ROOT::Math::GSLMinimizer> m_gsl_minimizer;
 };
 
-#endif // BORNAGAIN_FIT_ADAPTER_GSLMULTIMINIMIZER_H
+#endif // BORNAGAIN_FIT_SUITE_GSLMULTIMINIMIZER_H

Fit/Adapter/GeneticMinimizer.cpp → Fit/Suite/GeneticMinimizer.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Fit/Adapter/GeneticMinimizer.cpp
+//! @file      Fit/Suite/GeneticMinimizer.cpp
 //! @brief     Implements class GeneticMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/Adapter/GeneticMinimizer.h"
+#include "Fit/Suite/GeneticMinimizer.h"
 #include <Math/GeneticMinimizer.h>
 
 namespace {

Fit/Adapter/GeneticMinimizer.h → Fit/Suite/GeneticMinimizer.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Fit/Adapter/GeneticMinimizer.h
+//! @file      Fit/Suite/GeneticMinimizer.h
 //! @brief     Declares class GeneticMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_FIT_ADAPTER_GENETICMINIMIZER_H
-#define BORNAGAIN_FIT_ADAPTER_GENETICMINIMIZER_H
+#ifndef BORNAGAIN_FIT_SUITE_GENETICMINIMIZER_H
+#define BORNAGAIN_FIT_SUITE_GENETICMINIMIZER_H
 
 #include "Fit/Adapter/MinimizerAdapter.h"
 
@@ -69,4 +69,4 @@ private:
     std::unique_ptr<ROOT::Math::GeneticMinimizer> m_genetic_minimizer;
 };
 
-#endif // BORNAGAIN_FIT_ADAPTER_GENETICMINIMIZER_H
+#endif // BORNAGAIN_FIT_SUITE_GENETICMINIMIZER_H

Fit/Adapter/Minuit2Minimizer.cpp → Fit/Suite/Minuit2Minimizer.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Fit/Adapter/Minuit2Minimizer.cpp
+//! @file      Fit/Suite/Minuit2Minimizer.cpp
 //! @brief     Declares class Minuit2Minimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/Adapter/Minuit2Minimizer.h"
+#include "Fit/Suite/Minuit2Minimizer.h"
 #include "Fit/Tools/StringUtil.h"
 #include <Minuit2/Minuit2Minimizer.h>
 

Fit/Adapter/Minuit2Minimizer.h → Fit/Suite/Minuit2Minimizer.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Fit/Adapter/Minuit2Minimizer.h
+//! @file      Fit/Suite/Minuit2Minimizer.h
 //! @brief     Declares class Minuit2Minimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_FIT_ADAPTER_MINUIT2MINIMIZER_H
-#define BORNAGAIN_FIT_ADAPTER_MINUIT2MINIMIZER_H
+#ifndef BORNAGAIN_FIT_SUITE_MINUIT2MINIMIZER_H
+#define BORNAGAIN_FIT_SUITE_MINUIT2MINIMIZER_H
 
 #include "Fit/Adapter/MinimizerAdapter.h"
 #include <memory>
@@ -82,4 +82,4 @@ private:
     std::unique_ptr<ROOT::Minuit2::Minuit2Minimizer> m_minuit2_minimizer;
 };
 
-#endif // BORNAGAIN_FIT_ADAPTER_MINUIT2MINIMIZER_H
+#endif // BORNAGAIN_FIT_SUITE_MINUIT2MINIMIZER_H

Fit/Adapter/SimAnMinimizer.cpp → Fit/Suite/SimAnMinimizer.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Fit/Adapter/SimAnMinimizer.cpp
+//! @file      Fit/Suite/SimAnMinimizer.cpp
 //! @brief     Implements class SimAnMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#include "Fit/Adapter/SimAnMinimizer.h"
-#include "Fit/Adapter/GSLMultiMinimizer.h"
+#include "Fit/Suite/SimAnMinimizer.h"
+#include "Fit/Suite/GSLMultiMinimizer.h"
 
 #ifdef _WIN32
 #pragma warning(push)

Fit/Adapter/SimAnMinimizer.h → Fit/Suite/SimAnMinimizer.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Fit/Adapter/SimAnMinimizer.h
+//! @file      Fit/Suite/SimAnMinimizer.h
 //! @brief     Declares class SimAnMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_FIT_ADAPTER_SIMANMINIMIZER_H
-#define BORNAGAIN_FIT_ADAPTER_SIMANMINIMIZER_H
+#ifndef BORNAGAIN_FIT_SUITE_SIMANMINIMIZER_H
+#define BORNAGAIN_FIT_SUITE_SIMANMINIMIZER_H
 
 #include "Fit/Adapter/MinimizerAdapter.h"
 
@@ -75,4 +75,4 @@ private:
     std::unique_ptr<ROOT::Math::GSLSimAnMinimizer> m_siman_minimizer;
 };
 
-#endif // BORNAGAIN_FIT_ADAPTER_SIMANMINIMIZER_H
+#endif // BORNAGAIN_FIT_SUITE_SIMANMINIMIZER_H

GUI/Model/Job/MinimizerItem.cpp

@@ -14,11 +14,11 @@
 
 #include "GUI/Model/Job/MinimizerItem.h"
 #include "Base/Util/Assert.h"
-#include "Fit/Adapter/GSLLevenbergMarquardtMinimizer.h"
-#include "Fit/Adapter/GSLMultiMinimizer.h"
-#include "Fit/Adapter/GeneticMinimizer.h"
-#include "Fit/Adapter/Minuit2Minimizer.h"
-#include "Fit/Adapter/SimAnMinimizer.h"
+#include "Fit/Suite/GSLLevenbergMarquardtMinimizer.h"
+#include "Fit/Suite/GSLMultiMinimizer.h"
+#include "Fit/Suite/GeneticMinimizer.h"
+#include "Fit/Suite/Minuit2Minimizer.h"
+#include "Fit/Suite/SimAnMinimizer.h"
 #include "GUI/Model/Job/MinimizerItemCatalog.h"
 #include "GUI/Support/XML/UtilXML.h"
 #include "Sim/Fitting/ObjectiveMetric.h"