From 0672dd9557bac47486075c1a7f0d51430de5fbe8 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 19 May 2022 07:07:14 +0200
Subject: [PATCH] rm unused fct
---
Device/Data/Powerfield.h | 15 ------------
Tests/Unit/Device/IOReaderWriterTest.cpp | 3 ---
auto/Wrap/doxygenDevice.i | 5 ----
auto/Wrap/libBornAgainDevice.py | 10 --------
auto/Wrap/libBornAgainDevice_wrap.cpp | 30 ------------------------
5 files changed, 63 deletions(-)
diff --git a/Device/Data/Powerfield.h b/Device/Data/Powerfield.h
index f7da207a0e5..90f22e30866 100644
--- a/Device/Data/Powerfield.h
+++ b/Device/Data/Powerfield.h
@@ -145,9 +145,6 @@ public:
return 0;
}
- //! Returns all sizes of its axes
- std::vector<size_t> getAllSizes() const;
-
//! Returns copy of raw data vector
std::vector<T> getRawDataVector() const;
@@ -355,18 +352,6 @@ void Powerfield<T>::addAxis(const std::string& name, size_t size, double start,
addAxis(new_axis);
}
-template <class T>
-inline std::vector<size_t> Powerfield<T>::getAllSizes() const
-{
- ASSERT(m_ll_data);
- std::vector<size_t> result;
- for (size_t i = 0; i < rank(); ++i) {
- int dim = m_ll_data->dimensions()[i];
- result.push_back(dim);
- }
- return result;
-}
-
template <class T>
inline std::vector<T> Powerfield<T>::getRawDataVector() const
{
diff --git a/Tests/Unit/Device/IOReaderWriterTest.cpp b/Tests/Unit/Device/IOReaderWriterTest.cpp
index 48ec02f2ef2..c5f1685a10e 100644
--- a/Tests/Unit/Device/IOReaderWriterTest.cpp
+++ b/Tests/Unit/Device/IOReaderWriterTest.cpp
@@ -35,7 +35,6 @@ TEST_F(IOReaderWriterTest, TestRWINT)
};
EXPECT_EQ(m_model_data.rank(), result->rank());
- EXPECT_EQ(m_model_data.getAllSizes(), result->getAllSizes());
compare_axis(0);
compare_axis(1);
for (size_t i = 0, size = m_model_data.getAllocatedSize(); i < size; ++i)
@@ -51,7 +50,6 @@ TEST_F(IOReaderWriterTest, TestRWNumpyTXT)
ReadWriteNumpyTXT read_txt;
auto result = std::unique_ptr<Powerfield<double>>(read_txt.readPowerfield(ss));
EXPECT_EQ(m_model_data.rank(), result->rank());
- EXPECT_EQ(m_model_data.getAllSizes(), result->getAllSizes());
for (size_t i = 0, size = m_model_data.getAllocatedSize(); i < size; ++i)
EXPECT_EQ(m_model_data[i], (*result)[i]);
}
@@ -67,7 +65,6 @@ TEST_F(IOReaderWriterTest, TestRWTiff)
ReadWriteTiff read_tiff;
auto result = std::unique_ptr<Powerfield<double>>(read_tiff.readPowerfield(ss));
EXPECT_EQ(m_model_data.rank(), result->rank());
- EXPECT_EQ(m_model_data.getAllSizes(), result->getAllSizes());
for (size_t i = 0, size = m_model_data.getAllocatedSize(); i < size; ++i)
EXPECT_EQ(m_model_data[i], (*result)[i]);
}
diff --git a/auto/Wrap/doxygenDevice.i b/auto/Wrap/doxygenDevice.i
index 02d761d73d0..68ef5cfe7cf 100644
--- a/auto/Wrap/doxygenDevice.i
+++ b/auto/Wrap/doxygenDevice.i
@@ -2081,11 +2081,6 @@ C++ includes: Powerfield.h
Returns total size of data buffer (product of bin number in every dimension).
";
-%feature("docstring") Powerfield::getAllSizes "std::vector< size_t > Powerfield< T >::getAllSizes() const
-
-Returns all sizes of its axes.
-";
-
%feature("docstring") Powerfield::getRawDataVector "std::vector< T > Powerfield< T >::getRawDataVector() const
Returns copy of raw data vector.
diff --git a/auto/Wrap/libBornAgainDevice.py b/auto/Wrap/libBornAgainDevice.py
index 4b6dfd76ee5..bfabc46b53c 100644
--- a/auto/Wrap/libBornAgainDevice.py
+++ b/auto/Wrap/libBornAgainDevice.py
@@ -2300,16 +2300,6 @@ class IntensityData(IField):
"""
return _libBornAgainDevice.IntensityData_getAllocatedSize(self)
- def getAllSizes(self):
- r"""
- getAllSizes(IntensityData self) -> std::vector< size_t,std::allocator< size_t > >
- std::vector< size_t > Powerfield< T >::getAllSizes() const
-
- Returns all sizes of its axes.
-
- """
- return _libBornAgainDevice.IntensityData_getAllSizes(self)
-
def getRawDataVector(self):
r"""
getRawDataVector(IntensityData self) -> vdouble1d_t
diff --git a/auto/Wrap/libBornAgainDevice_wrap.cpp b/auto/Wrap/libBornAgainDevice_wrap.cpp
index 253875ceecd..0658ca9b600 100644
--- a/auto/Wrap/libBornAgainDevice_wrap.cpp
+++ b/auto/Wrap/libBornAgainDevice_wrap.cpp
@@ -28115,29 +28115,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_IntensityData_getAllSizes(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- Powerfield< double > *arg1 = (Powerfield< double > *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
- SwigValueWrapper< std::vector< size_t,std::allocator< size_t > > > result;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_PowerfieldT_double_t, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IntensityData_getAllSizes" "', argument " "1"" of type '" "Powerfield< double > const *""'");
- }
- arg1 = reinterpret_cast< Powerfield< double > * >(argp1);
- result = ((Powerfield< double > const *)arg1)->getAllSizes();
- resultobj = SWIG_NewPointerObj((new std::vector< size_t,std::allocator< size_t > >(static_cast< const std::vector< size_t,std::allocator< size_t > >& >(result))), SWIGTYPE_p_std__vectorT_size_t_std__allocatorT_size_t_t_t, SWIG_POINTER_OWN | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *_wrap_IntensityData_getRawDataVector(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
Powerfield< double > *arg1 = (Powerfield< double > *) 0 ;
@@ -43089,13 +43066,6 @@ static PyMethodDef SwigMethods[] = {
"Returns total size of data buffer (product of bin number in every dimension). \n"
"\n"
""},
- { "IntensityData_getAllSizes", _wrap_IntensityData_getAllSizes, METH_O, "\n"
- "IntensityData_getAllSizes(IntensityData self) -> std::vector< size_t,std::allocator< size_t > >\n"
- "std::vector< size_t > Powerfield< T >::getAllSizes() const\n"
- "\n"
- "Returns all sizes of its axes. \n"
- "\n"
- ""},
{ "IntensityData_getRawDataVector", _wrap_IntensityData_getRawDataVector, METH_O, "\n"
"IntensityData_getRawDataVector(IntensityData self) -> vdouble1d_t\n"
"std::vector< T > Powerfield< T >::getRawDataVector() const\n"
--
GitLab