From 57376b17c7f91549ed2e8503abb5fa6c9dd506dd Mon Sep 17 00:00:00 2001
From: Tomas Oberhuber <tomas.oberhuber@fjfi.cvut.cz>
Date: Thu, 19 Nov 2009 13:41:59 +0000
Subject: [PATCH] Renaming mParameterContainer to tnlParameterContainer.
---
src/core/Makefile.am | 4 +-
src/core/tnlConfigDescription.cpp | 6 +--
src/core/tnlConfigDescription.h | 8 ++--
src/core/tnlLogger.h | 4 +-
...ontainer.cpp => tnlParameterContainer.cpp} | 32 +++++++-------
...terContainer.h => tnlParameterContainer.h} | 42 +++++++++----------
src/diff/mMPIMesh2D.h | 6 +--
src/diff/mMPIMesh3D.h | 4 +-
tools/src/mdiff-err-norms.cpp | 4 +-
tools/src/mgrid-view.cpp | 8 ++--
tools/src/mgrid2gnuplot.cpp | 4 +-
tools/src/tnlcurve2gnuplot.cpp | 4 +-
12 files changed, 63 insertions(+), 63 deletions(-)
rename src/core/{mParameterContainer.cpp => tnlParameterContainer.cpp} (89%)
rename src/core/{mParameterContainer.h => tnlParameterContainer.h} (75%)
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index de86e3ae9f..be94e9b1ab 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -27,7 +27,7 @@ headers = \
tnlConfigDescriptionParserbase.h \
tnlConfigDescriptionParser.ih \
tnlConfigDescriptionScanner.h \
- mParameterContainer.h \
+ tnlParameterContainer.h \
mTimerCPU.h \
mTimerRT.h \
mVector.h \
@@ -43,7 +43,7 @@ sources = tnlConfigDescription.cpp \
tnlString.cpp \
tnlConfigDescriptionScanner.cpp \
tnlConfigDescriptionParser.cpp \
- mParameterContainer.cpp \
+ tnlParameterContainer.cpp \
mTimerCPU.cpp \
mTimerRT.cpp \
compress-file.cpp \
diff --git a/src/core/tnlConfigDescription.cpp b/src/core/tnlConfigDescription.cpp
index 2cc40a2550..bc2d087fe5 100644
--- a/src/core/tnlConfigDescription.cpp
+++ b/src/core/tnlConfigDescription.cpp
@@ -19,7 +19,7 @@
#include <iomanip>
#include "tnlConfigDescriptionParser.h"
#include "tnlConfigDescription.h"
-#include "mParameterContainer.h"
+#include "tnlParameterContainer.h"
#include "mfuncs.h"
//--------------------------------------------------------------------------
@@ -124,7 +124,7 @@ bool tnlConfigDescription :: ParseConfigDescription( const char* file_name )
return true;
}
//--------------------------------------------------------------------------
-void tnlConfigDescription :: AddMissingEntries( mParameterContainer& parameter_container ) const
+void tnlConfigDescription :: AddMissingEntries( tnlParameterContainer& parameter_container ) const
{
int i;
const int size = entries. Size();
@@ -166,7 +166,7 @@ void tnlConfigDescription :: AddMissingEntries( mParameterContainer& parameter_c
}
}
//--------------------------------------------------------------------------
-bool tnlConfigDescription :: CheckMissingEntries( mParameterContainer& parameter_container ) const
+bool tnlConfigDescription :: CheckMissingEntries( tnlParameterContainer& parameter_container ) const
{
int i;
const int size = entries. Size();
diff --git a/src/core/tnlConfigDescription.h b/src/core/tnlConfigDescription.h
index 7bf7052b9c..73151a5925 100644
--- a/src/core/tnlConfigDescription.h
+++ b/src/core/tnlConfigDescription.h
@@ -21,7 +21,7 @@
#include "tnlString.h"
#include "tnlList.h"
-class mParameterContainer;
+class tnlParameterContainer;
struct tnlConfigGroup
{
@@ -166,13 +166,13 @@ class tnlConfigDescription
return NULL;
};
- //! If there is missing entry with defined default value in the mParameterContainer it is going to be added
- void AddMissingEntries( mParameterContainer& parameter_container ) const;
+ //! If there is missing entry with defined default value in the tnlParameterContainer it is going to be added
+ void AddMissingEntries( tnlParameterContainer& parameter_container ) const;
//! Check for all entries with the flag 'required'.
/*! Returns false if any parameter is missing.
*/
- bool CheckMissingEntries( mParameterContainer& parameter_container ) const;
+ bool CheckMissingEntries( tnlParameterContainer& parameter_container ) const;
void PrintUsage( const char* program_name );
diff --git a/src/core/tnlLogger.h b/src/core/tnlLogger.h
index 9f74922096..4c0ff5bfcc 100644
--- a/src/core/tnlLogger.h
+++ b/src/core/tnlLogger.h
@@ -21,7 +21,7 @@
#include <cstring>
#include <ostream>
#include <iomanip>
-#include <core/mParameterContainer.h>
+#include <core/tnlParameterContainer.h>
class tnlLogger
{
@@ -38,7 +38,7 @@ class tnlLogger
template< typename T > void WriteParameter( const char* label,
const char* parameter_name,
- const mParameterContainer& parameters,
+ const tnlParameterContainer& parameters,
int parameter_level = 0 )
{
stream << "| ";
diff --git a/src/core/mParameterContainer.cpp b/src/core/tnlParameterContainer.cpp
similarity index 89%
rename from src/core/mParameterContainer.cpp
rename to src/core/tnlParameterContainer.cpp
index 589cbfc865..48b8bab3ce 100644
--- a/src/core/mParameterContainer.cpp
+++ b/src/core/tnlParameterContainer.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- mParameterContainer.cpp - description
+ tnlParameterContainer.cpp - description
-------------------
begin : 2007/06/15
copyright : (C) 2007 by Tomá¹ Oberhuber
@@ -18,7 +18,7 @@
#include <ctype.h>
#include <cstring>
#include <stdio.h>
-#include "mParameterContainer.h"
+#include "tnlParameterContainer.h"
bool matob( const char* value, bool& ret_val )
{
@@ -37,17 +37,17 @@ bool matob( const char* value, bool& ret_val )
return false;
}
//--------------------------------------------------------------------------
-mParameterContainer :: mParameterContainer()
+tnlParameterContainer :: tnlParameterContainer()
{
}
//--------------------------------------------------------------------------
-bool mParameterContainer :: AddParameter( const char* name,
+bool tnlParameterContainer :: AddParameter( const char* name,
const char* value )
{
- return parameters. Append( new mParameter< tnlString >( name, GetParameterType( tnlString() ). Data(), tnlString( value ) ) );
+ return parameters. Append( new tnlParameter< tnlString >( name, GetParameterType( tnlString() ). Data(), tnlString( value ) ) );
}
//--------------------------------------------------------------------------
-bool mParameterContainer :: SetParameter( const char* name,
+bool tnlParameterContainer :: SetParameter( const char* name,
const char* value )
{
long int i;
@@ -57,7 +57,7 @@ bool mParameterContainer :: SetParameter( const char* name,
{
if( GetParameterType( parameters[ i ] ) == GetParameterType( tnlString() ) )
{
- ( ( mParameter< tnlString > * ) parameters[ i ] ) -> value. SetString( value );
+ ( ( tnlParameter< tnlString > * ) parameters[ i ] ) -> value. SetString( value );
return true;
}
else
@@ -73,7 +73,7 @@ bool mParameterContainer :: SetParameter( const char* name,
return AddParameter( name, value );
};
//--------------------------------------------------------------------------
-bool mParameterContainer :: CheckParameter( const char* name ) const
+bool tnlParameterContainer :: CheckParameter( const char* name ) const
{
int i;
const int parameters_num = parameters. Size();
@@ -82,12 +82,12 @@ bool mParameterContainer :: CheckParameter( const char* name ) const
return false;
}
//--------------------------------------------------------------------------
-mParameterContainer :: ~mParameterContainer()
+tnlParameterContainer :: ~tnlParameterContainer()
{
parameters. DeepEraseAll();
}
//--------------------------------------------------------------------------
-void mParameterContainer :: MPIBcast( int root, MPI_Comm mpi_comm )
+void tnlParameterContainer :: MPIBcast( int root, MPI_Comm mpi_comm )
{
#ifdef HAVE_MPI
int i;
@@ -97,24 +97,24 @@ void mParameterContainer :: MPIBcast( int root, MPI_Comm mpi_comm )
{
if( MPIGetRank() == root )
{
- mParameterBase* param = parameters[ i ];
+ tnlParameterBase* param = parameters[ i ];
param -> type. MPIBcast( root, MPI_COMM_WORLD );
param -> name. MPIBcast( root, MPI_COMM_WORLD );
if( param -> type == "mString" )
{
- ( ( mParameter< tnlString >* ) param ) -> value. MPIBcast( root, mpi_comm );
+ ( ( tnlParameter< tnlString >* ) param ) -> value. MPIBcast( root, mpi_comm );
}
if( param -> type == "bool" )
{
- :: MPIBcast( ( ( mParameter< bool >* ) param ) -> value, 1, root, mpi_comm );
+ :: MPIBcast( ( ( tnlParameter< bool >* ) param ) -> value, 1, root, mpi_comm );
}
if( param -> type == "int" )
{
- :: MPIBcast( ( ( mParameter< int >* ) param ) -> value, 1, root, mpi_comm );
+ :: MPIBcast( ( ( tnlParameter< int >* ) param ) -> value, 1, root, mpi_comm );
}
if( param -> type == "double" )
{
- :: MPIBcast( ( ( mParameter< double >* ) param ) -> value, 1, root, mpi_comm );
+ :: MPIBcast( ( ( tnlParameter< double >* ) param ) -> value, 1, root, mpi_comm );
}
}
else
@@ -158,7 +158,7 @@ void mParameterContainer :: MPIBcast( int root, MPI_Comm mpi_comm )
//--------------------------------------------------------------------------
bool ParseCommandLine( int argc, char* argv[],
const tnlConfigDescription& config_description,
- mParameterContainer& parameters )
+ tnlParameterContainer& parameters )
{
int i;
bool parse_error( false );
diff --git a/src/core/mParameterContainer.h b/src/core/tnlParameterContainer.h
similarity index 75%
rename from src/core/mParameterContainer.h
rename to src/core/tnlParameterContainer.h
index 50010e360c..c0b8ed8b78 100644
--- a/src/core/mParameterContainer.h
+++ b/src/core/tnlParameterContainer.h
@@ -1,5 +1,5 @@
/***************************************************************************
- mParameterContainer.h - description
+ tnlParameterContainer.h - description
-------------------
begin : 2007/06/15
copyright : (C) 2007 by Tomá¹ Oberhuber
@@ -15,40 +15,40 @@
* *
***************************************************************************/
-#ifndef mParameterContainerH
-#define mParameterContainerH
+#ifndef tnlParameterContainerH
+#define tnlParameterContainerH
#include "tnlList.h"
#include "tnlConfigDescription.h"
#include "mpi-supp.h"
#include "param-types.h"
-struct mParameterBase
+struct tnlParameterBase
{
- mParameterBase( const char* _name, const char* _type )
+ tnlParameterBase( const char* _name, const char* _type )
: name( _name ), type( _type ){};
tnlString name, type;
};
-template< class T > struct mParameter : public mParameterBase
+template< class T > struct tnlParameter : public tnlParameterBase
{
- mParameter( const char* _name,
+ tnlParameter( const char* _name,
const char* _type,
const T& val )
- : mParameterBase( _name, _type ), value( val ){};
+ : tnlParameterBase( _name, _type ), value( val ){};
T value;
};
//template< class T > const char* GetParameterType( const T& val );
-class mParameterContainer
+class tnlParameterContainer
{
public:
- mParameterContainer();
+ tnlParameterContainer();
template< class T > bool AddParameter( const char* name,
const T& value );
@@ -71,7 +71,7 @@ class mParameterContainer
for( i = 0; i < size; i ++ )
if( parameters[ i ] -> name == name )
{
- value = ( ( mParameter< T >* ) parameters[ i ] ) -> value;
+ value = ( ( tnlParameter< T >* ) parameters[ i ] ) -> value;
return true;
}
if( verbose )
@@ -85,7 +85,7 @@ class mParameterContainer
const int size = parameters. Size();
for( i = 0; i < size; i ++ )
if( parameters[ i ] -> name == name )
- return ( ( mParameter< T >* ) parameters[ i ] ) -> value;
+ return ( ( tnlParameter< T >* ) parameters[ i ] ) -> value;
cerr << "Unknown parameter " << name << endl;
abort();
};
@@ -96,7 +96,7 @@ class mParameterContainer
const int size = parameters. Size();
for( i = 0; i < size; i ++ )
if( parameters[ i ] -> name == name )
- return ( ( mParameter< T >* ) parameters[ i ] ) -> value;
+ return ( ( tnlParameter< T >* ) parameters[ i ] ) -> value;
cerr << "Unknown parameter " << name << endl;
abort();
};
@@ -104,26 +104,26 @@ class mParameterContainer
//! Broadcast to other nodes in MPI cluster
void MPIBcast( int root, MPI_Comm mpi_comm = MPI_COMM_WORLD );
- ~mParameterContainer();
+ ~tnlParameterContainer();
protected:
- tnlList< mParameterBase* > parameters;
+ tnlList< tnlParameterBase* > parameters;
};
bool ParseCommandLine( int argc, char* argv[],
const tnlConfigDescription& config_description,
- mParameterContainer& parameters );
+ tnlParameterContainer& parameters );
-template< class T > bool mParameterContainer :: AddParameter( const char* name,
+template< class T > bool tnlParameterContainer :: AddParameter( const char* name,
const T& value )
{
- return parameters. Append( new mParameter< T >( name, GetParameterType( value ). Data(), value ) );
+ return parameters. Append( new tnlParameter< T >( name, GetParameterType( value ). Data(), value ) );
};
-template< class T > bool mParameterContainer :: SetParameter( const char* name,
- const T& value )
+template< class T > bool tnlParameterContainer :: SetParameter( const char* name,
+ const T& value )
{
long int i;
for( i = 0; i < parameters. Size(); i ++ )
@@ -132,7 +132,7 @@ template< class T > bool mParameterContainer :: SetParameter( const char* name,
{
if( GetParameterType( parameters[ i ] ) == GetParameterType( value ) )
{
- ( ( mParameter< T > * ) parameters[ i ] ) -> value = value;
+ ( ( tnlParameter< T > * ) parameters[ i ] ) -> value = value;
return true;
}
else
diff --git a/src/diff/mMPIMesh2D.h b/src/diff/mMPIMesh2D.h
index 45c0c53e1b..bb5eafc776 100644
--- a/src/diff/mMPIMesh2D.h
+++ b/src/diff/mMPIMesh2D.h
@@ -19,7 +19,7 @@
#define mMPIMesh2DH
#include <diff/mGrid2D.h>
-#include <core/mParameterContainer.h>
+#include <core/tnlParameterContainer.h>
#include <core/mpi-supp.h>
#include <debug/tnlDebug.h>
#include <core/mfilename.h>
@@ -48,7 +48,7 @@ template< class T > class mMPIMesh2D
//! Initiation by parametr container
bool Init( const mGrid2D< T >& u,
- const mParameterContainer& parameters,
+ const tnlParameterContainer& parameters,
int _overlap_width,
int root = 0,
MPI_Comm comm = MPI_COMM_WORLD );
@@ -417,7 +417,7 @@ template< class T > bool mMPIMesh2D< T > :: Init( const mGrid2D< T >& u,
};
template< class T > bool mMPIMesh2D< T > :: Init( const mGrid2D< T >& u,
- const mParameterContainer& parameters,
+ const tnlParameterContainer& parameters,
int _overlap_width,
int root,
MPI_Comm comm )
diff --git a/src/diff/mMPIMesh3D.h b/src/diff/mMPIMesh3D.h
index e8d9ca36d6..a4831d8c1f 100644
--- a/src/diff/mMPIMesh3D.h
+++ b/src/diff/mMPIMesh3D.h
@@ -46,7 +46,7 @@ template< class T > class mMPIMesh3D
MPI_Comm comm = MPI_COMM_WORLD );
bool Init( const mGrid3D< T >& u,
- const mParameterContainer& parameters,
+ const tnlParameterContainer& parameters,
int _overlap_width,
int root = 0,
MPI_Comm comm = MPI_COMM_WORLD );
@@ -532,7 +532,7 @@ template< class T > bool mMPIMesh3D< T > :: Init( const mGrid3D< T >& u,
};
template< class T > bool mMPIMesh3D< T > :: Init( const mGrid3D< T >& u,
- const mParameterContainer& parameters,
+ const tnlParameterContainer& parameters,
int _overlap_width,
int root,
MPI_Comm comm )
diff --git a/tools/src/mdiff-err-norms.cpp b/tools/src/mdiff-err-norms.cpp
index 58214a65e6..7786db49ca 100644
--- a/tools/src/mdiff-err-norms.cpp
+++ b/tools/src/mdiff-err-norms.cpp
@@ -25,7 +25,7 @@
#include <diff/drawGrid1D.h>
#include <diff/drawGrid2D.h>
#include <core/tnlConfigDescription.h>
-#include <core/mParameterContainer.h>
+#include <core/tnlParameterContainer.h>
#include <core/tnlCurve.h>
#include "../../mdiff-err-norms-def.h"
@@ -145,7 +145,7 @@ int main( int argc, char* argv[] )
{
dbgFunctionName( "", "main" );
dbgInit( "mdiff-err-norms.dbg" );
- mParameterContainer parameters;
+ tnlParameterContainer parameters;
tnlConfigDescription conf_desc;
dbgCout( "Parsing config description file ... " );
diff --git a/tools/src/mgrid-view.cpp b/tools/src/mgrid-view.cpp
index 0c94d75ba2..5459161753 100644
--- a/tools/src/mgrid-view.cpp
+++ b/tools/src/mgrid-view.cpp
@@ -20,13 +20,13 @@
#include <core/compress-file.h>
#include <core/tnlCurve.h>
#include <core/tnlConfigDescription.h>
-#include <core/mParameterContainer.h>
+#include <core/tnlParameterContainer.h>
#include <diff/curve-ident.h>
#include <diff/drawGrid2D.h>
#include <diff/drawGrid3D.h>
bool ProcessmGrid2D( const tnlString& file_name,
- const mParameterContainer& parameters,
+ const tnlParameterContainer& parameters,
int file_index,
const tnlString& output_file_name,
const tnlString& output_file_format )
@@ -103,7 +103,7 @@ bool ProcessmGrid2D( const tnlString& file_name,
}
//--------------------------------------------------------------------------
bool ProcessmGrid3D( const tnlString& file_name,
- const mParameterContainer& parameters,
+ const tnlParameterContainer& parameters,
int file_index,
const tnlString& output_file_name,
const tnlString& output_file_format )
@@ -170,7 +170,7 @@ bool ProcessmGrid3D( const tnlString& file_name,
//--------------------------------------------------------------------------
int main( int argc, char* argv[] )
{
- mParameterContainer parameters;
+ tnlParameterContainer parameters;
tnlConfigDescription conf_desc;
if( conf_desc. ParseConfigDescription( MGRID_VIEW_CONFIG_DESCRIPTION_FILE ) != 0 )
return 1;
diff --git a/tools/src/mgrid2gnuplot.cpp b/tools/src/mgrid2gnuplot.cpp
index 47dff5c85f..6c912373e6 100644
--- a/tools/src/mgrid2gnuplot.cpp
+++ b/tools/src/mgrid2gnuplot.cpp
@@ -18,13 +18,13 @@
#include "mgrid2gnuplot-def.h"
#include <diff/mGrid2D.h>
-#include <core/mParameterContainer.h>
+#include <core/tnlParameterContainer.h>
//--------------------------------------------------------------------------
int main( int argc, char* argv[] )
{
- mParameterContainer parameters;
+ tnlParameterContainer parameters;
tnlConfigDescription conf_desc;
if( conf_desc. ParseConfigDescription( CONFIG_DESCRIPTION_FILE ) != 0 )
return 1;
diff --git a/tools/src/tnlcurve2gnuplot.cpp b/tools/src/tnlcurve2gnuplot.cpp
index 038e943f8c..62fa7d6edd 100644
--- a/tools/src/tnlcurve2gnuplot.cpp
+++ b/tools/src/tnlcurve2gnuplot.cpp
@@ -16,7 +16,7 @@
***************************************************************************/
#include "tnlcurve2gnuplot-def.h"
-#include <core/mParameterContainer.h>
+#include <core/tnlParameterContainer.h>
#include <core/compress-file.h>
#include <core/tnlCurve.h>
#include <core/mVector.h>
@@ -25,7 +25,7 @@
//--------------------------------------------------------------------------
int main( int argc, char* argv[] )
{
- mParameterContainer parameters;
+ tnlParameterContainer parameters;
tnlConfigDescription conf_desc;
if( conf_desc. ParseConfigDescription( CONFIG_DESCRIPTION_FILE ) != 0 )
return 1;
--
GitLab