diff --git a/include/dynamic-graph/signal-base.h b/include/dynamic-graph/signal-base.h index a2a99a9774f61a07ffea16640c4eb27b08860c45..c6500c47f3b3b90581c3dbd3623aa1918cb36adf 100644 --- a/include/dynamic-graph/signal-base.h +++ b/include/dynamic-graph/signal-base.h @@ -60,11 +60,11 @@ class SignalBase : public boost::noncopyable virtual ~SignalBase( void ) {} - /* --- DEPENDANCIES ------------------------------------------------------- */ + /* --- DEPENDENCIES ------------------------------------------------------- */ - virtual void addDependancy( const SignalBase<Time>& signal ) {} - virtual void removeDependancy( const SignalBase<Time>& signal ) {} - virtual void clearDependancies( void ) {} + virtual void addDependency( const SignalBase<Time>& signal ) {} + virtual void removeDependency( const SignalBase<Time>& signal ) {} + virtual void clearDependencies( void ) {} virtual bool needUpdate( const Time& t ) const {return ready;} inline void setReady( const bool sready = true ) { ready = sready; } diff --git a/include/dynamic-graph/signal-ptr.h b/include/dynamic-graph/signal-ptr.h index 94799d4b6dac259ccf0d42939296160c6af919e6..1190379487ae3ac9683e3659583ab1617fe983a0 100644 --- a/include/dynamic-graph/signal-ptr.h +++ b/include/dynamic-graph/signal-ptr.h @@ -120,16 +120,16 @@ class SignalPtr { setConstant( t ); return *this; } - virtual std::ostream& displayDependancies( std::ostream& os,const int depth=-1, + virtual std::ostream& displayDependencies( std::ostream& os,const int depth=-1, std::string space="", std::string next1="", std::string next2="" ) const; protected: // Interdiction of the rest of the heritage - virtual void addDependancy( const SignalBase<Time>& signal ) {} - virtual void removeDependancy( const SignalBase<Time>& signal ) {} - virtual void clearDependancies( void ) {} + virtual void addDependency( const SignalBase<Time>& signal ) {} + virtual void removeDependency( const SignalBase<Time>& signal ) {} + virtual void clearDependencies( void ) {} }; diff --git a/include/dynamic-graph/signal-ptr.t.cpp b/include/dynamic-graph/signal-ptr.t.cpp index a0bcd64067ce7aa5862836d3a7220cfd426b7633..394def3fa484be7d1cdfb1d4a56fb7c18a75f4c3 100644 --- a/include/dynamic-graph/signal-ptr.t.cpp +++ b/include/dynamic-graph/signal-ptr.t.cpp @@ -246,17 +246,17 @@ display( std::ostream& os ) const template< class T,class Time > std::ostream& SignalPtr<T,Time>:: -displayDependancies( std::ostream& os,const int depth, +displayDependencies( std::ostream& os,const int depth, std::string space, std::string next1,std::string next2 ) const { dgTDEBUGIN(25); if( (isAbstractPluged())&&(!autoref()) ) - { getAbstractPtr()->displayDependancies(os,depth,space,next1+"-- " + { getAbstractPtr()->displayDependencies(os,depth,space,next1+"-- " +SignalBase<Time>::name+" -->",next2); } else { - SignalBase<Time>::displayDependancies(os,depth,space,next1,next2); + SignalBase<Time>::displayDependencies(os,depth,space,next1,next2); } dgTDEBUGOUT(25); return os; diff --git a/src/dgraph/entity.cpp b/src/dgraph/entity.cpp index ea631045429b0e0182f0d11abeb84ae321fabbf1..3c71929a04bb012ca34d723a489db30c2c224efd 100644 --- a/src/dgraph/entity.cpp +++ b/src/dgraph/entity.cpp @@ -225,7 +225,7 @@ commandLine( const std::string& cmdLine,std::istringstream& cmdArgs,std::ostream os << "Entity : " << std::endl << " - print\t\t\tWhat d'you think?"<<endl << " - signals\t\t\tDisplay the signals list."<<endl - << " - signalDep <signame> \tDisplay the dependancy graph for signal signame."<<endl; + << " - signalDep <signame> \tDisplay the dependency graph for signal signame."<<endl; } else if( cmdLine == "print") {