Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
dynamic-graph
Commits
41e11cc3
Commit
41e11cc3
authored
Jun 28, 2010
by
Francois Bleibel
Browse files
Corrected typo 'dependant' -> 'dependent'
parent
db50d150
Changes
7
Hide whitespace changes
Inline
Side-by-side
doc/additionalDoc/package.h
View file @
41e11cc3
...
...
@@ -51,7 +51,7 @@ from one feature to another. There are three main types of signals,
all deriving from the common class dynamicgraph::SignalBase :
\li dynamicgraph::Signal
\li dynamicgraph::SignalPtr
\li dynamicgraph::SignalTimeDepend
a
nt
\li dynamicgraph::SignalTimeDepend
e
nt
Signals can be grouped together using dynamicgraph::SignalArray.
...
...
include/CMakeLists.txt
View file @
41e11cc3
...
...
@@ -22,7 +22,7 @@ signal.h
signal-array.h
signal-base.h
signal-ptr.h
signal-time-depend
a
nt.h
signal-time-depend
e
nt.h
signal-ptr.t.cpp
signal.t.cpp
time-dependency.h
...
...
include/dynamic-graph/all-signals.h
View file @
41e11cc3
...
...
@@ -12,6 +12,6 @@
#include
<dynamic-graph/signal.h>
#include
<dynamic-graph/signal-ptr.h>
#include
<dynamic-graph/signal-time-depend
a
nt.h>
#include
<dynamic-graph/signal-time-depend
e
nt.h>
#endif
/* ALLSIGNALS_H_ */
include/dynamic-graph/signal-time-dependant.h
deleted
100644 → 0
View file @
db50d150
/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
* Copyright Projet JRL-Japan, 2007
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: signal-time-dependant.h
* Project: DYNAMIC-GRAPH
* Author: Nicolas Mansard
*
* Version control
* ===============
*
* $Id$
*
* Description
* ============
*
*
* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
#ifndef __DEPENDANT_SIGNAL_HH
#define __DEPENDANT_SIGNAL_HH
#include
<dynamic-graph/signal.h>
#include
<dynamic-graph/time-dependency.h>
namespace
dynamicgraph
{
template
<
class
T
,
class
Time
>
class
SignalTimeDependant
:
public
virtual
Signal
<
T
,
Time
>
,
public
TimeDependancy
<
Time
>
{
//TimeDependancy<Time> timeDependancy;
public:
SignalTimeDependant
(
std
::
string
name
=
""
);
SignalTimeDependant
(
const
SignalArray_const
<
Time
>
&
arr
,
std
::
string
name
=
""
);
SignalTimeDependant
(
boost
::
function2
<
T
&
,
T
&
,
Time
>
t
,
const
SignalArray_const
<
Time
>
&
sig
,
std
::
string
name
=
""
);
virtual
~
SignalTimeDependant
(
void
)
{}
inline
const
T
&
operator
()
(
const
Time
&
t1
){
return
access
(
t1
);
}
const
T
&
access
(
const
Time
&
t1
);
virtual
void
addDependancy
(
const
SignalBase
<
Time
>&
signal
)
;
virtual
void
removeDependancy
(
const
SignalBase
<
Time
>&
signal
)
;
virtual
void
clearDependancies
(
void
);
std
::
ostream
&
writeGraph
(
std
::
ostream
&
os
)
const
{
return
os
;}
std
::
ostream
&
displayDependancies
(
std
::
ostream
&
os
,
const
int
depth
=-
1
,
std
::
string
space
=
""
,
std
::
string
next1
=
""
,
std
::
string
next2
=
""
)
const
{
return
TimeDependancy
<
Time
>::
displayDependancies
(
os
,
depth
,
space
,
next1
,
next2
);
}
virtual
bool
needUpdate
(
const
Time
&
t
)
const
;
virtual
void
setPeriodTime
(
const
Time
&
p
)
;
virtual
Time
getPeriodTime
(
void
)
const
;
};
/* -------------------------------------------- */
template
<
class
T
,
class
Time
>
SignalTimeDependant
<
T
,
Time
>::
SignalTimeDependant
(
std
::
string
name
)
:
Signal
<
T
,
Time
>
(
name
)
,
TimeDependancy
<
Time
>
(
this
)
{}
template
<
class
T
,
class
Time
>
SignalTimeDependant
<
T
,
Time
>::
SignalTimeDependant
(
const
SignalArray_const
<
Time
>
&
arr
,
std
::
string
name
)
:
Signal
<
T
,
Time
>
(
name
)
,
TimeDependancy
<
Time
>
(
this
,
arr
)
{}
template
<
class
T
,
class
Time
>
SignalTimeDependant
<
T
,
Time
>::
SignalTimeDependant
(
boost
::
function2
<
T
&
,
T
&
,
Time
>
t
,
const
SignalArray_const
<
Time
>
&
sig
,
std
::
string
name
)
:
Signal
<
T
,
Time
>
(
name
)
,
TimeDependancy
<
Time
>
(
this
,
sig
)
{
setFunction
(
t
);
}
template
<
class
T
,
class
Time
>
const
T
&
SignalTimeDependant
<
T
,
Time
>::
access
(
const
Time
&
t1
)
{
const
bool
up
=
TimeDependancy
<
Time
>::
needUpdate
(
t1
);
//SignalBase<Time>::setReady(false);
/* std::cout << "Time before: "<< signalTime << " -- " */
/* << t1<< " -> Up: "<<up <<std::endl ; */
if
(
up
)
{
TimeDependancy
<
Time
>::
lastAskForUpdate
=
false
;
const
T
&
Tres
=
Signal
<
T
,
Time
>::
access
(
t1
);
SignalBase
<
Time
>::
setReady
(
false
);
return
Tres
;
}
else
{
return
Signal
<
T
,
Time
>::
accessCopy
();
}
}
template
<
class
T
,
class
Time
>
void
SignalTimeDependant
<
T
,
Time
>::
addDependancy
(
const
SignalBase
<
Time
>&
signal
)
{
TimeDependancy
<
Time
>::
addDependancy
(
signal
);
}
template
<
class
T
,
class
Time
>
void
SignalTimeDependant
<
T
,
Time
>::
removeDependancy
(
const
SignalBase
<
Time
>&
signal
)
{
TimeDependancy
<
Time
>::
removeDependancy
(
signal
);
}
template
<
class
T
,
class
Time
>
void
SignalTimeDependant
<
T
,
Time
>::
clearDependancies
(
void
)
{
TimeDependancy
<
Time
>::
clearDependancy
();
}
template
<
class
T
,
class
Time
>
bool
SignalTimeDependant
<
T
,
Time
>::
needUpdate
(
const
Time
&
t
)
const
{
return
TimeDependancy
<
Time
>::
needUpdate
(
t
);
}
template
<
class
T
,
class
Time
>
void
SignalTimeDependant
<
T
,
Time
>::
setPeriodTime
(
const
Time
&
p
)
{
TimeDependancy
<
Time
>::
setPeriodTime
(
p
);
}
template
<
class
T
,
class
Time
>
Time
SignalTimeDependant
<
T
,
Time
>::
getPeriodTime
(
void
)
const
{
return
TimeDependancy
<
Time
>::
getPeriodTime
();
}
}
// namespace dynamicgraph
#endif
/* #ifndef __DEPENDANT_SIGNAL_HH */
include/dynamic-graph/time-dependency.h
View file @
41e11cc3
...
...
@@ -2,7 +2,7 @@
* Copyright Projet JRL-Japan, 2007
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: TimeDepend
a
ncy.h
* File: TimeDepend
e
ncy.h
* Project: DYNAMIC-GRAPH
* Author: Nicolas Mansard
*
...
...
@@ -33,7 +33,7 @@ namespace dynamicgraph {
template
<
class
Time
>
class
TimeDepend
a
ncy
class
TimeDepend
e
ncy
{
public:
enum
DependancyType
...
...
@@ -64,12 +64,12 @@ class TimeDependancy
public:
TimeDepend
a
ncy
(
SignalBase
<
Time
>*
sig
,
TimeDepend
e
ncy
(
SignalBase
<
Time
>*
sig
,
const
DependancyType
dep
=
DEPENDANCY_TYPE_DEFAULT
);
TimeDepend
a
ncy
(
SignalBase
<
Time
>*
sig
,
TimeDepend
e
ncy
(
SignalBase
<
Time
>*
sig
,
const
SignalArray_const
<
Time
>&
arr
,
const
DependancyType
dep
=
DEPENDANCY_TYPE_DEFAULT
);
~
TimeDepend
a
ncy
(
void
)
{}
~
TimeDepend
e
ncy
(
void
)
{}
void
addDependancy
(
const
SignalBase
<
Time
>&
sig
);
void
removeDependancy
(
const
SignalBase
<
Time
>&
sig
);
...
...
include/dynamic-graph/time-dependency.t.cpp
View file @
41e11cc3
...
...
@@ -2,7 +2,7 @@
* Copyright Projet JRL-Japan, 2007
*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*
* File: TimeDepend
a
ncy.t.cpp
* File: TimeDepend
e
ncy.t.cpp
* Project: DYNAMIC-GRAPH
* Author: Nicolas Mansard
*
...
...
@@ -40,15 +40,15 @@ namespace dynamicgraph {
template
<
class
Time
>
TimeDepend
a
ncy
<
Time
>::
TimeDepend
a
ncy
(
SignalBase
<
Time
>
*
sig
TimeDepend
e
ncy
<
Time
>::
TimeDepend
e
ncy
(
SignalBase
<
Time
>
*
sig
,
const
DependancyType
dep
)
:
__TIME_DEPENDANCY_INIT
(
sig
,
dep
)
{}
template
<
class
Time
>
TimeDepend
a
ncy
<
Time
>::
TimeDepend
a
ncy
(
SignalBase
<
Time
>
*
sig
TimeDepend
e
ncy
<
Time
>::
TimeDepend
e
ncy
(
SignalBase
<
Time
>
*
sig
,
const
SignalArray_const
<
Time
>&
ar
,
const
DependancyType
dep
)
:
__TIME_DEPENDANCY_INIT
(
sig
,
dep
)
...
...
@@ -61,27 +61,27 @@ TimeDependancy( SignalBase<Time> * sig
/* -------------------------------------------------------------------------- */
template
<
class
Time
>
void
TimeDepend
a
ncy
<
Time
>::
void
TimeDepend
e
ncy
<
Time
>::
addDependancy
(
const
SignalBase
<
Time
>&
sig
)
{
dependancies
.
push_front
(
&
sig
);
}
template
<
class
Time
>
void
TimeDepend
a
ncy
<
Time
>::
void
TimeDepend
e
ncy
<
Time
>::
removeDependancy
(
const
SignalBase
<
Time
>&
sig
)
{
dependancies
.
remove
(
&
sig
);
}
template
<
class
Time
>
void
TimeDepend
a
ncy
<
Time
>::
void
TimeDepend
e
ncy
<
Time
>::
clearDependancy
(
void
)
{
dependancies
.
clear
();
}
template
<
class
Time
>
bool
TimeDepend
a
ncy
<
Time
>::
bool
TimeDepend
e
ncy
<
Time
>::
needUpdate
(
const
Time
&
t1
)
const
{
dgTDEBUG
(
15
)
<<
"# In {"
<<
leader
.
getName
()
<<
" : ("
<<
leader
.
getReady
()
<<
") "
...
...
@@ -122,7 +122,7 @@ needUpdate( const Time& t1 ) const
template
<
class
Time
>
std
::
ostream
&
TimeDepend
a
ncy
<
Time
>::
std
::
ostream
&
TimeDepend
e
ncy
<
Time
>::
writeGraph
(
std
::
ostream
&
os
)
const
{
std
::
string
LeaderLocalName
;
...
...
@@ -143,7 +143,7 @@ writeGraph( std::ostream & os) const
}
template
<
class
Time
>
std
::
ostream
&
TimeDepend
a
ncy
<
Time
>::
std
::
ostream
&
TimeDepend
e
ncy
<
Time
>::
displayDependancies
(
std
::
ostream
&
os
,
const
int
depth
,
std
::
string
space
,
std
::
string
next1
,
std
::
string
next2
)
const
...
...
unitTesting/test_depend.cpp
View file @
41e11cc3
...
...
@@ -23,8 +23,8 @@
/* -------------------------------------------------------------------------- */
// #include <dynamic-graph/all-signals.h>
#include
<dynamic-graph/signal.h>
#include
<dynamic-graph/signal-time-depend
a
nt.h>
//#include <sot/TimeDepend
a
ncy.h>
#include
<dynamic-graph/signal-time-depend
e
nt.h>
//#include <sot/TimeDepend
e
ncy.h>
#include
<dynamic-graph/debug.h>
#include
<iostream>
#include
<string>
...
...
@@ -40,8 +40,8 @@ class DummyClass
public:
std
::
string
proname
;
list
<
SignalTimeDepend
a
nt
<
double
,
int
>*
>
inputsig
;
list
<
SignalTimeDepend
a
nt
<
string
,
int
>*
>
inputsigV
;
list
<
SignalTimeDepend
e
nt
<
double
,
int
>*
>
inputsig
;
list
<
SignalTimeDepend
e
nt
<
string
,
int
>*
>
inputsigV
;
public:
DummyClass
(
const
std
::
string
&
n
)
:
proname
(
n
),
res
(),
appel
(
0
),
timedata
(
0
)
{}
...
...
@@ -52,22 +52,22 @@ public:
cout
<<
"Inside "
<<
proname
<<
" -> "
<<
this
<<
endl
;
for
(
list
<
SignalTimeDepend
a
nt
<
double
,
int
>*
>::
iterator
it
=
inputsig
.
begin
();
for
(
list
<
SignalTimeDepend
e
nt
<
double
,
int
>*
>::
iterator
it
=
inputsig
.
begin
();
it
!=
inputsig
.
end
();
++
it
)
{
cout
<<
*
(
*
it
)
<<
endl
;
(
*
it
)
->
access
(
timedata
);
}
for
(
list
<
SignalTimeDepend
a
nt
<
string
,
int
>*
>::
iterator
it
=
inputsigV
.
begin
();
for
(
list
<
SignalTimeDepend
e
nt
<
string
,
int
>*
>::
iterator
it
=
inputsigV
.
begin
();
it
!=
inputsigV
.
end
();
++
it
)
{
cout
<<
*
(
*
it
)
<<
endl
;
(
*
it
)
->
access
(
timedata
);}
return
res
=
(
*
this
)();
}
void
add
(
SignalTimeDepend
a
nt
<
double
,
int
>&
sig
)
void
add
(
SignalTimeDepend
e
nt
<
double
,
int
>&
sig
)
{
inputsig
.
push_back
(
&
sig
);
}
void
add
(
SignalTimeDepend
a
nt
<
string
,
int
>&
sig
)
void
add
(
SignalTimeDepend
e
nt
<
string
,
int
>&
sig
)
{
inputsigV
.
push_back
(
&
sig
);
}
Res
operator
()
(
void
);
...
...
@@ -101,13 +101,13 @@ int main( void )
DummyClass
<
double
>
pro1
(
"pro1"
),
pro3
(
"pro3"
),
pro5
(
"pro5"
);
DummyClass
<
string
>
pro2
(
"pro2"
),
pro4
(
"pro4"
),
pro6
(
"pro6"
);
SignalTimeDepend
a
nt
<
double
,
int
>
sig5
(
"Sig5"
);
SignalTimeDepend
a
nt
<
string
,
int
>
sig6
(
"Sig6"
);
SignalTimeDepend
e
nt
<
double
,
int
>
sig5
(
"Sig5"
);
SignalTimeDepend
e
nt
<
string
,
int
>
sig6
(
"Sig6"
);
SignalTimeDepend
a
nt
<
string
,
int
>
sig4
(
sig5
,
"Sig4"
);
SignalTimeDepend
a
nt
<
string
,
int
>
sig2
(
sig4
<<
sig4
<<
sig4
<<
sig6
,
"Sig2"
);
SignalTimeDepend
a
nt
<
double
,
int
>
sig3
(
sig2
<<
sig5
<<
sig6
,
"Sig3"
);
SignalTimeDepend
a
nt
<
double
,
int
>
sig1
(
boost
::
bind
(
&
DummyClass
<
double
>::
fun
,
&
pro1
,
_1
,
_2
),
SignalTimeDepend
e
nt
<
string
,
int
>
sig4
(
sig5
,
"Sig4"
);
SignalTimeDepend
e
nt
<
string
,
int
>
sig2
(
sig4
<<
sig4
<<
sig4
<<
sig6
,
"Sig2"
);
SignalTimeDepend
e
nt
<
double
,
int
>
sig3
(
sig2
<<
sig5
<<
sig6
,
"Sig3"
);
SignalTimeDepend
e
nt
<
double
,
int
>
sig1
(
boost
::
bind
(
&
DummyClass
<
double
>::
fun
,
&
pro1
,
_1
,
_2
),
sig2
<<
sig3
,
"Sig1"
);
// cout << "--- Test Array ------ "<<endl;
...
...
@@ -133,8 +133,8 @@ int main( void )
pro3
.
add
(
sig5
);
pro3
.
add
(
sig6
);
sig5
.
setDependancyType
(
TimeDepend
a
ncy
<
int
>::
ALWAYS_READY
);
sig6
.
setDependancyType
(
TimeDepend
a
ncy
<
int
>::
BOOL_DEPENDANT
);
sig5
.
setDependancyType
(
TimeDepend
e
ncy
<
int
>::
ALWAYS_READY
);
sig6
.
setDependancyType
(
TimeDepend
e
ncy
<
int
>::
BOOL_DEPENDANT
);
sig6
.
setReady
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment