Skip to content

Commit

Permalink
Re #9030. Removed unused classes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mantid-roman
mantid-roman committed Feb 19, 2014
1 parent 5d3eded commit 65a9f64
Show file tree
Hide file tree
Showing 24 changed files with 72 additions and 290 deletions.
1 change: 0 additions & 1 deletion Code/Mantid/Framework/API/CMakeLists.txt
View file
Expand Up @@ -183,7 +183,6 @@ set ( INC_FILES
inc/MantidAPI/IFunction1D.h
inc/MantidAPI/IFunctionMD.h
inc/MantidAPI/IFunctionMW.h
inc/MantidAPI/IFunctionValues.h
inc/MantidAPI/IFunctionWithLocation.h
inc/MantidAPI/ILiveListener.h
inc/MantidAPI/ILocatedData.h
Expand Down
3 changes: 1 addition & 2 deletions Code/Mantid/Framework/API/inc/MantidAPI/FunctionValues.h
View file
Expand Up @@ -6,7 +6,6 @@
//----------------------------------------------------------------------
#include "MantidAPI/DllConfig.h"
#include "MantidAPI/FunctionDomain.h"
#include "MantidAPI/IFunctionValues.h"

#include <vector>

Expand Down Expand Up @@ -40,7 +39,7 @@ namespace API
File change history is stored at: <https://github.com/mantidproject/mantid>.
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
class MANTID_API_DLL FunctionValues: public IFunctionValues
class MANTID_API_DLL FunctionValues
{
public:
/// Default constructor.
Expand Down
6 changes: 3 additions & 3 deletions Code/Mantid/Framework/API/inc/MantidAPI/IDomainCreator.h
View file
Expand Up @@ -14,7 +14,7 @@ namespace Mantid
namespace API
{
class FunctionDomain;
class IFunctionValues;
class FunctionValues;
}

namespace API
Expand Down Expand Up @@ -81,7 +81,7 @@ namespace Mantid
/// for the data from index i0 to the end of the container.
virtual void createDomain(
boost::shared_ptr<API::FunctionDomain>& domain,
boost::shared_ptr<API::IFunctionValues>& values,
boost::shared_ptr<API::FunctionValues>& values,
size_t i0 = 0) = 0;

/// Create an output workspace filled with data simulated with the fitting function.
Expand All @@ -93,7 +93,7 @@ namespace Mantid
const std::string& baseName,
API::IFunction_sptr function,
boost::shared_ptr<API::FunctionDomain> domain,
boost::shared_ptr<API::IFunctionValues> values)
boost::shared_ptr<API::FunctionValues> values)
{UNUSED_ARG(baseName);UNUSED_ARG(function);UNUSED_ARG(domain);UNUSED_ARG(values);}

/// Initialize the function
Expand Down
74 changes: 0 additions & 74 deletions Code/Mantid/Framework/API/inc/MantidAPI/IFunctionValues.h
View file

This file was deleted.

