Commit e0a1948b authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[FIX] - now all tests compile too. Some of them: Not yet working.

parent 9159b512
......@@ -30,10 +30,10 @@
#include <cxxtest/TestSuite.h>
#include "../../WException.h"
#include "../../WLimits.h"
#include "../WLinearAlgebraFunctions.h"
#include "../WMatrix.h"
#include "../linearAlgebra/WLinearAlgebra.h"
#include "../linearAlgebra/WLinearAlgebra.h"
#include "WVector3dTraits.h"
/**
......@@ -241,9 +241,9 @@ public:
WMatrix_2 Ainvers( pseudoInverse( A ) );
WMatrix_2 I( A*Ainvers );
for ( size_t row = 0; row < I.rows(); row++ )
for ( int row = 0; row < I.rows(); row++ )
{
for ( size_t col = 0; col < I.cols(); col++ )
for ( int col = 0; col < I.cols(); col++ )
{
if ( row == col )
{
......
......@@ -30,6 +30,7 @@
#include <cxxtest/TestSuite.h>
#include "../WMath.h"
#include "../../WLimits.h"
#include "WPositionTraits.h"
......
......@@ -87,7 +87,7 @@ public:
// eigenvectors should be perpendicular
TS_ASSERT_DELTA( dot( sys[0].second, sys[1].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[1].second, sys[2].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second., sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second, sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[0].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[1].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[2].second ), 1.0, 1e-9 );
......@@ -104,7 +104,7 @@ public:
TS_ASSERT_DELTA( sys[2].first, 2.0, 1e-6 );
TS_ASSERT_DELTA( dot( sys[0].second, sys[1].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[1].second, sys[2].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second., sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second, sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[0].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[1].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[2].second ), 1.0, 1e-9 );
......@@ -121,7 +121,7 @@ public:
TS_ASSERT_DELTA( sys[2].first, 2.0, 1e-6 );
TS_ASSERT_DELTA( dot( sys[0].second, sys[1].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[1].second, sys[2].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second., sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second, sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[0].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[1].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[2].second ), 1.0, 1e-9 );
......@@ -138,7 +138,7 @@ public:
TS_ASSERT_DELTA( sys[2].first, -1.0, 1e-6 );
TS_ASSERT_DELTA( dot( sys[0].second, sys[1].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[1].second, sys[2].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second., sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second, sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[0].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[1].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[2].second ), 1.0, 1e-9 );
......@@ -155,7 +155,7 @@ public:
TS_ASSERT_DELTA( sys[2].first, 1.0, 1e-6 );
TS_ASSERT_DELTA( dot( sys[0].second, sys[1].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[1].second, sys[2].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second., sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second, sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[0].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[1].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[2].second ), 1.0, 1e-9 );
......@@ -172,7 +172,7 @@ public:
TS_ASSERT_DELTA( sys[2].first, 0.0, 1e-6 );
TS_ASSERT_DELTA( dot( sys[0].second, sys[1].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[1].second, sys[2].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second., sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second, sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[0].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[1].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[2].second ), 1.0, 1e-9 );
......@@ -190,7 +190,7 @@ public:
TS_ASSERT_DELTA( sys[2].first, 2.000001, 1e-6 );
TS_ASSERT_DELTA( dot( sys[0].second, sys[1].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[1].second, sys[2].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second., sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second, sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[0].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[1].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[2].second ), 1.0, 1e-9 );
......@@ -208,7 +208,7 @@ public:
TS_ASSERT_DELTA( sys[2].first, 3.824572321236e30, 1e-6 );
TS_ASSERT_DELTA( dot( sys[0].second, sys[1].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[1].second, sys[2].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second., sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second, sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[0].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[1].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[2].second ), 1.0, 1e-9 );
......@@ -226,7 +226,7 @@ public:
TS_ASSERT_DELTA( sys[2].first, 2.0, 1e-6 );
TS_ASSERT_DELTA( dot( sys[0].second, sys[1].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[1].second, sys[2].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second., sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second, sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[0].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[1].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[2].second ), 1.0, 1e-9 );
......@@ -248,7 +248,7 @@ public:
TS_ASSERT_DELTA( sys[2].first, 3.0, 1e-6 );
TS_ASSERT_DELTA( dot( sys[0].second, sys[1].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[1].second, sys[2].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second., sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second, sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[0].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[1].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[2].second ), 1.0, 1e-9 );
......@@ -271,7 +271,7 @@ public:
TS_ASSERT_DELTA( sys[2].first, 3.0, 1e-6 );
TS_ASSERT_DELTA( dot( sys[0].second, sys[1].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[1].second, sys[2].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second., sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second, sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[0].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[1].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[2].second ), 1.0, 1e-9 );
......@@ -294,7 +294,7 @@ public:
TS_ASSERT_DELTA( sys[2].first, 2.0, 1e-6 );
TS_ASSERT_DELTA( dot( sys[0].second, sys[1].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[1].second, sys[2].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second., sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( dot( sys[2].second, sys[0].second ), 0.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[0].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[1].second ), 1.0, 1e-9 );
TS_ASSERT_DELTA( length( sys[2].second ), 1.0, 1e-9 );
......
......@@ -35,7 +35,7 @@
#include <cxxtest/TestSuite.h>
#include "../../common/exceptions/WOutOfBounds.h"
#include "../../common/math/test/WVector3d_2Traits.h"
#include "../../common/math/test/WVector3dTraits.h"
#include "../../common/WLimits.h"
#include "../WGridRegular3D.h"
......
......@@ -625,7 +625,7 @@ private:
wtracking::WThreadedTrackingFunction::JobType const& j,
WVector3d_2 d )
{
if( dot( j, d ) > 0.0 )
if( dot( j.second, d ) > 0.0 )
{
return d;
}
......
......@@ -14,7 +14,6 @@ SET( QT_LIBS ${QT_QTCORE_LIBRARY}
SET(GUI_QT4_MOC_HDRS
WMainWindow.h
WQtNavGLWidget.h
WQtGLWidget.h
WQtGLDockWidget.h
WQtCombinerToolbar.h
guiElements/WQtPushButton.h
......
......@@ -236,7 +236,7 @@ void WMNavigationSlices::PickCallback::pick( WPickInfo pickInfo )
if ( pickInfo.getName() == m_node->getName() )
{
WVector3d_2 normal = pickInfo.getPickNormal();
WVector2D_2 newPixelPos = pickInfo.getPickPixel();
WVector2d_2 newPixelPos = pickInfo.getPickPixel();
// dragging was initialized earlier
if ( m_isPicked )
{
......
......@@ -33,6 +33,7 @@
#include <boost/signals2.hpp>
#include "../../graphicsEngine/WGEManagedGroupNode.h"
#include "../../common/math/linearAlgebra/WLinearAlgebra.h"
#include "../../common/WPropertyTypes.h"
#include "../../graphicsEngine/WPickInfo.h"
......@@ -162,7 +163,7 @@ private:
/**
* The stored pixel position of a previous drag event.
*/
WVector2D_2 m_oldPixelPosition;
WVector2d_2 m_oldPixelPosition;
/**
* The transformation direction. This is needed since the OSG coord system has a mirrored coronal direction.
......
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