summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdoardo Pasca <edo.paskino@gmail.com>2019-10-29 23:13:37 +0000
committerGitHub <noreply@github.com>2019-10-29 23:13:37 +0000
commita4d3aa5d160f695acedef2d4fa39013ddd8d9bef (patch)
tree6a822f15f34172ea47df1e189778bb00b07c24fd
parent7296dfbd1cba5c055b276ba099d32827c7024dd4 (diff)
downloadframework-a4d3aa5d160f695acedef2d4fa39013ddd8d9bef.tar.gz
framework-a4d3aa5d160f695acedef2d4fa39013ddd8d9bef.tar.bz2
framework-a4d3aa5d160f695acedef2d4fa39013ddd8d9bef.tar.xz
framework-a4d3aa5d160f695acedef2d4fa39013ddd8d9bef.zip
Indicator box to use as_array, for SIRF (#418)
-rwxr-xr-xWrappers/Python/ccpi/optimisation/functions/IndicatorBox.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Wrappers/Python/ccpi/optimisation/functions/IndicatorBox.py b/Wrappers/Python/ccpi/optimisation/functions/IndicatorBox.py
index fd34d96..ac8978a 100755
--- a/Wrappers/Python/ccpi/optimisation/functions/IndicatorBox.py
+++ b/Wrappers/Python/ccpi/optimisation/functions/IndicatorBox.py
@@ -49,8 +49,8 @@ class IndicatorBox(Function):
'''Evaluates IndicatorBox at x'''
- if (numpy.all(x.array>=self.lower) and
- numpy.all(x.array <= self.upper) ):
+ if (numpy.all(x.as_array() >= self.lower) and
+ numpy.all(x.as_array() <= self.upper) ):
val = 0
else:
val = numpy.inf