diff --git a/Core/Algorithms/inc/IChiSquaredModule.h b/Core/Algorithms/inc/IChiSquaredModule.h index 9ccda1412edacc1c1bf59c63ec779cc989827bbf..210e5f387930b969130df5fbb5aecc8c93920ac7 100644 --- a/Core/Algorithms/inc/IChiSquaredModule.h +++ b/Core/Algorithms/inc/IChiSquaredModule.h @@ -1,4 +1,4 @@ -// ************************************************************************** // +//* ************************************************************************ *// // // BornAgain: simulate and fit scattering at grazing incidence // @@ -11,7 +11,7 @@ //! @authors Scientific Computing Group at MLZ Garching //! @authors C. Durniak, G. Pospelov, W. Van Herck, J. Wuttke // -// ************************************************************************** // +//* ************************************************************************ *// #ifndef ICHISQUAREDMODULE_H_ #define ICHISQUAREDMODULE_H_ @@ -21,6 +21,8 @@ #include "IOutputDataNormalizer.h" #include "IIntensityFunction.h" +//! Interface for ChiSquaredModule, ChiSquaredFrequency. + class IChiSquaredModule : public ICloneable { public: @@ -28,55 +30,59 @@ public: virtual ~IChiSquaredModule(); //! clone method - virtual IChiSquaredModule *clone() const = 0; + virtual IChiSquaredModule* clone() const = 0; //! return output data which contains chi^2 values - virtual OutputData<double > *createChi2DifferenceMap() const=0; + virtual OutputData<double>* createChi2DifferenceMap() const=0; //! calculate chi dquared value virtual double calculateChiSquared() = 0; //! get real data - const OutputData<double> *getRealData() const { + const OutputData<double>* getRealData() const { return mp_real_data; } //! get simulated data - const OutputData<double> *getSimulationData() const { + const OutputData<double>* getSimulationData() const { return mp_simulation_data; } //! set real and simulated data pair - void setRealAndSimulatedData(const OutputData<double > &real_data, const OutputData<double >&simulation_data); + void setRealAndSimulatedData( + const OutputData<double >& real_data, + const OutputData<double >&simulation_data); //! get squared function - const ISquaredFunction *getSquaredFunction() const { + const ISquaredFunction* getSquaredFunction() const { return mp_squared_function; } //! set squared function - void setChiSquaredFunction(const ISquaredFunction &squared_function); + void setChiSquaredFunction(const ISquaredFunction& squared_function); //! get fitting data selector - virtual const IFittingDataSelector *getFittingDataSelector() const { + virtual const IFittingDataSelector* getFittingDataSelector() const { return mp_data_selector; } //! set fitting data selector - virtual void setFittingDataSelector(const IFittingDataSelector &selector); + virtual void setFittingDataSelector(const IFittingDataSelector& selector); //! get data normalizer - virtual const IOutputDataNormalizer *getOutputDataNormalizer() const { + virtual const IOutputDataNormalizer* getOutputDataNormalizer() const { return mp_data_normalizer; } - virtual IOutputDataNormalizer *getOutputDataNormalizer() { + virtual IOutputDataNormalizer* getOutputDataNormalizer() { return mp_data_normalizer; } //! set data normalizer - virtual void setOutputDataNormalizer(const IOutputDataNormalizer &data_normalizer); + virtual void setOutputDataNormalizer( + const IOutputDataNormalizer& data_normalizer); //! get data normalizer - virtual const IIntensityFunction *getIntensityFunction() const { + virtual const IIntensityFunction* getIntensityFunction() const { return mp_intensity_function; } //! set data normalizer - virtual void setIntensityFunction(const IIntensityFunction &intensity_function); + virtual void setIntensityFunction( + const IIntensityFunction& intensity_function); //! return last calculated chi squared value virtual double getValue() const { return m_chi2_value; } @@ -87,19 +93,20 @@ public: //! return residual between data and simulation for single element virtual double getResidualValue(size_t /* index */) const { - throw NotImplementedException("IChiSquaredModule::getResidualValue() -> Error! Not implemented."); } + throw NotImplementedException( + "IChiSquaredModule::getResidualValue() -> Error! Not implemented."); } protected: - IChiSquaredModule(const IChiSquaredModule &other); + IChiSquaredModule(const IChiSquaredModule& other); virtual void initWeights(); - OutputData<double> *mp_real_data; - OutputData<double> *mp_simulation_data; - OutputData<double> *mp_weights; - ISquaredFunction *mp_squared_function; - IFittingDataSelector *mp_data_selector; - IOutputDataNormalizer *mp_data_normalizer; - IIntensityFunction *mp_intensity_function; + OutputData<double>* mp_real_data; + OutputData<double>* mp_simulation_data; + OutputData<double>* mp_weights; + ISquaredFunction* mp_squared_function; + IFittingDataSelector* mp_data_selector; + IOutputDataNormalizer* mp_data_normalizer; + IIntensityFunction * mp_intensity_function; int m_ndegree_of_freedom; double m_chi2_value; diff --git a/Core/Fitting/inc/FitSuite.h b/Core/Fitting/inc/FitSuite.h index ffb0400b3e5e8c43078f0f4c08f9497d2903457e..6bf32099b09749d3cbd48c2ab5d369898fadcb6b 100644 --- a/Core/Fitting/inc/FitSuite.h +++ b/Core/Fitting/inc/FitSuite.h @@ -17,7 +17,6 @@ #define FITSUITE_H #include "AttFitting.h" -#include "ChiSquaredModule.h" #include "FitSuiteFunctions.h" #include "FitSuiteObjects.h" #include "FitSuiteParameters.h" diff --git a/Core/Fitting/src/FitSuite.cpp b/Core/Fitting/src/FitSuite.cpp index cda0ed83c465f72c996903d164b5d56f120d745a..2f1bce42dc1a9ed050eed36786e089f9ddd0ea90 100644 --- a/Core/Fitting/src/FitSuite.cpp +++ b/Core/Fitting/src/FitSuite.cpp @@ -16,7 +16,6 @@ #include "FitSuite.h" #include "FitParameterLinked.h" #include "IMinimizer.h" -#include "ChiSquaredModule.h" #include "MessageService.h" #include <boost/bind.hpp> diff --git a/Core/Fitting/src/IFitSuiteStrategy.cpp b/Core/Fitting/src/IFitSuiteStrategy.cpp index a23166a8c21d8abd0b215154e05ee5dc461a575b..8fcdee052569040f8ddd5af485507e9c3cceb978 100644 --- a/Core/Fitting/src/IFitSuiteStrategy.cpp +++ b/Core/Fitting/src/IFitSuiteStrategy.cpp @@ -18,7 +18,6 @@ #include "FitSuiteParameters.h" #include "Exceptions.h" #include "OutputData.h" -#include "IChiSquaredModule.h" #include "Simulation.h" #include "Simulation.h" #include "IMinimizer.h" diff --git a/Core/Geometry/inc/BasicVector3D.h b/Core/Geometry/inc/BasicVector3D.h old mode 100755 new mode 100644 diff --git a/Core/Geometry/inc/Transform3D.h b/Core/Geometry/inc/Transform3D.h old mode 100755 new mode 100644 diff --git a/Core/Geometry/src/BasicVector3D.cpp b/Core/Geometry/src/BasicVector3D.cpp old mode 100755 new mode 100644 diff --git a/Core/Geometry/src/Transform3D.cpp b/Core/Geometry/src/Transform3D.cpp old mode 100755 new mode 100644