From b19efce7b16f3fafece9681e30bef656917015a8 Mon Sep 17 00:00:00 2001
From: Roman Tolchenov <roman.tolchenov@stfc.ac.uk>
Date: Thu, 14 Jul 2011 10:34:03 +0000
Subject: [PATCH] Hoping to fix some warnings. re #3352
---
.../API/inc/MantidAPI/CompositeFunctionMD.h | 2 +-
.../API/inc/MantidAPI/CompositeFunctionMW.h | 4 ++--
.../Framework/API/inc/MantidAPI/IFunctionMD.h | 2 +-
.../Framework/API/inc/MantidAPI/IFunctionMW.h | 4 ++--
.../API/inc/MantidAPI/IPeakFunction.h | 4 ++--
.../API/inc/MantidAPI/ParamFunction.h | 3 ++-
.../Framework/API/src/CompositeFunctionMD.cpp | 2 +-
.../Framework/API/src/CompositeFunctionMW.cpp | 10 +++++-----
Code/Mantid/Framework/API/src/IFunctionMD.cpp | 6 +++---
Code/Mantid/Framework/API/src/IFunctionMW.cpp | 14 +++++++-------
.../Mantid/Framework/API/src/IPeakFunction.cpp | 4 ++--
.../Framework/API/test/CompositeFunctionTest.h | 8 ++++----
Code/Mantid/Framework/API/test/FunctionTest.h | 4 ++--
.../API/test/ParameterReferenceTest.h | 2 +-
.../Framework/API/test/ParameterTieTest.h | 6 +++---
.../Framework/Crystal/src/PeakIntegration.cpp | 2 +-
.../MantidCurveFitting/BackToBackExponential.h | 4 ++--
.../inc/MantidCurveFitting/BivariateNormal.h | 4 ++--
.../inc/MantidCurveFitting/Chebyshev.h | 4 ++--
.../inc/MantidCurveFitting/Convolution.h | 4 ++--
.../inc/MantidCurveFitting/DeltaFunction.h | 4 ++--
.../inc/MantidCurveFitting/ExpDecay.h | 4 ++--
.../inc/MantidCurveFitting/LinearBackground.h | 4 ++--
.../inc/MantidCurveFitting/ProductFunctionMW.h | 4 ++--
.../inc/MantidCurveFitting/Quadratic.h | 4 ++--
.../inc/MantidCurveFitting/Resolution.h | 4 ++--
.../inc/MantidCurveFitting/UserFunction.h | 4 ++--
.../CurveFitting/src/BackToBackExponential.cpp | 4 ++--
.../CurveFitting/src/BivariateNormal.cpp | 4 ++--
.../Framework/CurveFitting/src/Chebyshev.cpp | 4 ++--
.../Framework/CurveFitting/src/Convolution.cpp | 18 +++++++++---------
.../CurveFitting/src/DeltaFunction.cpp | 4 ++--
.../Framework/CurveFitting/src/ExpDecay.cpp | 4 ++--
.../CurveFitting/src/LinearBackground.cpp | 4 ++--
.../CurveFitting/src/ProductFunctionMW.cpp | 8 ++++----
.../Framework/CurveFitting/src/Quadratic.cpp | 4 ++--
.../Framework/CurveFitting/src/Resolution.cpp | 2 +-
.../CurveFitting/src/UserFunction.cpp | 8 ++++----
.../test/BackToBackExponentialTest.h | 2 +-
.../CurveFitting/test/BivariateNormalTest.h | 6 +++---
.../CurveFitting/test/ChebyshevTest.h | 2 +-
.../CurveFitting/test/CompositeFunctionTest.h | 4 ++--
.../CurveFitting/test/ConvolutionTest.h | 10 +++++-----
.../Framework/CurveFitting/test/FitTest.h | 4 ++--
.../CurveFitting/test/FunctionFactoryTest.h | 16 ++++++++--------
.../Framework/CurveFitting/test/GaussianTest.h | 2 +-
.../CurveFitting/test/IkedaCarpenterPVTest.h | 2 +-
.../CurveFitting/test/ProductFunctionMWTest.h | 6 +++---
.../CurveFitting/test/ResolutionTest.h | 2 +-
.../CurveFitting/test/UserFunctionTest.h | 4 ++--
.../inc/MantidMDAlgorithms/QuadEnBackground.h | 2 +-
.../MantidMDAlgorithms/SimulateResolution.h | 2 +-
.../MDAlgorithms/src/QuadEnBackground.cpp | 2 +-
.../MDAlgorithms/src/SimulateResolution.cpp | 2 +-
.../src/IndirectDataAnalysis.cpp | 4 ++--
.../MantidWidgets/src/PropertyHandler.cpp | 2 +-
56 files changed, 130 insertions(+), 129 deletions(-)
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/CompositeFunctionMD.h b/Code/Mantid/Framework/API/inc/MantidAPI/CompositeFunctionMD.h
index 7435fccf2e4..6577448655f 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/CompositeFunctionMD.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/CompositeFunctionMD.h
@@ -68,7 +68,7 @@ public:
protected:
- double function(IMDIterator& r) const;
+ double functionMD(IMDIterator& r) const;
/// to collect different workspaces found in child functions
std::vector< boost::shared_ptr<const IMDWorkspace> > m_workspaces;
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/CompositeFunctionMW.h b/Code/Mantid/Framework/API/inc/MantidAPI/CompositeFunctionMW.h
index 3a2a02ddf49..9f7e20ee15a 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/CompositeFunctionMW.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/CompositeFunctionMW.h
@@ -63,9 +63,9 @@ public:
std::string asString()const;
/// Function you want to fit to.
- void function(double* out, const double* xValues, const size_t nData)const;
+ void functionMW(double* out, const double* xValues, const size_t nData)const;
/// Derivatives of function with respect to active parameters
- void functionDeriv(Jacobian* out, const double* xValues, const size_t nData);
+ void functionDerivMW(Jacobian* out, const double* xValues, const size_t nData);
/// Derivatives to be used in covariance matrix calculation.
void calJacobianForCovariance(Jacobian* out, const double* xValues, const int& nData);
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IFunctionMD.h b/Code/Mantid/Framework/API/inc/MantidAPI/IFunctionMD.h
index b9928a623f5..f2aaa752707 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/IFunctionMD.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/IFunctionMD.h
@@ -143,7 +143,7 @@ protected:
/// Do finction initialization after useAllDimensions() was called
virtual void initDimensions(){}
/// Does the function evaluation. Must be implemented in derived classes.
- virtual double function(IMDIterator& r) const = 0;
+ virtual double functionMD(IMDIterator& r) const = 0;
// fields for implementing IFitFunction interface
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IFunctionMW.h b/Code/Mantid/Framework/API/inc/MantidAPI/IFunctionMW.h
index 6edcc6c1543..0b16ee85c51 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/IFunctionMW.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/IFunctionMW.h
@@ -148,9 +148,9 @@ public:
virtual int getWorkspaceIndex()const{return m_workspaceIndex;}
/// Function you want to fit to.
- virtual void function(double* out, const double* xValues, const size_t nData)const = 0;
+ virtual void functionMW(double* out, const double* xValues, const size_t nData)const = 0;
/// Derivatives of function with respect to active parameters
- virtual void functionDeriv(Jacobian* out, const double* xValues, const size_t nData);
+ virtual void functionDerivMW(Jacobian* out, const double* xValues, const size_t nData);
/// Derivatives to be used in covariance matrix calculation. Override this method some of the fitted parameters
/// are different form the declared ones.
virtual void calJacobianForCovariance(Jacobian* out, const double* xValues, const int& nData);
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IPeakFunction.h b/Code/Mantid/Framework/API/inc/MantidAPI/IPeakFunction.h
index 1afa96b5a4b..9393659b61e 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/IPeakFunction.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/IPeakFunction.h
@@ -48,9 +48,9 @@ public:
virtual void setWidth(const double w) = 0;
/// General implementation of the method for all peaks.
- void function(double* out, const double* xValues, const size_t nData)const;
+ void functionMW(double* out, const double* xValues, const size_t nData)const;
/// General implementation of the method for all peaks.
- void functionDeriv(API::Jacobian* out, const double* xValues, const size_t nData);
+ void functionDerivMW(API::Jacobian* out, const double* xValues, const size_t nData);
/// Set new peak radius
static void setPeakRadius(const int& r);
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ParamFunction.h b/Code/Mantid/Framework/API/inc/MantidAPI/ParamFunction.h
index 89b0c7123cd..04aff618610 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/ParamFunction.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/ParamFunction.h
@@ -28,7 +28,8 @@ namespace API
class Jacobian;
class ParameterTie;
class IConstraint;
-/** An interface to a function.
+/** Implements the part of IFitFunction interface dealing with parameters. This function has parameters of its own
+ as opposed to a CompositeFunction which list of parameters consists only of parameters of the member functions.
@author Roman Tolchenov, Tessella Support Services plc
@date 13/01/2011
diff --git a/Code/Mantid/Framework/API/src/CompositeFunctionMD.cpp b/Code/Mantid/Framework/API/src/CompositeFunctionMD.cpp
index 1d20f1e4658..6338fbe7181 100644
--- a/Code/Mantid/Framework/API/src/CompositeFunctionMD.cpp
+++ b/Code/Mantid/Framework/API/src/CompositeFunctionMD.cpp
@@ -220,7 +220,7 @@ void CompositeFunctionMD::setWorkspace(boost::shared_ptr<const Workspace> ws,con
//std::for_each(&m_data[0],&m_data[0]+m_dataSize,std::cerr << _1 << '\n');
}
-double CompositeFunctionMD::function(IMDIterator& r) const
+double CompositeFunctionMD::functionMD(IMDIterator& r) const
{
UNUSED_ARG(r)
return 0;
diff --git a/Code/Mantid/Framework/API/src/CompositeFunctionMW.cpp b/Code/Mantid/Framework/API/src/CompositeFunctionMW.cpp
index a88f559d434..138ca6bddce 100644
--- a/Code/Mantid/Framework/API/src/CompositeFunctionMW.cpp
+++ b/Code/Mantid/Framework/API/src/CompositeFunctionMW.cpp
@@ -92,7 +92,7 @@ std::string CompositeFunctionMW::asString()const
}
/// Function you want to fit to.
-void CompositeFunctionMW::function(double* out, const double* xValues, const size_t nData)const
+void CompositeFunctionMW::functionMW(double* out, const double* xValues, const size_t nData)const
{
if (nData == 0) return;
boost::shared_array<double> tmpOut(new double[nData]);
@@ -100,24 +100,24 @@ void CompositeFunctionMW::function(double* out, const double* xValues, const siz
{
IFunctionMW* fun = dynamic_cast<IFunctionMW*>(getFunction(i));
if (i == 0)
- fun->function(out,xValues,nData);
+ fun->functionMW(out,xValues,nData);
else
{
- fun->function(tmpOut.get(),xValues,nData);
+ fun->functionMW(tmpOut.get(),xValues,nData);
std::transform(out,out+nData,tmpOut.get(),out,std::plus<double>());
}
}
}
/// Derivatives of function with respect to active parameters
-void CompositeFunctionMW::functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+void CompositeFunctionMW::functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
for(size_t i=0;i<nFunctions();i++)
{
int ii = static_cast<int>(i); // this is horrible
PartialJacobian J(out,paramOffset(ii),activeOffset(ii));
IFunctionMW* fun = dynamic_cast<IFunctionMW*>(getFunction(i));
- fun->functionDeriv(&J,xValues,nData);
+ fun->functionDerivMW(&J,xValues,nData);
}
}
diff --git a/Code/Mantid/Framework/API/src/IFunctionMD.cpp b/Code/Mantid/Framework/API/src/IFunctionMD.cpp
index 2c6812fe60b..1eb528c5e3f 100644
--- a/Code/Mantid/Framework/API/src/IFunctionMD.cpp
+++ b/Code/Mantid/Framework/API/src/IFunctionMD.cpp
@@ -130,7 +130,7 @@ namespace API
do
{
int i = static_cast<int>(r->getPointer());
- out[i] = function(*r);
+ out[i] = functionMD(*r);
}while(r->next());
delete r;
}
@@ -265,7 +265,7 @@ namespace Mantid
* Calculate the function value at a point r in the MD workspace
* @param r :: MD workspace iterator with a reference to the current point
*/
- double function(IMDIterator& r) const
+ double functionMD(IMDIterator& r) const
{
double arg = 0.0;
int n = static_cast<int>(m_dimensions.size());
@@ -351,7 +351,7 @@ namespace Mantid
* Calculate the function value at a point r in the MD workspace
* @param r :: MD workspace iterator with a reference to the current point
*/
- double function(IMDIterator& r) const
+ double functionMD(IMDIterator& r) const
{
int n = static_cast<int>(m_dimensions.size());
for(int i = 0; i < n; ++i)
diff --git a/Code/Mantid/Framework/API/src/IFunctionMW.cpp b/Code/Mantid/Framework/API/src/IFunctionMW.cpp
index c87f0cb9755..a91c34abbd7 100644
--- a/Code/Mantid/Framework/API/src/IFunctionMW.cpp
+++ b/Code/Mantid/Framework/API/src/IFunctionMW.cpp
@@ -209,7 +209,7 @@ namespace API
void IFunctionMW::function(double* out)const
{
if (m_dataSize == 0) return;
- function(out,m_xValues.get(),m_dataSize);
+ functionMW(out,m_xValues.get(),m_dataSize);
}
@@ -218,11 +218,11 @@ namespace API
{
if (out == NULL)
{
- functionDeriv(out,m_xValues.get(),0);
+ functionDerivMW(out,m_xValues.get(),0);
return;
}
if (m_dataSize == 0) return;
- functionDeriv(out,m_xValues.get(),m_dataSize);
+ functionDerivMW(out,m_xValues.get(),m_dataSize);
}
@@ -235,7 +235,7 @@ namespace API
* @param xValues :: X values for data points
* @param nData :: Number of data points
*/
-void IFunctionMW::functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+void IFunctionMW::functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
UNUSED_ARG(out); UNUSED_ARG(xValues); UNUSED_ARG(nData);
throw Kernel::Exception::NotImplementedError("No derivative IFunctionMW provided");
@@ -523,7 +523,7 @@ void IFunctionMW::convertValue(std::vector<double>& values, Kernel::Unit_sptr& o
*/
void IFunctionMW::calJacobianForCovariance(Jacobian* out, const double* xValues, const int& nData)
{
- this->functionDeriv(out,xValues,nData);
+ this->functionDerivMW(out,xValues,nData);
}
/// Called after setMatrixWorkspace if setWorkspace hadn't been called before
@@ -649,7 +649,7 @@ void IFunctionMW::calNumericalDeriv(Jacobian* out, const double* xValues, const
m_tmpFunctionOutputPlusStep.reset(new double[nData]);
}
- function(m_tmpFunctionOutputMinusStep.get(), xValues, nData);
+ functionMW(m_tmpFunctionOutputMinusStep.get(), xValues, nData);
for (int iP = 0; iP < static_cast<int>(nParam); iP++)
{
@@ -671,7 +671,7 @@ void IFunctionMW::calNumericalDeriv(Jacobian* out, const double* xValues, const
double paramPstep = val + step;
setParameter(iP, paramPstep);
- function(m_tmpFunctionOutputPlusStep.get(), xValues, nData);
+ functionMW(m_tmpFunctionOutputPlusStep.get(), xValues, nData);
step = paramPstep - val;
setParameter(iP, val);
diff --git a/Code/Mantid/Framework/API/src/IPeakFunction.cpp b/Code/Mantid/Framework/API/src/IPeakFunction.cpp
index b18cf3e4752..41db8f099cc 100644
--- a/Code/Mantid/Framework/API/src/IPeakFunction.cpp
+++ b/Code/Mantid/Framework/API/src/IPeakFunction.cpp
@@ -70,7 +70,7 @@ IPeakFunction::IPeakFunction()
* @param xValues :: X values for data points
* @param nData :: Number of data points
*/
-void IPeakFunction::function(double* out, const double* xValues, const size_t nData)const
+void IPeakFunction::functionMW(double* out, const double* xValues, const size_t nData)const
{
double c = this->centre();
double dx = fabs(s_peakRadius*this->width());
@@ -102,7 +102,7 @@ void IPeakFunction::function(double* out, const double* xValues, const size_t nD
* @param xValues :: X values for data points
* @param nData :: Number of data points
*/
-void IPeakFunction::functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+void IPeakFunction::functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
double c = this->centre();
double dx = fabs(s_peakRadius*this->width());
diff --git a/Code/Mantid/Framework/API/test/CompositeFunctionTest.h b/Code/Mantid/Framework/API/test/CompositeFunctionTest.h
index c3565b0574b..a005a492076 100644
--- a/Code/Mantid/Framework/API/test/CompositeFunctionTest.h
+++ b/Code/Mantid/Framework/API/test/CompositeFunctionTest.h
@@ -106,7 +106,7 @@ public:
std::string name()const{return "Linear";}
- void function(double* out, const double* xValues, const size_t nData)const
+ void functionMW(double* out, const double* xValues, const size_t nData)const
{
double a = getParameter("a");
double b = getParameter("b");
@@ -115,7 +115,7 @@ public:
out[i] = a + b * xValues[i];
}
}
- void functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+ void functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
//throw Mantid::Kernel::Exception::NotImplementedError("");
for(size_t i=0;i<nData;i++)
@@ -140,7 +140,7 @@ public:
std::string name()const{return "Cubic";}
- void function(double* out, const double* xValues, const size_t nData)const
+ void functionMW(double* out, const double* xValues, const size_t nData)const
{
double c0 = getParameter("c0");
double c1 = getParameter("c1");
@@ -152,7 +152,7 @@ public:
out[i] = c0 + x*(c1 + x*(c2 + x*c3));
}
}
- void functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+ void functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
for(size_t i=0;i<nData;i++)
{
diff --git a/Code/Mantid/Framework/API/test/FunctionTest.h b/Code/Mantid/Framework/API/test/FunctionTest.h
index cf749c38f26..6aebc1aff89 100644
--- a/Code/Mantid/Framework/API/test/FunctionTest.h
+++ b/Code/Mantid/Framework/API/test/FunctionTest.h
@@ -26,7 +26,7 @@ public:
std::string name()const{return "IFT_Funct";}
- void function(double* out, const double* xValues, const size_t nData)const
+ void functionMW(double* out, const double* xValues, const size_t nData)const
{
double c0 = getParameter("c0");
double c1 = getParameter("c1");
@@ -38,7 +38,7 @@ public:
out[i] = c0 + x*(c1 + x*(c2 + x*c3));
}
}
- void functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+ void functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
for(size_t i=0;i<nData;i++)
{
diff --git a/Code/Mantid/Framework/API/test/ParameterReferenceTest.h b/Code/Mantid/Framework/API/test/ParameterReferenceTest.h
index 6d09f50d0b3..9ad9c6caa3b 100644
--- a/Code/Mantid/Framework/API/test/ParameterReferenceTest.h
+++ b/Code/Mantid/Framework/API/test/ParameterReferenceTest.h
@@ -21,7 +21,7 @@ public:
declareParameter("c");
}
std::string name()const{return "ParameterReferenceTest_Fun";}
- void function(double*, const double*, const size_t)const
+ void functionMW(double*, const double*, const size_t)const
{
}
};
diff --git a/Code/Mantid/Framework/API/test/ParameterTieTest.h b/Code/Mantid/Framework/API/test/ParameterTieTest.h
index 953daa25145..1a2c9f047c7 100644
--- a/Code/Mantid/Framework/API/test/ParameterTieTest.h
+++ b/Code/Mantid/Framework/API/test/ParameterTieTest.h
@@ -88,7 +88,7 @@ public:
declareParameter("b");
}
std::string name()const{return "ParameterTieTest_Linear";}
- void function(double* out, const double* xValues, const size_t nData)const
+ void functionMW(double* out, const double* xValues, const size_t nData)const
{
double a = getParameter("a");
double b = getParameter("b");
@@ -97,7 +97,7 @@ public:
out[i] = a + b * xValues[i];
}
}
- void functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+ void functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
//throw Mantid::Kernel::Exception::NotImplementedError("");
for(size_t i=0;i<nData;i++)
@@ -118,7 +118,7 @@ public:
declareParameter("B1e2Ta_");
}
std::string name()const{return "ParameterTieTest_Nothing";}
- void function(double* , const double*, const size_t)const{}
+ void functionMW(double* , const double*, const size_t)const{}
};
class ParameterTieTest : public CxxTest::TestSuite
diff --git a/Code/Mantid/Framework/Crystal/src/PeakIntegration.cpp b/Code/Mantid/Framework/Crystal/src/PeakIntegration.cpp
index f70637fd5b7..44a70bb8df6 100644
--- a/Code/Mantid/Framework/Crystal/src/PeakIntegration.cpp
+++ b/Code/Mantid/Framework/Crystal/src/PeakIntegration.cpp
@@ -317,7 +317,7 @@ namespace Mantid
//x[i] = X[TOFmin]+i*dx;
}
pk->setMatrixWorkspace(outputW, det, -1, -1);
- pk->function(y,x,n);
+ pk->functionMW(y,x,n);
//Calculate intensity
I = 0.0;
diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/BackToBackExponential.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/BackToBackExponential.h
index 25f24b3959a..4753e8361a2 100644
--- a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/BackToBackExponential.h
+++ b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/BackToBackExponential.h
@@ -66,8 +66,8 @@ namespace Mantid
/// overwrite IFunction base class methods
std::string name()const{return "BackToBackExponential";}
- virtual void function(double* out, const double* xValues, const size_t nData)const;
- virtual void functionDeriv(API::Jacobian* out, const double* xValues, const size_t nData);
+ virtual void functionMW(double* out, const double* xValues, const size_t nData)const;
+ virtual void functionDerivMW(API::Jacobian* out, const double* xValues, const size_t nData);
protected:
/// overwrite IFunction base class method, which declare function parameters
diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/BivariateNormal.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/BivariateNormal.h
index 650bcfc5b16..9b28922eb2a 100644
--- a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/BivariateNormal.h
+++ b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/BivariateNormal.h
@@ -123,11 +123,11 @@ using namespace Mantid::API;
std::cout<<"Inten OOB"<<IntensityConstraint->lower()<<","<<IntensityConstraint->upper()<<std::endl;
}
*/
- void function (double *out, const double *xValues, const size_t nData)const ;
+ void functionMW (double *out, const double *xValues, const size_t nData)const ;
- void functionDeriv (API::Jacobian *out, const double *xValues, const size_t nData);
+ void functionDerivMW (API::Jacobian *out, const double *xValues, const size_t nData);
int nAttributes () const
{ return 16;}
diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Chebyshev.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Chebyshev.h
index 5f81059835f..eeb8185a3ca 100644
--- a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Chebyshev.h
+++ b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Chebyshev.h
@@ -53,8 +53,8 @@ namespace Mantid
/// overwrite IFunction base class methods
std::string name()const{return "Chebyshev";}
- void function(double* out, const double* xValues, const size_t nData)const;
- void functionDeriv(API::Jacobian* out, const double* xValues, const size_t nData);
+ void functionMW(double* out, const double* xValues, const size_t nData)const;
+ void functionDerivMW(API::Jacobian* out, const double* xValues, const size_t nData);
/// Returns the number of attributes associated with the function
int nAttributes()const{return 1;}
diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Convolution.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Convolution.h
index 663eb54b0be..67e9478c6d1 100644
--- a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Convolution.h
+++ b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Convolution.h
@@ -120,8 +120,8 @@ namespace Mantid
/// overwrite IFunction base class methods
std::string name()const{return "Convolution";}
- void function(double* out, const double* xValues, const size_t nData)const;
- void functionDeriv(API::Jacobian* out, const double* xValues, const size_t nData);
+ void functionMW(double* out, const double* xValues, const size_t nData)const;
+ void functionDerivMW(API::Jacobian* out, const double* xValues, const size_t nData);
/// Add a function.
int addFunction(IFitFunction* f);
diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/DeltaFunction.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/DeltaFunction.h
index 56890291f52..11953567e14 100644
--- a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/DeltaFunction.h
+++ b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/DeltaFunction.h
@@ -60,8 +60,8 @@ namespace Mantid
std::string name()const{return "DeltaFunction";}
protected:
- virtual void function(double* out, const double* xValues, const size_t nData)const;
- virtual void functionDeriv(API::Jacobian* out, const double* xValues, const size_t nData);
+ virtual void functionMW(double* out, const double* xValues, const size_t nData)const;
+ virtual void functionDerivMW(API::Jacobian* out, const double* xValues, const size_t nData);
virtual void functionLocal(double* out, const double* xValues, const size_t nData)const
{
UNUSED_ARG(out); UNUSED_ARG(xValues); UNUSED_ARG(nData);
diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/ExpDecay.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/ExpDecay.h
index 27143408586..5251929e5f1 100644
--- a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/ExpDecay.h
+++ b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/ExpDecay.h
@@ -48,8 +48,8 @@ namespace Mantid
/// overwrite IFunction base class methods
std::string name()const{return "ExpDecay";}
protected:
- virtual void function(double* out, const double* xValues, const size_t nData)const;
- virtual void functionDeriv(API::Jacobian* out, const double* xValues, const size_t nData);
+ virtual void functionMW(double* out, const double* xValues, const size_t nData)const;
+ virtual void functionDerivMW(API::Jacobian* out, const double* xValues, const size_t nData);
};
} // namespace CurveFitting
diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/LinearBackground.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/LinearBackground.h
index 0afa2fd0e95..7888497bf93 100644
--- a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/LinearBackground.h
+++ b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/LinearBackground.h
@@ -51,8 +51,8 @@ namespace Mantid
/// overwrite IFunction base class methods
std::string name()const{return "LinearBackground";}
- virtual void function(double* out, const double* xValues, const size_t nData)const;
- virtual void functionDeriv(API::Jacobian* out, const double* xValues, const size_t nData);
+ virtual void functionMW(double* out, const double* xValues, const size_t nData)const;
+ virtual void functionDerivMW(API::Jacobian* out, const double* xValues, const size_t nData);
void fit(const std::vector<double>& X,const std::vector<double>& Y);
diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/ProductFunctionMW.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/ProductFunctionMW.h
index 7fa21940095..4bdcf03a58a 100644
--- a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/ProductFunctionMW.h
+++ b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/ProductFunctionMW.h
@@ -49,8 +49,8 @@ namespace Mantid
/// overwrite IFunction base class methods
std::string name()const{return "ProductFunctionMW";}
- void function(double* out, const double* xValues, const size_t nData)const;
- void functionDeriv(API::Jacobian* out, const double* xValues, const size_t nData);
+ void functionMW(double* out, const double* xValues, const size_t nData)const;
+ void functionDerivMW(API::Jacobian* out, const double* xValues, const size_t nData);
protected:
/// overwrite IFunction base class method, which declare function parameters
diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Quadratic.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Quadratic.h
index 2e1ef084f4b..9628eedb924 100644
--- a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Quadratic.h
+++ b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Quadratic.h
@@ -52,8 +52,8 @@ namespace Mantid
/// overwrite IFunction base class methods
std::string name()const{return "Quadratic";}
- virtual void function(double* out, const double* xValues, const size_t nData)const;
- virtual void functionDeriv(API::Jacobian* out, const double* xValues, const size_t nData);
+ virtual void functionMW(double* out, const double* xValues, const size_t nData)const;
+ virtual void functionDerivMW(API::Jacobian* out, const double* xValues, const size_t nData);
protected:
/// overwrite IFunction base class method, which declare function parameters
diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Resolution.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Resolution.h
index 35e80aa8b06..c2abc922907 100644
--- a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Resolution.h
+++ b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Resolution.h
@@ -49,9 +49,9 @@ public:
/// overwrite IFunction base class methods
std::string name()const{return "Resolution";}
- void function(double* out, const double* xValues, const size_t nData)const;
+ void functionMW(double* out, const double* xValues, const size_t nData)const;
/// function derivatives
- void functionDeriv(API::Jacobian* out, const double* xValues, const size_t nData)const
+ void functionDerivMW(API::Jacobian* out, const double* xValues, const size_t nData)const
{
(void) out; (void) xValues; (void) nData; //Avoid compiler warning
}
diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/UserFunction.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/UserFunction.h
index 99277fb1a7d..56be9df52d7 100644
--- a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/UserFunction.h
+++ b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/UserFunction.h
@@ -55,9 +55,9 @@ namespace Mantid
std::string name()const{return "UserFunction";}
/// Function you want to fit to.
- void function(double* out, const double* xValues, const size_t nData)const;
+ void functionMW(double* out, const double* xValues, const size_t nData)const;
/// Derivatives of function with respect to active parameters
- void functionDeriv(API::Jacobian* out, const double* xValues, const size_t nData);
+ void functionDerivMW(API::Jacobian* out, const double* xValues, const size_t nData);
/// Returns the number of attributes associated with the function
int nAttributes()const{return 1;}
diff --git a/Code/Mantid/Framework/CurveFitting/src/BackToBackExponential.cpp b/Code/Mantid/Framework/CurveFitting/src/BackToBackExponential.cpp
index acb3ab153b6..69dcaab8dbb 100644
--- a/Code/Mantid/Framework/CurveFitting/src/BackToBackExponential.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/BackToBackExponential.cpp
@@ -25,7 +25,7 @@ void BackToBackExponential::init()
}
-void BackToBackExponential::function(double* out, const double* xValues, const size_t nData)const
+void BackToBackExponential::functionMW(double* out, const double* xValues, const size_t nData)const
{
const double& I = getParameter("I");
const double& a = getParameter("A");
@@ -46,7 +46,7 @@ void BackToBackExponential::function(double* out, const double* xValues, const s
}
}
-void BackToBackExponential::functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+void BackToBackExponential::functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
const double& I = getParameter("I");
const double& a = getParameter("A");
diff --git a/Code/Mantid/Framework/CurveFitting/src/BivariateNormal.cpp b/Code/Mantid/Framework/CurveFitting/src/BivariateNormal.cpp
index ec32bd6f6bf..a4e5d34f9cc 100644
--- a/Code/Mantid/Framework/CurveFitting/src/BivariateNormal.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/BivariateNormal.cpp
@@ -110,7 +110,7 @@ BivariateNormal::~BivariateNormal()
-void BivariateNormal::function(double *out, const double *xValues, const size_t nData)const
+void BivariateNormal::functionMW(double *out, const double *xValues, const size_t nData)const
{
UNUSED_ARG(xValues);
@@ -168,7 +168,7 @@ void BivariateNormal::fit( std::vector<double>, std::vector<double>)
std::cout<<"In fit"<<std::endl;
initCommon();
}
-void BivariateNormal::functionDeriv(API::Jacobian *out, const double *xValues, const size_t nData)
+void BivariateNormal::functionDerivMW(API::Jacobian *out, const double *xValues, const size_t nData)
{
UNUSED_ARG(xValues);
UNUSED_ARG(nData);
diff --git a/Code/Mantid/Framework/CurveFitting/src/Chebyshev.cpp b/Code/Mantid/Framework/CurveFitting/src/Chebyshev.cpp
index f266d5856a3..15c36b0e92f 100644
--- a/Code/Mantid/Framework/CurveFitting/src/Chebyshev.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/Chebyshev.cpp
@@ -21,7 +21,7 @@ Chebyshev::Chebyshev():m_n(0),m_StartX(-1.),m_EndX(1.)
declareParameter("A0");
};
-void Chebyshev::function(double* out, const double* xValues, const size_t nData)const
+void Chebyshev::functionMW(double* out, const double* xValues, const size_t nData)const
{
if (m_StartX >= m_EndX)
{
@@ -47,7 +47,7 @@ void Chebyshev::function(double* out, const double* xValues, const size_t nData)
}
}
-void Chebyshev::functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+void Chebyshev::functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
if (m_n < 0)
{
diff --git a/Code/Mantid/Framework/CurveFitting/src/Convolution.cpp b/Code/Mantid/Framework/CurveFitting/src/Convolution.cpp
index 81196a5b00b..5b258cc928d 100644
--- a/Code/Mantid/Framework/CurveFitting/src/Convolution.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/Convolution.cpp
@@ -43,7 +43,7 @@ void Convolution::init()
/**
* Calculates convolution of the two member functions.
*/
-void Convolution::function(double* out, const double* xValues, const size_t nData)const
+void Convolution::functionMW(double* out, const double* xValues, const size_t nData)const
{
if (nFunctions() == 0)
{
@@ -85,7 +85,7 @@ void Convolution::function(double* out, const double* xValues, const size_t nDat
{
throw std::runtime_error("Convolution can work only with IFunctionMW");
}
- fun->function(m_resolution,xr,nData);
+ fun->functionMW(m_resolution,xr,nData);
// rotate the data to produce the right transform
if (odd)
@@ -141,20 +141,20 @@ void Convolution::function(double* out, const double* xValues, const size_t nDat
}
if (dltFuns.size() == cf->nFunctions())
{// all delta functions - return scaled reslution
- resolution->function(out,xValues,nData);
+ resolution->functionMW(out,xValues,nData);
std::transform(out,out+nData,out,std::bind2nd(std::multiplies<double>(),dltF));
return;
}
}
else if (dynamic_cast<DeltaFunction*>(getFunction(1)))
{// single delta function - return scaled reslution
- resolution->function(out,xValues,nData);
+ resolution->functionMW(out,xValues,nData);
std::transform(out,out+nData,out,std::bind2nd(std::multiplies<double>(),getFunction(1)->getParameter("Height")));
return;
}
API::IFunctionMW* funct = dynamic_cast<API::IFunctionMW*>(getFunction(1));
- funct->function(out,xValues,nData);
+ funct->functionMW(out,xValues,nData);
gsl_fft_real_transform (out, 1, nData, wavetable, workspace);
gsl_fft_real_wavetable_free (wavetable);
@@ -190,7 +190,7 @@ void Convolution::function(double* out, const double* xValues, const size_t nDat
if (dltF != 0.)
{
double* tmp = new double[nData];
- resolution->function(tmp,xValues,nData);
+ resolution->functionMW(tmp,xValues,nData);
std::transform(tmp,tmp+nData,tmp,std::bind2nd(std::multiplies<double>(),dltF));
std::transform(out,out+nData,tmp,out,std::plus<double>());
delete tmp;
@@ -198,7 +198,7 @@ void Convolution::function(double* out, const double* xValues, const size_t nDat
}
-void Convolution::functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+void Convolution::functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
if (nData == 0) return;
std::vector<double> dp(nParams());
@@ -222,13 +222,13 @@ void Convolution::functionDeriv(Jacobian* out, const double* xValues, const size
m_tmp1.reset(new double[nData]);
}
- function(m_tmp.get(),xValues, nData);
+ functionMW(m_tmp.get(),xValues, nData);
for (int j = 0; j < nParams(); j++)
{
double p0 = getParameter(j);
setParameter(j,p0 + dp[j],false);
- function(m_tmp1.get(),xValues, nData);
+ functionMW(m_tmp1.get(),xValues, nData);
for (size_t i = 0; i < nData; i++)
{
out->set(i,j, (m_tmp1[i] - m_tmp[i])/dp[j]);
diff --git a/Code/Mantid/Framework/CurveFitting/src/DeltaFunction.cpp b/Code/Mantid/Framework/CurveFitting/src/DeltaFunction.cpp
index f0b97c2fd62..c7a8f52983e 100644
--- a/Code/Mantid/Framework/CurveFitting/src/DeltaFunction.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/DeltaFunction.cpp
@@ -21,13 +21,13 @@ DeltaFunction::DeltaFunction()
}
-void DeltaFunction::function(double* out, const double* xValues, const size_t nData)const
+void DeltaFunction::functionMW(double* out, const double* xValues, const size_t nData)const
{
UNUSED_ARG(xValues);
std::fill(out,out+nData,0);
}
-void DeltaFunction::functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+void DeltaFunction::functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
UNUSED_ARG(out); UNUSED_ARG(xValues); UNUSED_ARG(nData);
std::runtime_error("Cannot compute derivative of a delta function");
diff --git a/Code/Mantid/Framework/CurveFitting/src/ExpDecay.cpp b/Code/Mantid/Framework/CurveFitting/src/ExpDecay.cpp
index b4f4ff1605b..b4139be2556 100644
--- a/Code/Mantid/Framework/CurveFitting/src/ExpDecay.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/ExpDecay.cpp
@@ -21,7 +21,7 @@ ExpDecay::ExpDecay()
}
-void ExpDecay::function(double* out, const double* xValues, const size_t nData)const
+void ExpDecay::functionMW(double* out, const double* xValues, const size_t nData)const
{
const double& h = getParameter("Height");
const double& t = getParameter("Lifetime");
@@ -32,7 +32,7 @@ void ExpDecay::function(double* out, const double* xValues, const size_t nData)c
}
}
-void ExpDecay::functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+void ExpDecay::functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
const double& h = getParameter("Height");
const double& t = getParameter("Lifetime");
diff --git a/Code/Mantid/Framework/CurveFitting/src/LinearBackground.cpp b/Code/Mantid/Framework/CurveFitting/src/LinearBackground.cpp
index 98ceac022cf..da0f30e86a8 100644
--- a/Code/Mantid/Framework/CurveFitting/src/LinearBackground.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/LinearBackground.cpp
@@ -20,7 +20,7 @@ void LinearBackground::init()
}
-void LinearBackground::function(double* out, const double* xValues, const size_t nData)const
+void LinearBackground::functionMW(double* out, const double* xValues, const size_t nData)const
{
const double& a0 = getParameter("A0");
const double& a1 = getParameter("A1");
@@ -30,7 +30,7 @@ void LinearBackground::function(double* out, const double* xValues, const size_t
}
}
-void LinearBackground::functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+void LinearBackground::functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
for (size_t i = 0; i < nData; i++) {
out->set(i,0, 1);
diff --git a/Code/Mantid/Framework/CurveFitting/src/ProductFunctionMW.cpp b/Code/Mantid/Framework/CurveFitting/src/ProductFunctionMW.cpp
index 921ef861cdd..845ec458e09 100644
--- a/Code/Mantid/Framework/CurveFitting/src/ProductFunctionMW.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/ProductFunctionMW.cpp
@@ -26,7 +26,7 @@ using namespace API;
DECLARE_FUNCTION(ProductFunctionMW)
-void ProductFunctionMW::function(double* out, const double* xValues, const size_t nData)const
+void ProductFunctionMW::functionMW(double* out, const double* xValues, const size_t nData)const
{
if (nData == 0) return;
boost::shared_array<double> tmpOut(new double[nData]);
@@ -34,16 +34,16 @@ void ProductFunctionMW::function(double* out, const double* xValues, const size_
{
IFunctionMW* fun = dynamic_cast<IFunctionMW*>(getFunction(i));
if (i == 0)
- fun->function(out,xValues,nData);
+ fun->functionMW(out,xValues,nData);
else
{
- fun->function(tmpOut.get(),xValues,nData);
+ fun->functionMW(tmpOut.get(),xValues,nData);
std::transform(out,out+nData,tmpOut.get(),out,std::multiplies<double>());
}
}
}
-void ProductFunctionMW::functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+void ProductFunctionMW::functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
calNumericalDeriv(out, xValues, nData);
}
diff --git a/Code/Mantid/Framework/CurveFitting/src/Quadratic.cpp b/Code/Mantid/Framework/CurveFitting/src/Quadratic.cpp
index ccc6488a264..85fecdbc52f 100644
--- a/Code/Mantid/Framework/CurveFitting/src/Quadratic.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/Quadratic.cpp
@@ -29,7 +29,7 @@ void Quadratic::init()
* @param xValues :: Array of double x values
* @param nData :: Array of integer data
*/
-void Quadratic::function(double* out, const double* xValues, const size_t nData)const
+void Quadratic::functionMW(double* out, const double* xValues, const size_t nData)const
{
const double& a0 = getParameter("A0");
const double& a1 = getParameter("A1");
@@ -47,7 +47,7 @@ void Quadratic::function(double* out, const double* xValues, const size_t nData)
* @param xValues :: Array of double x values
* @param nData :: Array of integer data
*/
-void Quadratic::functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+void Quadratic::functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
for (size_t i = 0; i < nData; i++) {
out->set(i,0, 1);
diff --git a/Code/Mantid/Framework/CurveFitting/src/Resolution.cpp b/Code/Mantid/Framework/CurveFitting/src/Resolution.cpp
index 44af76be476..15a86c8f8b8 100644
--- a/Code/Mantid/Framework/CurveFitting/src/Resolution.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/Resolution.cpp
@@ -18,7 +18,7 @@ using namespace API;
DECLARE_FUNCTION(Resolution)
-void Resolution::function(double* out, const double* xValues, const size_t nData)const
+void Resolution::functionMW(double* out, const double* xValues, const size_t nData)const
{
if (nData == 0) return;
diff --git a/Code/Mantid/Framework/CurveFitting/src/UserFunction.cpp b/Code/Mantid/Framework/CurveFitting/src/UserFunction.cpp
index 1137d4353ab..4e7a5aaf60a 100644
--- a/Code/Mantid/Framework/CurveFitting/src/UserFunction.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/UserFunction.cpp
@@ -105,7 +105,7 @@ namespace Mantid
* @param xValues :: The array of nData x-values.
* @param nData :: The size of the fitted data.
*/
- void UserFunction::function(double* out, const double* xValues, const size_t nData)const
+ void UserFunction::functionMW(double* out, const double* xValues, const size_t nData)const
{
for (size_t i = 0; i < nData; i++)
{
@@ -119,7 +119,7 @@ namespace Mantid
* @param xValues :: X values for data points
* @param nData :: Number of data points
*/
- void UserFunction::functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+ void UserFunction::functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
if (nData == 0) return;
std::vector<double> dp(nParams());
@@ -143,13 +143,13 @@ namespace Mantid
m_tmp1.reset(new double[nData]);
}
- function(m_tmp.get(),xValues, nData);
+ functionMW(m_tmp.get(),xValues, nData);
for (int j = 0; j < nParams(); j++)
{
double p0 = getParameter(j);
setParameter(j,p0 + dp[j],false);
- function(m_tmp1.get(),xValues, nData);
+ functionMW(m_tmp1.get(),xValues, nData);
for (size_t i = 0; i < nData; i++)
{
out->set(i,j, (m_tmp1[i] - m_tmp[i])/dp[j]);
diff --git a/Code/Mantid/Framework/CurveFitting/test/BackToBackExponentialTest.h b/Code/Mantid/Framework/CurveFitting/test/BackToBackExponentialTest.h
index 50fa9ff3e3b..ccac6b16165 100644
--- a/Code/Mantid/Framework/CurveFitting/test/BackToBackExponentialTest.h
+++ b/Code/Mantid/Framework/CurveFitting/test/BackToBackExponentialTest.h
@@ -254,7 +254,7 @@ public:
const double* xx = &ws2D->readX(0)[0];
double *yy = new double[timechannels];
- pk->function(yy, xx, timechannels);
+ pk->functionMW(yy, xx, timechannels);
// note that fitting a none-totally optimized IC to a Gaussian peak so
// not a perfect fit - but pretty ok result
diff --git a/Code/Mantid/Framework/CurveFitting/test/BivariateNormalTest.h b/Code/Mantid/Framework/CurveFitting/test/BivariateNormalTest.h
index 39c8b728082..a4744bfa641 100644
--- a/Code/Mantid/Framework/CurveFitting/test/BivariateNormalTest.h
+++ b/Code/Mantid/Framework/CurveFitting/test/BivariateNormalTest.h
@@ -104,7 +104,7 @@ public:
x[i] = i;
double* out = new double[nCells];
- NormalFit.function(out, x, nCells);
+ NormalFit.functionMW(out, x, nCells);
TS_ASSERT_LESS_THAN(fabs(out[0] - .0500), .00004);
TS_ASSERT_LESS_THAN(fabs(out[(int) (nCells / 4)] - 0.38912475), .00004);
@@ -114,7 +114,7 @@ public:
Jacob Jac(7, nCells);
- NormalFit.functionDeriv(&Jac, x, nCells);
+ NormalFit.functionDerivMW(&Jac, x, nCells);
delete[] x;
size_t p = 0;
{
@@ -237,7 +237,7 @@ public:
NormalFit.setWorkspace( ws, std::string("StartX=0,EndX=857,WorkspaceIndex=0") );
double* out = new double[nCells];
- NormalFit.function(out, x, nCells);
+ NormalFit.functionMW(out, x, nCells);
double sav = out[0];
diff --git a/Code/Mantid/Framework/CurveFitting/test/ChebyshevTest.h b/Code/Mantid/Framework/CurveFitting/test/ChebyshevTest.h
index b8b7bc2fe8f..0976c30ee23 100644
--- a/Code/Mantid/Framework/CurveFitting/test/ChebyshevTest.h
+++ b/Code/Mantid/Framework/CurveFitting/test/ChebyshevTest.h
@@ -33,7 +33,7 @@ public:
{
cheb.setParameter(n-1,0.);
}
- cheb.function(&y[0],&x[0],N);
+ cheb.functionMW(&y[0],&x[0],N);
for(int i=0;i<N;++i)
{
TS_ASSERT_DELTA(y[i],cos(n*acos(x[i])),1e-12);
diff --git a/Code/Mantid/Framework/CurveFitting/test/CompositeFunctionTest.h b/Code/Mantid/Framework/CurveFitting/test/CompositeFunctionTest.h
index 6041e85a198..c912bb19a1b 100644
--- a/Code/Mantid/Framework/CurveFitting/test/CompositeFunctionTest.h
+++ b/Code/Mantid/Framework/CurveFitting/test/CompositeFunctionTest.h
@@ -115,7 +115,7 @@ public:
std::string name()const{return "CurveFittingLinear";}
- void function(double* out, const double* xValues, const size_t nData)const
+ void functionMW(double* out, const double* xValues, const size_t nData)const
{
double a = getParameter("a");
double b = getParameter("b");
@@ -124,7 +124,7 @@ public:
out[i] = a + b * xValues[i];
}
}
- void functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+ void functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
//throw Mantid::Kernel::Exception::NotImplementedError("");
for(size_t i=0;i<nData;i++)
diff --git a/Code/Mantid/Framework/CurveFitting/test/ConvolutionTest.h b/Code/Mantid/Framework/CurveFitting/test/ConvolutionTest.h
index 058ce80003e..5cd6075e3bc 100644
--- a/Code/Mantid/Framework/CurveFitting/test/ConvolutionTest.h
+++ b/Code/Mantid/Framework/CurveFitting/test/ConvolutionTest.h
@@ -119,7 +119,7 @@ public:
std::string name()const{return "ConvolutionTest_Linear";}
- void function(double* out, const double* xValues, const size_t nData)const
+ void functionMW(double* out, const double* xValues, const size_t nData)const
{
double a = getParameter("a");
double b = getParameter("b");
@@ -128,7 +128,7 @@ public:
out[i] = a + b * xValues[i];
}
}
- void functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+ void functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
//throw Mantid::Kernel::Exception::NotImplementedError("");
for(size_t i=0;i<nData;i++)
@@ -268,10 +268,10 @@ public:
xr[i] = x[i] - x0 - Dx/2;
}
- res->function(out,xr,N);
+ res->functionMW(out,xr,N);
// When called with only 1 function attached returns its fourier transform
- conv.function(out,x,N);
+ conv.functionMW(out,x,N);
// Check that the transform is correct: F( exp(-a*x^2) ) == sqrt(pi/a)*exp(-(pi*x)^2/a)
Convolution::HalfComplex hout(out,N);
@@ -327,7 +327,7 @@ public:
conv.addFunction(fun);
- conv.function(out,x,N);
+ conv.functionMW(out,x,N);
// a convolution of two gaussians is a gaussian with h == hp and s == sp
double sp = s1*s2/(s1+s2);
diff --git a/Code/Mantid/Framework/CurveFitting/test/FitTest.h b/Code/Mantid/Framework/CurveFitting/test/FitTest.h
index 0f745d6707e..5ec196b99ad 100644
--- a/Code/Mantid/Framework/CurveFitting/test/FitTest.h
+++ b/Code/Mantid/Framework/CurveFitting/test/FitTest.h
@@ -121,7 +121,7 @@ public:
std::string name()const{return "FitTest_Linear";}
- void function(double* out, const double* xValues, const size_t nData)const
+ void functionMW(double* out, const double* xValues, const size_t nData)const
{
double a = getParameter("a");
double b = getParameter("b");
@@ -130,7 +130,7 @@ public:
out[i] = a + b * xValues[i];
}
}
- void functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+ void functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
//throw Mantid::Kernel::Exception::NotImplementedError("");
for(size_t i=0;i<nData;i++)
diff --git a/Code/Mantid/Framework/CurveFitting/test/FunctionFactoryTest.h b/Code/Mantid/Framework/CurveFitting/test/FunctionFactoryTest.h
index c12ef6f4217..90d6e9085ab 100644
--- a/Code/Mantid/Framework/CurveFitting/test/FunctionFactoryTest.h
+++ b/Code/Mantid/Framework/CurveFitting/test/FunctionFactoryTest.h
@@ -27,13 +27,13 @@ public:
declareParameter("a1");
}
std::string name()const{return "FunctionFactoryTest_FunctA";}
- void function(double* out, const double* xValues, const size_t nData)const
+ void functionMW(double* out, const double* xValues, const size_t nData)const
{
UNUSED_ARG(out);
UNUSED_ARG(xValues);
UNUSED_ARG(nData);
}
- void functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+ void functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
UNUSED_ARG(out);
UNUSED_ARG(xValues);
@@ -84,13 +84,13 @@ public:
std::string name()const{return "FunctionFactoryTest_FunctB";}
- void function(double* out, const double* xValues, const size_t nData)const
+ void functionMW(double* out, const double* xValues, const size_t nData)const
{
UNUSED_ARG(out);
UNUSED_ARG(xValues);
UNUSED_ARG(nData);
}
- void functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+ void functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
UNUSED_ARG(out);
UNUSED_ARG(xValues);
@@ -106,13 +106,13 @@ public:
std::string name()const{return "FunctionFactoryTest_CompFunctA";}
- void function(double* out, const double* xValues, const size_t nData)const
+ void functionMW(double* out, const double* xValues, const size_t nData)const
{
UNUSED_ARG(out);
UNUSED_ARG(xValues);
UNUSED_ARG(nData);
}
- void functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+ void functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
UNUSED_ARG(out);
UNUSED_ARG(xValues);
@@ -142,13 +142,13 @@ public:
std::string name()const{return "FunctionFactoryTest_CompFunctB";}
- void function(double* out, const double* xValues, const size_t nData)const
+ void functionMW(double* out, const double* xValues, const size_t nData)const
{
UNUSED_ARG(out);
UNUSED_ARG(xValues);
UNUSED_ARG(nData);
}
- void functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+ void functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
UNUSED_ARG(out);
UNUSED_ARG(xValues);
diff --git a/Code/Mantid/Framework/CurveFitting/test/GaussianTest.h b/Code/Mantid/Framework/CurveFitting/test/GaussianTest.h
index 5fe2d8c69a2..a02f348c366 100644
--- a/Code/Mantid/Framework/CurveFitting/test/GaussianTest.h
+++ b/Code/Mantid/Framework/CurveFitting/test/GaussianTest.h
@@ -36,7 +36,7 @@ public:
std::string name()const{return "SimplexGaussian";}
protected:
- void functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+ void functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
UNUSED_ARG(out);
UNUSED_ARG(xValues);
diff --git a/Code/Mantid/Framework/CurveFitting/test/IkedaCarpenterPVTest.h b/Code/Mantid/Framework/CurveFitting/test/IkedaCarpenterPVTest.h
index f06b1a9b52a..862f73c4d77 100644
--- a/Code/Mantid/Framework/CurveFitting/test/IkedaCarpenterPVTest.h
+++ b/Code/Mantid/Framework/CurveFitting/test/IkedaCarpenterPVTest.h
@@ -181,7 +181,7 @@ public:
const double* x = &ws2D->readX(0)[0];
double *yy = new double[timechannels];
- pk->function(yy, x, timechannels);
+ pk->functionMW(yy, x, timechannels);
// note that fitting a none-totally optimized IC to a Gaussian peak so
// not a perfect fit - but pretty ok result
diff --git a/Code/Mantid/Framework/CurveFitting/test/ProductFunctionMWTest.h b/Code/Mantid/Framework/CurveFitting/test/ProductFunctionMWTest.h
index 64cd74c9f73..4a535eccbe6 100644
--- a/Code/Mantid/Framework/CurveFitting/test/ProductFunctionMWTest.h
+++ b/Code/Mantid/Framework/CurveFitting/test/ProductFunctionMWTest.h
@@ -109,7 +109,7 @@ public:
std::string name()const{return "ProductFunctionMWTest_Linear";}
- void function(double* out, const double* xValues, const size_t nData)const
+ void functionMW(double* out, const double* xValues, const size_t nData)const
{
double a = getParameter("a");
double b = getParameter("b");
@@ -118,7 +118,7 @@ public:
out[i] = a + b * xValues[i];
}
}
- void functionDeriv(Jacobian* out, const double* xValues, const size_t nData)
+ void functionDerivMW(Jacobian* out, const double* xValues, const size_t nData)
{
for(size_t i=0;i<nData;i++)
{
@@ -254,7 +254,7 @@ public:
prodF.addFunction(f1);
- prodF.function(out,x,N);
+ prodF.functionMW(out,x,N);
diff --git a/Code/Mantid/Framework/CurveFitting/test/ResolutionTest.h b/Code/Mantid/Framework/CurveFitting/test/ResolutionTest.h
index 1824acab8e0..79008cc89e0 100644
--- a/Code/Mantid/Framework/CurveFitting/test/ResolutionTest.h
+++ b/Code/Mantid/Framework/CurveFitting/test/ResolutionTest.h
@@ -136,7 +136,7 @@ void tearDown()
{
x[i] = xStart + dx*i;
}
- res.function(y,x,n);
+ res.functionMW(y,x,n);
for(int i=0;i<n;i++)
{
double xi = x[i];
diff --git a/Code/Mantid/Framework/CurveFitting/test/UserFunctionTest.h b/Code/Mantid/Framework/CurveFitting/test/UserFunctionTest.h
index 5273c309b64..685a4dc36f1 100644
--- a/Code/Mantid/Framework/CurveFitting/test/UserFunctionTest.h
+++ b/Code/Mantid/Framework/CurveFitting/test/UserFunctionTest.h
@@ -53,14 +53,14 @@ public:
{
x[i] = 0.1*static_cast<double>(i);
}
- fun.function(&y[0],&x[0],nData);
+ fun.functionMW(&y[0],&x[0],nData);
for(size_t i=0;i<nData;i++)
{
TS_ASSERT_DELTA(y[i],2.2*sin(2*x[i]-1.2),0.000001);
}
UserTestJacobian J(nData,nParams);
- fun.functionDeriv(&J,&x[0],nData);
+ fun.functionDerivMW(&J,&x[0],nData);
for(size_t i=0;i<nData;i++)
for(size_t j=0;j<nParams;j++)
{
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/QuadEnBackground.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/QuadEnBackground.h
index 58774e09601..e992616fbc0 100644
--- a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/QuadEnBackground.h
+++ b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/QuadEnBackground.h
@@ -58,7 +58,7 @@ namespace Mantid
std::string name()const{return "QuadEnBackground";}
protected:
/// function to return the calculated signal at cell r, given the energy dependent model applied to points
- virtual double function(Mantid::API::IMDIterator& r) const;
+ virtual double functionMD(Mantid::API::IMDIterator& r) const;
};
} // namespace MDAlgorithms
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SimulateResolution.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SimulateResolution.h
index 10b1844996c..e4195a3c59d 100644
--- a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SimulateResolution.h
+++ b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SimulateResolution.h
@@ -57,7 +57,7 @@ namespace Mantid
std::string name()const{return "SimulateResolution";}
protected:
/// function to return the calculated signal at cell r, given the energy dependent model applied to points
- virtual double function(Mantid::API::IMDIterator& r) const;
+ virtual double functionMD(Mantid::API::IMDIterator& r) const;
/// This will be over ridden by the user's SQW function TODO argument list is not general enough
virtual double sqwBroad(const std::vector<double> & point, const std::vector<double> & fgParams,
const double temp, const Kernel::DblMatrix & ubinv) const=0;
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/QuadEnBackground.cpp b/Code/Mantid/Framework/MDAlgorithms/src/QuadEnBackground.cpp
index becc540079a..c018a9f7ec3 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/QuadEnBackground.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/QuadEnBackground.cpp
@@ -26,7 +26,7 @@ namespace Mantid
}
// quadratic term in energy background defined for MDiterator
- double QuadEnBackground::function(Mantid::API::IMDIterator& it) const
+ double QuadEnBackground::functionMD(Mantid::API::IMDIterator& it) const
{
double linear = getParameter("Linear");
double constant = getParameter("Constant");
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/SimulateResolution.cpp b/Code/Mantid/Framework/MDAlgorithms/src/SimulateResolution.cpp
index 8bf1b4a7290..2f9c88831a2 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/SimulateResolution.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/SimulateResolution.cpp
@@ -31,7 +31,7 @@ namespace Mantid
{
delete m_randGen;
}
- double SimulateResolution::function(Mantid::API::IMDIterator& it) const
+ double SimulateResolution::functionMD(Mantid::API::IMDIterator& it) const
{
getParams();
double fgSignal = 0.;
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataAnalysis.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataAnalysis.cpp
index 548837d82d0..bdb7e3a7f9c 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataAnalysis.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataAnalysis.cpp
@@ -1938,7 +1938,7 @@ void IndirectDataAnalysis::furyfitPlotGuess(QtProperty*)
inputXData[i] = XValues[binIndxLow+i];
}
- function->function(outputData, inputXData, nData);
+ function->functionMW(outputData, inputXData, nData);
QVector<double> dataX;
QVector<double> dataY;
@@ -2245,7 +2245,7 @@ void IndirectDataAnalysis::confitPlotGuess(QtProperty*)
}
}
- function->function(outputData, inputXData, nData);
+ function->functionMW(outputData, inputXData, nData);
QVector<double> dataX, dataY;
diff --git a/Code/Mantid/MantidQt/MantidWidgets/src/PropertyHandler.cpp b/Code/Mantid/MantidQt/MantidWidgets/src/PropertyHandler.cpp
index cc980b3a0d0..4d4e33738b1 100644
--- a/Code/Mantid/MantidQt/MantidWidgets/src/PropertyHandler.cpp
+++ b/Code/Mantid/MantidQt/MantidWidgets/src/PropertyHandler.cpp
@@ -1024,7 +1024,7 @@ void PropertyHandler::calcBase()
{
double x = X[m_ci];
double y = 0;
- dynamic_cast<const Mantid::API::IFunctionMW*>(m_browser->m_autoBackground->function())->function(&y,&x,1);
+ dynamic_cast<const Mantid::API::IFunctionMW*>(m_browser->m_autoBackground->function())->functionMW(&y,&x,1);
m_base = y;
}
}
--
GitLab