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

Replacing Array in mesh Container with tnlArrayManager. 

Adding unit tests for tnlString, tnlObject and tnlArrayManager.
parent cbbc799c

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ INCLUDE( Dart ) 


set( configDirectory \"${CMAKE_INSTALL_PREFIX}/share/tnl-${tnlVersion}/\")

set( sourceDirectory \"${PROJECT_SOURCE_DIR}/\" )

set( testsDirectory \"${PROJECT_TESTS_DIR}/\" )

set( testsDirectory \"${PROJECT_TESTS_PATH}/\" )

CONFIGURE_FILE( "tnlConfig.h.in" "${PROJECT_BUILD_PATH}/tnlConfig.h" )

INSTALL( FILES ${PROJECT_BUILD_PATH}/tnlConfig.h DESTINATION include/tnl-${tnlVersion} )

ChangeLog

+7 −0
Original line number Diff line number Diff line 
2012-10-05  Tomas Oberhuber  <tomas.oberhuber@fjfi.cvut.cz>

 

	* src/mesh/detail/container.h:

	  replacing Array for m_data with tnlArrayManager     

	* tests/mesh/main.cpp (main):

	  re-defining i/o files w.r.t. the project directory structure 



2012-07-09  oberhuber  <oberhuber@yvonne>



	* src/core/tnlVectorBase.h: Removed.

buildAll

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


cd Debug

cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${HOME}/local -DCUDA_ARCHITECTURE=${CUDA_ARCHITECTURE} -DWITH_CUDA=${WITH_CUDA}

make -j${CPUS} #VERBOSE=${VERBOSE}

make -j${CPUS} VERBOSE=1

make -j${CPUS} test

make -j${CPUS} install

src/config/tnlParameterContainer.cpp

+3 −3
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ bool tnlParameterContainer :: SetParameter( const char* name, 
   {

      if( parameters[ i ] -> name == name )

      {

         if( GetParameterType( parameters[ i ] ) == GetParameterType( tnlString() ) ) 

         if( parameters[ i ] -> type == getParameterType< tnlString >() )

         {

            ( ( tnlParameter< tnlString > * ) parameters[ i ] ) -> value. setString( value );

            return true;
@@ -63,7 +63,7 @@ bool tnlParameterContainer :: SetParameter( const char* name, 
         else

         {

            cerr << "Parameter " << name << " already exists with different type " 

                 << GetParameterType( parameters[ i ] ) << " not " 

                 << parameters[ i ] -> type << " not " 

                 << GetParameterType( value ) << endl;

            abort();

            return false;

src/core/param-types.h

+10 −7
Original line number Diff line number Diff line
@@ -22,12 +22,15 @@ 
#include <core/tnlList.h>

#include <core/tnlString.h>



inline tnlString GetParameterType( bool ) { return tnlString( "bool" ); };

inline tnlString GetParameterType( int ) { return tnlString( "int" ); };

inline tnlString GetParameterType( char ) { return tnlString( "char" ); };

inline tnlString GetParameterType( const float& ) { return tnlString( "float" ); };

inline tnlString GetParameterType( const double& ) { return tnlString( "double" ); };

inline tnlString GetParameterType( const tnlFloat& ) { return tnlString( "tnlFloat" ); };

inline tnlString GetParameterType( const tnlDouble& ) { return tnlString( "tnlDouble" ); };

template< typename T >

tnlString getParameterType() { return tnlString( "unknown type" ); };



template<> inline tnlString getParameterType< bool >() { return tnlString( "bool" ); };

template<> inline tnlString getParameterType< int >() { return tnlString( "int" ); };

template<> inline tnlString getParameterType< char >() { return tnlString( "char" ); };

template<> inline tnlString getParameterType< float >() { return tnlString( "float" ); };

template<> inline tnlString getParameterType< double >() { return tnlString( "double" ); };

template<> inline tnlString getParameterType< tnlFloat >() { return tnlString( "tnlFloat" ); };

template<> inline tnlString getParameterType< tnlDouble> () { return tnlString( "tnlDouble" ); };



#endif