2 changes: 0 additions & 2 deletions Code/Mantid/Framework/CurveFitting/CMakeLists.txt
View file
Expand Up @@ -112,7 +112,6 @@ set ( INC_FILES
inc/MantidCurveFitting/BoundaryConstraint.h
inc/MantidCurveFitting/CalculateGammaBackground.h
inc/MantidCurveFitting/Chebyshev.h
inc/MantidCurveFitting/CompositeValues.h
inc/MantidCurveFitting/ComptonPeakProfile.h
inc/MantidCurveFitting/ComptonProfile.h
inc/MantidCurveFitting/ComptonScatteringCountRate.h
Expand All @@ -129,7 +128,6 @@ set ( INC_FILES
inc/MantidCurveFitting/DiffSphere.h
inc/MantidCurveFitting/DiffRotDiscreteCircle.h
inc/MantidCurveFitting/DllConfig.h
inc/MantidCurveFitting/EmptyValues.h
inc/MantidCurveFitting/EndErfc.h
inc/MantidCurveFitting/ExpDecay.h
inc/MantidCurveFitting/ExpDecayMuon.h
Expand Down
51 changes: 0 additions & 51 deletions Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/CompositeValues.h
View file

This file was deleted.

6 changes: 3 additions & 3 deletions Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/CostFuncFitting.h
View file
Expand Up @@ -57,7 +57,7 @@ class DLLExport CostFuncFitting : public API::ICostFunction

/// Set fitting function.
virtual void setFittingFunction(API::IFunction_sptr function,
API::FunctionDomain_sptr domain, API::IFunctionValues_sptr values);
API::FunctionDomain_sptr domain, API::FunctionValues_sptr values);

/// Get fitting function.
virtual API::IFunction_sptr getFittingFunction()const{return m_function;}
Expand All @@ -73,7 +73,7 @@ class DLLExport CostFuncFitting : public API::ICostFunction
/// Get the domain the fitting function is applied to
API::FunctionDomain_sptr getDomain() const {return m_domain;}
/// Get FunctionValues where function values are stored.
API::IFunctionValues_sptr getValues() const {return m_values;}
API::FunctionValues_sptr getValues() const {return m_values;}

protected:

Expand All @@ -92,7 +92,7 @@ class DLLExport CostFuncFitting : public API::ICostFunction
/// Shared pointer to the function domain
API::FunctionDomain_sptr m_domain;
/// Shared poinetr to the function values
API::IFunctionValues_sptr m_values;
API::FunctionValues_sptr m_values;
/// maps the cost function's parameters to the ones of the fitting function.
std::vector<size_t> m_indexMap;

Expand Down
77 changes: 0 additions & 77 deletions Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/EmptyValues.h
View file

This file was deleted.

2 changes: 1 addition & 1 deletion Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Fit.h
View file
Expand Up @@ -15,7 +15,7 @@ namespace Mantid
namespace API
{
class FunctionDomain;
class IFunctionValues;
class FunctionValues;
class Workspace;
}

Expand Down
6 changes: 3 additions & 3 deletions Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/FitMW.h
View file
Expand Up @@ -15,7 +15,7 @@ namespace Mantid
{
class FunctionDomain;
class FunctionDomain1D;
class IFunctionValues;
class FunctionValues;
class MatrixWorkspace;
}

Expand Down Expand Up @@ -63,12 +63,12 @@ namespace Mantid
/// Create a domain from the input workspace
virtual void createDomain(
boost::shared_ptr<API::FunctionDomain>& domain,
boost::shared_ptr<API::IFunctionValues>& values, size_t i0 = 0);
boost::shared_ptr<API::FunctionValues>& values, size_t i0 = 0);
void createOutputWorkspace(
const std::string& baseName,
API::IFunction_sptr function,
boost::shared_ptr<API::FunctionDomain> domain,
boost::shared_ptr<API::IFunctionValues> values
boost::shared_ptr<API::FunctionValues> values
);
/// Return the size of the domain to be created.
virtual size_t getDomainSize() const;
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/MultiDomainCreator.h
View file
Expand Up @@ -52,7 +52,7 @@ namespace Mantid
/// Create a domain from the input workspace
virtual void createDomain(
boost::shared_ptr<API::FunctionDomain>& domain,
boost::shared_ptr<API::IFunctionValues>& values, size_t i0 = 0);
boost::shared_ptr<API::FunctionValues>& values, size_t i0 = 0);

/// Return the size of the domain to be created.
virtual size_t getDomainSize() const{return 0;}
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/ParDomain.h
View file
Expand Up @@ -41,7 +41,7 @@ class MANTID_CURVEFITTING_DLL ParDomain: public SeqDomain
public:
ParDomain():SeqDomain(){}
/// Create and return i-th domain and i-th values, (i-1)th domain is released.
virtual void getDomainAndValues(size_t i, API::FunctionDomain_sptr& domain, API::IFunctionValues_sptr& values) const;
virtual void getDomainAndValues(size_t i, API::FunctionDomain_sptr& domain, API::FunctionValues_sptr& values) const;
/// Calculate the value of a least squares cost function
virtual void leastSquaresVal(const CostFuncLeastSquares& leastSquares);
/// Calculate the value, first and second derivatives of a least squares cost function
Expand Down
4 changes: 2 additions & 2 deletions Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomain.h
View file
Expand Up @@ -54,7 +54,7 @@ class MANTID_CURVEFITTING_DLL SeqDomain: public API::FunctionDomain
/// Return the number of parts in the domain
virtual size_t getNDomains() const;
/// Create and return i-th domain and i-th values, (i-1)th domain is released.
virtual void getDomainAndValues(size_t i, API::FunctionDomain_sptr& domain, API::IFunctionValues_sptr& values) const;
virtual void getDomainAndValues(size_t i, API::FunctionDomain_sptr& domain, API::FunctionValues_sptr& values) const;
/// Add new domain creator
void addCreator( API::IDomainCreator_sptr creator );
/// Calculate the value of a least squares cost function
Expand All @@ -75,7 +75,7 @@ class MANTID_CURVEFITTING_DLL SeqDomain: public API::FunctionDomain
/// Currently active domain.
mutable std::vector< API::FunctionDomain_sptr > m_domain;
/// Currently active values.
mutable std::vector< API::IFunctionValues_sptr > m_values;
mutable std::vector< API::FunctionValues_sptr > m_values;
/// Domain creators.
std::vector< boost::shared_ptr<API::IDomainCreator> > m_creators;
};
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/CurveFitting/src/CostFuncFitting.cpp
View file
Expand Up @@ -66,7 +66,7 @@ size_t CostFuncFitting::nParams()const
* also contains the data to fit to and the fitting weights (reciprocal errors).
*/
void CostFuncFitting::setFittingFunction(API::IFunction_sptr function,
API::FunctionDomain_sptr domain, API::IFunctionValues_sptr values)
API::FunctionDomain_sptr domain, API::FunctionValues_sptr values)
{
if (domain->size() != values->size())
{
Expand Down

0 comments on commit 65a9f64

Please sign in to comment.