Refs #11219. Changing implementation of nParams and nAttributes

These methods now return 0 instead of throwing when no function is decorated.
mantidproject · Mar 4, 2015 · 8826549 · 8826549
1 parent fc19c38
commit 8826549
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Code/Mantid/Framework/API/src/FunctionParameterDecorator.cpp b/Code/Mantid/Framework/API/src/FunctionParameterDecorator.cpp
@@ -79,7 +79,9 @@ double FunctionParameterDecorator::getParameter(const std::string &name) const {
 }
 
 size_t FunctionParameterDecorator::nParams() const {
-  throwIfNoFunctionSet();
+  if(!m_wrappedFunction) {
+      return 0;
+  }
 
   return m_wrappedFunction->nParams();
 }
@@ -147,7 +149,9 @@ size_t FunctionParameterDecorator::getParameterIndex(
 }
 
 size_t FunctionParameterDecorator::nAttributes() const {
-  throwIfNoFunctionSet();
+  if(!m_wrappedFunction) {
+      return 0;
+  }
 
   return m_wrappedFunction->nAttributes();
 }

diff --git a/Code/Mantid/Framework/API/test/FunctionParameterDecoratorTest.h b/Code/Mantid/Framework/API/test/FunctionParameterDecoratorTest.h
@@ -127,7 +127,7 @@ class FunctionParameterDecoratorTest : public CxxTest::TestSuite {
 
   void testNParams() {
     TestableFunctionParameterDecorator invalidFn;
-    TS_ASSERT_THROWS(invalidFn.nParams(), std::runtime_error);
+    TS_ASSERT_EQUALS(invalidFn.nParams(), 0);
 
     FunctionParameterDecorator_sptr fn =
         getFunctionParameterDecoratorGaussian();
@@ -215,7 +215,7 @@ class FunctionParameterDecoratorTest : public CxxTest::TestSuite {
 
   void testAttributes() {
     TestableFunctionParameterDecorator invalidFn;
-    TS_ASSERT_THROWS(invalidFn.nAttributes(), std::runtime_error);
+    TS_ASSERT_EQUALS(invalidFn.nAttributes(), 0);
 
     FunctionParameterDecorator_sptr fn =
         getFunctionParameterDecoratorGaussian();