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

@@ -46,10 +46,10 @@ complex<long double> promote(long double x) { return complex<long double>( x);
long double difpower=0;
cerr <<"idx\ttruth\t\tvalue\t|dif|=\n";
long double pi = acos((long double)-1);
for (int k0=0;k0<fftbuf.size();++k0) {
for (int k0=0;k0<static_cast<int>(fftbuf.size());++k0) {
complex<long double> acc = 0;
long double phinc = -2.*k0* pi / timebuf.size();
for (int k1=0;k1<timebuf.size();++k1) {
for (int k1=0;k1<static_cast<int>(timebuf.size());++k1) {
acc += promote( timebuf[k1] ) * exp( complex<long double>(0,k1*phinc) );
}
totalpower += norm(acc);

View File

@@ -33,14 +33,15 @@ template<typename MatrixType>
MatrixType createRandomMatrix(const int size)
{
typedef typename MatrixType::Scalar Scalar;
typedef typename MatrixType::RealScalar RealScalar;
MatrixType result;
if (ei_random<int>(0,1) == 0) {
result = MatrixType::Random(size, size);
} else {
MatrixType diag = MatrixType::Zero(size, size);
for (int i = 0; i < size; ++i) {
diag(i, i) = static_cast<Scalar>(ei_random<int>(0,2))
+ ei_random<Scalar>() * static_cast<Scalar>(0.01);
diag(i, i) = Scalar(RealScalar(ei_random<int>(0,2)))
+ ei_random<Scalar>() * Scalar(RealScalar(0.01));
}
MatrixType A = MatrixType::Random(size, size);
result = A.inverse() * diag * A;