From 7000a0d5e55001815ac6d6b3e3a3d3ccb1918912 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 18 May 2022 11:25:01 +0200
Subject: [PATCH] Swig rm empty lines
---
Wrap/Swig/libBornAgainDevice.i | 1 -
Wrap/Swig/libBornAgainFit.i | 3 -
Wrap/Swig/libBornAgainParam.i | 1 -
Wrap/Swig/libBornAgainSample.i | 11 ---
auto/Wrap/libBornAgainFit.py | 2 -
auto/Wrap/libBornAgainSample.py | 16 ---
auto/Wrap/libBornAgainSample_wrap.cpp | 136 --------------------------
7 files changed, 170 deletions(-)
diff --git a/Wrap/Swig/libBornAgainDevice.i b/Wrap/Swig/libBornAgainDevice.i
index 63334b70a75..b297dd35c8b 100644
--- a/Wrap/Swig/libBornAgainDevice.i
+++ b/Wrap/Swig/libBornAgainDevice.i
@@ -20,7 +20,6 @@
%include "../../auto/Wrap/doxygenDevice.i"
-
%{
#include "Base/Element/PolMatrices.h"
#include "Param/Distrib/ParameterDistribution.h"
diff --git a/Wrap/Swig/libBornAgainFit.i b/Wrap/Swig/libBornAgainFit.i
index 72e37df7a36..94bab48853a 100644
--- a/Wrap/Swig/libBornAgainFit.i
+++ b/Wrap/Swig/libBornAgainFit.i
@@ -95,14 +95,11 @@ namespace mumufit {
%pythoncode %{
value = property(value, setValue)
error = property(error, setError)
-
-
%}
};
}
-
// --- Setting up Minimizer callback ---
%pythoncode %{
diff --git a/Wrap/Swig/libBornAgainParam.i b/Wrap/Swig/libBornAgainParam.i
index d5b6b374ce6..055aa611754 100644
--- a/Wrap/Swig/libBornAgainParam.i
+++ b/Wrap/Swig/libBornAgainParam.i
@@ -20,7 +20,6 @@
%include "../../auto/Wrap/doxygenParam.i"
-
%{
#include "Param/Distrib/Distributions.h"
#include "Param/Distrib/ParameterDistribution.h"
diff --git a/Wrap/Swig/libBornAgainSample.i b/Wrap/Swig/libBornAgainSample.i
index 761c2359431..d3b5ebce193 100644
--- a/Wrap/Swig/libBornAgainSample.i
+++ b/Wrap/Swig/libBornAgainSample.i
@@ -167,14 +167,3 @@
%include "Sample/Lattice/Lattice3D.h"
%include "Sample/Lattice/Lattice2D.h"
%include "Sample/Lattice/BakeLattice.h"
-
-%extend Vec3<double> {
- Vec3<double> __add__(const Vec3<double>& rhs) const {
- return *($self) + rhs; }
- Vec3<double> __mul__(double c) const {
- return c * *($self); }
- Vec3<double> __rmul__(double c) const {
- return *($self) * c; }
- Vec3<double> __neg__() const {
- return - *($self); }
-};
diff --git a/auto/Wrap/libBornAgainFit.py b/auto/Wrap/libBornAgainFit.py
index 6899de5f973..638de8c2d99 100644
--- a/auto/Wrap/libBornAgainFit.py
+++ b/auto/Wrap/libBornAgainFit.py
@@ -2237,8 +2237,6 @@ class Parameter(object):
value = property(value, setValue)
error = property(error, setError)
-
-
__swig_destroy__ = _libBornAgainFit.delete_Parameter
# Register Parameter in _libBornAgainFit:
diff --git a/auto/Wrap/libBornAgainSample.py b/auto/Wrap/libBornAgainSample.py
index a2c2412be3a..cb05dca14a2 100644
--- a/auto/Wrap/libBornAgainSample.py
+++ b/auto/Wrap/libBornAgainSample.py
@@ -1771,22 +1771,6 @@ class R3(object):
def rotatedZ(self, a):
r"""rotatedZ(R3 self, double a) -> R3"""
return _libBornAgainSample.R3_rotatedZ(self, a)
-
- def __add__(self, rhs):
- r"""__add__(R3 self, R3 rhs) -> R3"""
- return _libBornAgainSample.R3___add__(self, rhs)
-
- def __mul__(self, c):
- r"""__mul__(R3 self, double c) -> R3"""
- return _libBornAgainSample.R3___mul__(self, c)
-
- def __rmul__(self, c):
- r"""__rmul__(R3 self, double c) -> R3"""
- return _libBornAgainSample.R3___rmul__(self, c)
-
- def __neg__(self):
- r"""__neg__(R3 self) -> R3"""
- return _libBornAgainSample.R3___neg__(self)
__swig_destroy__ = _libBornAgainSample.delete_R3
# Register R3 in _libBornAgainSample:
diff --git a/auto/Wrap/libBornAgainSample_wrap.cpp b/auto/Wrap/libBornAgainSample_wrap.cpp
index a66af808aac..cf04a0f1ec0 100644
--- a/auto/Wrap/libBornAgainSample_wrap.cpp
+++ b/auto/Wrap/libBornAgainSample_wrap.cpp
@@ -6785,14 +6785,6 @@ SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__insert__SWIG_
#include "Sample/Scattering/Rotations.h"
#include "Sample/SoftParticle/SoftParticles.h"
-SWIGINTERN Vec3< double > Vec3_Sl_double_Sg____add__(Vec3< double > const *self,Vec3< double > const &rhs){
- return *(self) + rhs; }
-SWIGINTERN Vec3< double > Vec3_Sl_double_Sg____mul__(Vec3< double > const *self,double c){
- return c * *(self); }
-SWIGINTERN Vec3< double > Vec3_Sl_double_Sg____rmul__(Vec3< double > const *self,double c){
- return *(self) * c; }
-SWIGINTERN Vec3< double > Vec3_Sl_double_Sg____neg__(Vec3< double > const *self){
- return - *(self); }
namespace swig {
template <> struct traits< Vec3< double > > {
@@ -25520,130 +25512,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_R3___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- Vec3< double > *arg1 = (Vec3< double > *) 0 ;
- Vec3< double > *arg2 = 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
- PyObject *swig_obj[2] ;
- Vec3< double > result;
-
- if (!SWIG_Python_UnpackTuple(args, "R3___add__", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Vec3T_double_t, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "R3___add__" "', argument " "1"" of type '" "Vec3< double > const *""'");
- }
- arg1 = reinterpret_cast< Vec3< double > * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_Vec3T_double_t, 0 | 0);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "R3___add__" "', argument " "2"" of type '" "Vec3< double > const &""'");
- }
- if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "R3___add__" "', argument " "2"" of type '" "Vec3< double > const &""'");
- }
- arg2 = reinterpret_cast< Vec3< double > * >(argp2);
- result = Vec3_Sl_double_Sg____add__((Vec3< double > const *)arg1,(Vec3< double > const &)*arg2);
- resultobj = SWIG_NewPointerObj((new Vec3< double >(static_cast< const Vec3< double >& >(result))), SWIGTYPE_p_Vec3T_double_t, SWIG_POINTER_OWN | 0 );
- return resultobj;
-fail:
- PyErr_Clear();
- Py_INCREF(Py_NotImplemented);
- return Py_NotImplemented;
-}
-
-
-SWIGINTERN PyObject *_wrap_R3___mul__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- Vec3< double > *arg1 = (Vec3< double > *) 0 ;
- double arg2 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
- Vec3< double > result;
-
- if (!SWIG_Python_UnpackTuple(args, "R3___mul__", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Vec3T_double_t, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "R3___mul__" "', argument " "1"" of type '" "Vec3< double > const *""'");
- }
- arg1 = reinterpret_cast< Vec3< double > * >(argp1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "R3___mul__" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- result = Vec3_Sl_double_Sg____mul__((Vec3< double > const *)arg1,arg2);
- resultobj = SWIG_NewPointerObj((new Vec3< double >(static_cast< const Vec3< double >& >(result))), SWIGTYPE_p_Vec3T_double_t, SWIG_POINTER_OWN | 0 );
- return resultobj;
-fail:
- PyErr_Clear();
- Py_INCREF(Py_NotImplemented);
- return Py_NotImplemented;
-}
-
-
-SWIGINTERN PyObject *_wrap_R3___rmul__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- Vec3< double > *arg1 = (Vec3< double > *) 0 ;
- double arg2 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
- Vec3< double > result;
-
- if (!SWIG_Python_UnpackTuple(args, "R3___rmul__", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Vec3T_double_t, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "R3___rmul__" "', argument " "1"" of type '" "Vec3< double > const *""'");
- }
- arg1 = reinterpret_cast< Vec3< double > * >(argp1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "R3___rmul__" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- result = Vec3_Sl_double_Sg____rmul__((Vec3< double > const *)arg1,arg2);
- resultobj = SWIG_NewPointerObj((new Vec3< double >(static_cast< const Vec3< double >& >(result))), SWIGTYPE_p_Vec3T_double_t, SWIG_POINTER_OWN | 0 );
- return resultobj;
-fail:
- PyErr_Clear();
- Py_INCREF(Py_NotImplemented);
- return Py_NotImplemented;
-}
-
-
-SWIGINTERN PyObject *_wrap_R3___neg__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- Vec3< double > *arg1 = (Vec3< double > *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
- Vec3< double > result;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Vec3T_double_t, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "R3___neg__" "', argument " "1"" of type '" "Vec3< double > const *""'");
- }
- arg1 = reinterpret_cast< Vec3< double > * >(argp1);
- result = Vec3_Sl_double_Sg____neg__((Vec3< double > const *)arg1);
- resultobj = SWIG_NewPointerObj((new Vec3< double >(static_cast< const Vec3< double >& >(result))), SWIGTYPE_p_Vec3T_double_t, SWIG_POINTER_OWN | 0 );
- return resultobj;
-fail:
- PyErr_Clear();
- Py_INCREF(Py_NotImplemented);
- return Py_NotImplemented;
-}
-
-
SWIGINTERN PyObject *_wrap_delete_R3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
Vec3< double > *arg1 = (Vec3< double > *) 0 ;
@@ -60761,10 +60629,6 @@ static PyMethodDef SwigMethods[] = {
{ "R3___ne__", _wrap_R3___ne__, METH_VARARGS, "R3___ne__(R3 self, R3 other) -> bool"},
{ "R3_rotatedY", _wrap_R3_rotatedY, METH_VARARGS, "R3_rotatedY(R3 self, double a) -> R3"},
{ "R3_rotatedZ", _wrap_R3_rotatedZ, METH_VARARGS, "R3_rotatedZ(R3 self, double a) -> R3"},
- { "R3___add__", _wrap_R3___add__, METH_VARARGS, "R3___add__(R3 self, R3 rhs) -> R3"},
- { "R3___mul__", _wrap_R3___mul__, METH_VARARGS, "R3___mul__(R3 self, double c) -> R3"},
- { "R3___rmul__", _wrap_R3___rmul__, METH_VARARGS, "R3___rmul__(R3 self, double c) -> R3"},
- { "R3___neg__", _wrap_R3___neg__, METH_O, "R3___neg__(R3 self) -> R3"},
{ "delete_R3", _wrap_delete_R3, METH_O, "delete_R3(R3 self)"},
{ "R3_swigregister", R3_swigregister, METH_O, NULL},
{ "R3_swiginit", R3_swiginit, METH_VARARGS, NULL},
--
GitLab