From 6a496eef54f92716983641ef5ba9600b19866e2e Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 10 Nov 2020 10:51:21 +0100
Subject: [PATCH] outcomment unused random generators
---
Base/Utils/MathFunctions.cpp | 3 ++
Base/Utils/MathFunctions.h | 6 +--
auto/Wrap/doxygenBase.i | 9 -----
auto/Wrap/libBornAgainBase.py | 12 ------
auto/Wrap/libBornAgainBase_wrap.cpp | 59 -----------------------------
5 files changed, 6 insertions(+), 83 deletions(-)
diff --git a/Base/Utils/MathFunctions.cpp b/Base/Utils/MathFunctions.cpp
index 6e0001f6af0..3b497aeacdf 100644
--- a/Base/Utils/MathFunctions.cpp
+++ b/Base/Utils/MathFunctions.cpp
@@ -97,6 +97,8 @@ double Math::erf(double arg)
// Random number generators
// ************************************************************************** //
+/* currently unused
+
double Math::GenerateUniformRandom()
{
int random_int = std::rand();
@@ -116,6 +118,7 @@ double Math::GenerateNormalRandom(double average, double std_dev)
{
return GenerateStandardNormalRandom() * std_dev + average;
}
+*/
double Math::GeneratePoissonRandom(double average) // using c++11 standard library
{
diff --git a/Base/Utils/MathFunctions.h b/Base/Utils/MathFunctions.h
index 0cd305f732a..3f2ab498e31 100644
--- a/Base/Utils/MathFunctions.h
+++ b/Base/Utils/MathFunctions.h
@@ -53,9 +53,9 @@ double erf(double arg);
// Random number generators
// ************************************************************************** //
-double GenerateUniformRandom();
-double GenerateStandardNormalRandom();
-double GenerateNormalRandom(double average, double std_dev);
+//double GenerateUniformRandom();
+//double GenerateStandardNormalRandom();
+//double GenerateNormalRandom(double average, double std_dev);
double GeneratePoissonRandom(double average);
} // Namespace Math
diff --git a/auto/Wrap/doxygenBase.i b/auto/Wrap/doxygenBase.i
index 726a6fdef1c..601a793005c 100644
--- a/auto/Wrap/doxygenBase.i
+++ b/auto/Wrap/doxygenBase.i
@@ -1285,15 +1285,6 @@ Real Laue function: $Laue(x,N)\\\\equiv\\\\sin(Nx)/sin(x)$.
Error function of real-valued argument.
";
-%feature("docstring") Math::Bessel::GenerateUniformRandom "double Math::GenerateUniformRandom()
-";
-
-%feature("docstring") Math::Bessel::GenerateStandardNormalRandom "double Math::GenerateStandardNormalRandom()
-";
-
-%feature("docstring") Math::Bessel::GenerateNormalRandom "double Math::GenerateNormalRandom(double average, double std_dev)
-";
-
%feature("docstring") Math::Bessel::GeneratePoissonRandom "double Math::GeneratePoissonRandom(double average)
";
diff --git a/auto/Wrap/libBornAgainBase.py b/auto/Wrap/libBornAgainBase.py
index 2c6df866706..917855e1cde 100644
--- a/auto/Wrap/libBornAgainBase.py
+++ b/auto/Wrap/libBornAgainBase.py
@@ -1790,18 +1790,6 @@ def erf(arg):
r"""erf(double arg) -> double"""
return _libBornAgainBase.erf(arg)
-def GenerateUniformRandom():
- r"""GenerateUniformRandom() -> double"""
- return _libBornAgainBase.GenerateUniformRandom()
-
-def GenerateStandardNormalRandom():
- r"""GenerateStandardNormalRandom() -> double"""
- return _libBornAgainBase.GenerateStandardNormalRandom()
-
-def GenerateNormalRandom(average, std_dev):
- r"""GenerateNormalRandom(double average, double std_dev) -> double"""
- return _libBornAgainBase.GenerateNormalRandom(average, std_dev)
-
def GeneratePoissonRandom(average):
r"""GeneratePoissonRandom(double average) -> double"""
return _libBornAgainBase.GeneratePoissonRandom(average)
diff --git a/auto/Wrap/libBornAgainBase_wrap.cpp b/auto/Wrap/libBornAgainBase_wrap.cpp
index 8a7c8d97ee0..4942a7b52da 100644
--- a/auto/Wrap/libBornAgainBase_wrap.cpp
+++ b/auto/Wrap/libBornAgainBase_wrap.cpp
@@ -24613,62 +24613,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_GenerateUniformRandom(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- double result;
-
- if (!SWIG_Python_UnpackTuple(args, "GenerateUniformRandom", 0, 0, 0)) SWIG_fail;
- result = (double)Math::GenerateUniformRandom();
- resultobj = SWIG_From_double(static_cast< double >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_GenerateStandardNormalRandom(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- double result;
-
- if (!SWIG_Python_UnpackTuple(args, "GenerateStandardNormalRandom", 0, 0, 0)) SWIG_fail;
- result = (double)Math::GenerateStandardNormalRandom();
- resultobj = SWIG_From_double(static_cast< double >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_GenerateNormalRandom(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- double arg1 ;
- double arg2 ;
- double val1 ;
- int ecode1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- PyObject *swig_obj[2] ;
- double result;
-
- if (!SWIG_Python_UnpackTuple(args, "GenerateNormalRandom", 2, 2, swig_obj)) SWIG_fail;
- ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
- if (!SWIG_IsOK(ecode1)) {
- SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "GenerateNormalRandom" "', argument " "1"" of type '" "double""'");
- }
- arg1 = static_cast< double >(val1);
- ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "GenerateNormalRandom" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- result = (double)Math::GenerateNormalRandom(arg1,arg2);
- resultobj = SWIG_From_double(static_cast< double >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *_wrap_GeneratePoissonRandom(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
double arg1 ;
@@ -33342,9 +33286,6 @@ static PyMethodDef SwigMethods[] = {
{ "tanhc", _wrap_tanhc, METH_O, "tanhc(complex_t const z) -> complex_t"},
{ "Laue", _wrap_Laue, METH_VARARGS, "Laue(double const x, size_t N) -> double"},
{ "erf", _wrap_erf, METH_O, "erf(double arg) -> double"},
- { "GenerateUniformRandom", _wrap_GenerateUniformRandom, METH_NOARGS, "GenerateUniformRandom() -> double"},
- { "GenerateStandardNormalRandom", _wrap_GenerateStandardNormalRandom, METH_NOARGS, "GenerateStandardNormalRandom() -> double"},
- { "GenerateNormalRandom", _wrap_GenerateNormalRandom, METH_VARARGS, "GenerateNormalRandom(double average, double std_dev) -> double"},
{ "GeneratePoissonRandom", _wrap_GeneratePoissonRandom, METH_O, "GeneratePoissonRandom(double average) -> double"},
{ "new_ThreadInfo", _wrap_new_ThreadInfo, METH_NOARGS, "\n"
"new_ThreadInfo() -> ThreadInfo\n"
--
GitLab