Fixes the check of the indices

mbaudin47 · Jul 29, 2024 · a3e4351 · a3e4351
1 parent dbb17ca
commit a3e4351
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/lib/src/Base/Func/HyperbolicAnisotropicEnumerateFunction.cxx b/lib/src/Base/Func/HyperbolicAnisotropicEnumerateFunction.cxx
@@ -280,7 +280,10 @@ void HyperbolicAnisotropicEnumerateFunction::setUpperBound(const Indices & upper
 EnumerateFunction HyperbolicAnisotropicEnumerateFunction::getMarginal(const Indices & indices) const
 {
   const UnsignedInteger inputDimension = getDimension();
-  indices.check(inputDimension);
+  if (!indices.check(inputDimension))
+  {
+    throw InvalidArgumentException(HERE) << "Indices " << indices << "must not exceed dimension " << inputDimension;
+  }
   const UnsignedInteger activeDimension = indices.getSize();
   Point weightMarginal(activeDimension);
   for (UnsignedInteger i = 0; i < activeDimension; ++i)

diff --git a/lib/src/Base/Func/LinearEnumerateFunction.cxx b/lib/src/Base/Func/LinearEnumerateFunction.cxx
@@ -179,7 +179,10 @@ void LinearEnumerateFunction::setUpperBound(const Indices & /*upperBound*/)
 EnumerateFunction LinearEnumerateFunction::getMarginal(const Indices & indices) const
 {
   const UnsignedInteger inputDimension = getDimension();
-  indices.check(inputDimension);
+  if (!indices.check(inputDimension))
+  {
+    throw InvalidArgumentException(HERE) << "Indices " << indices << "must not exceed dimension " << inputDimension;
+  }
   const UnsignedInteger activeDimension = indices.getSize();
   const LinearEnumerateFunction enumerateFunctionMarginal(activeDimension);
   return enumerateFunctionMarginal;

diff --git a/lib/src/Base/Func/NormInfEnumerateFunction.cxx b/lib/src/Base/Func/NormInfEnumerateFunction.cxx
@@ -148,7 +148,10 @@ UnsignedInteger NormInfEnumerateFunction::getMaximumDegreeStrataIndex(const Unsi
 EnumerateFunction NormInfEnumerateFunction::getMarginal(const Indices & indices) const
 {
   const UnsignedInteger inputDimension = getDimension();
-  indices.check(inputDimension);
+  if (!indices.check(inputDimension))
+  {
+    throw InvalidArgumentException(HERE) << "Indices " << indices << "must not exceed dimension " << inputDimension;
+  }
   const UnsignedInteger activeDimension = indices.getSize();
   const NormInfEnumerateFunction enumerateFunctionMarginal(activeDimension);
   return enumerateFunctionMarginal;