Commit 376b4bff authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Fixing multidiagonal matrix unit tests fro CUDA.

parent 53762829

src/UnitTests/Matrices/MultidiagonalMatrixTest.h

+13 −41
Original line number Diff line number Diff line
@@ -354,22 +354,12 @@ void test_SetElement() 
   RealType value = 1;

   for( IndexType i = 0; i < rows; i++ )

      for( IndexType j = 0; j < cols; j++ )

      {

         bool found( false );

         for( IndexType k = 0; k < diagonals.getSize(); k++ )

         {

            if( i + diagonals[ k ] == j )

            {

         if( diagonals.containsValue( j - i ) )

            m.setElement( i, j, value++ );

               found = true;

               break;

            }

         }

         if( ! found )

         else

         {

            EXPECT_THROW( m.setElement( i, j, value++ ), std::logic_error );

         }

      }



   EXPECT_EQ( m.getElement( 0, 0 ),  1 );

   EXPECT_EQ( m.getElement( 0, 1 ),  2 );
@@ -427,24 +417,16 @@ void test_AddElement() 
   RealType value = 1;

   for( IndexType i = 0; i < rows; i++ )

      for( IndexType j = 0; j < cols; j++ )

      {

         bool found( false );

         for( IndexType k = 0; k < diagonals.getSize(); k++ )

         {

            if( i + diagonals[ k ] == j )

         if( diagonals.containsValue( j - i ) )

         {

            if( j >= i )

                  m.setElement( i, j, value++ );

               else value++;

               found = true;

               break;

            }

               m.setElement( i, j, value );

            value++;

         }

         if( ! found )

         else

         {

            EXPECT_THROW( m.setElement( i, j, value++ ), std::logic_error );

         }

      }



   // Check the added elements

   EXPECT_EQ( m.getElement( 0, 0 ),  1 );
@@ -493,22 +475,12 @@ void test_AddElement() 
   RealType multiplicator = 2;

   for( IndexType i = 0; i < rows; i++ )

      for( IndexType j = 0; j < cols; j++ )

      {

         bool found( false );

         for( IndexType k = 0; k < diagonals.getSize(); k++ )

         {

            if( i + diagonals[ k ] == j )

            {

         if( diagonals.containsValue( j - i ) )

            m.addElement( i, j, value++, multiplicator );

               found = true;

               break;

            }

         }

         if( ! found )

         else

         {

            EXPECT_THROW( m.addElement( i, j, value++, multiplicator ), std::logic_error );

         }

      }



   EXPECT_EQ( m.getElement( 0, 0 ),  3 );

   EXPECT_EQ( m.getElement( 0, 1 ),  6 );