Skip to content

Commit

Permalink
REfs #5827 Define constructor for GridDomain1D
Browse files Browse the repository at this point in the history
  • Loading branch information
jmborr committed Sep 10, 2012
1 parent 6b60191 commit a1022bc
Show file tree
Hide file tree
Showing 3 changed files with 108 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Code/Mantid/Framework/API/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set ( SRC_FILES
src/GridDomain.cpp
# src/GridDomain1D.cpp
src/GridDomain1D.cpp
src/ITransformScale.cpp
src/TransformScaleFactory.cpp
src/LinearScale.cpp
Expand Down Expand Up @@ -117,7 +117,7 @@ set ( SRC_UNITY_IGNORE_FILES src/CompositeFunction.cpp
set ( INC_FILES
# inc/MantidAPI/BoxCtrlChangesInterface.h
inc/MantidAPI/GridDomain.h
# inc/MantidAPI/GridDomain1D.h
inc/MantidAPI/GridDomain1D.h
inc/MantidAPI/ITransformScale.h
inc/MantidAPI/TransformScaleFactory.h
inc/MantidAPI/LinearScale.h
Expand Down
71 changes: 71 additions & 0 deletions Code/Mantid/Framework/API/inc/MantidAPI/GridDomain1D.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
#ifndef MANTID_API_GRIDDOMAIN1D_H_
#define MANTID_API_GRIDDOMAIN1D_H_

//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
#include <stdexcept>
#include <boost/shared_ptr.hpp>

#include "MantidAPI/DllConfig.h"
#include "MantidAPI/GridDomain.h"

namespace Mantid
{
namespace API
{
/*Base class that represents a one dimensional grid domain,
from which a function may take its arguments.
@author Jose Borreguero
@date Aug/28/2012
Copyright &copy; 2009 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 MANTID_API_DLL GridDomain1D: public API::GridDomain
{
public:
GridDomain1D() {};
virtual ~GridDomain1D();
/// initialize
void initialize(double &startX, double &endX, size_t &n, std::string scaling);
/// number of grid point s
size_t size() const { return m_points.size(); }
/// number of dimensions in the grid
size_t nDimensions() { return 1; }
void reScale( const std::string &scaling );
void SetScalingName(const std::string scaling);
std::vector<double> &getPoints(){ return m_points; }

private:
std::string m_scaling;
std::vector<double> m_points;

}; // class IGridDomain

/// typedef for a shared pointer
typedef boost::shared_ptr<GridDomain1D> GridDomain1D_sptr;

} // namespace API
} // namespace Mantid

#endif /*MANTID_API_GRIDDOMAIN1D_H_*/
35 changes: 35 additions & 0 deletions Code/Mantid/Framework/API/src/GridDomain1D.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
#include <iostream>
#include <numeric>

#include "MantidAPI/GridDomain1D.h"
#include "MantidAPI/ITransformScale.h"
#include "MantidAPI/TransformScaleFactory.h"

namespace Mantid
{
namespace API
{

void GridDomain1D::initialize(double &startX, double &endX, size_t &n, const std::string scaling )
{
m_points.resize(n);
m_points.front() = startX;
m_points.back() = endX;
this->reScale( scaling );
}

void GridDomain1D::reScale( const std::string &scaling )
{
ITransformScale_sptr fx = Mantid::API::TransformScaleFactory::Instance().create( scaling );
fx->transform( m_points );
m_scaling = scaling;
}




} // namespace API
} // namespace Mantid

0 comments on commit a1022bc

Please sign in to comment.