From 697ec31f1f038e7e3a4557c565236ca1da27a4a6 Mon Sep 17 00:00:00 2001
From: stasse <olivier.stasse@aist.go.jp>
Date: Mon, 28 Jun 2010 23:03:29 +0900
Subject: [PATCH] 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.
---
include/dynamic-graph/signal-base.h | 8 ++++----
include/dynamic-graph/signal-ptr.h | 8 ++++----
include/dynamic-graph/signal-ptr.t.cpp | 6 +++---
src/dgraph/entity.cpp | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/include/dynamic-graph/signal-base.h b/include/dynamic-graph/signal-base.h
index a2a99a97..c6500c47 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 94799d4b..11903794 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 a0bcd640..394def3f 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 ea631045..3c71929a 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")
{
--
GitLab