--- trunk/esys2/escript/src/Data/AbstractSystemMatrix.h 2005/07/08 04:08:13 123 +++ trunk/escript/src/AbstractSystemMatrix.h 2006/01/30 04:23:44 474 @@ -16,9 +16,10 @@ #if !defined escript_AbstractSystemMatrix_20040628_H #define escript_AbstractSystemMatrix_20040628_H -#include "escript/Data/FunctionSpace.h" -#include "escript/Data/SystemMatrixException.h" -#include "escript/Data/Data.h" +#include "FunctionSpace.h" +#include "SystemMatrixException.h" +#include "Data.h" + #include namespace escript { @@ -67,7 +68,7 @@ \brief matrix*vector multiplication */ - Data vectorMultiply(const Data& right) const; + Data vectorMultiply(Data& right) const; /** \brief @@ -123,7 +124,7 @@ \brief returns the solution u of the linear system this*u=in */ - Data solve(const Data& in,const boost::python::dict& options) const; + Data solve(Data& in,const boost::python::dict& options) const; /** \brief writes the matrix to a file using the Matrix Market file format @@ -136,15 +137,9 @@ virtual void saveHB(const std::string& fileName) const; /** - \brief sets the matrix entries to value + \brief resets the matrix entries */ - virtual void setValue(const double value) const; - - /** - \brief cleans any setting, allocations by the solver. - */ - virtual void resetSolver() const; - + virtual void resetValues() const; protected: @@ -154,13 +149,13 @@ \brief solves the linear system this*out=in */ - virtual void setToSolution(Data& out,const Data& in,const boost::python::dict& options) const; + virtual void setToSolution(Data& out,Data& in,const boost::python::dict& options) const; /** \brief performs y+=this*x */ - virtual void ypAx(Data& y,const Data& x) const; + virtual void ypAx(Data& y,Data& x) const; int m_empty; int m_column_blocksize; @@ -170,7 +165,7 @@ }; -Data operator*(const AbstractSystemMatrix& left, const Data& right) ; +Data operator*(const AbstractSystemMatrix& left,const Data& right) ;