From f74842a561f8e01d68a0cae85ead47d6830895e9 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Wed, 31 Jan 2018 09:54:25 +0100
Subject: [PATCH] IntensityDataFunctions::createClippedDataset switched to
smart pointers
---
Core/Instrument/IntensityDataFunctions.cpp | 4 +-
Core/Instrument/IntensityDataFunctions.h | 7 +-
.../IntensityDataFunctionsTest.h | 55 +++-----
auto/Wrap/libBornAgainCore.py | 19 ++-
auto/Wrap/libBornAgainCore_wrap.cpp | 127 ++++++++----------
auto/Wrap/libBornAgainFit_wrap.cpp | 2 +-
6 files changed, 94 insertions(+), 120 deletions(-)
diff --git a/Core/Instrument/IntensityDataFunctions.cpp b/Core/Instrument/IntensityDataFunctions.cpp
index 89c1880a9b3..c26fede419a 100644
--- a/Core/Instrument/IntensityDataFunctions.cpp
+++ b/Core/Instrument/IntensityDataFunctions.cpp
@@ -106,7 +106,7 @@ IntensityDataFunctions::createRearrangedDataSet(const OutputData<double>& data,
return output;
}
-OutputData<double>* IntensityDataFunctions::createClippedDataSet(
+std::unique_ptr<OutputData<double>> IntensityDataFunctions::createClippedDataSet(
const OutputData<double>& origin, double x1, double y1, double x2, double y2)
{
if (origin.getRank() != 2)
@@ -114,7 +114,7 @@ OutputData<double>* IntensityDataFunctions::createClippedDataSet(
"IntensityDataFunctions::createClippedData()"
" -> Error! Works only on two-dimensional data");
- OutputData<double>* result = new OutputData<double>;
+ std::unique_ptr<OutputData<double> > result(new OutputData<double>);
for(size_t i_axis=0; i_axis<origin.getRank(); i_axis++) {
const IAxis& axis = origin.getAxis(i_axis);
IAxis* new_axis;
diff --git a/Core/Instrument/IntensityDataFunctions.h b/Core/Instrument/IntensityDataFunctions.h
index a1d9093681f..0967ea14c34 100644
--- a/Core/Instrument/IntensityDataFunctions.h
+++ b/Core/Instrument/IntensityDataFunctions.h
@@ -42,12 +42,13 @@ BA_CORE_API_ OutputData<double>* createRelativeDifferenceData(
//! Applicable to 2D arrays only
BA_CORE_API_ std::unique_ptr<OutputData<double>>
createRearrangedDataSet(const OutputData<double>& data, int n);
-#endif //SWIG
//! Returns new IntensityData objects which axes clipped to represent the specified rectangle.
-BA_CORE_API_ OutputData<double>* createClippedDataSet(
+BA_CORE_API_ std::unique_ptr<OutputData<double>> createClippedDataSet(
const OutputData<double>& origin, double x1, double y1, double x2, double y2);
+#endif // SWIG
+
//! Applies detector resolution function and returns new IntensityData object.
BA_CORE_API_ OutputData<double>* applyDetectorResolution(
const OutputData<double>& origin, const IResolutionFunction2D& resolution_function);
@@ -81,7 +82,7 @@ BA_CORE_API_ std::unique_ptr<OutputData<double>> createOutputDatafrom2DArray(
//! Creates Fourier Transform (OutputData format) of intensity map (OutputData format).
BA_CORE_API_ std::unique_ptr<OutputData<double>> createFFT(const OutputData<double> &data);
-#endif //SWIG
+#endif // SWIG
}; // namespace IntensityDataFunctions
diff --git a/Tests/UnitTests/Core/DataStructure/IntensityDataFunctionsTest.h b/Tests/UnitTests/Core/DataStructure/IntensityDataFunctionsTest.h
index 0b94211816d..0a605800ab4 100644
--- a/Tests/UnitTests/Core/DataStructure/IntensityDataFunctionsTest.h
+++ b/Tests/UnitTests/Core/DataStructure/IntensityDataFunctionsTest.h
@@ -1,7 +1,6 @@
-#include "google_test.h"
#include "IntensityDataFunctions.h"
#include "VariableBinAxis.h"
-
+#include "google_test.h"
class IntensityDataFunctionsTest : public ::testing::Test
{
@@ -19,19 +18,15 @@ TEST_F(IntensityDataFunctionsTest, ClipDataSetFixed)
FixedBinAxis axis1("axis1", 3, 0.0, 3.0);
data.addAxis(axis1);
- for (size_t i = 0; i < data.getAllocatedSize(); ++i) {
+ for (size_t i = 0; i < data.getAllocatedSize(); ++i)
data[i] = static_cast<double>(i);
- }
- OutputData<double>* clip
- = IntensityDataFunctions::createClippedDataSet(data, -5.0, 0.0, -1.5, 1.5);
+ auto clip = IntensityDataFunctions::createClippedDataSet(data, -5.0, 0.0, -1.5, 1.5);
std::vector<double> vref = {0.0, 1.0, 3.0, 4.0, 6.0, 7.0, 9.0, 10.0};
EXPECT_EQ(clip->getAllocatedSize(), size_t(8));
- int index(0);
- for (size_t i = 0; i < clip->getAllocatedSize(); ++i) {
+ size_t index(0);
+ for (size_t i = 0; i < clip->getAllocatedSize(); ++i)
EXPECT_EQ(vref[index++], (*clip)[i]);
- }
- delete clip;
}
TEST_F(IntensityDataFunctionsTest, ClipDataSetVariable)
@@ -45,19 +40,15 @@ TEST_F(IntensityDataFunctionsTest, ClipDataSetVariable)
VariableBinAxis axis1("axis1", 4, values);
data.addAxis(axis1);
- for (size_t i = 0; i < data.getAllocatedSize(); ++i) {
+ for (size_t i = 0; i < data.getAllocatedSize(); ++i)
data[i] = static_cast<double>(i);
- }
- OutputData<double>* clip
- = IntensityDataFunctions::createClippedDataSet(data, -0.5, 0.5, 0.99, 2.0);
+ auto clip = IntensityDataFunctions::createClippedDataSet(data, -0.5, 0.5, 0.99, 2.0);
std::vector<double> vref = {6.0, 7.0, 10.0, 11.0};
EXPECT_EQ(clip->getAllocatedSize(), size_t(4));
size_t index(0);
- for (size_t i = 0; i < clip->getAllocatedSize(); ++i) {
+ for (size_t i = 0; i < clip->getAllocatedSize(); ++i)
EXPECT_EQ(vref[index++], (*clip)[i]);
- }
- delete clip;
}
TEST_F(IntensityDataFunctionsTest, createRearrangedDataSet)
@@ -173,33 +164,31 @@ TEST_F(IntensityDataFunctionsTest, create2DArrayfromOutputDataTest)
EXPECT_EQ(2u, out_data.getAxis(0).size()); // no. of rows
EXPECT_EQ(3u, out_data.getAxis(1).size()); // no. of cols
- std::vector<double> arr_in{1,2,3,4,5,6};
+ std::vector<double> arr_in{1, 2, 3, 4, 5, 6};
out_data.setRawDataVector(arr_in);
- EXPECT_EQ(arr_in[0],out_data[0]);
- EXPECT_EQ(arr_in[1],out_data[1]);
- EXPECT_EQ(arr_in[2],out_data[2]);
- EXPECT_EQ(arr_in[3],out_data[3]);
- EXPECT_EQ(arr_in[4],out_data[4]);
- EXPECT_EQ(arr_in[5],out_data[5]);
+ EXPECT_EQ(arr_in[0], out_data[0]);
+ EXPECT_EQ(arr_in[1], out_data[1]);
+ EXPECT_EQ(arr_in[2], out_data[2]);
+ EXPECT_EQ(arr_in[3], out_data[3]);
+ EXPECT_EQ(arr_in[4], out_data[4]);
+ EXPECT_EQ(arr_in[5], out_data[5]);
- std::vector<double> arr_out = out_data.getRawDataVector();
+ auto arr_out = out_data.getRawDataVector();
EXPECT_EQ(arr_in, arr_out);
- std::vector<std::vector<double>> array_2d;
- array_2d = IntensityDataFunctions::create2DArrayfromOutputData(out_data);
-
- std::vector<std::vector<double>> array_expected_2d{{arr_in[0],arr_in[1], arr_in[2]},
- {arr_in[3],arr_in[4], arr_in[5]}};
+ auto array_2d = IntensityDataFunctions::create2DArrayfromOutputData(out_data);
+ std::vector<std::vector<double>> array_expected_2d{{arr_in[0], arr_in[1], arr_in[2]},
+ {arr_in[3], arr_in[4], arr_in[5]}};
EXPECT_EQ(array_expected_2d, array_2d);
}
TEST_F(IntensityDataFunctionsTest, createOutputDatafrom2DArrayTest)
{
- std::vector<double> arr_in{1,2,3,4,5,6};
- std::vector<std::vector<double>> array_2d{{arr_in[0],arr_in[1],arr_in[2]},
- {arr_in[3],arr_in[4],arr_in[5]}};
+ std::vector<double> arr_in{1, 2, 3, 4, 5, 6};
+ std::vector<std::vector<double>> array_2d{{arr_in[0], arr_in[1], arr_in[2]},
+ {arr_in[3], arr_in[4], arr_in[5]}};
auto data = IntensityDataFunctions::createOutputDatafrom2DArray(array_2d);
EXPECT_EQ(arr_in, data->getRawDataVector());
}
diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py
index 642a7e13d8e..e2f07e2d8c1 100644
--- a/auto/Wrap/libBornAgainCore.py
+++ b/auto/Wrap/libBornAgainCore.py
@@ -20277,17 +20277,6 @@ def createRelativeDifferenceData(data, reference):
"""
return _libBornAgainCore.createRelativeDifferenceData(data, reference)
-def createClippedDataSet(origin, x1, y1, x2, y2):
- """
- createClippedDataSet(IntensityData origin, double x1, double y1, double x2, double y2) -> IntensityData
-
- OutputData< double > * IntensityDataFunctions::createClippedDataSet(const OutputData< double > &origin, double x1, double y1, double x2, double y2)
-
- Returns new IntensityData objects which axes clipped to represent the specified rectangle.
-
- """
- return _libBornAgainCore.createClippedDataSet(origin, x1, y1, x2, y2)
-
def applyDetectorResolution(origin, resolution_function):
"""
applyDetectorResolution(IntensityData origin, IResolutionFunction2D resolution_function) -> IntensityData
@@ -20322,6 +20311,14 @@ def coordinateFromBinf(*args):
"""
return _libBornAgainCore.coordinateFromBinf(*args)
+
+def create2DArrayfromOutputData(data):
+ """create2DArrayfromOutputData(IntensityData data) -> vdouble2d_t"""
+ return _libBornAgainCore.create2DArrayfromOutputData(data)
+
+def FT2DArray(signal):
+ """FT2DArray(vdouble2d_t signal) -> vdouble2d_t"""
+ return _libBornAgainCore.FT2DArray(signal)
class IntensityDataIOFactory(_object):
"""
diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp
index 0ba622b124a..1c986e3b1fc 100644
--- a/auto/Wrap/libBornAgainCore_wrap.cpp
+++ b/auto/Wrap/libBornAgainCore_wrap.cpp
@@ -6004,7 +6004,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_ (PyObject *o, std::complex<double>* val)
SWIGINTERNINLINE PyObject*
-SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/share/swig3.0/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/home/pospelov/software/local/share/swig/3.0.8/typemaps/swigmacros.swg,104,%ifcplusplus@*/
const std::complex<double>&
@@ -88668,67 +88668,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_createClippedDataSet(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- OutputData< double > *arg1 = 0 ;
- double arg2 ;
- double arg3 ;
- double arg4 ;
- double arg5 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- double val2 ;
- int ecode2 = 0 ;
- double val3 ;
- int ecode3 = 0 ;
- double val4 ;
- int ecode4 = 0 ;
- double val5 ;
- int ecode5 = 0 ;
- PyObject * obj0 = 0 ;
- PyObject * obj1 = 0 ;
- PyObject * obj2 = 0 ;
- PyObject * obj3 = 0 ;
- PyObject * obj4 = 0 ;
- OutputData< double > *result = 0 ;
-
- if (!PyArg_ParseTuple(args,(char *)"OOOOO:createClippedDataSet",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
- res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_OutputDataT_double_t, 0 | 0);
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "createClippedDataSet" "', argument " "1"" of type '" "OutputData< double > const &""'");
- }
- if (!argp1) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "createClippedDataSet" "', argument " "1"" of type '" "OutputData< double > const &""'");
- }
- arg1 = reinterpret_cast< OutputData< double > * >(argp1);
- ecode2 = SWIG_AsVal_double(obj1, &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "createClippedDataSet" "', argument " "2"" of type '" "double""'");
- }
- arg2 = static_cast< double >(val2);
- ecode3 = SWIG_AsVal_double(obj2, &val3);
- if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "createClippedDataSet" "', argument " "3"" of type '" "double""'");
- }
- arg3 = static_cast< double >(val3);
- ecode4 = SWIG_AsVal_double(obj3, &val4);
- if (!SWIG_IsOK(ecode4)) {
- SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "createClippedDataSet" "', argument " "4"" of type '" "double""'");
- }
- arg4 = static_cast< double >(val4);
- ecode5 = SWIG_AsVal_double(obj4, &val5);
- if (!SWIG_IsOK(ecode5)) {
- SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "createClippedDataSet" "', argument " "5"" of type '" "double""'");
- }
- arg5 = static_cast< double >(val5);
- result = (OutputData< double > *)IntensityDataFunctions::createClippedDataSet((OutputData< double > const &)*arg1,arg2,arg3,arg4,arg5);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OutputDataT_double_t, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *_wrap_applyDetectorResolution(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
OutputData< double > *arg1 = 0 ;
@@ -89038,6 +88977,60 @@ fail:
}
+SWIGINTERN PyObject *_wrap_create2DArrayfromOutputData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *resultobj = 0;
+ OutputData< double > *arg1 = 0 ;
+ void *argp1 = 0 ;
+ int res1 = 0 ;
+ PyObject * obj0 = 0 ;
+ std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > result;
+
+ if (!PyArg_ParseTuple(args,(char *)"O:create2DArrayfromOutputData",&obj0)) SWIG_fail;
+ res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_OutputDataT_double_t, 0 | 0);
+ if (!SWIG_IsOK(res1)) {
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "create2DArrayfromOutputData" "', argument " "1"" of type '" "OutputData< double > const &""'");
+ }
+ if (!argp1) {
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "create2DArrayfromOutputData" "', argument " "1"" of type '" "OutputData< double > const &""'");
+ }
+ arg1 = reinterpret_cast< OutputData< double > * >(argp1);
+ result = IntensityDataFunctions::create2DArrayfromOutputData((OutputData< double > const &)*arg1);
+ resultobj = swig::from(static_cast< std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > >(result));
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FT2DArray(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *resultobj = 0;
+ std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *arg1 = 0 ;
+ int res1 = SWIG_OLDOBJ ;
+ PyObject * obj0 = 0 ;
+ std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > result;
+
+ if (!PyArg_ParseTuple(args,(char *)"O:FT2DArray",&obj0)) SWIG_fail;
+ {
+ 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;
+ res1 = swig::asptr(obj0, &ptr);
+ if (!SWIG_IsOK(res1)) {
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FT2DArray" "', argument " "1"" 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 '" "FT2DArray" "', argument " "1"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'");
+ }
+ arg1 = ptr;
+ }
+ result = IntensityDataFunctions::FT2DArray((std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)*arg1);
+ resultobj = swig::from(static_cast< std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > >(result));
+ if (SWIG_IsNewObj(res1)) delete arg1;
+ return resultobj;
+fail:
+ if (SWIG_IsNewObj(res1)) delete arg1;
+ return NULL;
+}
+
+
SWIGINTERN PyObject *_wrap_IntensityDataIOFactory_readOutputData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
std::string *arg1 = 0 ;
@@ -123273,14 +123266,6 @@ static PyMethodDef SwigMethods[] = {
"OutputData< double > * IntensityDataFunctions::createRelativeDifferenceData(const OutputData< double > &data, const OutputData< double > &reference)\n"
"\n"
""},
- { (char *)"createClippedDataSet", _wrap_createClippedDataSet, METH_VARARGS, (char *)"\n"
- "createClippedDataSet(IntensityData origin, double x1, double y1, double x2, double y2) -> IntensityData\n"
- "\n"
- "OutputData< double > * IntensityDataFunctions::createClippedDataSet(const OutputData< double > &origin, double x1, double y1, double x2, double y2)\n"
- "\n"
- "Returns new IntensityData objects which axes clipped to represent the specified rectangle. \n"
- "\n"
- ""},
{ (char *)"applyDetectorResolution", _wrap_applyDetectorResolution, METH_VARARGS, (char *)"\n"
"applyDetectorResolution(IntensityData origin, IResolutionFunction2D resolution_function) -> IntensityData\n"
"\n"
@@ -123307,6 +123292,8 @@ static PyMethodDef SwigMethods[] = {
"Transforms x,y coordinate from bin-fraction-coordinates to OutputData's axes coordinates. \n"
"\n"
""},
+ { (char *)"create2DArrayfromOutputData", _wrap_create2DArrayfromOutputData, METH_VARARGS, (char *)"create2DArrayfromOutputData(IntensityData data) -> vdouble2d_t"},
+ { (char *)"FT2DArray", _wrap_FT2DArray, METH_VARARGS, (char *)"FT2DArray(vdouble2d_t signal) -> vdouble2d_t"},
{ (char *)"IntensityDataIOFactory_readOutputData", _wrap_IntensityDataIOFactory_readOutputData, METH_VARARGS, (char *)"IntensityDataIOFactory_readOutputData(std::string const & file_name) -> IntensityData"},
{ (char *)"IntensityDataIOFactory_readIntensityData", _wrap_IntensityDataIOFactory_readIntensityData, METH_VARARGS, (char *)"IntensityDataIOFactory_readIntensityData(std::string const & file_name) -> IHistogram"},
{ (char *)"IntensityDataIOFactory_writeOutputData", _wrap_IntensityDataIOFactory_writeOutputData, METH_VARARGS, (char *)"IntensityDataIOFactory_writeOutputData(IntensityData data, std::string const & file_name)"},
diff --git a/auto/Wrap/libBornAgainFit_wrap.cpp b/auto/Wrap/libBornAgainFit_wrap.cpp
index 9b2e6f6958d..df2c2eb7a1c 100644
--- a/auto/Wrap/libBornAgainFit_wrap.cpp
+++ b/auto/Wrap/libBornAgainFit_wrap.cpp
@@ -5628,7 +5628,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_ (PyObject *o, std::complex<double>* val)
SWIGINTERNINLINE PyObject*
-SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/share/swig3.0/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/home/pospelov/software/local/share/swig/3.0.8/typemaps/swigmacros.swg,104,%ifcplusplus@*/
const std::complex<double>&
--
GitLab