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

Fixing assertions.

parent cc17f0dd

src/core/tnlAssert.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


#ifndef TNLASSERT_H_



#ifdef DEBUG

#ifndef NDEBUG



#include <iostream>

#include <stdlib.h>

src/implementation/core/tnlMultiArray2D_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ template< typename Element, typename Device, typename Index > 
bool tnlMultiArray< 2, Element, Device, Index > :: setDimensions( const Index jSize,

                                                                  const Index iSize )

{

   tnlAssert( xSize > 0 && ySize > 0,

   tnlAssert( iSize > 0 && jSize > 0,

              cerr << "iSize = " << iSize

                   << "jSize = " << jSize );

src/implementation/core/tnlMultiArray3D_impl.h

+2 −2
Original line number Diff line number Diff line
@@ -106,8 +106,8 @@ Index tnlMultiArray< 3, Element, Device, Index > :: getElementIndex( const Index 
                                                                     const Index i ) const

{

   tnlAssert( i >= 0 && i < this -> dimensions[ 0 ] &&

              j >= 0 && j < this -> dimensions[ 1 ] &&,

              k >= 0 && k < this -> dimensions[ 2 ]

              j >= 0 && j < this -> dimensions[ 1 ] &&

              k >= 0 && k < this -> dimensions[ 2 ],

              cerr << " i = " << i

                   << " j = " << j

                   << " k = " << k

src/implementation/core/tnlMultiArray4D_impl.h

+2 −2
Original line number Diff line number Diff line
@@ -114,9 +114,9 @@ Index tnlMultiArray< 4, Element, Device, Index > :: getElementIndex( const Index 
                                                                          const Index i ) const

{

   tnlAssert( i >= 0 && i < this -> dimensions[ 0 ] &&

              j >= 0 && j < this -> dimensions[ 1 ] &&,

              j >= 0 && j < this -> dimensions[ 1 ] &&

              k >= 0 && k < this -> dimensions[ 2 ] &&

              l >= 0 && l < this -> dimensions[ 3 ]

              l >= 0 && l < this -> dimensions[ 3 ],

              cerr << " i = " << i

                   << " j = " << j

                   << " k = " << k

src/matrix/tnlMultiDiagonalMatrix.h

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ Index tnlMultiDiagonalMatrix< Real, Device, Index > :: getNonzeroElements() cons 
template< typename Real, typename Device, typename Index >

void tnlMultiDiagonalMatrix< Real, Device, Index > :: setDiagonalsOffsets( const tnlVector< Index, Device, Index >& diagonalsOffsets )

{

   tnlAssert( diagonalsOffsets. getSize() == this -> diagonalsOffsest. getSize(),

   tnlAssert( diagonalsOffsets. getSize() == this -> diagonalsOffsets. getSize(),

              cerr << "diagonalsOffsets. getSize() = " << diagonalsOffsets. getSize()

                   << " this -> diagonalsOffsets. getSize() = " << this -> diagonalsOffsets. getSize() << endl; );

   this -> diagonalsOffsets = diagonalsOffsets;