Commit 057fb587 authored by Francois Bleibel's avatar Francois Bleibel

Removed all 'sot' references.

parent c5f08ca3
Authors:
Authors: Nicolas Mansard, Olivier Stasse, François Keith, François Bleibel
\ No newline at end of file
......@@ -3,14 +3,14 @@
\section intro_dynamicGraph Introduction
This code implements the factory design pattern, making creation of entities
This code implements the g_factory design pattern, making creation of entities
available to packages depending on the dynamic-graph API.
Objects, which are derived from Entities, can be
declared within the code and compiled to shared libraries (.so/.dll files).
These libraries can be loaded at run-time using the PluginLoader methods,
and at the same time register their class names to the Factory (see the
examples in the SOT documentation to learn how).
examples in the DYNAMIC-GRAPH documentation to learn how).
The Factory can then create instances of these objects and subsequently
register them in the Pool, where they can be listed, accessed, and acted upon
......@@ -29,9 +29,9 @@ at the command line.
The public static objects (singletons) made available by including the
corresponding headers in this module are:
\li factory: FactoryStorage
\li pool: PoolStorage
\li Shell: Interpreter
\li g_factory: FactoryStorage
\li g_pool: PoolStorage
\li g_shell: Interpreter
\image html pictures/use-case.svg
......
......@@ -2,8 +2,8 @@
* Copyright Projet JRL-Japan, 2007
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: sotContiifstream.h
* Project: SOT
* File: Contiifstream.h
* Project: DYNAMIC-GRAPH
* Author: Nicolas Mansard
*
* Version control
......@@ -45,17 +45,17 @@
#if defined (WIN32)
# if defined (sotContiifstream_EXPORTS)
# define SOTCONTIIFSTREAM_EXPORT __declspec(dllexport)
# define DYNAMICGRAPHCONTIIFSTREAM_EXPORT __declspec(dllexport)
# else
# define SOTCONTIIFSTREAM_EXPORT __declspec(dllimport)
# define DYNAMICGRAPHCONTIIFSTREAM_EXPORT __declspec(dllimport)
# endif
#else
# define SOTCONTIIFSTREAM_EXPORT
# define DYNAMICGRAPHCONTIIFSTREAM_EXPORT
#endif
/* --------------------------------------------------------------------- */
/* --- CLASS ----------------------------------------------------------- */
/* --------------------------------------------------------------------- */
class SOTCONTIIFSTREAM_EXPORT sotContiifstream
class DYNAMICGRAPHCONTIIFSTREAM_EXPORT Contiifstream
{
protected:
std::string filename;
......@@ -66,8 +66,8 @@ protected:
bool first;
public: /* --- Constructor --- */
sotContiifstream( const std::string& n="" );
~sotContiifstream( void );
Contiifstream( const std::string& n="" );
~Contiifstream( void );
void open( const std::string& n ) { filename=n; cursor=0; }
public: /* --- READ FILE --- */
......
......@@ -3,7 +3,7 @@
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: entity.h
* Project: SOT
* Project: DYNAMIC-GRAPH
* Author: François Bleibel (from Nicolas Mansard)
*
* Version control
......@@ -26,7 +26,7 @@
/* --- INCLUDE --------------------------------------------------------- */
/* --------------------------------------------------------------------- */
/* SOT */
/* DYNAMIC-GRAPH */
#include <dynamic-graph/signal-base.h>
#include <dynamic-graph/exception-factory.h>
#include <dynamic-graph/signal-array.h>
......@@ -52,7 +52,7 @@ namespace dynamicgraph {
These signals link the entities together to form a complete computation graph.
To declare a new entity, please see the DYNAMICGRAPH_FACTORY_ENTITY_PLUGIN macro
in factory.h.
in g_factory.h.
A command-line interface provided by the entity can be used by a sot shell to
call methods from entities and display the result of their execution.
Classes that derive from Entity can customize the command-line by overriding commandLine().
......
......@@ -3,7 +3,7 @@
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: exception-abstract.h
* Project: SOT
* Project: DYNAMIC-GRAPH
* Author: Nicolas Mansard
*
* Version control
......@@ -33,7 +33,7 @@
// Uncomment this macros to have lines parameter on the throw display
// #define SOT_EXCEPTION_PASSING_PARAM
// #define DYNAMIC-GRAPH_EXCEPTION_PASSING_PARAM
/* --------------------------------------------------------------------- */
/* --- CLASS ----------------------------------------------------------- */
......@@ -91,7 +91,7 @@ public:
DYNAMICGRAPH_EXPORT friend std::ostream & operator << (std::ostream & os,
const ExceptionAbstract & err);
#ifdef SOT_EXCEPTION_PASSING_PARAM
#ifdef DYNAMICGRAPH_EXCEPTION_PASSING_PARAM
public:
class Param
{
......@@ -120,7 +120,7 @@ public:
template<class Exc>
friend Exc& operator+ ( const ExceptionAbstract::Param& p, Exc& e )
{ e.p.initCopy(p); return e; }
#endif //#ifdef SOT_EXCEPTION_PASSING_PARAM
#endif //#ifdef DYNAMICGRAPH_EXCEPTION_PASSING_PARAM
};
} // namespace dynamicgraph
......@@ -129,11 +129,11 @@ public:
#ifdef SOT_EXCEPTION_PASSING_PARAM
#ifdef DYNAMICGRAPH_EXCEPTION_PASSING_PARAM
# define DG_THROW throw ExceptionAbstract::Param(__LINE__,__FUNCTION__,__FILE__) +
#else //#ifdef SOT_EXCEPTION_PASSING_PARAM
#else //#ifdef DYNAMICGRAPH_EXCEPTION_PASSING_PARAM
# define DG_THROW throw
#endif //#ifdef SOT_EXCEPTION_PASSING_PARAM
#endif //#ifdef DYNAMICGRAPH_EXCEPTION_PASSING_PARAM
#endif /* #ifndef __ABSTRACT_EXCEPTION_H */
......
......@@ -3,7 +3,7 @@
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: sotExceptionFactory.h
* Project: SOT
* Project: DYNAMIC-GRAPH
* Author: Nicolas Mansard
*
* Version control
......
......@@ -3,7 +3,7 @@
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: sotexception-signal.h
* Project: SOT
* Project: DYNAMIC-GRAPH
* Author: Nicolas Mansard
*
* Version control
......
......@@ -2,8 +2,8 @@
* Copyright Projet JRL-Japan, 2007
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: factory.h
* Project: SOT
* File: g_factory.h
* Project: DYNAMIC-GRAPH
* Author: François Bleibel (from Nicolas Mansard)
*
* Version control
......@@ -30,7 +30,7 @@
#include <map>
#include <string>
/* --- SOT --- */
/* --- DYNAMIC-GRAPH --- */
#include <dynamic-graph/exception-factory.h>
#include <dynamic-graph/dynamic-graph-api.h>
......@@ -78,7 +78,7 @@ class DYNAMICGRAPH_EXPORT FactoryStorage
};
DYNAMICGRAPH_EXPORT extern FactoryStorage factory;
DYNAMICGRAPH_EXPORT extern FactoryStorage g_factory;
/* --- REGISTERER ----------------------------------------------------------- */
/* --- REGISTERER ----------------------------------------------------------- */
......@@ -105,8 +105,8 @@ class DYNAMICGRAPH_EXPORT EntityRegisterer
};
/*! This macro should be used to automatically register an entity
* of classType to the factory. It is then possible to create it
* with the factory.
* of classType to the g_factory. It is then possible to create it
* with the g_factory.
*/
#define DYNAMICGRAPH_FACTORY_ENTITY_PLUGIN(classType,className) \
const std::string classType::CLASS_NAME = className; \
......
......@@ -3,7 +3,7 @@
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: interpreter.h
* Project: SOT
* Project: DYNAMIC-GRAPH
* Author: François Bleibel (from Nicolas Mansard)
*
* Version control
......@@ -26,7 +26,7 @@
/* --- INCLUDE --------------------------------------------------------- */
/* --------------------------------------------------------------------- */
/* SOT */
/* DYNAMIC-GRAPH */
#include <dynamic-graph/signal-base.h>
#include <dynamic-graph/exception-factory.h>
#include <dynamic-graph/pool.h>
......@@ -185,7 +185,7 @@ class DYNAMICGRAPH_EXPORT Interpreter
/* -------------------------------------------------------------------------- */
/*! \brief Class for automatic registration of shell functions.
* Use the macro SOT_SHELL_FUNCTION_REGISTERER(name, fun) in a .cpp file
* Use the macro DYNAMIC-GRAPH_SHELL_FUNCTION_REGISTERER(name, fun) in a .cpp file
* to register functions on plugin load.
*/
class DYNAMICGRAPH_EXPORT ShellFunctionRegisterer
......@@ -201,7 +201,7 @@ public:
ShellFunctionRegisterer reg( name,boost::bind(fun,_1,_2,_3) );\
}
DYNAMICGRAPH_EXPORT extern Interpreter Shell;
DYNAMICGRAPH_EXPORT extern Interpreter g_shell;
} // namespace dynamicgraph
......
......@@ -3,7 +3,7 @@
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: plugin-loader.h
* Project: SOT
* Project: DYNAMIC-GRAPH
* Author: François Bleibel (from Nicolas Mansard)
*
* Version control
......@@ -31,7 +31,7 @@
#include <string>
#include <map>
/* --- SOT --- */
/* --- DYNAMIC-GRAPH --- */
#include <dynamic-graph/exception-factory.h>
#include <dynamic-graph/dynamic-graph-api.h>
......
......@@ -2,8 +2,8 @@
* Copyright Projet JRL-Japan, 2007
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: pool.h
* Project: SOT
* File: g_pool.h
* Project: DYNAMIC-GRAPH
* Author: François Bleibel (from Nicolas Mansard)
*
* Version control
......@@ -29,7 +29,7 @@
#include <string>
#include <sstream>
/* --- SOT --- */
/* --- DYNAMIC-GRAPH --- */
#include <dynamic-graph/exception-factory.h>
#include <dynamic-graph/signal-base.h>
#include <dynamic-graph/dynamic-graph-api.h>
......@@ -119,8 +119,8 @@ class DYNAMICGRAPH_EXPORT PoolStorage
If the method of the object displays some information this will
be done on os.
The commands specific to the <b>pool<\b> object are:
\li <b>list</b> : List all the entities registered in the pool.s
The commands specific to the <b>g_pool<\b> object are:
\li <b>list</b> : List all the entities registered in the g_pool.s
*/
void commandLine( const std::string& objectName,const std::string& functionName,
std::istringstream& cmdArg, std::ostream& os );
......@@ -130,7 +130,7 @@ class DYNAMICGRAPH_EXPORT PoolStorage
void writeCompletionList(std::ostream& os);
};
DYNAMICGRAPH_EXPORT extern dynamicgraph::PoolStorage pool;
DYNAMICGRAPH_EXPORT extern dynamicgraph::PoolStorage g_pool;
} // namespace dynamicgraph
......
......@@ -3,7 +3,7 @@
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: shell-functions.h
* Project: SOT
* Project: DYNAMIC-GRAPH
* Author: François Bleibel (from Nicolas Mansard)
*
* Version control
......@@ -26,7 +26,7 @@
/* --- INCLUDE --------------------------------------------------------- */
/* --------------------------------------------------------------------- */
/* SOT */
/* DYNAMIC-GRAPH */
#include <dynamic-graph/exception-factory.h>
#include <dynamic-graph/interpreter.h>
......@@ -94,4 +94,4 @@ class SHELLFUNCTIONS_EXPORT ShellFunctions
};
#endif //#ifndef __SOT_SHELL_FUNCTIONS_HH__
#endif //#ifndef __DYNAMIC-GRAPH_SHELL_FUNCTIONS_HH__
......@@ -3,7 +3,7 @@
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: shell-procedure.h
* Project: SOT
* Project: DYNAMIC-GRAPH
* Author: François Bleibel (from Nicolas Mansard)
*
* Version control
......@@ -26,7 +26,7 @@
/* --- INCLUDE --------------------------------------------------------- */
/* --------------------------------------------------------------------- */
/* SOT */
/* DYNAMIC-GRAPH */
#include <dynamic-graph/exception-factory.h>
#include <dynamic-graph/interpreter.h>
......@@ -74,18 +74,18 @@ class ShellProcedure_EXPORT ShellProcedure
std::vector<std::string> args;
std::vector<int> params;
};
struct sotProcedure {
struct Procedure {
std::list< Instruction > instructions;
std::vector< std::string > params;
void clear() { instructions.clear(); params.clear(); }
};
typedef std::map< std::string,sotProcedure > ProcedureList;
typedef std::map< std::string,Procedure > ProcedureList;
public:
std::string procName;
ProcedureList procedureList;
sotProcedure currentProc;
Procedure currentProc;
public:
......@@ -104,4 +104,4 @@ class ShellProcedure_EXPORT ShellProcedure
#endif //#ifndef __SOT_SHELL_PROCEDURE_HH__
#endif //#ifndef __DYNAMIC-GRAPH_SHELL_PROCEDURE_HH__
......@@ -3,7 +3,7 @@
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: SignalArray.h
* Project: SOT
* Project: DYNAMIC-GRAPH
* Author: Nicolas Mansard
*
* Version control
......@@ -85,15 +85,6 @@ class SignalArray_const
virtual const SignalBase<Time>& operator[] ( const unsigned int& idx ) const
{ return *const_array[idx]; }
virtual unsigned int getSize( void ) const { return rank; }
/* SignalArray_const<Time>& operator= ( SignalArray<Time> & siga ) */
/* { */
/* for( unsigned int i=0;i<rank;++i ) const_array[i]=&siga[i]; */
/* rank=siga.getSize(); */
/* } */
// friend class SignalArray<Time>;
};
......@@ -173,7 +164,12 @@ class SignalArray
template<class Time>
SignalArray<Time> operator<<( SignalBase<Time>& sig1,
SignalBase<Time>& sig2 )
{ SignalArray<Time> res(20); res<<sig1; res<<sig2; return res;}
{
SignalArray<Time> res(20);
res<<sig1;
res<<sig2;
return res;
}
DYNAMICGRAPH_EXPORT extern SignalArray<int> sotNOSIGNAL;
......
......@@ -3,7 +3,7 @@
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: signal-base.h
* Project: SOT
* Project: DYNAMIC-GRAPH
* Author: Nicolas Mansard
*
* Version control
......
......@@ -3,7 +3,7 @@
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: SignalPtr.h
* Project: SOT
* Project: DYNAMIC-GRAPH
* Author: Nicolas Mansard
*
* Version control
......
......@@ -3,7 +3,7 @@
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: SignalPtr.t.cpp
* Project: SOT
* Project: DYNAMIC-GRAPH
* Author: Nicolas Mansard
*
* Version control
......
......@@ -3,7 +3,7 @@
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: signal-time-dependant.h
* Project: SOT
* Project: DYNAMIC-GRAPH
* Author: Nicolas Mansard
*
* Version control
......
......@@ -3,7 +3,7 @@
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: Signal.h
* Project: SOT
* Project: DYNAMIC-GRAPH
* Author: Nicolas Mansard
*
* Version control
......
......@@ -3,7 +3,7 @@
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: Signal.t.cpp
* Project: SOT
* Project: DYNAMIC-GRAPH
* Author: Nicolas Mansard
*
* Version control
......
......@@ -3,7 +3,7 @@
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: TimeDependancy.h
* Project: SOT
* Project: DYNAMIC-GRAPH
* Author: Nicolas Mansard
*
* Version control
......
......@@ -3,7 +3,7 @@
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: TimeDependancy.t.cpp
* Project: SOT
* Project: DYNAMIC-GRAPH
* Author: Nicolas Mansard
*
* Version control
......
......@@ -43,8 +43,8 @@ INSTALL(TARGETS ${LIBRARY_NAME}
### Plugins
####################################
SET(plugins_list
dgraph/shell-functions
dgraph/shell-procedure
plugins/shell-functions
plugins/shell-procedure
debug/contiifstream
)
......
......@@ -2,8 +2,8 @@
* Copyright Projet JRL-Japan, 2007
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: sotContiifstream.cpp
* Project: SOT
* File: Contiifstream.cpp
* Project: DYNAMIC-GRAPH
* Author: Nicolas Mansard
*
* Version control
......@@ -20,19 +20,19 @@
#include <dynamic-graph/contiifstream.h>
#include <dynamic-graph/debug.h>
sotContiifstream::
sotContiifstream( const std::string& n )
Contiifstream::
Contiifstream( const std::string& n )
:filename(n),cursor(0),first(true) {}
sotContiifstream::
~sotContiifstream( void )
Contiifstream::
~Contiifstream( void )
{
dgDEBUGINOUT(5);
}
bool sotContiifstream::
bool Contiifstream::
loop( void )
{
dgDEBUGIN(25);
......@@ -64,7 +64,7 @@ loop( void )
}
std::string
sotContiifstream::next( void )
Contiifstream::next( void )
{
std::string res = *reader.begin();
reader.pop_front();
......
......@@ -53,13 +53,13 @@ const char * DebugTrace::DEBUG_FILENAME_DEFAULT = "/tmp/traces_dynamicgraph.txt"
#endif /*WIN32*/
#else
std::ofstream dg_debugfile; //( "/dev/null", std::ios::trunc&std::ios::out );
class __dgDebug_init
class dgDebug_init
{
public:
__dgDebug_init( void )
dgDebug_init( void )
{ dg_debugfile.setstate( std::ios::failbit ) ; /* dg_debugfile.close(); */ }
};
__dgDebug_init __dgDebug_initialisator;
dgDebug_init dgDebug_initialisator;
#endif
......
......@@ -3,7 +3,7 @@
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: entity.cpp
* Project: SOT
* Project: DYNAMIC-GRAPH
* Author: François Bleibel (from Nicolas Mansard)
*
* Version control
......@@ -39,13 +39,13 @@ entityRegistration( void )
{
//sotPool.entity[name] = this;
pool.registerEntity(name,this);
g_pool.registerEntity(name,this);
}
void Entity::
entityDeregistration( void )
{
pool.deregisterEntity(name);
g_pool.deregisterEntity(name);
}
Entity::
......
......@@ -3,8 +3,8 @@
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: factory.cpp
* Project: SOT
* Author: François Bleibel (from Nicolas Mansard)
* Project: DYNAMIC-GRAPH
* Author: François Bleibel, Nicolas Mansard
*
* Version control
* ===============
......@@ -22,7 +22,7 @@
/* --- INCLUDE --------------------------------------------------------- */
/* --------------------------------------------------------------------- */
/* --- SOT --- */
/* --- DYNAMIC-GRAPH --- */
#include <dynamic-graph/debug.h>
#include <dynamic-graph/factory.h>
......@@ -52,7 +52,7 @@ registerEntity( const std::string& entname,FactoryStorage::EntityConstructor_ptr
{
// DG_THROW ExceptionFactory( ExceptionFactory::OBJECT_CONFLICT,
// "Another entity class already defined with the same name. ",
// "(while adding entity class <%s> inside the factory).",
// "(while adding entity class <%s> inside the g_factory).",
// entname.c_str() );
dgERRORF("Another entity class already defined with the same name. "
"(while adding entity class <%s> inside the factory).",
......@@ -127,7 +127,7 @@ EntityRegisterer( const std::string& entityClassName,
:entityName( entityClassName )
{
dgDEBUGIN(15);
factory.registerEntity(entityClassName,maker);
g_factory.registerEntity(entityClassName,maker);
dgDEBUGOUT(15);
}
......@@ -136,7 +136,7 @@ EntityRegisterer::
{
dgDEBUGIN(15);
factory.deregisterEntity(entityName);
g_factory.deregisterEntity(entityName);
dgDEBUGOUT(15);
}
......@@ -174,6 +174,6 @@ commandLine( const std::string& cmdLine,std::istringstream& cmdArgs,
}
namespace dynamicgraph {
//! The global factory object.
FactoryStorage factory;
//! The global g_factory object.
FactoryStorage g_factory;
}
......@@ -3,8 +3,8 @@
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: interpretor.cpp
* Project: SOT
* Author: François Bleibel (from Nicolas Mansard)
* Project: DYNAMIC-GRAPH
* Author: François Bleibel, Nicolas Mansard
*
* Version control
* ===============
......@@ -22,7 +22,7 @@
/* --- INCLUDE --------------------------------------------------------- */
/* --------------------------------------------------------------------- */
/* SOT */
/* DYNAMIC-GRAPH */
#include <dynamic-graph/interpreter.h>
#include <dynamic-graph/plugin-loader.h>
#include <dynamic-graph/debug.h>
......@@ -121,12 +121,12 @@ cmdPlug( const std::string& cmdLine, istringstream& cmdArg, std::ostream& os )
}
dgDEBUG(20) << "Get Ent1 <"<<obj1<<"> ."<<endl;
Entity& ent1 = pool.getEntity(obj1);
Entity& ent1 = g_pool.getEntity(obj1);
dgDEBUG(20) << "Get Sig1 <"<<fun1<<"> ."<<endl;
SignalBase<int> &sig1 = ent1.getSignal(fun1);
dgDEBUG(20) << "Get Ent2 <"<<obj2<<"> ."<<endl;
Entity& ent2 = pool.getEntity(obj2);
Entity& ent2 = g_pool.getEntity(obj2);
dgDEBUG(20) << "Get Sig2 <"<<fun2<<"> ."<<endl;
SignalBase<int> &sig2 = ent2.getSignal(fun2);
......@@ -147,10 +147,10 @@ cmdNew( const std::string& cmdLine, istringstream& cmdArg, std::ostream& os )
string objName;
cmdArg >> className >>objName;
dgDEBUG(15) << "New <" << className<<"> requested."<<endl;
if( factory.existEntity( className ) )
if( g_factory.existEntity( className ) )
{
dgDEBUG(15) << "New entity<"<<className<<"> " <<objName<<std::endl;
factory.newEntity(className,objName);
g_factory.newEntity(className,objName);
}
else os << " !! Class <" << className << "> does not exist."<<endl;
}
......@@ -167,7 +167,7 @@ cmdDestroy( const std::string& cmdLine, istringstream& cmdArg, std::ostream& os
}
string objName; cmdArg >> objName;
dgDEBUG(15) << "Destroy <" << objName <<"> requested."<<endl;
delete &( pool.getEntity( objName ) );
delete &( g_pool.getEntity( objName ) );
}
......@@ -334,7 +334,7 @@ cmdSetSignal( const std::string& cmdLine, std::istringstream& cmdArg, std::ostre
string objname,signame;
objectNameParser(cmdArg,objname,signame);
Entity& obj = pool.getEntity(objname);
Entity& obj = g_pool.getEntity(objname);
SignalBase<int>& sig = obj.getSignal( signame );
cmdArg >> ws;
......@@ -357,7 +357,7 @@ cmdGetSignal( const std::string& cmdLine, std::istringstream& cmdArg, std::ostre
string objname,signame;
objectNameParser(cmdArg,objname,signame);
Entity& obj = pool.getEntity(objname);
Entity& obj = g_pool.getEntity(objname);
SignalBase<int>& sig = obj.getSignal( signame );
os << signame << " = "; sig.get( os );
......@@ -379,7 +379,7 @@ cmdComputeSignal( const std::string& cmdLine, std::istringstream& cmdArg, std::o
string objname,signame;
objectNameParser(cmdArg,objname,signame);
Entity& obj = pool.getEntity(objname);
Entity& obj = g_pool.getEntity(objname);
SignalBase<int>& sig = obj.getSignal( signame );
int time; cmdArg >> std::ws;
......@@ -407,7 +407,7 @@ cmd( const std::string& cmdLine, istringstream& cmdArg, std::ostream& os )
else if( objectNameParser( cmdparse,obj,fun ) )
{
dgDEBUG(15) << "Object <" << obj<< "> function <"<<fun<<">"<<endl;
pool.commandLine( obj,fun,cmdArg,os );
g_pool.commandLine( obj,fun,cmdArg,os );
}
else
{
......@@ -486,7 +486,7 @@ ShellFunctionRegisterer( const std::string& funName,
const Interpreter::ShellBasicFunction& f)
{
dgDEBUGIN(25);
S