Silenced type conversion warnings.

This commit is contained in:
Hauke Heibel
2010-02-03 19:20:25 +01:00
parent 05837be8fb
commit 1a77334d54
6 changed files with 23 additions and 15 deletions

View File

@@ -50,8 +50,8 @@ template<typename VectorType>
void testVectorType(const VectorType& base)
{
typedef typename ei_traits<VectorType>::Scalar Scalar;
Scalar low = ei_random(-500,500);
Scalar high = ei_random(-500,500);
Scalar low = ei_random<Scalar>(-500,500);
Scalar high = ei_random<Scalar>(-500,500);
if (low>high) std::swap(low,high);
const int size = base.size();
const Scalar step = (high-low)/(size-1);

View File

@@ -27,6 +27,7 @@
template<typename MatrixType> void matrixRedux(const MatrixType& m)
{
typedef typename MatrixType::Scalar Scalar;
typedef typename MatrixType::RealScalar RealScalar;
int rows = m.rows();
int cols = m.cols();
@@ -44,7 +45,7 @@ template<typename MatrixType> void matrixRedux(const MatrixType& m)
minc = std::min(ei_real(minc), ei_real(m1(i,j)));
maxc = std::max(ei_real(maxc), ei_real(m1(i,j)));
}
const Scalar mean = s/Scalar(rows*cols);
const Scalar mean = s/Scalar(RealScalar(rows*cols));
VERIFY_IS_APPROX(m1.sum(), s);
VERIFY_IS_APPROX(m1.mean(), mean);