Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refs #9782. Added Gaussian function with numerical derivatives
The same as GaussianAutoDiff, for comparison.
- Loading branch information
Michael Wedel
committed
Jul 31, 2014
1 parent
62cc1e6
commit 1fbcda1
Showing
4 changed files
with
131 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/GaussianNumDiff.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
#ifndef MANTID_CURVEFITTING_GAUSSIANNUMDIFF_H_ | ||
#define MANTID_CURVEFITTING_GAUSSIANNUMDIFF_H_ | ||
|
||
#include "MantidKernel/System.h" | ||
|
||
#include "MantidAPI/IFunction1D.h" | ||
#include "MantidAPI/ParamFunction.h" | ||
|
||
|
||
namespace Mantid | ||
{ | ||
namespace CurveFitting | ||
{ | ||
|
||
/** GaussianNumDiff : TODO: DESCRIPTION | ||
Copyright © 2014 ISIS Rutherford Appleton Laboratory & NScD Oak Ridge National Laboratory | ||
This file is part of Mantid. | ||
Mantid is free software; you can redistribute it and/or modify | ||
it under the terms of the GNU General Public License as published by | ||
the Free Software Foundation; either version 3 of the License, or | ||
(at your option) any later version. | ||
Mantid is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
GNU General Public License for more details. | ||
You should have received a copy of the GNU General Public License | ||
along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
File change history is stored at: <https://github.com/mantidproject/mantid> | ||
Code Documentation is available at: <http://doxygen.mantidproject.org> | ||
*/ | ||
class DLLExport GaussianNumDiff : public API::IFunction1D, public API::ParamFunction | ||
{ | ||
public: | ||
GaussianNumDiff(); | ||
virtual ~GaussianNumDiff(); | ||
|
||
std::string name() const { return "GaussianNumDiff"; } | ||
|
||
void function1D(double *out, const double *xValues, const size_t nData) const; | ||
|
||
protected: | ||
void init(); | ||
|
||
}; | ||
|
||
|
||
} // namespace CurveFitting | ||
} // namespace Mantid | ||
|
||
#endif /* MANTID_CURVEFITTING_GAUSSIANNUMDIFF_H_ */ |
43 changes: 43 additions & 0 deletions
43
Code/Mantid/Framework/CurveFitting/src/GaussianNumDiff.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
#include "MantidCurveFitting/GaussianNumDiff.h" | ||
|
||
namespace Mantid | ||
{ | ||
namespace CurveFitting | ||
{ | ||
|
||
|
||
//---------------------------------------------------------------------------------------------- | ||
/** Constructor | ||
*/ | ||
GaussianNumDiff::GaussianNumDiff() | ||
{ | ||
} | ||
|
||
//---------------------------------------------------------------------------------------------- | ||
/** Destructor | ||
*/ | ||
GaussianNumDiff::~GaussianNumDiff() | ||
{ | ||
} | ||
|
||
void GaussianNumDiff::function1D(double *out, const double *xValues, const size_t nData) const | ||
{ | ||
double height = getParameter("Height"); | ||
double centre = getParameter("PeakCentre"); | ||
double sigma = getParameter("Sigma"); | ||
|
||
for(size_t i = 0; i < nData; ++i) { | ||
out[i] = height * exp(-0.5 * pow( (xValues[i] - centre)/sigma, 2.0) ); | ||
} | ||
} | ||
|
||
void GaussianNumDiff::init() { | ||
declareParameter("Height"); | ||
declareParameter("PeakCentre"); | ||
declareParameter("Sigma"); | ||
} | ||
|
||
|
||
|
||
} // namespace CurveFitting | ||
} // namespace Mantid |
29 changes: 29 additions & 0 deletions
29
Code/Mantid/Framework/CurveFitting/test/GaussianNumDiffTest.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
#ifndef MANTID_CURVEFITTING_GAUSSIANNUMDIFFTEST_H_ | ||
#define MANTID_CURVEFITTING_GAUSSIANNUMDIFFTEST_H_ | ||
|
||
#include <cxxtest/TestSuite.h> | ||
|
||
#include "MantidCurveFitting/GaussianNumDiff.h" | ||
|
||
using Mantid::CurveFitting::GaussianNumDiff; | ||
using namespace Mantid::API; | ||
|
||
class GaussianNumDiffTest : public CxxTest::TestSuite | ||
{ | ||
public: | ||
// This pair of boilerplate methods prevent the suite being created statically | ||
// This means the constructor isn't called when running other tests | ||
static GaussianNumDiffTest *createSuite() { return new GaussianNumDiffTest(); } | ||
static void destroySuite( GaussianNumDiffTest *suite ) { delete suite; } | ||
|
||
|
||
void test_Something() | ||
{ | ||
TSM_ASSERT( "You forgot to write a test!", 0); | ||
} | ||
|
||
|
||
}; | ||
|
||
|
||
#endif /* MANTID_CURVEFITTING_GAUSSIANNUMDIFFTEST_H_ */ |