Changes following -weffc++ flag

Core/Algorithms/inc/DiffuseDWBASimulation.h

@@ -35,6 +35,7 @@ protected:
     double m_surface_density;
     SafePointerVector<DiffuseParticleInfo> m_np_infos;
     struct DiffuseFormFactorTerm {
+        DiffuseFormFactorTerm() : m_form_factors(), m_probabilities(), m_factor(0.0) { }
         ~DiffuseFormFactorTerm();
         std::vector<IFormFactor *> m_form_factors;
         std::vector<double> m_probabilities;

Core/Algorithms/inc/Mask.h

@@ -16,13 +16,11 @@
 
 #include "MaskCoordinateFunction.h"
 
-//#include <cstddef>
-
 //- -------------------------------------------------------------------
 //! @class Mask
 //! @brief Definition of base class for masking OutputData elements
 //- -------------------------------------------------------------------
-class Mask
+class Mask : public ICloneable
 {
 public:
     template <class TValue, class TContainer> friend class OutputDataIterator;

Core/Algorithms/inc/MaskCoordinateFunction.h

@@ -15,8 +15,9 @@
 //! @date   Nov 20, 2012
 
 #include <cstddef>
+#include "ICloneable.h"
 
-class MaskCoordinateFunction
+class MaskCoordinateFunction : public ICloneable
 {
 public:
     MaskCoordinateFunction(size_t rank);

Core/Algorithms/inc/MultiLayerDWBASimulation.h

@@ -16,6 +16,7 @@
 
 #include "LayerDWBASimulation.h"
 
+#include <set>
 #include <map>
 
 class MultiLayer;

Core/Algorithms/src/Beam.cpp

@@ -4,17 +4,15 @@
 /* ************************************************************************* */
 // c-tors, assignment operators, swap
 /* ************************************************************************* */
-Beam::Beam() : m_intensity(1.0)
+Beam::Beam() : m_central_k(), m_intensity(1.0)
 {
     setName("Beam");
     init_parameters();
 }
 
-Beam::Beam(const Beam &other) : IParameterized()
+Beam::Beam(const Beam &other) : IParameterized(), m_central_k(other.m_central_k), m_intensity(other.m_intensity)
 {
     setName(other.getName());
-    m_central_k = other.m_central_k;
-    m_intensity = other.m_intensity;
     init_parameters();
 }
 

Core/Algorithms/src/Detector.cpp

@@ -7,7 +7,7 @@
 // c-tors, assignment operators, swap
 /* ************************************************************************* */
 Detector::Detector()
-: mp_detector_resolution(0)
+: m_axes(), mp_detector_resolution(0)
 {
     setName("Detector");
     init_parameters();
@@ -15,10 +15,9 @@ Detector::Detector()
 
 
 Detector::Detector(const Detector &other) : IParameterized()
-, mp_detector_resolution(0)
+, m_axes(other.m_axes), mp_detector_resolution(0)
 {
     setName(other.getName());
-    m_axes = other.m_axes;
     if(other.mp_detector_resolution) mp_detector_resolution = other.mp_detector_resolution->clone();
     init_parameters();
 }

Core/Algorithms/src/Experiment.cpp

 #include "Experiment.h"
 
+
 Experiment::Experiment()
-: IParameterized("Experiment")
-, mp_sample(0)
-, mp_sample_builder(0)
-, m_is_normalized(false)
-, mp_options(0)
+    : IParameterized("Experiment")
+    , mp_sample(0)
+    , mp_sample_builder(0)
+    , m_detector()
+    , m_beam()
+    , m_intensity_map()
+    , m_is_normalized(false)
+    , mp_options(0)
 {
     //setName("Experiment");
     init_parameters();
 }
 
-Experiment::Experiment(const Experiment &other) : IParameterized(other), ICloneable()
+Experiment::Experiment(const Experiment &other)
+    : IParameterized(other), ICloneable()
     , mp_sample(0)
-    , mp_sample_builder(0)
-    , m_is_normalized(false)
-    , mp_options(0)
+    , mp_sample_builder(other.mp_sample_builder)
+    , m_detector(other.m_detector)
+    , m_beam(other.m_beam)
+    , m_intensity_map()
+    , m_is_normalized(other.m_is_normalized)
+    , mp_options(other.mp_options)
 {
     if(other.mp_sample) mp_sample = other.mp_sample->clone();
-    mp_sample_builder = other.mp_sample_builder; // sample builder owned by the user
-    m_detector = other.m_detector;
-    m_beam = other.m_beam;
-
     m_intensity_map.copyFrom(other.m_intensity_map);
-    m_is_normalized = other.m_is_normalized;
-    mp_options = other.mp_options; // program options are owned by the user
     init_parameters();
 }
 
-
 Experiment::Experiment(const ProgramOptions *p_options)
-: IParameterized("Experiment")
-, mp_sample(0)
-, mp_sample_builder(0)
-, m_is_normalized(false)
-, mp_options(p_options)
+    : IParameterized("Experiment")
+    , mp_sample(0)
+    , mp_sample_builder(0)
+    , m_detector()
+    , m_beam()
+    , m_intensity_map()
+    , m_is_normalized(false)
+    , mp_options(p_options)
 {
-//    setName("Experiment");
     init_parameters();
 }
 
 Experiment::Experiment(const ISample &p_sample, const ProgramOptions *p_options)
-: IParameterized("Experiment")
-, mp_sample(p_sample.clone())
-, mp_sample_builder(0)
-, m_is_normalized(false)
-, mp_options(p_options)
+    : IParameterized("Experiment")
+    , mp_sample(p_sample.clone())
+    , mp_sample_builder(0)
+    , m_detector()
+    , m_beam()
+    , m_intensity_map()
+    , m_is_normalized(false)
+    , mp_options(p_options)
 {
-//    setName("Experiment");
     init_parameters();
 }
 
 Experiment::Experiment(const ISampleBuilder* p_sample_builder, const ProgramOptions *p_options)
-: IParameterized("Experiment")
-, mp_sample(0)
-, mp_sample_builder(p_sample_builder)
-, m_is_normalized(false)
-, mp_options(p_options)
+    : IParameterized("Experiment")
+    , mp_sample(0)
+    , mp_sample_builder(p_sample_builder)
+    , m_detector()
+    , m_beam()
+    , m_intensity_map()
+    , m_is_normalized(false)
+    , mp_options(p_options)
 {
-    //setName("Experiment");
     init_parameters();
 }
 

Core/Algorithms/src/IChiSquaredModule.cpp

@@ -18,7 +18,8 @@ IChiSquaredModule::IChiSquaredModule()
 
 
 IChiSquaredModule::IChiSquaredModule(const IChiSquaredModule &other)
-    : mp_real_data(0)
+    : ICloneable()
+    , mp_real_data(0)
     , mp_simulation_data(0)
     , mp_weights(0)
     , mp_squared_function(0)

Core/Core.pro

@@ -104,6 +104,7 @@ SOURCES += \
     Tools/src/FitParameter.cpp \
     Tools/src/FitParameterLinked.cpp \
     Tools/src/FitSuite.cpp \
+    Tools/src/FitSuiteFunctions.cpp \
     Tools/src/FitSuiteObjects.cpp \
     Tools/src/FitSuiteParameters.cpp \
     Tools/src/FitSuiteStrategy.cpp \
@@ -123,8 +124,7 @@ SOURCES += \
     Tools/src/StochasticGaussian.cpp \
     Tools/src/StochasticSampledParameter.cpp \
     Tools/src/Types.cpp \
-    Tools/src/Utils.cpp \
-    Tools/src/FitSuiteFunctions.cpp
+    Tools/src/Utils.cpp
 
 HEADERS += \
     Algorithms/inc/Beam.h \
@@ -237,6 +237,7 @@ HEADERS += \
     Tools/inc/Bin.h \
     Tools/inc/Convolve.h \
     Tools/inc/Coordinate3D.h \
+    Tools/inc/CoreOptionsDescription.h \
     Tools/inc/DoubleToComplexInterpolatingFunction.h \
     Tools/inc/DoubleToComplexMap.h \
     Tools/inc/Exceptions.h \
@@ -244,11 +245,13 @@ HEADERS += \
     Tools/inc/FitParameter.h \
     Tools/inc/FitParameterLinked.h \
     Tools/inc/FitSuite.h \
+    Tools/inc/FitSuiteFunctions.h \
     Tools/inc/FitSuiteObjects.h \
     Tools/inc/FitSuiteParameters.h \
     Tools/inc/FitSuiteStrategy.h \
     Tools/inc/IAxis.h \
     Tools/inc/IChangeable.h \
+    Tools/inc/ICloneable.h \
     Tools/inc/IDoubleToComplexFunction.h \
     Tools/inc/IFactory.h \
     Tools/inc/IMinimizer.h \
@@ -271,16 +274,15 @@ HEADERS += \
     Tools/inc/ParameterPool.h \
     Tools/inc/ProgramOptions.h \
     Tools/inc/RealParameterWrapper.h \
-    Tools/inc/TRange.h \
+    Tools/inc/SafePointerVector.h \
     Tools/inc/StochasticDiracDelta.h \
     Tools/inc/StochasticGaussian.h \
     Tools/inc/StochasticSampledParameter.h \
+    Tools/inc/TRange.h \
     Tools/inc/Types.h \
     Tools/inc/Units.h \
     Tools/inc/Utils.h \
-    Tools/inc/CoreOptionsDescription.h \
-    Tools/inc/FitSuiteFunctions.h \
-    Tools/inc/ICloneable.h
+    Tools/inc/FastVector.h
 
 INCLUDEPATH += ./Algorithms/inc ./FormFactors/inc ./Geometry/inc ./Samples/inc ./Tools/inc
 DEPENDPATH  += ./Algorithms/inc ./FormFactors/inc ./Geometry/inc ./Samples/inc ./Tools/inc

Core/Geometry/src/Transform3D.cpp

@@ -71,6 +71,9 @@ namespace Geometry {
 			   const Point3D<double> & to0,
 			   const Point3D<double> & to1,
 			   const Point3D<double> & to2)
+      : xx_(1), xy_(0), xz_(0), dx_(0),
+        yx_(0), yy_(1), yz_(0), dy_(0),
+        zx_(0), zy_(0), zz_(1), dz_(0)
   /***********************************************************************
    *                                                                     *
    * Name: Transform3D::Transform3D              Date:    24.09.96 *

Core/Samples/inc/Lattice.h

@@ -18,6 +18,7 @@
 #include "Coordinate3D.h"
 #include "ISelectionRule.h"
 #include "TRange.h"
+#include "FastVector.h"
 
 #include <vector>
 

Core/Tools/inc/Bin.h

@@ -36,14 +36,14 @@ struct Bin1D
 //- -------------------------------------------------------------------
 struct Bin1DCVector
 {
-    Bin1DCVector() {}
+    Bin1DCVector() : m_q_lower(), m_q_upper() {}
     Bin1DCVector(const cvector_t &lower, const cvector_t &upper)
         : m_q_lower(lower), m_q_upper(upper) {}
     Bin1DCVector(double wavelength, const Bin1D &alpha_bin, const Bin1D &phi_bin);
-    cvector_t m_q_lower;  //!< lower bound of the bin
-    cvector_t m_q_upper;  //!< upper bound of the bin
     cvector_t getMidPoint() const { return (m_q_lower + m_q_upper)/2.0; }
     cvector_t getDelta() const { return m_q_upper - m_q_lower; }
+    cvector_t m_q_lower;  //!< lower bound of the bin
+    cvector_t m_q_upper;  //!< upper bound of the bin
 };
 
 //! equality operator for bins
@@ -60,7 +60,7 @@ inline bool operator!=(const Bin1D &left, const Bin1D &right) {
 }
 
 //! creation on Bin1DCVector from alpha and phi bins
-inline Bin1DCVector::Bin1DCVector(double wavelength, const Bin1D &alpha_bin, const Bin1D &phi_bin)
+inline Bin1DCVector::Bin1DCVector(double wavelength, const Bin1D &alpha_bin, const Bin1D &phi_bin) : m_q_lower(), m_q_upper()
 {
     m_q_lower.setLambdaAlphaPhi(wavelength, alpha_bin.m_lower, phi_bin.m_lower);
     m_q_upper.setLambdaAlphaPhi(wavelength, alpha_bin.m_upper, phi_bin.m_upper);

Core/Tools/inc/DoubleToComplexMap.h

 #ifndef DOUBLETOCOMPLEXUNORDEREDMAP_H
 #define DOUBLETOCOMPLEXUNORDEREDMAP_H
 
-#include "Exceptions.h"
-#include "Types.h"
+//#include "Exceptions.h"
+//#include "Types.h"
+#include "Utils.h"
 #include "IDoubleToComplexFunction.h"
 
 
@@ -14,7 +15,7 @@
 class DoubleToComplexMap : public IDoubleToComplexMap
 {
 public:
-    typedef UnorderedMap<double, complex_t> container_t;
+    typedef Utils::UnorderedMap<double, complex_t> container_t;
 
     DoubleToComplexMap(){}
     DoubleToComplexMap(const container_t &value_map) : m_value_map(value_map) {}
@@ -34,7 +35,7 @@ private:
 class DoubleToPairOfComplexMap : public IDoubleToPairOfComplexMap
 {
 public:
-    typedef UnorderedMap<double, complexpair_t> container_t;
+    typedef Utils::UnorderedMap<double, complexpair_t> container_t;
 
     DoubleToPairOfComplexMap(){}
     DoubleToPairOfComplexMap(const container_t &value_map) : m_value_map(value_map) {}

Core/Tools/inc/FastVector.h

+#ifndef FASTVECTOR_H
+#define FASTVECTOR_H
+
+
+#include "Types.h"
+#include <iostream>
+
+/* ************************************************************************* */
+// container for holding kvectors with optimised location/deallocation
+/* ************************************************************************* */
+class KVectorContainer {
+public:
+    typedef std::vector<kvector_t > container_t;
+    typedef container_t::const_iterator const_iterator;
+    KVectorContainer(int buff_size = 3) : m_current_position(0), m_max_buff_size(buff_size), m_buffer()
+    {
+        m_buffer.reserve(m_max_buff_size);
+        for(size_t i=0; i<m_max_buff_size; ++i) m_buffer.push_back(kvector_t(0.0, 0.0, 0.0));
+    }
+
+    inline void push_back(const kvector_t &k) {
+        if(m_current_position == m_max_buff_size) {
+            std::cout << "KVectorContainer::push_back() -> Info. Increasing size of the buffer from " << m_max_buff_size;
+            m_max_buff_size *=2;
+            std::cout << " to " << m_max_buff_size << std::endl;
+            m_buffer.resize(m_max_buff_size);
+        }
+        m_buffer[m_current_position][0] = k[0];
+        m_buffer[m_current_position][1] = k[1];
+        m_buffer[m_current_position][2] = k[2];
+        m_current_position++;
+    }
+
+    inline void clear() { m_current_position = 0; }
+
+    inline size_t size() { return m_current_position; }
+
+    void print() {
+        for(size_t i=0; i<m_max_buff_size; ++i) std::cout << i << " " << m_buffer[i] << std::endl;
+        std::cout << "size:" << size() << std::endl;
+    }
+
+    const_iterator begin() const { return m_buffer.begin(); }
+    const_iterator end() const { return m_buffer.begin()+m_current_position; }
+
+
+private:
+    size_t m_current_position;
+    size_t m_max_buff_size;
+    container_t m_buffer;
+};
+
+
+#endif // FASTVECTOR_H

Core/Tools/inc/FitSuiteFunctions.h

@@ -16,6 +16,8 @@
 
 
 #include <vector>
+#include <cstddef>
+using std::size_t;
 
 class FitSuite;
 

Core/Tools/inc/INamed.h

@@ -24,8 +24,8 @@
 class INamed
 {
 public:
-    INamed() {}
-    INamed(const std::string &name) : m_name(name) { }
+    INamed() : m_name(), m_title() {}
+    INamed(const std::string &name) : m_name(name), m_title() { }
     INamed(const std::string &name, const std::string &title) : m_name(name), m_title(title) { }
     virtual ~INamed(){}
 

Core/Tools/inc/IParameterized.h

@@ -23,7 +23,7 @@ class IParameterized : public INamed
 {
 public:
     IParameterized();
-    IParameterized(const std::string &name) : INamed(name){}
+    IParameterized(const std::string &name);
     IParameterized(const IParameterized &other);
     IParameterized &operator=(const IParameterized &other);
     virtual ~IParameterized() {}

Core/Tools/inc/LLData.h

@@ -67,10 +67,10 @@ private:
 };
 
 // Global helper functions for arithmetic
-template <class T> LLData<T> &operator+(const LLData<T> &left, const LLData<T> &right);
-template <class T> LLData<T> &operator-(const LLData<T> &left, const LLData<T> &right);
-template <class T> LLData<T> &operator*(const LLData<T> &left, const LLData<T> &right);
-template <class T> LLData<T> &operator/(const LLData<T> &left, const LLData<T> &right);
+template <class T> LLData<T> operator+(const LLData<T> &left, const LLData<T> &right);
+template <class T> LLData<T> operator-(const LLData<T> &left, const LLData<T> &right);
+template <class T> LLData<T> operator*(const LLData<T> &left, const LLData<T> &right);
+template <class T> LLData<T> operator/(const LLData<T> &left, const LLData<T> &right);
 
 // Global helper functions for comparison
 template <class T> bool HaveSameDimensions(const LLData<T> &left, const LLData<T> &right);
@@ -276,28 +276,28 @@ template<class T> void LLData<T>::swapContents(LLData<T> &other)
     std::swap(this->m_data_array, other.m_data_array);
 }
 
-template<class T> LLData<T> &operator+(const LLData<T>& left, const LLData<T>& right)
+template<class T> LLData<T> operator+(const LLData<T>& left, const LLData<T>& right)
 {
     LLData<T> *p_result = new LLData<T>(left);
     (*p_result) += right;
     return *p_result;
 }
 
-template<class T> LLData<T> &operator-(const LLData<T>& left, const LLData<T>& right)
+template<class T> LLData<T> operator-(const LLData<T>& left, const LLData<T>& right)
 {
     LLData<T> *p_result = new LLData<T>(left);
     (*p_result) -= right;
     return *p_result;
 }
 
-template<class T> LLData<T> &operator*(const LLData<T>& left, const LLData<T>& right)
+template<class T> LLData<T> operator*(const LLData<T>& left, const LLData<T>& right)
 {
     LLData<T> *p_result = new LLData<T>(left);
     (*p_result) *= right;
     return *p_result;
 }
 
-template<class T> LLData<T> &operator/(const LLData<T>& left, const LLData<T>& right)
+template<class T> LLData<T> operator/(const LLData<T>& left, const LLData<T>& right)
 {
     LLData<T> *p_result = new LLData<T>(left);
     (*p_result) /= right;

Core/Tools/inc/OutputData.h

@@ -214,7 +214,8 @@ private:
 /* ***************************************************************************/
 
 template <class T> OutputData<T>::OutputData()
-: mp_ll_data(0)
+: m_value_axes()
+, mp_ll_data(0)
 , mp_mask(0)
 {
     allocate();

Core/Tools/inc/ParameterPool.h

@@ -31,7 +31,7 @@ public:
     typedef RealParameterWrapper parameter_t;
     typedef std::map<std::string, parameter_t > parametermap_t;
 
-    ParameterPool() {}
+    ParameterPool() : m_map() {}
     virtual ~ParameterPool() {}
 
     //! simple clone