Skip to content
Snippets Groups Projects
Commit 047cc75e authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

rm fct setLimits

parent d6f80eaf
No related branches found
No related tags found
1 merge request!2205rewrite DoubleSpinBox; use DoubleSpinBox for intensity; simplify RealLimits (#870)
......@@ -57,12 +57,6 @@ void RealLimits::setUpperLimit(double value)
m_has_upper_limit = true;
}
void RealLimits::setLimits(double xmin, double xmax)
{
setLowerLimit(xmin);
setUpperLimit(xmax);
}
bool RealLimits::isInRange(double value) const
{
if (hasLowerLimit() && value < m_lower_limit)
......
......@@ -37,9 +37,6 @@ public:
//! Sets upper limit
void setUpperLimit(double value);
//! Sets lower and upper limits
void setLimits(double xmin, double xmax);
//! Returns true if proposed value is in limits range
bool isInRange(double value) const;
......
......@@ -12,27 +12,6 @@ TEST(RealLimitsTest, LimitsInitial)
EXPECT_FALSE(limits.isLimited());
}
TEST(RealLimitsTest, LimitsSetLimit)
{
RealLimits limits;
// set limit [-1.0, 10.0[
limits.setLimits(-1.0, 10.0);
EXPECT_TRUE(limits.hasLowerLimit());
EXPECT_TRUE(limits.hasUpperLimit());
EXPECT_TRUE(limits.isLimited());
EXPECT_EQ(-1.0, limits.min());
EXPECT_EQ(10.0, limits.max());
EXPECT_FALSE(limits.isInRange(-2.0));
EXPECT_TRUE(limits.isInRange(-1.0));
EXPECT_TRUE(limits.isInRange(0.0));
EXPECT_TRUE(limits.isInRange(9.0));
EXPECT_FALSE(limits.isInRange(10.0));
EXPECT_FALSE(limits.isInRange(20.0));
}
TEST(RealLimitsTest, LimitsLowerLimited)
{
RealLimits limits = RealLimits::lowerLimited(5.0);
......
......@@ -1690,10 +1690,6 @@ class RealLimits(object):
r"""setUpperLimit(RealLimits self, double value)"""
return _libBornAgainFit.RealLimits_setUpperLimit(self, value)
def setLimits(self, xmin, xmax):
r"""setLimits(RealLimits self, double xmin, double xmax)"""
return _libBornAgainFit.RealLimits_setLimits(self, xmin, xmax)
def isInRange(self, value):
r"""isInRange(RealLimits self, double value) -> bool"""
return _libBornAgainFit.RealLimits_isInRange(self, value)
......
......@@ -24334,53 +24334,6 @@ fail:
}
 
 
SWIGINTERN PyObject *_wrap_RealLimits_setLimits(PyObject *self, PyObject *args) {
PyObject *resultobj = 0;
RealLimits *arg1 = (RealLimits *) 0 ;
double arg2 ;
double arg3 ;
void *argp1 = 0 ;
int res1 = 0 ;
double val2 ;
int ecode2 = 0 ;
double val3 ;
int ecode3 = 0 ;
PyObject *swig_obj[3] ;
if (!SWIG_Python_UnpackTuple(args, "RealLimits_setLimits", 3, 3, swig_obj)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RealLimits, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealLimits_setLimits" "', argument " "1"" of type '" "RealLimits *""'");
}
arg1 = reinterpret_cast< RealLimits * >(argp1);
ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RealLimits_setLimits" "', argument " "2"" of type '" "double""'");
}
arg2 = static_cast< double >(val2);
ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
if (!SWIG_IsOK(ecode3)) {
SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "RealLimits_setLimits" "', argument " "3"" of type '" "double""'");
}
arg3 = static_cast< double >(val3);
{
try {
(arg1)->setLimits(arg2,arg3);
} catch (const std::exception& ex) {
// message shown in the Python interpreter
const std::string msg {
"BornAgain C++ Exception: " + std::string(ex.what())
};
SWIG_exception(SWIG_RuntimeError, msg.c_str());
}
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_RealLimits_isInRange(PyObject *self, PyObject *args) {
PyObject *resultobj = 0;
RealLimits *arg1 = (RealLimits *) 0 ;
......@@ -29790,7 +29743,6 @@ static PyMethodDef SwigMethods[] = {
{ "RealLimits_setLowerLimit", _wrap_RealLimits_setLowerLimit, METH_VARARGS, "RealLimits_setLowerLimit(RealLimits self, double value)"},
{ "RealLimits_max", _wrap_RealLimits_max, METH_O, "RealLimits_max(RealLimits self) -> double"},
{ "RealLimits_setUpperLimit", _wrap_RealLimits_setUpperLimit, METH_VARARGS, "RealLimits_setUpperLimit(RealLimits self, double value)"},
{ "RealLimits_setLimits", _wrap_RealLimits_setLimits, METH_VARARGS, "RealLimits_setLimits(RealLimits self, double xmin, double xmax)"},
{ "RealLimits_isInRange", _wrap_RealLimits_isInRange, METH_VARARGS, "RealLimits_isInRange(RealLimits self, double value) -> bool"},
{ "RealLimits_lowerLimited", _wrap_RealLimits_lowerLimited, METH_O, "RealLimits_lowerLimited(double bound_value) -> RealLimits"},
{ "RealLimits_positive", _wrap_RealLimits_positive, METH_NOARGS, "RealLimits_positive() -> RealLimits"},
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment