Commit 455e8462 authored by Stefan Philips's avatar Stefan Philips

[REMOVE] Deprecated typedefs WVector_2, WVectorComplex_2, WMatrix_2 and WMatrixComplex_2

parent 6cede2d9
...@@ -370,20 +370,6 @@ public: ...@@ -370,20 +370,6 @@ public:
m_components.resize( size ); m_components.resize( size );
} }
/**
* Returns this WValue as WVector_2.
* \return The WValue as WVector_2.
*/
WVector_2 toWVector()
{
WVector_2 result( m_components.size() );
for( size_t i = 0; i < m_components.size(); ++i )
{
result( i ) = static_cast<double>( m_components[ i ] );
}
return result;
}
protected: protected:
private: private:
/** /**
......
...@@ -31,21 +31,4 @@ ...@@ -31,21 +31,4 @@
#include "WVectorFixed.h" #include "WVectorFixed.h"
#include "WPosition.h" #include "WPosition.h"
/**
* The new dynamic vector type. It is a heap-allocated double vector with dynamic size.
*
* \see http://eigen.tuxfamily.org/dox/classEigen_1_1Matrix.html
* \see http://eigen.tuxfamily.org/dox/classEigen_1_1MatrixBase.html
*/
typedef Eigen::Matrix< double, Eigen::Dynamic, 1 > WVector_2;
/**
* A complex double vector of dynamic size. Heap-allocated.
*
* \see http://eigen.tuxfamily.org/dox/classEigen_1_1Matrix.html
* \see http://eigen.tuxfamily.org/dox/classEigen_1_1MatrixBase.html
*/
typedef Eigen::VectorXcd WVectorComplex_2;
#endif // WLINEARALGEBRA_H #endif // WLINEARALGEBRA_H
...@@ -30,23 +30,5 @@ ...@@ -30,23 +30,5 @@
#include <Eigen/Core> #include <Eigen/Core>
#include <Eigen/LU> #include <Eigen/LU>
/**
* A double matrix of dynamic size. Heap-allocated.
* If you want to access coefficients using the operator( size_t, size_t ), the first parameter is still the row index, starting with 0.
*
* \see http://eigen.tuxfamily.org/dox/classEigen_1_1Matrix.html
* \see http://eigen.tuxfamily.org/dox/classEigen_1_1MatrixBase.html
*/
typedef Eigen::MatrixXd WMatrix_2;
/**
* A complex double matrix of dynamic size. Heap-allocated.
* If you want to access coefficients using the operator( size_t, size_t ), the first parameter is still the row index, starting with 0.
*
* \see http://eigen.tuxfamily.org/dox/classEigen_1_1Matrix.html
* \see http://eigen.tuxfamily.org/dox/classEigen_1_1MatrixBase.html
*/
typedef Eigen::MatrixXcd WMatrixComplex_2;
#endif // WMATRIXEIGEN_H #endif // WMATRIXEIGEN_H
...@@ -213,15 +213,6 @@ public: ...@@ -213,15 +213,6 @@ public:
return WValue< double >( getWValue( i ) ); return WValue< double >( getWValue( i ) );
} }
/**
* \param i id of the WVector to retrieve
* \return The i-th WValue (stored in this value set) as WVector. There are size() such scalars.
*/
virtual WVector_2 getWVector( size_t i ) const
{
return ( WValue< double >( getWValue( i ) ) ).toWVector();
}
/** /**
* Get the i'th vector * Get the i'th vector
* *
......
...@@ -105,12 +105,6 @@ public: ...@@ -105,12 +105,6 @@ public:
*/ */
virtual WValue< double > getWValueDouble( size_t i ) const = 0; virtual WValue< double > getWValueDouble( size_t i ) const = 0;
/**
* \param i id of the WVector to retrieve
* \return The i-th WValue (stored in this value set) as WVector. There are size() such scalars.
*/
virtual WVector_2 getWVector( size_t i ) const = 0;
/** /**
* \return Dimension of the values in this ValueSet * \return Dimension of the values in this ValueSet
*/ */
......
...@@ -100,14 +100,6 @@ public: ...@@ -100,14 +100,6 @@ public:
return WValue< double >( size() ); return WValue< double >( size() );
} }
/**
* \return The i-th WValue (stored in this value set) as WVector_2. There are size() such scalars.
*/
virtual WVector_2 getWVector( size_t /*i*/ ) const
{
return WVector_2( size() );
}
/** /**
* This method returns the smallest value in the valueset. It does not handle vectors, matrices and so on well. It simply returns the * This method returns the smallest value in the valueset. It does not handle vectors, matrices and so on well. It simply returns the
* smallest value in the data array. This is especially useful for texture scaling or other statistic tools (histograms). * smallest value in the data array. This is especially useful for texture scaling or other statistic tools (histograms).
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment