From 493135c58a3c37eadcbf41c6cec282bcb56c8525 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 18 May 2022 13:58:48 +0200
Subject: [PATCH] rm unused SimulationResult::max()
---
Device/Histo/SimulationResult.cpp | 5 ----
Device/Histo/SimulationResult.h | 1 -
Tests/Unit/Device/SimulationResultTest.cpp | 32 ----------------------
auto/Wrap/doxygenDevice.i | 5 +---
auto/Wrap/libBornAgainDevice.py | 10 +------
auto/Wrap/libBornAgainDevice_wrap.cpp | 30 +-------------------
6 files changed, 3 insertions(+), 80 deletions(-)
delete mode 100644 Tests/Unit/Device/SimulationResultTest.cpp
diff --git a/Device/Histo/SimulationResult.cpp b/Device/Histo/SimulationResult.cpp
index 882390673de..e7dff16840f 100644
--- a/Device/Histo/SimulationResult.cpp
+++ b/Device/Histo/SimulationResult.cpp
@@ -106,11 +106,6 @@ size_t SimulationResult::size() const
return m_data ? m_data->getAllocatedSize() : 0;
}
-double SimulationResult::max() const
-{
- return m_data->max();
-}
-
SimulationResult SimulationResult::relativeToMaximum() const
{
std::unique_ptr<Powerfield<double>> data2{m_data->clone()};
diff --git a/Device/Histo/SimulationResult.h b/Device/Histo/SimulationResult.h
index 44e0d8e9e04..9b5ac566f84 100644
--- a/Device/Histo/SimulationResult.h
+++ b/Device/Histo/SimulationResult.h
@@ -67,7 +67,6 @@ public:
double& operator[](size_t i);
const double& operator[](size_t i) const;
size_t size() const;
- double max() const;
bool empty() const { return size() == 0; }
//! Returns modified SimulationResult: all intensities dvided by maximum intensity
diff --git a/Tests/Unit/Device/SimulationResultTest.cpp b/Tests/Unit/Device/SimulationResultTest.cpp
deleted file mode 100644
index 3e13a47a95a..00000000000
--- a/Tests/Unit/Device/SimulationResultTest.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "Device/Histo/SimulationResult.h"
-#include "Base/Const/Units.h"
-#include "Device/Beam/Beam.h"
-#include "Device/Coord/CoordSystem2D.h"
-#include "Device/Data/Powerfield.h"
-#include "Device/Detector/SphericalDetector.h"
-#include "Tests/GTestWrapper/google_test.h"
-
-class SimulationResultTest : public ::testing::Test {
-};
-
-TEST_F(SimulationResultTest, max)
-{
- Powerfield<double> data;
- data.addAxis("axis1", 10, 0., 10.);
- data.addAxis("axis2", 2, 0., 10.);
- Powerfield<double>::iterator it = data.begin();
- for (size_t i = 0; i < data.getAllocatedSize(); ++i)
- if (i == 10)
- (*it) = 10.0;
-
- SphericalDetector det(100, 0.0, 5.0 * Units::deg, 70, -2.0 * Units::deg, 1.5);
- Beam beam(1.0, 1.0, {1 * Units::deg, 0});
- SphericalCoords coords(det.axesClippedToRegionOfInterest(), beam.direction(),
- beam.wavelength());
-
- SimulationResult sr1(data, coords.clone());
-
- SimulationResult sr2 = sr1.relativeToMaximum();
-
- EXPECT_EQ(sr2.max(), 1.);
-}
diff --git a/auto/Wrap/doxygenDevice.i b/auto/Wrap/doxygenDevice.i
index 5be60ba9688..143a111fce5 100644
--- a/auto/Wrap/doxygenDevice.i
+++ b/auto/Wrap/doxygenDevice.i
@@ -1308,7 +1308,7 @@ The name of selected axis.
Corresponding bin index for selected axis
";
-%feature("docstring") IField::getAxesBinIndices "std::vector<int> IField::getAxesBinIndices(size_t global_index) const
+%feature("docstring") IField::getAxesBinIndices "std::vector< int > IField::getAxesBinIndices(size_t global_index) const
Returns vector of axes indices for given global index
@@ -2523,9 +2523,6 @@ Returns underlying unit converter.
%feature("docstring") SimulationResult::size "size_t SimulationResult::size() const
";
-%feature("docstring") SimulationResult::max "double SimulationResult::max() const
-";
-
%feature("docstring") SimulationResult::empty "bool SimulationResult::empty() const
";
diff --git a/auto/Wrap/libBornAgainDevice.py b/auto/Wrap/libBornAgainDevice.py
index 78db2602716..f5d0d0c7da3 100644
--- a/auto/Wrap/libBornAgainDevice.py
+++ b/auto/Wrap/libBornAgainDevice.py
@@ -2147,7 +2147,7 @@ class IField(object):
def getAxesBinIndices(self, global_index):
r"""
getAxesBinIndices(IField self, size_t global_index) -> vector_integer_t
- std::vector<int> IField::getAxesBinIndices(size_t global_index) const
+ std::vector< int > IField::getAxesBinIndices(size_t global_index) const
Returns vector of axes indices for given global index
@@ -5458,14 +5458,6 @@ class SimulationResult(object):
"""
return _libBornAgainDevice.SimulationResult_size(self)
- def max(self):
- r"""
- max(SimulationResult self) -> double
- double SimulationResult::max() const
-
- """
- return _libBornAgainDevice.SimulationResult_max(self)
-
def empty(self):
r"""
empty(SimulationResult self) -> bool
diff --git a/auto/Wrap/libBornAgainDevice_wrap.cpp b/auto/Wrap/libBornAgainDevice_wrap.cpp
index b3227cc7269..777ebd8b46d 100644
--- a/auto/Wrap/libBornAgainDevice_wrap.cpp
+++ b/auto/Wrap/libBornAgainDevice_wrap.cpp
@@ -41646,29 +41646,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_SimulationResult_max(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- SimulationResult *arg1 = (SimulationResult *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
- double result;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationResult, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_max" "', argument " "1"" of type '" "SimulationResult const *""'");
- }
- arg1 = reinterpret_cast< SimulationResult * >(argp1);
- result = (double)((SimulationResult const *)arg1)->max();
- resultobj = SWIG_From_double(static_cast< double >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *_wrap_SimulationResult_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
SimulationResult *arg1 = (SimulationResult *) 0 ;
@@ -42844,7 +42821,7 @@ static PyMethodDef SwigMethods[] = {
""},
{ "IField_getAxesBinIndices", _wrap_IField_getAxesBinIndices, METH_VARARGS, "\n"
"IField_getAxesBinIndices(IField self, size_t global_index) -> vector_integer_t\n"
- "std::vector<int> IField::getAxesBinIndices(size_t global_index) const\n"
+ "std::vector< int > IField::getAxesBinIndices(size_t global_index) const\n"
"\n"
"Returns vector of axes indices for given global index\n"
"\n"
@@ -44844,11 +44821,6 @@ static PyMethodDef SwigMethods[] = {
"size_t SimulationResult::size() const\n"
"\n"
""},
- { "SimulationResult_max", _wrap_SimulationResult_max, METH_O, "\n"
- "SimulationResult_max(SimulationResult self) -> double\n"
- "double SimulationResult::max() const\n"
- "\n"
- ""},
{ "SimulationResult_empty", _wrap_SimulationResult_empty, METH_O, "\n"
"SimulationResult_empty(SimulationResult self) -> bool\n"
"bool SimulationResult::empty() const\n"
--
GitLab