From 68f3a91faff3da40c5da238c7dcace4fb02f4700 Mon Sep 17 00:00:00 2001
From: Dmitry Yurov <d.yurov@fz-juelich.de>
Date: Tue, 30 Jan 2018 16:27:42 +0100
Subject: [PATCH] Use current interface of INode in checking parametrization
Redmine: #1860
---
Core/Parametrization/IParameterized.h | 2 +-
Core/Simulation/SpecularSimulation.cpp | 3 +-
auto/Wrap/libBornAgainCore.py | 5 +-
auto/Wrap/libBornAgainCore_wrap.cpp | 81 +-------------------------
4 files changed, 6 insertions(+), 85 deletions(-)
diff --git a/Core/Parametrization/IParameterized.h b/Core/Parametrization/IParameterized.h
index 48ab0ba5f16..7e310220f86 100644
--- a/Core/Parametrization/IParameterized.h
+++ b/Core/Parametrization/IParameterized.h
@@ -33,7 +33,7 @@ public:
IParameterized(const IParameterized& other);
~IParameterized();
- IParameterized operator=(const IParameterized& other) = delete;
+ IParameterized& operator=(const IParameterized& other) = delete;
//! Returns pointer to the parameter pool.
ParameterPool* parameterPool() const { return m_pool; }
diff --git a/Core/Simulation/SpecularSimulation.cpp b/Core/Simulation/SpecularSimulation.cpp
index ce2b5b11456..0e5b6f629bf 100644
--- a/Core/Simulation/SpecularSimulation.cpp
+++ b/Core/Simulation/SpecularSimulation.cpp
@@ -244,8 +244,7 @@ void SpecularSimulation::validateParametrization(const ParameterDistribution& pa
if (zero_mean)
return;
- std::unique_ptr<ParameterPool> parameter_pool(
- m_instrument.getBeam().createParameterTree(this->parent()));
+ std::unique_ptr<ParameterPool> parameter_pool(createParameterTree());
const std::vector<RealParameter*> names
= parameter_pool->getMatchedParameters(par_distr.getMainParameterName());
for (const auto par : names)
diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py
index 5a099a5b011..8daff6f2e54 100644
--- a/auto/Wrap/libBornAgainCore.py
+++ b/auto/Wrap/libBornAgainCore.py
@@ -2177,17 +2177,16 @@ class INode(IParameterized):
return _libBornAgainCore.INode_displayName(self)
- def createParameterTree(self, *args):
+ def createParameterTree(self):
"""
createParameterTree(INode self) -> ParameterPool
- createParameterTree(INode self, INode node) -> ParameterPool
ParameterPool * INode::createParameterTree(const INode *node) const
Creates new parameter pool, with all local parameters and those of its children. Parameter names are derived relatively to the given node.
"""
- return _libBornAgainCore.INode_createParameterTree(self, *args)
+ return _libBornAgainCore.INode_createParameterTree(self)
def __disown__(self):
self.this.disown()
diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp
index 956fcf26fb5..7653f1bebfc 100644
--- a/auto/Wrap/libBornAgainCore_wrap.cpp
+++ b/auto/Wrap/libBornAgainCore_wrap.cpp
@@ -26181,7 +26181,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_INode_createParameterTree__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_INode_createParameterTree(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
INode *arg1 = (INode *) 0 ;
void *argp1 = 0 ;
@@ -26218,82 +26218,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_INode_createParameterTree__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- INode *arg1 = (INode *) 0 ;
- INode *arg2 = (INode *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
- PyObject * obj0 = 0 ;
- PyObject * obj1 = 0 ;
- ParameterPool *result = 0 ;
-
- if (!PyArg_ParseTuple(args,(char *)"OO:INode_createParameterTree",&obj0,&obj1)) SWIG_fail;
- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_INode, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "INode_createParameterTree" "', argument " "1"" of type '" "INode const *""'");
- }
- arg1 = reinterpret_cast< INode * >(argp1);
- res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_INode, 0 | 0 );
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "INode_createParameterTree" "', argument " "2"" of type '" "INode const *""'");
- }
- arg2 = reinterpret_cast< INode * >(argp2);
- result = (ParameterPool *)((INode const *)arg1)->createParameterTree((INode const *)arg2);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ParameterPool, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_INode_createParameterTree(PyObject *self, PyObject *args) {
- Py_ssize_t argc;
- PyObject *argv[3] = {
- 0
- };
- Py_ssize_t ii;
-
- if (!PyTuple_Check(args)) SWIG_fail;
- argc = args ? PyObject_Length(args) : 0;
- for (ii = 0; (ii < 2) && (ii < argc); ii++) {
- argv[ii] = PyTuple_GET_ITEM(args,ii);
- }
- if (argc == 1) {
- int _v;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_INode, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_INode_createParameterTree__SWIG_0(self, args);
- }
- }
- if (argc == 2) {
- int _v;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_INode, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_INode, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_INode_createParameterTree__SWIG_1(self, args);
- }
- }
- }
-
-fail:
- SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'INode_createParameterTree'.\n"
- " Possible C/C++ prototypes are:\n"
- " INode::createParameterTree() const\n"
- " INode::createParameterTree(INode const *) const\n");
- return 0;
-}
-
-
SWIGINTERN PyObject *_wrap_disown_INode(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
INode *arg1 = (INode *) 0 ;
@@ -114059,8 +113983,7 @@ static PyMethodDef SwigMethods[] = {
"\n"
""},
{ (char *)"INode_createParameterTree", _wrap_INode_createParameterTree, METH_VARARGS, (char *)"\n"
- "createParameterTree() -> ParameterPool\n"
- "INode_createParameterTree(INode self, INode node) -> ParameterPool\n"
+ "INode_createParameterTree(INode self) -> ParameterPool\n"
"\n"
"ParameterPool * INode::createParameterTree(const INode *node) const\n"
"\n"
--
GitLab