GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-06-04 18:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix typo in blue norm

Browse Source
This commit is contained in:
Gael Guennebaud 2009-07-14 23:00:53 +02:00
parent f5d2317b12
commit 7a9519a9be
2 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Eigen/src/Core/Dot.h
View File

@ -394,7 +394,7 @@ MatrixBase<Derived>::blueNorm() const
{ {
ax = ei_abs(coeff(j)); ax = ei_abs(coeff(j));
if(ax > b2) abig += ei_abs2(ax*s2m); if(ax > b2) abig += ei_abs2(ax*s2m);
else if(ax < b2) asml += ei_abs2(ax*s1m); else if(ax < b1) asml += ei_abs2(ax*s1m);
else amed += ei_abs2(ax); else amed += ei_abs2(ax);
} }
if(abig > Scalar(0)) if(abig > Scalar(0))

32
test/adjoint.cpp
View File

@ -114,29 +114,15 @@ template<typename MatrixType> void adjoint(const MatrixType& m)
void test_adjoint() void test_adjoint()
{ {
// for(int i = 0; i < g_repeat; i++) { for(int i = 0; i < g_repeat; i++) {
// CALL_SUBTEST( adjoint(Matrix<float, 1, 1>()) ); CALL_SUBTEST( adjoint(Matrix<float, 1, 1>()) );
// CALL_SUBTEST( adjoint(Matrix3d()) ); CALL_SUBTEST( adjoint(Matrix3d()) );
// CALL_SUBTEST( adjoint(Matrix4f()) ); CALL_SUBTEST( adjoint(Matrix4f()) );
// CALL_SUBTEST( adjoint(MatrixXcf(4, 4)) ); CALL_SUBTEST( adjoint(MatrixXcf(4, 4)) );
// CALL_SUBTEST( adjoint(MatrixXi(8, 12)) ); CALL_SUBTEST( adjoint(MatrixXi(8, 12)) );
// CALL_SUBTEST( adjoint(MatrixXf(21, 21)) ); CALL_SUBTEST( adjoint(MatrixXf(21, 21)) );
// }
// test a large matrix only once
// CALL_SUBTEST( adjoint(Matrix<float, 100, 100>()) );
for(int i = 0; i < g_repeat; i++)
{
std::cerr.precision(20);
int s = 1000000;
double y = 1.131242353467546478463457843445677435233e23 * ei_abs(ei_random<double>());
VectorXf v = VectorXf::Ones(s) * y;
// Vector4f x(v.segment(0,s/4).blueNorm(), v.segment(s/4+1,s/4).blueNorm(),
// v.segment((s/2)+1,s/4).blueNorm(), v.segment(3*s/4+1,s - 3*s/4-1).blueNorm());
// std::cerr << v.norm() << " == " << v.stableNorm() << " == " << v.blueNorm() << " == " << x.norm() << "\n";
std::cerr << v.norm() << "\n" << v.stableNorm() << "\n" << v.blueNorm() << "\n" << ei_sqrt(double(s)) * y << "\n\n\n";
// VectorXd d = VectorXd::Ones(s) * y;//v.cast<double>();
// std::cerr << d.norm() << "\n" << d.stableNorm() << "\n" << d.blueNorm() << "\n" << ei_sqrt(double(s)) * y << "\n\n\n";
} }
// test a large matrix only once
CALL_SUBTEST( adjoint(Matrix<float, 100, 100>()) );
} }