From 9c1bf93bc5539db386de56b7aa6d8c1330b692d5 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 11 Nov 2020 09:14:55 +0100
Subject: [PATCH] copy edit VarianceFunctions
---
Device/Instrument/VarianceFunctions.cpp | 9 +++++++--
Device/Instrument/VarianceFunctions.h | 10 +++++-----
auto/Wrap/doxygenDevice.i | 10 +++++-----
auto/Wrap/libBornAgainDevice_wrap.cpp | 2 +-
4 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/Device/Instrument/VarianceFunctions.cpp b/Device/Instrument/VarianceFunctions.cpp
index c070c29d9df..620630c444d 100644
--- a/Device/Instrument/VarianceFunctions.cpp
+++ b/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
diff --git a/Device/Instrument/VarianceFunctions.h b/Device/Instrument/VarianceFunctions.h
index 9e68f2d3ce5..c35927ddc7a 100644
--- a/Device/Instrument/VarianceFunctions.h
+++ b/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
diff --git a/auto/Wrap/doxygenDevice.i b/auto/Wrap/doxygenDevice.i
index b72cfdd6285..19dee54c59a 100644
--- a/auto/Wrap/doxygenDevice.i
+++ b/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
";
diff --git a/auto/Wrap/libBornAgainDevice_wrap.cpp b/auto/Wrap/libBornAgainDevice_wrap.cpp
index 82a5cfbaa2c..0d4fbd72591 100644
--- a/auto/Wrap/libBornAgainDevice_wrap.cpp
+++ b/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"
--
GitLab