From a7875686a89e05c5269fee1296c3d88734a30d6a Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 8 Mar 2024 12:17:52 +0100
Subject: [PATCH] MinimizerCatalog: rm explicit ctors
---
Fit/Minimizer/MinimizerCatalog.h | 2 -
auto/Wrap/libBornAgainFit.py | 9 ++--
auto/Wrap/libBornAgainFit_wrap.cpp | 83 ++----------------------------
3 files changed, 6 insertions(+), 88 deletions(-)
diff --git a/Fit/Minimizer/MinimizerCatalog.h b/Fit/Minimizer/MinimizerCatalog.h
index 4d88c1a9f1e..47e046f0f8f 100644
--- a/Fit/Minimizer/MinimizerCatalog.h
+++ b/Fit/Minimizer/MinimizerCatalog.h
@@ -34,8 +34,6 @@ Test | Default
class MinimizerCatalog {
public:
MinimizerCatalog();
- MinimizerCatalog(const MinimizerCatalog&) = delete;
- MinimizerCatalog(MinimizerCatalog&&) = default;
std::string toString() const;
diff --git a/auto/Wrap/libBornAgainFit.py b/auto/Wrap/libBornAgainFit.py
index 467b9a058a2..d7af57d5471 100644
--- a/auto/Wrap/libBornAgainFit.py
+++ b/auto/Wrap/libBornAgainFit.py
@@ -2047,12 +2047,9 @@ class MinimizerCatalog(object):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
__repr__ = _swig_repr
- def __init__(self, *args):
- r"""
- __init__(MinimizerCatalog self) -> MinimizerCatalog
- __init__(MinimizerCatalog self, MinimizerCatalog arg2) -> MinimizerCatalog
- """
- _libBornAgainFit.MinimizerCatalog_swiginit(self, _libBornAgainFit.new_MinimizerCatalog(*args))
+ def __init__(self):
+ r"""__init__(MinimizerCatalog self) -> MinimizerCatalog"""
+ _libBornAgainFit.MinimizerCatalog_swiginit(self, _libBornAgainFit.new_MinimizerCatalog())
def toString(self):
r"""toString(MinimizerCatalog self) -> std::string"""
diff --git a/auto/Wrap/libBornAgainFit_wrap.cpp b/auto/Wrap/libBornAgainFit_wrap.cpp
index 8f79a64425c..5b68c2afd89 100644
--- a/auto/Wrap/libBornAgainFit_wrap.cpp
+++ b/auto/Wrap/libBornAgainFit_wrap.cpp
@@ -7034,9 +7034,6 @@ SWIGINTERN mumufit::Parameter const &mumufit_Parameters___getitem____SWIG_1(mumu
return (*(self))[index];
}
-#include <memory>
-
-
/* ---------------------------------------------------
* C++ director class methods
@@ -27769,12 +27766,12 @@ SWIGINTERN PyObject *IMinimizer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyO
return SWIG_Py_Void();
}
-SWIGINTERN PyObject *_wrap_new_MinimizerCatalog__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_new_MinimizerCatalog(PyObject *self, PyObject *args) {
PyObject *resultobj = 0;
MinimizerCatalog *result = 0 ;
(void)self;
- if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
+ if (!SWIG_Python_UnpackTuple(args, "new_MinimizerCatalog", 0, 0, 0)) SWIG_fail;
{
try {
result = (MinimizerCatalog *)new MinimizerCatalog();
@@ -27793,77 +27790,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_new_MinimizerCatalog__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- MinimizerCatalog *arg1 = 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- std::unique_ptr< MinimizerCatalog > rvrdeleter1 ;
- MinimizerCatalog *result = 0 ;
-
- (void)self;
- if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_MinimizerCatalog, SWIG_POINTER_RELEASE | 0 );
- if (!SWIG_IsOK(res1)) {
- if (res1 == SWIG_ERROR_RELEASE_NOT_OWNED) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MinimizerCatalog" "', cannot release ownership as memory is not owned for argument " "1"" of type '" "MinimizerCatalog &&""'");
- } else {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MinimizerCatalog" "', argument " "1"" of type '" "MinimizerCatalog &&""'");
- }
- }
- if (!argp1) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_MinimizerCatalog" "', argument " "1"" of type '" "MinimizerCatalog &&""'");
- }
- arg1 = reinterpret_cast< MinimizerCatalog * >(argp1);
- rvrdeleter1.reset(arg1);
- {
- try {
- result = (MinimizerCatalog *)new MinimizerCatalog((MinimizerCatalog &&)*arg1);
- } catch (const std::exception& ex) {
- // message shown in the Python interpreter
- const std::string msg {
- "BornAgain C++ Exception: " + std::string(ex.what())
- };
- SWIG_exception(SWIG_RuntimeError, msg.c_str());
- }
- }
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_MinimizerCatalog, SWIG_POINTER_NEW | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_MinimizerCatalog(PyObject *self, PyObject *args) {
- Py_ssize_t argc;
- PyObject *argv[2] = {
- 0
- };
-
- if (!(argc = SWIG_Python_UnpackTuple(args, "new_MinimizerCatalog", 0, 1, argv))) SWIG_fail;
- --argc;
- if (argc == 0) {
- return _wrap_new_MinimizerCatalog__SWIG_0(self, argc, argv);
- }
- if (argc == 1) {
- int _v = 0;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_MinimizerCatalog, SWIG_POINTER_NO_NULL);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_new_MinimizerCatalog__SWIG_1(self, argc, argv);
- }
- }
-
-fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_MinimizerCatalog'.\n"
- " Possible C/C++ prototypes are:\n"
- " MinimizerCatalog::MinimizerCatalog()\n"
- " MinimizerCatalog::MinimizerCatalog(MinimizerCatalog &&)\n");
- return 0;
-}
-
-
SWIGINTERN PyObject *_wrap_MinimizerCatalog_toString(PyObject *self, PyObject *args) {
PyObject *resultobj = 0;
MinimizerCatalog *arg1 = (MinimizerCatalog *) 0 ;
@@ -30356,10 +30282,7 @@ static PyMethodDef SwigMethods[] = {
{ "IMinimizer_minValue", _wrap_IMinimizer_minValue, METH_O, "IMinimizer_minValue(IMinimizer self) -> double"},
{ "IMinimizer_setOptions", _wrap_IMinimizer_setOptions, METH_VARARGS, "IMinimizer_setOptions(IMinimizer self, std::string const & options)"},
{ "IMinimizer_swigregister", IMinimizer_swigregister, METH_O, NULL},
- { "new_MinimizerCatalog", _wrap_new_MinimizerCatalog, METH_VARARGS, "\n"
- "MinimizerCatalog()\n"
- "new_MinimizerCatalog(MinimizerCatalog arg1) -> MinimizerCatalog\n"
- ""},
+ { "new_MinimizerCatalog", _wrap_new_MinimizerCatalog, METH_NOARGS, "new_MinimizerCatalog() -> MinimizerCatalog"},
{ "MinimizerCatalog_toString", _wrap_MinimizerCatalog_toString, METH_O, "MinimizerCatalog_toString(MinimizerCatalog self) -> std::string"},
{ "MinimizerCatalog_minimizerNames", _wrap_MinimizerCatalog_minimizerNames, METH_O, "MinimizerCatalog_minimizerNames(MinimizerCatalog self) -> vector_string_t"},
{ "MinimizerCatalog_algorithmNames", _wrap_MinimizerCatalog_algorithmNames, METH_VARARGS, "MinimizerCatalog_algorithmNames(MinimizerCatalog self, std::string const & minimizerName) -> vector_string_t"},
--
GitLab