Skip to content
Snippets Groups Projects
Commit 3448ed4e authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

sample builder machinery: rm default argument from createSample(index)

parent 867ed6c7
No related branches found
No related tags found
No related merge requests found
...@@ -29,7 +29,7 @@ public: ...@@ -29,7 +29,7 @@ public:
virtual MultiLayer* buildSample() const = 0; virtual MultiLayer* buildSample() const = 0;
virtual MultiLayer* createSample(size_t index = 0) virtual MultiLayer* createSample(size_t index)
{ {
(void)index; (void)index;
return buildSample(); return buildSample();
......
...@@ -35,7 +35,7 @@ public: ...@@ -35,7 +35,7 @@ public:
~LayersWithAbsorptionBuilder(); ~LayersWithAbsorptionBuilder();
virtual MultiLayer* buildSample() const; virtual MultiLayer* buildSample() const;
MultiLayer* createSample(size_t index = 0); MultiLayer* createSample(size_t index);
size_t size(); size_t size();
private: private:
......
...@@ -65,7 +65,7 @@ public: ...@@ -65,7 +65,7 @@ public:
SimpleMagneticRotationBuilder(); SimpleMagneticRotationBuilder();
MultiLayer* buildSample() const override; MultiLayer* buildSample() const override;
MultiLayer* createSample(size_t index = 0) override; MultiLayer* createSample(size_t index) override;
size_t size() override; size_t size() override;
protected: protected:
......
...@@ -50,7 +50,7 @@ public: ...@@ -50,7 +50,7 @@ public:
~Basic2DParaCrystalBuilder(); ~Basic2DParaCrystalBuilder();
virtual MultiLayer* buildSample() const; virtual MultiLayer* buildSample() const;
MultiLayer* createSample(size_t index = 0); MultiLayer* createSample(size_t index);
private: private:
std::unique_ptr<IFTDistribution2D> m_pdf1; std::unique_ptr<IFTDistribution2D> m_pdf1;
......
...@@ -32,7 +32,7 @@ public: ...@@ -32,7 +32,7 @@ public:
ParticleInTheAirBuilder(); ParticleInTheAirBuilder();
virtual MultiLayer* buildSample() const; virtual MultiLayer* buildSample() const;
MultiLayer* createSample(size_t index = 0); MultiLayer* createSample(size_t index);
size_t size(); size_t size();
protected: protected:
......
...@@ -14008,9 +14008,9 @@ class IMultiLayerBuilder(IParameterized): ...@@ -14008,9 +14008,9 @@ class IMultiLayerBuilder(IParameterized):
""" """
return _libBornAgainCore.IMultiLayerBuilder_buildSample(self) return _libBornAgainCore.IMultiLayerBuilder_buildSample(self)
   
def createSample(self, index=0): def createSample(self, index):
r""" r"""
createSample(IMultiLayerBuilder self, size_t index=0) -> MultiLayer createSample(IMultiLayerBuilder self, size_t index) -> MultiLayer
virtual MultiLayer* IMultiLayerBuilder::createSample(size_t index=0) virtual MultiLayer* IMultiLayerBuilder::createSample(size_t index=0)
   
""" """
......
...@@ -10744,7 +10744,7 @@ size_t SwigDirector_IMultiLayerBuilder::size() { ...@@ -10744,7 +10744,7 @@ size_t SwigDirector_IMultiLayerBuilder::size() {
Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IMultiLayerBuilder.__init__."); Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call IMultiLayerBuilder.__init__.");
} }
#if defined(SWIG_PYTHON_DIRECTOR_VTABLE) #if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
const size_t swig_method_index = 5; const size_t swig_method_index = 4;
const char *const swig_method_name = "size"; const char *const swig_method_name = "size";
PyObject *method = swig_get_method(swig_method_index, swig_method_name); PyObject *method = swig_get_method(swig_method_index, swig_method_name);
swig::SwigVar_PyObject args = PyTuple_New(0); swig::SwigVar_PyObject args = PyTuple_New(0);
...@@ -88875,7 +88875,7 @@ fail: ...@@ -88875,7 +88875,7 @@ fail:
} }
   
   
SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_createSample__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_createSample(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0; PyObject *resultobj = 0;
IMultiLayerBuilder *arg1 = (IMultiLayerBuilder *) 0 ; IMultiLayerBuilder *arg1 = (IMultiLayerBuilder *) 0 ;
size_t arg2 ; size_t arg2 ;
...@@ -88885,11 +88885,12 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_createSample__SWIG_0(PyObject *SWI ...@@ -88885,11 +88885,12 @@ SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_createSample__SWIG_0(PyObject *SWI
std::shared_ptr< IMultiLayerBuilder > *smartarg1 = 0 ; std::shared_ptr< IMultiLayerBuilder > *smartarg1 = 0 ;
size_t val2 ; size_t val2 ;
int ecode2 = 0 ; int ecode2 = 0 ;
PyObject *swig_obj[2] ;
Swig::Director *director = 0; Swig::Director *director = 0;
bool upcall = false; bool upcall = false;
MultiLayer *result = 0 ; MultiLayer *result = 0 ;
if ((nobjs < 2) || (nobjs > 2)) SWIG_fail; if (!SWIG_Python_UnpackTuple(args, "IMultiLayerBuilder_createSample", 2, 2, swig_obj)) SWIG_fail;
{ {
int newmem = 0; int newmem = 0;
res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 | 0 , &newmem); res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 | 0 , &newmem);
...@@ -88931,94 +88932,6 @@ fail: ...@@ -88931,94 +88932,6 @@ fail:
} }
   
   
SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_createSample__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
IMultiLayerBuilder *arg1 = (IMultiLayerBuilder *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
std::shared_ptr< IMultiLayerBuilder > tempshared1 ;
std::shared_ptr< IMultiLayerBuilder > *smartarg1 = 0 ;
Swig::Director *director = 0;
bool upcall = false;
MultiLayer *result = 0 ;
if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
{
int newmem = 0;
res1 = SWIG_ConvertPtrAndOwn(swig_obj[0], &argp1, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0 | 0 , &newmem);
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IMultiLayerBuilder_createSample" "', argument " "1"" of type '" "IMultiLayerBuilder *""'");
}
if (newmem & SWIG_CAST_NEW_MEMORY) {
tempshared1 = *reinterpret_cast< std::shared_ptr< IMultiLayerBuilder > * >(argp1);
delete reinterpret_cast< std::shared_ptr< IMultiLayerBuilder > * >(argp1);
arg1 = const_cast< IMultiLayerBuilder * >(tempshared1.get());
} else {
smartarg1 = reinterpret_cast< std::shared_ptr< IMultiLayerBuilder > * >(argp1);
arg1 = const_cast< IMultiLayerBuilder * >((smartarg1 ? smartarg1->get() : 0));
}
}
director = SWIG_DIRECTOR_CAST(arg1);
upcall = (director && (director->swig_get_self()==swig_obj[0]));
try {
if (upcall) {
result = (MultiLayer *)(arg1)->IMultiLayerBuilder::createSample();
} else {
result = (MultiLayer *)(arg1)->createSample();
}
} catch (Swig::DirectorException&) {
SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_MultiLayer, 0 | 0 );
if (director) {
SWIG_AcquirePtr(resultobj, director->swig_release_ownership(SWIG_as_voidptr(result)));
}
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_createSample(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[3] = {
0
};
if (!(argc = SWIG_Python_UnpackTuple(args, "IMultiLayerBuilder_createSample", 0, 2, argv))) SWIG_fail;
--argc;
if (argc == 1) {
int _v;
int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0);
_v = SWIG_CheckState(res);
if (_v) {
return _wrap_IMultiLayerBuilder_createSample__SWIG_1(self, argc, argv);
}
}
if (argc == 2) {
int _v;
int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_std__shared_ptrT_IMultiLayerBuilder_t, 0);
_v = SWIG_CheckState(res);
if (_v) {
{
int res = SWIG_AsVal_size_t(argv[1], NULL);
_v = SWIG_CheckState(res);
}
if (_v) {
return _wrap_IMultiLayerBuilder_createSample__SWIG_0(self, argc, argv);
}
}
}
fail:
SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'IMultiLayerBuilder_createSample'.\n"
" Possible C/C++ prototypes are:\n"
" IMultiLayerBuilder::createSample(size_t)\n"
" IMultiLayerBuilder::createSample()\n");
return 0;
}
SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { SWIGINTERN PyObject *_wrap_IMultiLayerBuilder_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0; PyObject *resultobj = 0;
IMultiLayerBuilder *arg1 = (IMultiLayerBuilder *) 0 ; IMultiLayerBuilder *arg1 = (IMultiLayerBuilder *) 0 ;
...@@ -128521,7 +128434,7 @@ static PyMethodDef SwigMethods[] = { ...@@ -128521,7 +128434,7 @@ static PyMethodDef SwigMethods[] = {
"\n" "\n"
""}, ""},
{ "IMultiLayerBuilder_createSample", _wrap_IMultiLayerBuilder_createSample, METH_VARARGS, "\n" { "IMultiLayerBuilder_createSample", _wrap_IMultiLayerBuilder_createSample, METH_VARARGS, "\n"
"IMultiLayerBuilder_createSample(IMultiLayerBuilder self, size_t index=0) -> MultiLayer\n" "IMultiLayerBuilder_createSample(IMultiLayerBuilder self, size_t index) -> MultiLayer\n"
"virtual MultiLayer* IMultiLayerBuilder::createSample(size_t index=0)\n" "virtual MultiLayer* IMultiLayerBuilder::createSample(size_t index=0)\n"
"\n" "\n"
""}, ""},
...@@ -479,7 +479,7 @@ public: ...@@ -479,7 +479,7 @@ public:
virtual ParameterPool *createParameterTree() const; virtual ParameterPool *createParameterTree() const;
virtual void onChange(); virtual void onChange();
virtual MultiLayer *buildSample() const; virtual MultiLayer *buildSample() const;
virtual MultiLayer *createSample(size_t index = 0); virtual MultiLayer *createSample(size_t index);
virtual size_t size(); virtual size_t size();
/* Internal director utilities */ /* Internal director utilities */
...@@ -511,7 +511,7 @@ private: ...@@ -511,7 +511,7 @@ private:
return method; return method;
} }
private: private:
mutable swig::SwigVar_PyObject vtable[6]; mutable swig::SwigVar_PyObject vtable[5];
#endif #endif
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment