From fa6f66b30cbc9e7c4229f682e5ee766ca5134c6f Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 18 May 2022 11:04:10 +0200
Subject: [PATCH] rm setter only used in unit tests
---
Tests/PyUnit/intensitydata.py | 3 -
Tests/PyUnit/intensitydata_io.py | 128 --------------------------
Tests/PyUnit/intensitydata_io_tiff.py | 57 ------------
Wrap/Swig/libBornAgainDevice.i | 5 -
auto/Wrap/libBornAgainDevice.py | 4 -
auto/Wrap/libBornAgainDevice_wrap.cpp | 43 ---------
6 files changed, 240 deletions(-)
delete mode 100644 Tests/PyUnit/intensitydata_io_tiff.py
diff --git a/Tests/PyUnit/intensitydata.py b/Tests/PyUnit/intensitydata.py
index 1678296fafb..5fe2935e96d 100644
--- a/Tests/PyUnit/intensitydata.py
+++ b/Tests/PyUnit/intensitydata.py
@@ -50,9 +50,6 @@ class IntensityDataTest(unittest.TestCase):
self.assertEqual(0, data.totalSum())
data.setAllTo(1)
self.assertEqual(200, data.totalSum())
- for i in range(0, data.getAllocatedSize()):
- data[i] = data[i]* -1.0
- self.assertEqual(-200, data.totalSum())
def test_numpy_array(self):
data = ba.IntensityData()
diff --git a/Tests/PyUnit/intensitydata_io.py b/Tests/PyUnit/intensitydata_io.py
index f4aa80a051c..8a088805474 100644
--- a/Tests/PyUnit/intensitydata_io.py
+++ b/Tests/PyUnit/intensitydata_io.py
@@ -5,14 +5,6 @@ import bornagain as ba
from bornagain import deg
-def fill_data(data):
- """
- Fills intensity data with some numbers
- """
- for i in range(0, data.getAllocatedSize()):
- data[i] = i
-
-
def is_the_same_data(data1, data2):
"""
Checks if two data are identical
@@ -48,115 +40,6 @@ class IOTest(unittest.TestCase):
Test serialization of IntensityData
"""
- def test_01_FixedBinAxis_1D(self):
- data = ba.IntensityData()
- data.addAxis(ba.FixedBinAxis("axis0", 10, -1.00000001, 1))
- fill_data(data)
- ba.IOFactory.writePowerfield(data, "tmp.int")
- newdata = ba.IOFactory.readPowerfield("tmp.int")
- self.assertTrue(is_the_same_data(data, newdata))
-
- def test_02_FixedBinAxis_2D(self):
- data = ba.IntensityData()
- data.addAxis(ba.FixedBinAxis("axis0", 9, -1.00000001, 1))
- data.addAxis(ba.FixedBinAxis("axis1", 3, -4, 5))
- fill_data(data)
- ba.IOFactory.writePowerfield(data, "tmp.int")
- newdata = ba.IOFactory.readPowerfield("tmp.int")
- self.assertTrue(is_the_same_data(data, newdata))
-
- def test_03_FixedBinAxis_3D(self):
- data = ba.IntensityData()
- data.addAxis(ba.FixedBinAxis("axis0", 9, -1.00000001, 1))
- data.addAxis(ba.FixedBinAxis("axis1", 1, -4, 5))
- data.addAxis(ba.FixedBinAxis("axis2", 3, 0, 1))
- fill_data(data)
- ba.IOFactory.writePowerfield(data, "tmp.int")
- newdata = ba.IOFactory.readPowerfield("tmp.int")
- self.assertTrue(is_the_same_data(data, newdata))
-
- def test_04_VariableBinAxis_1D(self):
- data = ba.IntensityData()
- data.addAxis(
- ba.VariableBinAxis(
- "axis0", 10, get_boundaries_flat_in_sin(10, -5*deg,
- 5*deg)))
- fill_data(data)
- ba.IOFactory.writePowerfield(data, "tmp.int")
- newdata = ba.IOFactory.readPowerfield("tmp.int")
- self.assertTrue(is_the_same_data(data, newdata))
-
- def test_05_VariableBinAxis_2D(self):
- data = ba.IntensityData()
- data.addAxis(
- ba.VariableBinAxis(
- "axis0", 10, get_boundaries_flat_in_sin(10, -5*deg,
- 5*deg)))
- data.addAxis(
- ba.VariableBinAxis("axis1", 3,
- get_boundaries_flat_in_sin(3, 0, 2*deg)))
- fill_data(data)
- ba.IOFactory.writePowerfield(data, "tmp.int")
- newdata = ba.IOFactory.readPowerfield("tmp.int")
- self.assertTrue(is_the_same_data(data, newdata))
-
- def test_06_VariableAndFixedMix(self):
- data = ba.IntensityData()
- data.addAxis(ba.FixedBinAxis("axis0", 10, -5, 5))
- data.addAxis(
- ba.VariableBinAxis("axis1", 3,
- get_boundaries_flat_in_sin(3, 0, 2*deg)))
- fill_data(data)
- ba.IOFactory.writePowerfield(data, "tmp.int")
- newdata = ba.IOFactory.readPowerfield("tmp.int")
- self.assertTrue(is_the_same_data(data, newdata))
-
- def test_07_ConstKBinAxis_2D(self):
- data = ba.IntensityData()
- data.addAxis(ba.ConstKBinAxis("axis0", 9, -1.00000001*deg, 1*deg))
- data.addAxis(ba.ConstKBinAxis("axis1", 3, -4*deg, 5*deg))
- fill_data(data)
- ba.IOFactory.writePowerfield(data, "tmp.int")
- newdata = ba.IOFactory.readPowerfield("tmp.int")
- self.assertTrue(is_the_same_data(data, newdata))
-
- def test_08_CustomBinAxis_2D(self):
- data = ba.IntensityData()
- data.addAxis(ba.CustomBinAxis("axis0", 9, -1.00000001*deg, 1*deg))
- data.addAxis(ba.CustomBinAxis("axis1", 3, -4*deg, 5*deg))
- fill_data(data)
- ba.IOFactory.writePowerfield(data, "tmp.int")
- newdata = ba.IOFactory.readPowerfield("tmp.int")
- self.assertTrue(is_the_same_data(data, newdata))
-
- def test_SaveToINT(self):
- data = ba.IntensityData()
- data.addAxis(ba.FixedBinAxis("axis0", 10, 0, 10))
- data.addAxis(ba.FixedBinAxis("axis1", 5, 0, 5))
- fill_data(data)
-
- ba.IOFactory.writePowerfield(data, "tmp.int")
- newdata = ba.IOFactory.readPowerfield("tmp.int")
- self.assertTrue(is_the_same_data(data, newdata))
-
- ba.IOFactory.writePowerfield(data, "tmp.int.gz")
- newdata = ba.IOFactory.readPowerfield("tmp.int.gz")
- self.assertTrue(is_the_same_data(data, newdata))
-
- ba.IOFactory.writePowerfield(data, "tmp.int.bz2")
- newdata = ba.IOFactory.readPowerfield("tmp.int.bz2")
- self.assertTrue(is_the_same_data(data, newdata))
-
- def test_SaveToTXT(self):
- data = ba.IntensityData()
- data.addAxis(ba.FixedBinAxis("axis0", 10, 0, 10))
- data.addAxis(ba.FixedBinAxis("axis1", 5, 0, 5))
- fill_data(data)
-
- ba.IOFactory.writePowerfield(data, "tmp.txt")
- newdata = ba.IOFactory.readPowerfield("tmp.txt")
- self.assertTrue(is_the_same_data(data, newdata))
-
def test_SaveNumpyArray_ReadPowerfield(self):
arr = numpy.array([[0, 1, 2, 3.0], [4, 5, 6, 7.0],
[8, 9, 10, 11.0]])
@@ -175,17 +58,6 @@ class IOTest(unittest.TestCase):
[8., 4., 0., 9., 5., 1., 10., 6., 2., 11., 7., 3.])
self.assertTrue(numpy.array_equal(newdata, expected))
- def test_SavePowerfield_ReadNumpyArray(self):
- data = ba.IntensityData()
- data.addAxis(ba.FixedBinAxis("axis0", 10, 0, 10))
- data.addAxis(ba.FixedBinAxis("axis1", 5, 0, 5))
- fill_data(data)
-
- ba.IOFactory.writePowerfield(data, "tmp.txt")
- arr = numpy.loadtxt("tmp.txt")
-
- self.assertTrue(numpy.array_equal(data.getArray(), arr))
-
if __name__ == '__main__':
unittest.main()
diff --git a/Tests/PyUnit/intensitydata_io_tiff.py b/Tests/PyUnit/intensitydata_io_tiff.py
deleted file mode 100644
index cf0adb27b6f..00000000000
--- a/Tests/PyUnit/intensitydata_io_tiff.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# Functional test: tests of IO operations with the IntensityData object
-
-import unittest
-import bornagain as ba
-
-
-def fill_data(data):
- """
- Fills intensity data with some numbers
- """
- for i in range(0, data.getAllocatedSize()):
- data[i] = i
-
-
-def is_the_same_data(data1, data2):
- """
- Checks if two data are identical
- """
- if data1.getAllocatedSize() != data2.getAllocatedSize():
- return False
- if data1.rank() != data2.rank():
- return False
- for i in range(0, data1.rank()):
- if data1.axis(i) != data2.axis(i):
- return False
- for i in range(0, data1.getAllocatedSize()):
- if data1[i] != data2[i]:
- return False
- return True
-
-
-class IOTiffTest(unittest.TestCase):
- """
- Test serialization of ba.IntensityData into TIFF format
- """
-
- def test_SaveToTiff(self):
- data = ba.IntensityData()
- data.addAxis(ba.FixedBinAxis("x", 10, 0, 10))
- data.addAxis(ba.FixedBinAxis("y", 5, 0, 5))
- fill_data(data)
-
- ba.IOFactory.writePowerfield(data, "tmp.tif")
- newdata = ba.IOFactory.readPowerfield("tmp.tif")
- self.assertTrue(is_the_same_data(data, newdata))
-
- ba.IOFactory.writePowerfield(data, "tmp.tif.gz")
- newdata = ba.IOFactory.readPowerfield("tmp.tif.gz")
- self.assertTrue(is_the_same_data(data, newdata))
-
- ba.IOFactory.writePowerfield(data, "tmp.tif.bz2")
- newdata = ba.IOFactory.readPowerfield("tmp.tif.bz2")
- self.assertTrue(is_the_same_data(data, newdata))
-
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/Wrap/Swig/libBornAgainDevice.i b/Wrap/Swig/libBornAgainDevice.i
index 6df14075c35..bd4c6236291 100644
--- a/Wrap/Swig/libBornAgainDevice.i
+++ b/Wrap/Swig/libBornAgainDevice.i
@@ -103,11 +103,6 @@
%extend Powerfield<double> {
double __getitem__(unsigned int i) { return (*($self))[i]; }
- double __setitem__(unsigned int i, double value)
- {
- (*($self))[i] = value;
- return (*($self))[i];
- }
};
%extend SimulationResult {
diff --git a/auto/Wrap/libBornAgainDevice.py b/auto/Wrap/libBornAgainDevice.py
index fb95bee15a8..b5c7bbdbf44 100644
--- a/auto/Wrap/libBornAgainDevice.py
+++ b/auto/Wrap/libBornAgainDevice.py
@@ -2432,10 +2432,6 @@ class IntensityData(object):
r"""__getitem__(IntensityData self, unsigned int i) -> double"""
return _libBornAgainDevice.IntensityData___getitem__(self, i)
- def __setitem__(self, i, value):
- r"""__setitem__(IntensityData self, unsigned int i, double value) -> double"""
- return _libBornAgainDevice.IntensityData___setitem__(self, i, value)
-
# Register IntensityData in _libBornAgainDevice:
_libBornAgainDevice.IntensityData_swigregister(IntensityData)
diff --git a/auto/Wrap/libBornAgainDevice_wrap.cpp b/auto/Wrap/libBornAgainDevice_wrap.cpp
index d182b7971d5..ef6dc3ad07f 100644
--- a/auto/Wrap/libBornAgainDevice_wrap.cpp
+++ b/auto/Wrap/libBornAgainDevice_wrap.cpp
@@ -6845,10 +6845,6 @@ SWIG_AsVal_unsigned_SS_int (PyObject * obj, unsigned int *val)
}
SWIGINTERN double Powerfield_Sl_double_Sg____getitem__(Powerfield< double > *self,unsigned int i){ return (*(self))[i]; }
-SWIGINTERN double Powerfield_Sl_double_Sg____setitem__(Powerfield< double > *self,unsigned int i,double value){
- (*(self))[i] = value;
- return (*(self))[i];
- }
SWIGINTERN int
SWIG_AsVal_bool (PyObject *obj, bool *val)
@@ -28502,44 +28498,6 @@ fail:
}
-SWIGINTERN PyObject *_wrap_IntensityData___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- Powerfield< double > *arg1 = (Powerfield< double > *) 0 ;
- unsigned int arg2 ;
- double arg3 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- unsigned int val2 ;
- int ecode2 = 0 ;
- double val3 ;
- int ecode3 = 0 ;
- PyObject *swig_obj[3] ;
- double result;
-
- if (!SWIG_Python_UnpackTuple(args, "IntensityData___setitem__", 3, 3, swig_obj)) SWIG_fail;
- 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___setitem__" "', argument " "1"" of type '" "Powerfield< double > *""'");
- }
- arg1 = reinterpret_cast< Powerfield< double > * >(argp1);
- ecode2 = SWIG_AsVal_unsigned_SS_int(swig_obj[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "IntensityData___setitem__" "', argument " "2"" of type '" "unsigned int""'");
- }
- arg2 = static_cast< unsigned int >(val2);
- ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
- if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IntensityData___setitem__" "', argument " "3"" of type '" "double""'");
- }
- arg3 = static_cast< double >(val3);
- result = (double)Powerfield_Sl_double_Sg____setitem__(arg1,arg2,arg3);
- resultobj = SWIG_From_double(static_cast< double >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *IntensityData_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
@@ -43022,7 +42980,6 @@ static PyMethodDef SwigMethods[] = {
"\n"
""},
{ "IntensityData___getitem__", _wrap_IntensityData___getitem__, METH_VARARGS, "IntensityData___getitem__(IntensityData self, unsigned int i) -> double"},
- { "IntensityData___setitem__", _wrap_IntensityData___setitem__, METH_VARARGS, "IntensityData___setitem__(IntensityData self, unsigned int i, double value) -> double"},
{ "IntensityData_swigregister", IntensityData_swigregister, METH_O, NULL},
{ "IntensityData_swiginit", IntensityData_swiginit, METH_VARARGS, NULL},
{ "relativeDataDifference", _wrap_relativeDataDifference, METH_VARARGS, "\n"
--
GitLab