Deleting name from tnlObject. (ae72d677) · Commits · TNL / tnl-dev

src/core/tnlObject.cpp

+4 −24

Original line number	Diff line number	Diff line
		@@ -25,21 +25,15 @@
		#include <cstring>
		#include <stdio.h>

		const char magic_number[] = "SIM33";
		const char magic_number[] = "TNLMN";

		tnlObject :: tnlObject()
		: name( "<no name>" )
		{
		dbgFunctionName( "tnlObject", "tnlObject" );
		dbgCout( "Initiating object " << getName() );
		}


		tnlObject :: tnlObject( const tnlString& _name )
		: name( _name )
		{
		dbgFunctionName( "tnlObject", "tnlObject" );
		dbgCout( "Initiating object " << getName() );
		}

		tnlString tnlObject :: getType()
		@@ -62,16 +56,6 @@ tnlString tnlObject :: getSerializationTypeVirtual() const
		return this->getSerializationType();
		}

		void tnlObject :: setName( const tnlString& name)
		{
		this -> name = name;
		}

		const tnlString& tnlObject :: getName() const
		{
		return name;
		}

		bool tnlObject :: save( tnlFile& file ) const
		{
		dbgFunctionName( "tnlObject", "Save" );
		@@ -82,9 +66,7 @@ bool tnlObject :: save( tnlFile& file ) const
		if( ! file. write( magic_number, strlen( magic_number ) ) )
		#endif
		return false;
		dbgCout( "Writing object name " << name );
		if( ! this->getSerializationTypeVirtual().save( file ) \|\|
		! name. save( file ) ) return false;
		if( ! this->getSerializationTypeVirtual().save( file ) ) return false;
		return true;
		}

		@@ -100,8 +82,6 @@ bool tnlObject :: load( tnlFile& file )
		cerr << "Given file contains instance of " << objectType << " but " << getSerializationTypeVirtual() << " is expected." << endl;
		return false;
		}
		dbgCout( "Reading object name " );
		if( ! name. load( file ) ) return false;
		return true;
		}

		@@ -144,7 +124,6 @@ bool tnlObject :: load( const tnlString& fileName )
		bool getObjectType( tnlFile& file, tnlString& type )
		{
		dbgFunctionName( "", "getObjectType" );
		dbgCout( "Checking magic number." );
		char mn[ 10 ];
		#ifdef HAVE_NOT_CXX11
		if( ! file. read< char, tnlHost, int >( mn, strlen( magic_number ) ) )
		@@ -155,7 +134,8 @@ bool getObjectType( tnlFile& file, tnlString& type )
		cerr << "Unable to read file " << file. getFileName() << " ... " << endl;
		return false;
		}
		if( strncmp( mn, magic_number, 5 ) != 0 ) return false;
		if( strncmp( mn, magic_number, 5 ) != 0 &&
		strncmp( mn, "SIM33", 5 ) != 0 ) return false;
		if( ! type. load( file ) ) return false;
		return true;
		}

src/core/vectors/tnlMultiVector1D_impl.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -182,8 +182,8 @@ tnlMultiVector< 1, Real, Device, Index >&
		// TODO: Static assert on dimensions
		tnlAssert( this -> getDimensions() == Vector. getDimensions(),
		cerr << "You are attempting to assign two Vectors with different dimensions." << endl
		<< "First Vector dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second Vector dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		<< "First vector dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second vector dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		tnlVector< Real, Device, Index > :: operator = ( Vector );
		return ( *this );
		}

src/core/vectors/tnlMultiVector2D_impl.h

+6 −6

