Re #9199. Implement iterationStarting() method on M-D-Function

mantidproject · Apr 2, 2014 · 06c77ee · 06c77ee
1 parent 40e59eb
commit 06c77ee
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/MultiDomainFunction.h b/Code/Mantid/Framework/API/inc/MantidAPI/MultiDomainFunction.h
@@ -54,6 +54,10 @@ class MANTID_API_DLL MultiDomainFunction : public CompositeFunction
   virtual void function(const FunctionDomain& domain, FunctionValues& values)const;
   /// Derivatives of function with respect to active parameters
   virtual void functionDeriv(const FunctionDomain& domain, Jacobian& jacobian);
+  /// Called at the start of each iteration
+  virtual void iterationStarting();
+  /// Called at the end of an iteration
+  virtual void iterationFinished();
 
   /// Associate a function and a domain
   void setDomainIndex(size_t funIndex, size_t domainIndex);

diff --git a/Code/Mantid/Framework/API/src/MultiDomainFunction.cpp b/Code/Mantid/Framework/API/src/MultiDomainFunction.cpp
@@ -177,6 +177,28 @@ namespace API
     }
   }
 
+  /**
+   * Called at the start of each iteration. Call iterationStarting() of the members.
+   */
+  void MultiDomainFunction::iterationStarting()
+  {
+    for(size_t iFun = 0; iFun < nFunctions(); ++iFun)
+    {
+      getFunction(iFun)->iterationStarting();
+    }
+  }
+
+  /**
+   * Called at the end of an iteration. Call iterationFinished() of the members.
+   */
+  void MultiDomainFunction::iterationFinished()
+  {
+    for(size_t iFun = 0; iFun < nFunctions(); ++iFun)
+    {
+      getFunction(iFun)->iterationFinished();
+    }
+  }
+
   /// Return a value of attribute attName
   IFunction::Attribute MultiDomainFunction::getLocalAttribute(size_t i, const std::string& attName)const
   {