copy edit VarianceFunctions

Device/Instrument/VarianceFunctions.cpp

@@ -15,8 +15,9 @@
 #include "Device/Instrument/VarianceFunctions.h"
 #include <algorithm>
 
-IVarianceFunction::IVarianceFunction() = default;
-IVarianceFunction::~IVarianceFunction() = default;
+// ************************************************************************** //
+// class VarianceConstantFunction
+// ************************************************************************** //
 
 VarianceConstantFunction* VarianceConstantFunction::clone() const
 {
@@ -28,6 +29,10 @@ double VarianceConstantFunction::variance(double, double) const
     return 1.0;
 }
 
+// ************************************************************************** //
+// class VarianceSimFunction
+// ************************************************************************** //
+
 VarianceSimFunction::VarianceSimFunction(double epsilon) : m_epsilon(epsilon) {}
 
 VarianceSimFunction* VarianceSimFunction::clone() const

Device/Instrument/VarianceFunctions.h

@@ -21,13 +21,13 @@
 class IVarianceFunction
 {
 public:
-    IVarianceFunction();
-    virtual ~IVarianceFunction();
-    virtual IVarianceFunction* clone() const = 0;
-    virtual double variance(double real_value, double simulated_value) const = 0;
-
+    IVarianceFunction() = default;
+    virtual ~IVarianceFunction() = default;
     IVarianceFunction(const IVarianceFunction&) = delete;
     IVarianceFunction& operator=(const IVarianceFunction&) = delete;
+
+    virtual IVarianceFunction* clone() const = 0;
+    virtual double variance(double real_value, double simulated_value) const = 0;
 };
 
 //! Returns 1.0 as variance value

auto/Wrap/doxygenDevice.i

@@ -1756,19 +1756,19 @@ Variance function interface.
 C++ includes: VarianceFunctions.h
 ";
 
-%feature("docstring")  IVarianceFunction::IVarianceFunction "IVarianceFunction::IVarianceFunction()
+%feature("docstring")  IVarianceFunction::IVarianceFunction "IVarianceFunction::IVarianceFunction()=default
 ";
 
-%feature("docstring")  IVarianceFunction::~IVarianceFunction "IVarianceFunction::~IVarianceFunction()
+%feature("docstring")  IVarianceFunction::~IVarianceFunction "virtual IVarianceFunction::~IVarianceFunction()=default
 ";
 
-%feature("docstring")  IVarianceFunction::clone "virtual IVarianceFunction* IVarianceFunction::clone() const =0
+%feature("docstring")  IVarianceFunction::IVarianceFunction "IVarianceFunction::IVarianceFunction(const IVarianceFunction &)=delete
 ";
 
-%feature("docstring")  IVarianceFunction::variance "virtual double IVarianceFunction::variance(double real_value, double simulated_value) const =0
+%feature("docstring")  IVarianceFunction::clone "virtual IVarianceFunction* IVarianceFunction::clone() const =0
 ";
 
-%feature("docstring")  IVarianceFunction::IVarianceFunction "IVarianceFunction::IVarianceFunction(const IVarianceFunction &)=delete
+%feature("docstring")  IVarianceFunction::variance "virtual double IVarianceFunction::variance(double real_value, double simulated_value) const =0
 ";
 
 

auto/Wrap/libBornAgainDevice_wrap.cpp

@@ -47568,7 +47568,7 @@ static PyMethodDef SwigMethods[] = {
 		""},
 	 { "delete_IVarianceFunction", _wrap_delete_IVarianceFunction, METH_O, "\n"
 		"delete_IVarianceFunction(IVarianceFunction self)\n"
-		"IVarianceFunction::~IVarianceFunction()\n"
+		"virtual IVarianceFunction::~IVarianceFunction()=default\n"
 		"\n"
 		""},
 	 { "IVarianceFunction_clone", _wrap_IVarianceFunction_clone, METH_O, "\n"