Original line number	Diff line number	Diff line
		@@ -155,8 +155,8 @@ bool tnlMultiVector< 2, Real, Device, Index > :: operator == ( const MultiVector
		// TODO: Static assert on dimensions
		tnlAssert( this -> getDimensions() == Vector. getDimensions(),
		cerr << "You are attempting to compare two Vectors with different dimensions." << endl
		<< "First Vector dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second Vector dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		<< "First vector dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second vector dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		return tnlVector< Real, Device, Index > :: operator == ( Vector );
		}

		@@ -174,8 +174,8 @@ tnlMultiVector< 2, Real, Device, Index >&
		// TODO: Static assert on dimensions
		tnlAssert( this -> getDimensions() == Vector. getDimensions(),
		cerr << "You are attempting to assign two Vectors with different dimensions." << endl
		<< "First Vector dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second Vector dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		<< "First vector dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second vector dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		tnlVector< Real, Device, Index > :: operator = ( Vector );
		return ( *this );
		}
		@@ -188,8 +188,8 @@ tnlMultiVector< 2, Real, Device, Index >&
		// TODO: Static assert on dimensions
		tnlAssert( this -> getDimensions() == Vector. getDimensions(),
		cerr << "You are attempting to assign two Vectors with different dimensions." << endl
		<< "First Vector dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second Vector dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		<< "First vector dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second vector dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		tnlVector< Real, Device, Index > :: operator = ( Vector );
		return ( *this );
		}

src/core/vectors/tnlMultiVector3D_impl.h

+10 −20

Original line number	Diff line number	Diff line
		@@ -174,10 +174,8 @@ bool tnlMultiVector< 3, Real, Device, Index > :: operator == ( const MultiVector
		// TODO: Static assert on dimensions
		tnlAssert( this -> getDimensions() == Vector. getDimensions(),
		cerr << "You are attempting to compare two Vectors with different dimensions." << endl
		<< "First Vector name is " << this -> getName()
		<< " dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second Vector is " << Vector. getName()
		<< " dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		<< "First vector dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second vector dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		return tnlVector< Real, Device, Index > :: operator == ( Vector );
		}

		@@ -195,10 +193,8 @@ tnlMultiVector< 3, Real, Device, Index >&
		// TODO: Static assert on dimensions
		tnlAssert( this -> getDimensions() == Vector. getDimensions(),
		cerr << "You are attempting to assign two Vectors with different dimensions." << endl
		<< "First Vector name is " << this -> getName()
		<< " dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second Vector is " << Vector. getName()
		<< " dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		<< "First vector dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second vector dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		tnlVector< Real, Device, Index > :: operator = ( Vector );
		return ( *this );
		}
		@@ -211,10 +207,8 @@ tnlMultiVector< 3, Real, Device, Index >&
		// TODO: Static assert on dimensions
		tnlAssert( this -> getDimensions() == Vector. getDimensions(),
		cerr << "You are attempting to assign two Vectors with different dimensions." << endl
		<< "First Vector name is " << this -> getName()
		<< " dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second Vector is " << Vector. getName()
		<< " dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		<< "First vector dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second vector dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		tnlVector< Real, Device, Index > :: operator = ( Vector );
		return ( *this );
		}
		@@ -224,14 +218,12 @@ bool tnlMultiVector< 3, Real, Device, Index > :: save( tnlFile& file ) const
		{
		if( ! tnlVector< Real, Device, Index > :: save( file ) )
		{
		cerr << "I was not able to write the tnlVector of tnlMultiVector "
		<< this -> getName() << endl;
		cerr << "I was not able to write the tnlVector of tnlMultiVector." << endl;
		return false;
		}
		if( ! dimensions. save( file ) )
		{
		cerr << "I was not able to write the dimensions of tnlMultiVector "
		<< this -> getName() << endl;
		cerr << "I was not able to write the dimensions of tnlMultiVector." << endl;
		return false;
		}
		return true;
		@@ -242,14 +234,12 @@ bool tnlMultiVector< 3, Real, Device, Index > :: load( tnlFile& file )
		{
		if( ! tnlVector< Real, Device, Index > :: load( file ) )
		{
		cerr << "I was not able to read the tnlVector of tnlMultiVector "
		<< this -> getName() << endl;
		cerr << "I was not able to read the tnlVector of tnlMultiVector." << endl;
		return false;
		}
		if( ! dimensions. load( file ) )
		{
		cerr << "I was not able to read the dimensions of tnlMultiVector "
		<< this -> getName() << endl;
		cerr << "I was not able to read the dimensions of tnlMultiVector." << endl;
		return false;
		}
		return true;

src/core/vectors/tnlMultiVector4D_impl.h

+10 −26

Original line number	Diff line number	Diff line
		@@ -25,12 +25,6 @@ tnlMultiVector< 4, Real, Device, Index > :: tnlMultiVector()
		{
		}

		template< typename Real, typename Device, typename Index >
		tnlMultiVector< 4, Real, Device, Index > :: tnlMultiVector( const tnlString& name )
		{
		this -> setName( name );
		}

		template< typename Real, typename Device, typename Index >
		tnlString tnlMultiVector< 4, Real, Device, Index > :: getType()
		{
		@@ -191,10 +185,8 @@ bool tnlMultiVector< 4, Real, Device, Index > :: operator == ( const MultiVector
		// TODO: Static assert on dimensions
		tnlAssert( this -> getDimensions() == Vector. getDimensions(),
		cerr << "You are attempting to compare two Vectors with different dimensions." << endl
		<< "First Vector name is " << this -> getName()
		<< " dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second Vector is " << Vector. getName()
		<< " dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		<< "First vector dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second vector dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		return tnlVector< Real, Device, Index > :: operator == ( Vector );
		}

		@@ -212,10 +204,8 @@ tnlMultiVector< 4, Real, Device, Index >&
		// TODO: Static assert on dimensions
		tnlAssert( this -> getDimensions() == Vector. getDimensions(),
		cerr << "You are attempting to assign two Vectors with different dimensions." << endl
		<< "First Vector name is " << this -> getName()
		<< " dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second Vector is " << Vector. getName()
		<< " dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		<< "First vector dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second vector dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		tnlVector< Real, Device, Index > :: operator = ( Vector );
		return ( *this );
		}
		@@ -228,10 +218,8 @@ tnlMultiVector< 4, Real, Device, Index >&
		// TODO: Static assert on dimensions
		tnlAssert( this -> getDimensions() == Vector. getDimensions(),
		cerr << "You are attempting to assign two Vectors with different dimensions." << endl
		<< "First Vector name is " << this -> getName()
		<< " dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second Vector is " << Vector. getName()
		<< " dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		<< "First vector dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second vector dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		tnlVector< Real, Device, Index > :: operator = ( Vector );
		return ( *this );
		}
		@@ -241,14 +229,12 @@ bool tnlMultiVector< 4, Real, Device, Index > :: save( tnlFile& file ) const
		{
		if( ! tnlVector< Real, Device, Index > :: save( file ) )
		{
		cerr << "I was not able to write the tnlVector of tnlMultiVector "
		<< this -> getName() << endl;
		cerr << "I was not able to write the tnlVector of tnlMultiVector." << endl;
		return false;
		}
		if( ! dimensions. save( file ) )
		{
		cerr << "I was not able to write the dimensions of tnlMultiVector "
		<< this -> getName() << endl;
		cerr << "I was not able to write the dimensions of tnlMultiVector." << endl;
		return false;
		}
		return true;
		@@ -259,14 +245,12 @@ bool tnlMultiVector< 4, Real, Device, Index > :: load( tnlFile& file )
		{
		if( ! tnlVector< Real, Device, Index > :: load( file ) )
		{
		cerr << "I was not able to read the tnlVector of tnlMultiVector "
		<< this -> getName() << endl;
		cerr << "I was not able to read the tnlVector of tnlMultiVector." << endl;
		return false;
		}
		if( ! dimensions. load( file ) )
		{
		cerr << "I was not able to read the dimensions of tnlMultiVector "
		<< this -> getName() << endl;
		cerr << "I was not able to read the dimensions of tnlMultiVector." << endl;
		return false;
		}
		return true;