Commit 697ec31f authored by stasse's avatar stasse Committed by florent
Browse files

Reinforce the dependant->dependent policy.

	  * include/dynamic-graph/signal-base.h,
	  * include/dynamic-graph/signal-ptr.h,
	  * include/dynamic-graph/signal-ptr.t.cpp,
	  * include/dynamic-graph/time-dependency.h,
	  * include/dynamic-graph/time-dependency.t.cpp,
	  * src/dgraph/entity.cpp, dependancy -> dependency,
	  * unitTesting/test_depend.cpp: makes the test_depend.cpp test works.
parent 3b87474d
......@@ -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; }
......
......@@ -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 ) {}
};
......
......@@ -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;
......
......@@ -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")
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment