From fa15afe30d08a024269b3fcbf76d8291394c19a5 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 28 Jul 2021 19:17:33 +0200
Subject: [PATCH] rm forward declarations; overriding fcts -> private
---
Core/Simulation/DepthProbeSimulation.h | 1 -
Core/Simulation/GISASSimulation.h | 6 +-
Core/Simulation/ISimulation2D.h | 6 +-
Core/Simulation/OffSpecularSimulation.h | 8 +--
Core/Simulation/SpecularSimulation.h | 1 -
auto/Wrap/doxygenCore.i | 15 -----
auto/Wrap/libBornAgainCore.py | 30 ---------
auto/Wrap/libBornAgainCore_wrap.cpp | 87 -------------------------
8 files changed, 9 insertions(+), 145 deletions(-)
diff --git a/Core/Simulation/DepthProbeSimulation.h b/Core/Simulation/DepthProbeSimulation.h
index ef614e25e4d..16dc306e62b 100644
--- a/Core/Simulation/DepthProbeSimulation.h
+++ b/Core/Simulation/DepthProbeSimulation.h
@@ -23,7 +23,6 @@
class IAxis;
class IComputation;
class IFootprintFactor;
-class MultiLayer;
class ICoordSystem;
class DepthProbeSimulation : public ISimulation {
diff --git a/Core/Simulation/GISASSimulation.h b/Core/Simulation/GISASSimulation.h
index 6414f35a91a..0d1dd5abbea 100644
--- a/Core/Simulation/GISASSimulation.h
+++ b/Core/Simulation/GISASSimulation.h
@@ -33,9 +33,6 @@ public:
void accept(INodeVisitor* visitor) const override { visitor->visit(this); }
- //! Put into a clean state for running a simulation
- void prepareSimulation() override;
-
//! Returns the results of the simulation in a format that supports unit conversion and export
//! to numpy arrays
SimulationResult result() const override;
@@ -51,6 +48,9 @@ public:
#endif // SWIG
private:
+ //! Put into a clean state for running a simulation
+ void prepareSimulation() override;
+
//! Initializes the vector of ISimulation elements
void initElementVector() override;
diff --git a/Core/Simulation/ISimulation2D.h b/Core/Simulation/ISimulation2D.h
index 666c2c6b857..16422fe4211 100644
--- a/Core/Simulation/ISimulation2D.h
+++ b/Core/Simulation/ISimulation2D.h
@@ -36,9 +36,6 @@ public:
IDetector2D& detector2D();
const IDetector2D& detector2D() const;
- //! Put into a clean state for running a simulation
- void prepareSimulation() override;
-
//! Sets spherical detector parameters using angle ranges
//! @param n_phi number of phi-axis bins
//! @param phi_min low edge of first phi-bin
@@ -66,6 +63,9 @@ public:
void setRegionOfInterest(double xlow, double ylow, double xup, double yup);
protected:
+ //! Put into a clean state for running a simulation
+ void prepareSimulation() override;
+
virtual void initCoordSystem() {}
//! Gets the number of elements this simulation needs to calculate
diff --git a/Core/Simulation/OffSpecularSimulation.h b/Core/Simulation/OffSpecularSimulation.h
index 1990c6ad925..42cd98a53fa 100644
--- a/Core/Simulation/OffSpecularSimulation.h
+++ b/Core/Simulation/OffSpecularSimulation.h
@@ -18,8 +18,6 @@
#include "Core/Simulation/ISimulation2D.h"
#include "Resample/Element/DiffuseElement.h"
-class Histogram2D;
-
//! Main class to run an off-specular simulation.
//! @ingroup simulation
@@ -31,9 +29,6 @@ public:
void accept(INodeVisitor* visitor) const override { visitor->visit(this); }
- //! Put into a clean state for running a simulation
- void prepareSimulation() override;
-
//! Returns the results of the simulation in a format that supports unit conversion and export
//! to numpy arrays
SimulationResult result() const override;
@@ -52,6 +47,9 @@ public:
size_t intensityMapSize() const override;
private:
+ //! Put into a clean state for running a simulation
+ void prepareSimulation() override;
+
//! Initializes the vector of ISimulation elements
void initElementVector() override;
diff --git a/Core/Simulation/SpecularSimulation.h b/Core/Simulation/SpecularSimulation.h
index 9d131ad27d2..b3c5237f0e8 100644
--- a/Core/Simulation/SpecularSimulation.h
+++ b/Core/Simulation/SpecularSimulation.h
@@ -18,7 +18,6 @@
#include "Core/Simulation/ISimulation.h"
class IAxis;
-class IComputation;
class IFootprintFactor;
class ISpecularScan;
class MultiLayer;
diff --git a/auto/Wrap/doxygenCore.i b/auto/Wrap/doxygenCore.i
index 346f7c87060..74aff863920 100644
--- a/auto/Wrap/doxygenCore.i
+++ b/auto/Wrap/doxygenCore.i
@@ -737,11 +737,6 @@ C++ includes: GISASSimulation.h
%feature("docstring") GISASSimulation::accept "void GISASSimulation::accept(INodeVisitor *visitor) const override
";
-%feature("docstring") GISASSimulation::prepareSimulation "void GISASSimulation::prepareSimulation() override
-
-Put into a clean state for running a simulation.
-";
-
%feature("docstring") GISASSimulation::result "SimulationResult GISASSimulation::result() const override
Returns the results of the simulation in a format that supports unit conversion and export to numpy arrays
@@ -1065,11 +1060,6 @@ C++ includes: ISimulation2D.h
%feature("docstring") ISimulation2D::detector2D "const IDetector2D & ISimulation2D::detector2D() const
";
-%feature("docstring") ISimulation2D::prepareSimulation "void ISimulation2D::prepareSimulation() override
-
-Put into a clean state for running a simulation.
-";
-
%feature("docstring") ISimulation2D::setDetectorParameters "void ISimulation2D::setDetectorParameters(size_t n_phi, double phi_min, double phi_max, size_t n_alpha, double alpha_min, double alpha_max)
Sets spherical detector parameters using angle ranges
@@ -1410,11 +1400,6 @@ C++ includes: OffSpecularSimulation.h
%feature("docstring") OffSpecularSimulation::accept "void OffSpecularSimulation::accept(INodeVisitor *visitor) const override
";
-%feature("docstring") OffSpecularSimulation::prepareSimulation "void OffSpecularSimulation::prepareSimulation() override
-
-Put into a clean state for running a simulation.
-";
-
%feature("docstring") OffSpecularSimulation::result "SimulationResult OffSpecularSimulation::result() const override
Returns the results of the simulation in a format that supports unit conversion and export to numpy arrays
diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py
index 92e578d742a..731f84dcf6c 100644
--- a/auto/Wrap/libBornAgainCore.py
+++ b/auto/Wrap/libBornAgainCore.py
@@ -3689,16 +3689,6 @@ class ISimulation2D(ISimulation):
"""
return _libBornAgainCore.ISimulation2D_detector2D(self, *args)
- def prepareSimulation(self):
- r"""
- prepareSimulation(ISimulation2D self)
- void ISimulation2D::prepareSimulation() override
-
- Put into a clean state for running a simulation.
-
- """
- return _libBornAgainCore.ISimulation2D_prepareSimulation(self)
-
def setDetectorParameters(self, n_phi, phi_min, phi_max, n_alpha, alpha_min, alpha_max):
r"""
setDetectorParameters(ISimulation2D self, size_t n_phi, double phi_min, double phi_max, size_t n_alpha, double alpha_min, double alpha_max)
@@ -3813,16 +3803,6 @@ class GISASSimulation(ISimulation2D):
"""
return _libBornAgainCore.GISASSimulation_accept(self, visitor)
- def prepareSimulation(self):
- r"""
- prepareSimulation(GISASSimulation self)
- void GISASSimulation::prepareSimulation() override
-
- Put into a clean state for running a simulation.
-
- """
- return _libBornAgainCore.GISASSimulation_prepareSimulation(self)
-
def result(self):
r"""
result(GISASSimulation self) -> SimulationResult
@@ -4071,16 +4051,6 @@ class OffSpecularSimulation(ISimulation2D):
"""
return _libBornAgainCore.OffSpecularSimulation_accept(self, visitor)
- def prepareSimulation(self):
- r"""
- prepareSimulation(OffSpecularSimulation self)
- void OffSpecularSimulation::prepareSimulation() override
-
- Put into a clean state for running a simulation.
-
- """
- return _libBornAgainCore.OffSpecularSimulation_prepareSimulation(self)
-
def result(self):
r"""
result(OffSpecularSimulation self) -> SimulationResult
diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp
index bb96bc420f9..7cb5e2663e8 100644
--- a/auto/Wrap/libBornAgainCore_wrap.cpp
+++ b/auto/Wrap/libBornAgainCore_wrap.cpp
@@ -39912,28 +39912,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_ISimulation2D_prepareSimulation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- ISimulation2D *arg1 = (ISimulation2D *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_ISimulation2D, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ISimulation2D_prepareSimulation" "', argument " "1"" of type '" "ISimulation2D *""'");
- }
- arg1 = reinterpret_cast< ISimulation2D * >(argp1);
- (arg1)->prepareSimulation();
- resultobj = SWIG_Py_Void();
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *_wrap_ISimulation2D_setDetectorParameters(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
ISimulation2D *arg1 = (ISimulation2D *) 0 ;
@@ -40384,28 +40362,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_GISASSimulation_prepareSimulation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- GISASSimulation *arg1 = (GISASSimulation *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_GISASSimulation, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GISASSimulation_prepareSimulation" "', argument " "1"" of type '" "GISASSimulation *""'");
- }
- arg1 = reinterpret_cast< GISASSimulation * >(argp1);
- (arg1)->prepareSimulation();
- resultobj = SWIG_Py_Void();
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *_wrap_GISASSimulation_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
GISASSimulation *arg1 = (GISASSimulation *) 0 ;
@@ -41289,28 +41245,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_OffSpecularSimulation_prepareSimulation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- OffSpecularSimulation *arg1 = (OffSpecularSimulation *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_OffSpecularSimulation, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OffSpecularSimulation_prepareSimulation" "', argument " "1"" of type '" "OffSpecularSimulation *""'");
- }
- arg1 = reinterpret_cast< OffSpecularSimulation * >(argp1);
- (arg1)->prepareSimulation();
- resultobj = SWIG_Py_Void();
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *_wrap_OffSpecularSimulation_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
OffSpecularSimulation *arg1 = (OffSpecularSimulation *) 0 ;
@@ -44440,13 +44374,6 @@ static PyMethodDef SwigMethods[] = {
"const IDetector2D & ISimulation2D::detector2D() const\n"
"\n"
""},
- { "ISimulation2D_prepareSimulation", _wrap_ISimulation2D_prepareSimulation, METH_O, "\n"
- "ISimulation2D_prepareSimulation(ISimulation2D self)\n"
- "void ISimulation2D::prepareSimulation() override\n"
- "\n"
- "Put into a clean state for running a simulation. \n"
- "\n"
- ""},
{ "ISimulation2D_setDetectorParameters", _wrap_ISimulation2D_setDetectorParameters, METH_VARARGS, "\n"
"ISimulation2D_setDetectorParameters(ISimulation2D self, size_t n_phi, double phi_min, double phi_max, size_t n_alpha, double alpha_min, double alpha_max)\n"
"void ISimulation2D::setDetectorParameters(size_t n_phi, double phi_min, double phi_max, size_t n_alpha, double alpha_min, double alpha_max)\n"
@@ -44529,13 +44456,6 @@ static PyMethodDef SwigMethods[] = {
"void GISASSimulation::accept(INodeVisitor *visitor) const override\n"
"\n"
""},
- { "GISASSimulation_prepareSimulation", _wrap_GISASSimulation_prepareSimulation, METH_O, "\n"
- "GISASSimulation_prepareSimulation(GISASSimulation self)\n"
- "void GISASSimulation::prepareSimulation() override\n"
- "\n"
- "Put into a clean state for running a simulation. \n"
- "\n"
- ""},
{ "GISASSimulation_result", _wrap_GISASSimulation_result, METH_O, "\n"
"GISASSimulation_result(GISASSimulation self) -> SimulationResult\n"
"SimulationResult GISASSimulation::result() const override\n"
@@ -44693,13 +44613,6 @@ static PyMethodDef SwigMethods[] = {
"void OffSpecularSimulation::accept(INodeVisitor *visitor) const override\n"
"\n"
""},
- { "OffSpecularSimulation_prepareSimulation", _wrap_OffSpecularSimulation_prepareSimulation, METH_O, "\n"
- "OffSpecularSimulation_prepareSimulation(OffSpecularSimulation self)\n"
- "void OffSpecularSimulation::prepareSimulation() override\n"
- "\n"
- "Put into a clean state for running a simulation. \n"
- "\n"
- ""},
{ "OffSpecularSimulation_result", _wrap_OffSpecularSimulation_result, METH_O, "\n"
"OffSpecularSimulation_result(OffSpecularSimulation self) -> SimulationResult\n"
"SimulationResult OffSpecularSimulation::result() const override\n"
--
GitLab