diff --git a/CHANGELOG b/CHANGELOG
index 9d381a42b7de948a8f9fe7fc242bf2fb5587ac32..b2378e9c1e412a7a35b9c8d015c0f738873bdd69 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,7 +7,7 @@ BornAgain-22.0, in preparation
* FlatDetector replaces RectangularDetector.
* SphericalDetector is obsolete. For 2D scattering, use FlatDetector as shown in examples.
* Offspec analyzer is set for detector, not scan(#651)
- * FitObjective::addSimulationAndData is obsolete. Replaced by function addFitPair,
+ * FitObjective::addSimulationAndData has been replaced by function addFitPair,
which takes experimental data in form of a Datafield object instead of a NumPy array.
* Function ba_plot.plot_histogram is replaced by plot_simulation_result.
* Conversion of plot axes from default to other units now done by functions
diff --git a/Sim/Fitting/FitObjective.cpp b/Sim/Fitting/FitObjective.cpp
index 2f3ed1d1e77eab1fb2841fc659aa61e636a5da3f..8fe5277c08cded71dc3cbaa5fc01145795a5cd27 100644
--- a/Sim/Fitting/FitObjective.cpp
+++ b/Sim/Fitting/FitObjective.cpp
@@ -147,36 +147,6 @@ void FitObjective::execAddSimulationAndData(const simulation_builder_t& builder,
m_fit_objects.emplace_back(builder, data, weight);
}
-void FitObjective::addSimulationAndData(const PyBuilderCallback& callback,
- const std::vector<std::vector<double>>& data, double weight)
-{
- execAddSimulationAndData(simulationBuilder(callback), *DataUtil::Array::createPField2D(data),
- weight);
-}
-
-void FitObjective::addSimulationAndData(const PyBuilderCallback& callback,
- const std::vector<double>& data, double weight)
-{
- execAddSimulationAndData(simulationBuilder(callback), *DataUtil::Array::createPField1D(data),
- weight);
-}
-
-void FitObjective::addSimulationAndData(const PyBuilderCallback& callback,
- const std::vector<std::vector<double>>& data,
- const std::vector<std::vector<double>>& stdv, double weight)
-{
- execAddSimulationAndData(simulationBuilder(callback),
- *DataUtil::Array::createPField2D(data, stdv), weight);
-}
-
-void FitObjective::addSimulationAndData(const PyBuilderCallback& callback,
- const std::vector<double>& data,
- const std::vector<double>& stdv, double weight)
-{
- execAddSimulationAndData(simulationBuilder(callback),
- *DataUtil::Array::createPField1D(data, stdv), weight);
-}
-
void FitObjective::addFitPair(const PyBuilderCallback& callback, Datafield expData, double weight)
{
execAddSimulationAndData(simulationBuilder(callback), expData, weight);
diff --git a/Sim/Fitting/FitObjective.h b/Sim/Fitting/FitObjective.h
index f3d8d3a9e7c06908ed35d4b144d9cbe63dd48e53..5552d30c0dad2320c3f2092de5eca6f41df54d75 100644
--- a/Sim/Fitting/FitObjective.h
+++ b/Sim/Fitting/FitObjective.h
@@ -47,27 +47,6 @@ public:
void execAddSimulationAndData(const simulation_builder_t& builder, const Datafield& data,
double weight = 1.0);
#endif
- //! Constructs simulation/data pair for later fit.
- //! @param callback: simulation builder capable of producing simulations
- //! @param data: experimental data array
- //! @param weight: weight of dataset in metric calculations
- void addSimulationAndData(const PyBuilderCallback& callback,
- const std::vector<std::vector<double>>& data, double weight = 1.0);
-
- void addSimulationAndData(const PyBuilderCallback& callback, const std::vector<double>& data,
- double weight = 1.0);
-
- //! Constructs simulation/data pair for later fit.
- //! @param callback: simulation builder capable of producing simulations
- //! @param data: experimental data array
- //! @param stdv: data uncertainties array
- //! @param weight: weight of dataset in metric calculations
- void addSimulationAndData(const PyBuilderCallback& callback,
- const std::vector<std::vector<double>>& data,
- const std::vector<std::vector<double>>& stdv, double weight = 1.0);
-
- void addSimulationAndData(const PyBuilderCallback& callback, const std::vector<double>& data,
- const std::vector<double>& stdv, double weight = 1.0);
void addFitPair(const PyBuilderCallback& callback, Datafield expData, double weight = 1.0);
diff --git a/Wrap/Swig/libBornAgainSim.i b/Wrap/Swig/libBornAgainSim.i
index 3aa24aad041b7cb45fa89b0d78a9fc7ef51d0747..1ad723f526cde28a54c0f87e4049c6869996c4d3 100644
--- a/Wrap/Swig/libBornAgainSim.i
+++ b/Wrap/Swig/libBornAgainSim.i
@@ -22,7 +22,6 @@
%import(module="libBornAgainFit") ""
-%rename(addSimulationAndData_cpp) FitObjective::addSimulationAndData;
%rename(addFitPair_cpp) FitObjective::addFitPair;
%rename(evaluate_residuals_cpp) FitObjective::evaluate_residuals;
%rename(evaluate_cpp) FitObjective::evaluate;
@@ -166,35 +165,12 @@ class ObserverCallbackWrapper(PyObserverCallback):
%extend FitObjective {
%pythoncode %{
def addSimulationAndData(self, callback, data, *args, **kwargs):
- """
- Sets simulation and experimental data to the fit objective.
- Optionally accepts experimental data uncertainties and
- user-defined dataset weight.
-
- Arguments:
-
- callback -- user-defined function returning fully-defined bornagain.ISimulation object.
- The function must use fit parameter dictionary as its input.
-
- data -- numpy array with experimental data.
-
- uncertainties -- numpy array with experimental data uncertainties.
- Array shape must correspond to the shape of data. Optional argument.
-
- weight -- user-defined weight of the dataset. If not specified, defaults to 1.0.
- """
- print("WARNING:\n"
- "addSimulationAndData is obsolete since BornAgain 22,"
- " and will be removed in BornAgain 23.\n"
- "Replace it by addFitPair, which takes experimental data in form of a Datafield\n"
+ raise Exception(
+ "Function FitObjective.addSimulationAndData has been replaced in BornAgain 22\n"
+ "by function FitObjective.addFitPair, which takes experimental data"
+ " in form of a Datafield\n"
"instead of NumPy arrays. For usage, see the fit examples in the online docs.")
- if not hasattr(self, 'callback_container'):
- self.callback_container = []
- wrp = SimulationBuilderWrapper(callback)
- self.callback_container.append(wrp)
- return self.addSimulationAndData_cpp(wrp, data, *args, **kwargs)
-
def addFitPair(self, callback, expData, *args):
"""
Sets simulation and experimental data to the fit objective.
diff --git a/auto/Wrap/libBornAgainSim.py b/auto/Wrap/libBornAgainSim.py
index c5cfb851461fd42d972731f57659f6cef883e739..6d95d5e2de76289eba978b2509caf0c1fad7a574 100644
--- a/auto/Wrap/libBornAgainSim.py
+++ b/auto/Wrap/libBornAgainSim.py
@@ -2335,15 +2335,6 @@ class FitObjective(object):
_libBornAgainSim.FitObjective_swiginit(self, _libBornAgainSim.new_FitObjective(_self, ))
__swig_destroy__ = _libBornAgainSim.delete_FitObjective
- def addSimulationAndData_cpp(self, *args):
- r"""
- addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble2d_t data, double weight=1.0)
- addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble1d_t data, double weight=1.0)
- addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble2d_t data, vdouble2d_t stdv, double weight=1.0)
- addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble1d_t data, vdouble1d_t stdv, double weight=1.0)
- """
- return _libBornAgainSim.FitObjective_addSimulationAndData_cpp(self, *args)
-
def addFitPair_cpp(self, callback, expData, weight=1.0):
r"""addFitPair_cpp(FitObjective self, PyBuilderCallback callback, Datafield expData, double weight=1.0)"""
return _libBornAgainSim.FitObjective_addFitPair_cpp(self, callback, expData, weight)
@@ -2428,35 +2419,12 @@ class FitObjective(object):
return _libBornAgainSim.FitObjective_allPairsHaveUncertainties_cpp(self)
def addSimulationAndData(self, callback, data, *args, **kwargs):
- """
- Sets simulation and experimental data to the fit objective.
- Optionally accepts experimental data uncertainties and
- user-defined dataset weight.
-
- Arguments:
-
- callback -- user-defined function returning fully-defined bornagain.ISimulation object.
- The function must use fit parameter dictionary as its input.
-
- data -- numpy array with experimental data.
-
- uncertainties -- numpy array with experimental data uncertainties.
- Array shape must correspond to the shape of data. Optional argument.
-
- weight -- user-defined weight of the dataset. If not specified, defaults to 1.0.
- """
- print("WARNING:\n"
- "addSimulationAndData is obsolete since BornAgain 22,"
- " and will be removed in BornAgain 23.\n"
- "Replace it by addFitPair, which takes experimental data in form of a Datafield\n"
+ raise Exception(
+ "Function FitObjective.addSimulationAndData has been replaced in BornAgain 22\n"
+ "by function FitObjective.addFitPair, which takes experimental data"
+ " in form of a Datafield\n"
"instead of NumPy arrays. For usage, see the fit examples in the online docs.")
- if not hasattr(self, 'callback_container'):
- self.callback_container = []
- wrp = SimulationBuilderWrapper(callback)
- self.callback_container.append(wrp)
- return self.addSimulationAndData_cpp(wrp, data, *args, **kwargs)
-
def addFitPair(self, callback, expData, *args):
"""
Sets simulation and experimental data to the fit objective.
diff --git a/auto/Wrap/libBornAgainSim_wrap.cpp b/auto/Wrap/libBornAgainSim_wrap.cpp
index 972cce94bc4b31551df3f047783a4443b8843f3e..3766ea044f2ac859caffae08a71d64b1abfd16c6 100644
--- a/auto/Wrap/libBornAgainSim_wrap.cpp
+++ b/auto/Wrap/libBornAgainSim_wrap.cpp
@@ -31827,746 +31827,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- FitObjective *arg1 = (FitObjective *) 0 ;
- PyBuilderCallback *arg2 = 0 ;
- std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *arg3 = 0 ;
- double arg4 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
- int res3 = SWIG_OLDOBJ ;
- double val4 ;
- int ecode4 = 0 ;
-
- if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "1"" of type '" "FitObjective *""'");
- }
- arg1 = reinterpret_cast< FitObjective * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_PyBuilderCallback, 0 | 0);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback const &""'");
- }
- if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback const &""'");
- }
- arg2 = reinterpret_cast< PyBuilderCallback * >(argp2);
- {
- std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
- res3 = swig::asptr(swig_obj[2], &ptr);
- if (!SWIG_IsOK(res3)) {
- SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'");
- }
- if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'");
- }
- arg3 = ptr;
- }
- ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
- if (!SWIG_IsOK(ecode4)) {
- SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "4"" of type '" "double""'");
- }
- arg4 = static_cast< double >(val4);
- {
- try {
- (arg1)->addSimulationAndData((PyBuilderCallback const &)*arg2,(std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)*arg3,arg4);
- } 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_Py_Void();
- if (SWIG_IsNewObj(res3)) delete arg3;
- return resultobj;
-fail:
- if (SWIG_IsNewObj(res3)) delete arg3;
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- FitObjective *arg1 = (FitObjective *) 0 ;
- PyBuilderCallback *arg2 = 0 ;
- std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *arg3 = 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
- int res3 = SWIG_OLDOBJ ;
-
- if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "1"" of type '" "FitObjective *""'");
- }
- arg1 = reinterpret_cast< FitObjective * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_PyBuilderCallback, 0 | 0);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback const &""'");
- }
- if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback const &""'");
- }
- arg2 = reinterpret_cast< PyBuilderCallback * >(argp2);
- {
- std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
- res3 = swig::asptr(swig_obj[2], &ptr);
- if (!SWIG_IsOK(res3)) {
- SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'");
- }
- if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'");
- }
- arg3 = ptr;
- }
- {
- try {
- (arg1)->addSimulationAndData((PyBuilderCallback const &)*arg2,(std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)*arg3);
- } 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_Py_Void();
- if (SWIG_IsNewObj(res3)) delete arg3;
- return resultobj;
-fail:
- if (SWIG_IsNewObj(res3)) delete arg3;
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- FitObjective *arg1 = (FitObjective *) 0 ;
- PyBuilderCallback *arg2 = 0 ;
- std::vector< double,std::allocator< double > > *arg3 = 0 ;
- double arg4 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
- int res3 = SWIG_OLDOBJ ;
- double val4 ;
- int ecode4 = 0 ;
-
- if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "1"" of type '" "FitObjective *""'");
- }
- arg1 = reinterpret_cast< FitObjective * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_PyBuilderCallback, 0 | 0);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback const &""'");
- }
- if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback const &""'");
- }
- arg2 = reinterpret_cast< PyBuilderCallback * >(argp2);
- {
- std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
- res3 = swig::asptr(swig_obj[2], &ptr);
- if (!SWIG_IsOK(res3)) {
- SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'");
- }
- if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'");
- }
- arg3 = ptr;
- }
- ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
- if (!SWIG_IsOK(ecode4)) {
- SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "4"" of type '" "double""'");
- }
- arg4 = static_cast< double >(val4);
- {
- try {
- (arg1)->addSimulationAndData((PyBuilderCallback const &)*arg2,(std::vector< double,std::allocator< double > > const &)*arg3,arg4);
- } 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_Py_Void();
- if (SWIG_IsNewObj(res3)) delete arg3;
- return resultobj;
-fail:
- if (SWIG_IsNewObj(res3)) delete arg3;
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- FitObjective *arg1 = (FitObjective *) 0 ;
- PyBuilderCallback *arg2 = 0 ;
- std::vector< double,std::allocator< double > > *arg3 = 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
- int res3 = SWIG_OLDOBJ ;
-
- if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "1"" of type '" "FitObjective *""'");
- }
- arg1 = reinterpret_cast< FitObjective * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_PyBuilderCallback, 0 | 0);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback const &""'");
- }
- if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback const &""'");
- }
- arg2 = reinterpret_cast< PyBuilderCallback * >(argp2);
- {
- std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
- res3 = swig::asptr(swig_obj[2], &ptr);
- if (!SWIG_IsOK(res3)) {
- SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'");
- }
- if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'");
- }
- arg3 = ptr;
- }
- {
- try {
- (arg1)->addSimulationAndData((PyBuilderCallback const &)*arg2,(std::vector< double,std::allocator< double > > const &)*arg3);
- } 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_Py_Void();
- if (SWIG_IsNewObj(res3)) delete arg3;
- return resultobj;
-fail:
- if (SWIG_IsNewObj(res3)) delete arg3;
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- FitObjective *arg1 = (FitObjective *) 0 ;
- PyBuilderCallback *arg2 = 0 ;
- std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *arg3 = 0 ;
- std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *arg4 = 0 ;
- double arg5 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
- int res3 = SWIG_OLDOBJ ;
- int res4 = SWIG_OLDOBJ ;
- double val5 ;
- int ecode5 = 0 ;
-
- if ((nobjs < 5) || (nobjs > 5)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "1"" of type '" "FitObjective *""'");
- }
- arg1 = reinterpret_cast< FitObjective * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_PyBuilderCallback, 0 | 0);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback const &""'");
- }
- if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback const &""'");
- }
- arg2 = reinterpret_cast< PyBuilderCallback * >(argp2);
- {
- std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
- res3 = swig::asptr(swig_obj[2], &ptr);
- if (!SWIG_IsOK(res3)) {
- SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'");
- }
- if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'");
- }
- arg3 = ptr;
- }
- {
- std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
- res4 = swig::asptr(swig_obj[3], &ptr);
- if (!SWIG_IsOK(res4)) {
- SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "4"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'");
- }
- if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "4"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'");
- }
- arg4 = ptr;
- }
- ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
- if (!SWIG_IsOK(ecode5)) {
- SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "5"" of type '" "double""'");
- }
- arg5 = static_cast< double >(val5);
- {
- try {
- (arg1)->addSimulationAndData((PyBuilderCallback const &)*arg2,(std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)*arg3,(std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)*arg4,arg5);
- } 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_Py_Void();
- if (SWIG_IsNewObj(res3)) delete arg3;
- if (SWIG_IsNewObj(res4)) delete arg4;
- return resultobj;
-fail:
- if (SWIG_IsNewObj(res3)) delete arg3;
- if (SWIG_IsNewObj(res4)) delete arg4;
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_5(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- FitObjective *arg1 = (FitObjective *) 0 ;
- PyBuilderCallback *arg2 = 0 ;
- std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *arg3 = 0 ;
- std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *arg4 = 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
- int res3 = SWIG_OLDOBJ ;
- int res4 = SWIG_OLDOBJ ;
-
- if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "1"" of type '" "FitObjective *""'");
- }
- arg1 = reinterpret_cast< FitObjective * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_PyBuilderCallback, 0 | 0);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback const &""'");
- }
- if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback const &""'");
- }
- arg2 = reinterpret_cast< PyBuilderCallback * >(argp2);
- {
- std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
- res3 = swig::asptr(swig_obj[2], &ptr);
- if (!SWIG_IsOK(res3)) {
- SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'");
- }
- if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'");
- }
- arg3 = ptr;
- }
- {
- std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0;
- res4 = swig::asptr(swig_obj[3], &ptr);
- if (!SWIG_IsOK(res4)) {
- SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "4"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'");
- }
- if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "4"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'");
- }
- arg4 = ptr;
- }
- {
- try {
- (arg1)->addSimulationAndData((PyBuilderCallback const &)*arg2,(std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)*arg3,(std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)*arg4);
- } 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_Py_Void();
- if (SWIG_IsNewObj(res3)) delete arg3;
- if (SWIG_IsNewObj(res4)) delete arg4;
- return resultobj;
-fail:
- if (SWIG_IsNewObj(res3)) delete arg3;
- if (SWIG_IsNewObj(res4)) delete arg4;
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_6(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- FitObjective *arg1 = (FitObjective *) 0 ;
- PyBuilderCallback *arg2 = 0 ;
- std::vector< double,std::allocator< double > > *arg3 = 0 ;
- std::vector< double,std::allocator< double > > *arg4 = 0 ;
- double arg5 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
- int res3 = SWIG_OLDOBJ ;
- int res4 = SWIG_OLDOBJ ;
- double val5 ;
- int ecode5 = 0 ;
-
- if ((nobjs < 5) || (nobjs > 5)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "1"" of type '" "FitObjective *""'");
- }
- arg1 = reinterpret_cast< FitObjective * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_PyBuilderCallback, 0 | 0);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback const &""'");
- }
- if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback const &""'");
- }
- arg2 = reinterpret_cast< PyBuilderCallback * >(argp2);
- {
- std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
- res3 = swig::asptr(swig_obj[2], &ptr);
- if (!SWIG_IsOK(res3)) {
- SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'");
- }
- if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'");
- }
- arg3 = ptr;
- }
- {
- std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
- res4 = swig::asptr(swig_obj[3], &ptr);
- if (!SWIG_IsOK(res4)) {
- SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "4"" of type '" "std::vector< double,std::allocator< double > > const &""'");
- }
- if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "4"" of type '" "std::vector< double,std::allocator< double > > const &""'");
- }
- arg4 = ptr;
- }
- ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
- if (!SWIG_IsOK(ecode5)) {
- SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "5"" of type '" "double""'");
- }
- arg5 = static_cast< double >(val5);
- {
- try {
- (arg1)->addSimulationAndData((PyBuilderCallback const &)*arg2,(std::vector< double,std::allocator< double > > const &)*arg3,(std::vector< double,std::allocator< double > > const &)*arg4,arg5);
- } 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_Py_Void();
- if (SWIG_IsNewObj(res3)) delete arg3;
- if (SWIG_IsNewObj(res4)) delete arg4;
- return resultobj;
-fail:
- if (SWIG_IsNewObj(res3)) delete arg3;
- if (SWIG_IsNewObj(res4)) delete arg4;
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp__SWIG_7(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- FitObjective *arg1 = (FitObjective *) 0 ;
- PyBuilderCallback *arg2 = 0 ;
- std::vector< double,std::allocator< double > > *arg3 = 0 ;
- std::vector< double,std::allocator< double > > *arg4 = 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
- int res3 = SWIG_OLDOBJ ;
- int res4 = SWIG_OLDOBJ ;
-
- if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_FitObjective, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "1"" of type '" "FitObjective *""'");
- }
- arg1 = reinterpret_cast< FitObjective * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_PyBuilderCallback, 0 | 0);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback const &""'");
- }
- if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "2"" of type '" "PyBuilderCallback const &""'");
- }
- arg2 = reinterpret_cast< PyBuilderCallback * >(argp2);
- {
- std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
- res3 = swig::asptr(swig_obj[2], &ptr);
- if (!SWIG_IsOK(res3)) {
- SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'");
- }
- if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'");
- }
- arg3 = ptr;
- }
- {
- std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0;
- res4 = swig::asptr(swig_obj[3], &ptr);
- if (!SWIG_IsOK(res4)) {
- SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "4"" of type '" "std::vector< double,std::allocator< double > > const &""'");
- }
- if (!ptr) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FitObjective_addSimulationAndData_cpp" "', argument " "4"" of type '" "std::vector< double,std::allocator< double > > const &""'");
- }
- arg4 = ptr;
- }
- {
- try {
- (arg1)->addSimulationAndData((PyBuilderCallback const &)*arg2,(std::vector< double,std::allocator< double > > const &)*arg3,(std::vector< double,std::allocator< double > > const &)*arg4);
- } 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_Py_Void();
- if (SWIG_IsNewObj(res3)) delete arg3;
- if (SWIG_IsNewObj(res4)) delete arg4;
- return resultobj;
-fail:
- if (SWIG_IsNewObj(res3)) delete arg3;
- if (SWIG_IsNewObj(res4)) delete arg4;
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FitObjective_addSimulationAndData_cpp(PyObject *self, PyObject *args) {
- Py_ssize_t argc;
- PyObject *argv[6] = {
- 0
- };
-
- if (!(argc = SWIG_Python_UnpackTuple(args, "FitObjective_addSimulationAndData_cpp", 0, 5, argv))) SWIG_fail;
- --argc;
- if (argc == 3) {
- int _v = 0;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FitObjective, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_PyBuilderCallback, SWIG_POINTER_NO_NULL | 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = swig::asptr(argv[2], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_1(self, argc, argv);
- }
- }
- }
- }
- if (argc == 3) {
- int _v = 0;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FitObjective, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_PyBuilderCallback, SWIG_POINTER_NO_NULL | 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_3(self, argc, argv);
- }
- }
- }
- }
- if (argc == 4) {
- int _v = 0;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FitObjective, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_PyBuilderCallback, SWIG_POINTER_NO_NULL | 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
- _v = SWIG_CheckState(res);
- if (_v) {
- {
- int res = SWIG_AsVal_double(argv[3], NULL);
- _v = SWIG_CheckState(res);
- }
- if (_v) {
- return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_2(self, argc, argv);
- }
- }
- }
- }
- }
- if (argc == 4) {
- int _v = 0;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FitObjective, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_PyBuilderCallback, SWIG_POINTER_NO_NULL | 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = swig::asptr(argv[2], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
- _v = SWIG_CheckState(res);
- if (_v) {
- {
- int res = SWIG_AsVal_double(argv[3], NULL);
- _v = SWIG_CheckState(res);
- }
- if (_v) {
- return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_0(self, argc, argv);
- }
- }
- }
- }
- }
- if (argc == 4) {
- int _v = 0;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FitObjective, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_PyBuilderCallback, SWIG_POINTER_NO_NULL | 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = swig::asptr(argv[2], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = swig::asptr(argv[3], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_5(self, argc, argv);
- }
- }
- }
- }
- }
- if (argc == 4) {
- int _v = 0;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FitObjective, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_PyBuilderCallback, SWIG_POINTER_NO_NULL | 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = swig::asptr(argv[3], (std::vector< double,std::allocator< double > >**)(0));
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_7(self, argc, argv);
- }
- }
- }
- }
- }
- if (argc == 5) {
- int _v = 0;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FitObjective, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_PyBuilderCallback, SWIG_POINTER_NO_NULL | 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0));
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = swig::asptr(argv[3], (std::vector< double,std::allocator< double > >**)(0));
- _v = SWIG_CheckState(res);
- if (_v) {
- {
- int res = SWIG_AsVal_double(argv[4], NULL);
- _v = SWIG_CheckState(res);
- }
- if (_v) {
- return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_6(self, argc, argv);
- }
- }
- }
- }
- }
- }
- if (argc == 5) {
- int _v = 0;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FitObjective, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_PyBuilderCallback, SWIG_POINTER_NO_NULL | 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = swig::asptr(argv[2], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = swig::asptr(argv[3], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0));
- _v = SWIG_CheckState(res);
- if (_v) {
- {
- int res = SWIG_AsVal_double(argv[4], NULL);
- _v = SWIG_CheckState(res);
- }
- if (_v) {
- return _wrap_FitObjective_addSimulationAndData_cpp__SWIG_4(self, argc, argv);
- }
- }
- }
- }
- }
- }
-
-fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'FitObjective_addSimulationAndData_cpp'.\n"
- " Possible C/C++ prototypes are:\n"
- " FitObjective::addSimulationAndData(PyBuilderCallback const &,std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &,double)\n"
- " FitObjective::addSimulationAndData(PyBuilderCallback const &,std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)\n"
- " FitObjective::addSimulationAndData(PyBuilderCallback const &,std::vector< double,std::allocator< double > > const &,double)\n"
- " FitObjective::addSimulationAndData(PyBuilderCallback const &,std::vector< double,std::allocator< double > > const &)\n"
- " FitObjective::addSimulationAndData(PyBuilderCallback const &,std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &,std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &,double)\n"
- " FitObjective::addSimulationAndData(PyBuilderCallback const &,std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &,std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)\n"
- " FitObjective::addSimulationAndData(PyBuilderCallback const &,std::vector< double,std::allocator< double > > const &,std::vector< double,std::allocator< double > > const &,double)\n"
- " FitObjective::addSimulationAndData(PyBuilderCallback const &,std::vector< double,std::allocator< double > > const &,std::vector< double,std::allocator< double > > const &)\n");
- return 0;
-}
-
-
SWIGINTERN PyObject *_wrap_FitObjective_addFitPair_cpp__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
FitObjective *arg1 = (FitObjective *) 0 ;
@@ -39978,12 +39238,6 @@ static PyMethodDef SwigMethods[] = {
{ "PyObserverCallback_swiginit", PyObserverCallback_swiginit, METH_VARARGS, NULL},
{ "new_FitObjective", _wrap_new_FitObjective, METH_O, "new_FitObjective(PyObject * _self) -> FitObjective"},
{ "delete_FitObjective", _wrap_delete_FitObjective, METH_O, "delete_FitObjective(FitObjective self)"},
- { "FitObjective_addSimulationAndData_cpp", _wrap_FitObjective_addSimulationAndData_cpp, METH_VARARGS, "\n"
- "FitObjective_addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble2d_t data, double weight=1.0)\n"
- "FitObjective_addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble1d_t data, double weight=1.0)\n"
- "FitObjective_addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble2d_t data, vdouble2d_t stdv, double weight=1.0)\n"
- "FitObjective_addSimulationAndData_cpp(FitObjective self, PyBuilderCallback callback, vdouble1d_t data, vdouble1d_t stdv, double weight=1.0)\n"
- ""},
{ "FitObjective_addFitPair_cpp", _wrap_FitObjective_addFitPair_cpp, METH_VARARGS, "FitObjective_addFitPair_cpp(FitObjective self, PyBuilderCallback callback, Datafield expData, double weight=1.0)"},
{ "FitObjective_evaluate_cpp", _wrap_FitObjective_evaluate_cpp, METH_VARARGS, "FitObjective_evaluate_cpp(FitObjective self, mumufit::Parameters const & params) -> double"},
{ "FitObjective_evaluate_residuals_cpp", _wrap_FitObjective_evaluate_residuals_cpp, METH_VARARGS, "FitObjective_evaluate_residuals_cpp(FitObjective self, mumufit::Parameters const & params) -> vdouble1d_t"},