Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
dynamic-graph
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Guilhem Saurel
dynamic-graph
Commits
3e9b9984
Commit
3e9b9984
authored
11 years ago
by
Francois Keith
Browse files
Options
Downloads
Patches
Plain Diff
Correct the name of the method isPlugged.
The old one is kept, but with a warning message (for now).
parent
f5c76eca
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/dynamic-graph/signal-base.h
+1
-1
1 addition, 1 deletion
include/dynamic-graph/signal-base.h
include/dynamic-graph/signal-ptr.h
+7
-2
7 additions, 2 deletions
include/dynamic-graph/signal-ptr.h
include/dynamic-graph/signal-ptr.t.cpp
+7
-7
7 additions, 7 deletions
include/dynamic-graph/signal-ptr.t.cpp
with
15 additions
and
10 deletions
include/dynamic-graph/signal-base.h
+
1
−
1
View file @
3e9b9984
...
@@ -152,7 +152,7 @@ namespace dynamicgraph
...
@@ -152,7 +152,7 @@ namespace dynamicgraph
"(while trying to unplug %s)."
,
this
->
getName
().
c_str
());
"(while trying to unplug %s)."
,
this
->
getName
().
c_str
());
}
}
virtual
bool
isPluged
()
const
virtual
bool
isPlug
g
ed
()
const
{
{
return
false
;
return
false
;
}
}
...
...
This diff is collapsed.
Click to expand it.
include/dynamic-graph/signal-ptr.h
+
7
−
2
View file @
3e9b9984
...
@@ -73,7 +73,12 @@ namespace dynamicgraph
...
@@ -73,7 +73,12 @@ namespace dynamicgraph
const
SignalBase
<
Time
>*
getAbstractPtr
()
const
;
// throw
const
SignalBase
<
Time
>*
getAbstractPtr
()
const
;
// throw
virtual
void
plug
(
SignalBase
<
Time
>*
ref
);
virtual
void
plug
(
SignalBase
<
Time
>*
ref
);
virtual
void
unplug
()
{
plug
(
NULL
);
}
virtual
void
unplug
()
{
plug
(
NULL
);
}
virtual
bool
isPluged
()
const
{
return
(
NULL
!=
signalPtr
);
}
virtual
bool
isPluged
()
const
{
std
::
cerr
<<
"The method isPluged is deprecated."
;
std
::
cerr
<<
" Please use isPlugged instead"
<<
std
::
endl
;
return
isPlugged
();
}
virtual
bool
isPlugged
()
const
{
return
(
NULL
!=
signalPtr
);
}
virtual
SignalBase
<
Time
>*
getPluged
()
const
{
return
signalPtr
;
}
virtual
SignalBase
<
Time
>*
getPluged
()
const
{
return
signalPtr
;
}
virtual
bool
isAbstractPluged
()
const
;
virtual
bool
isAbstractPluged
()
const
;
virtual
const
Time
&
getTime
()
const
;
virtual
const
Time
&
getTime
()
const
;
...
@@ -83,7 +88,7 @@ namespace dynamicgraph
...
@@ -83,7 +88,7 @@ namespace dynamicgraph
inline
const
Signal
<
T
,
Time
>*
operator
->
()
const
{
return
getPtr
();
}
inline
const
Signal
<
T
,
Time
>*
operator
->
()
const
{
return
getPtr
();
}
inline
Signal
<
T
,
Time
>&
operator
*
()
{
return
*
getPtr
();
}
inline
Signal
<
T
,
Time
>&
operator
*
()
{
return
*
getPtr
();
}
inline
const
Signal
<
T
,
Time
>&
operator
*
()
const
{
return
*
getPtr
();
}
inline
const
Signal
<
T
,
Time
>&
operator
*
()
const
{
return
*
getPtr
();
}
inline
operator
bool
()
const
{
return
isPluged
();
}
inline
operator
bool
()
const
{
return
isPlug
g
ed
();
}
public
:
/* --- INHERITANCE --- */
public
:
/* --- INHERITANCE --- */
...
...
This diff is collapsed.
Click to expand it.
include/dynamic-graph/signal-ptr.t.cpp
+
7
−
7
View file @
3e9b9984
...
@@ -38,7 +38,7 @@ namespace dynamicgraph
...
@@ -38,7 +38,7 @@ namespace dynamicgraph
getPtr
()
getPtr
()
{
{
dgTDEBUGIN
(
25
);
dgTDEBUGIN
(
25
);
if
(
!
isPluged
()
)
if
(
!
isPlug
g
ed
()
)
DG_THROW
ExceptionSignal
(
ExceptionSignal
::
NOT_INITIALIZED
,
DG_THROW
ExceptionSignal
(
ExceptionSignal
::
NOT_INITIALIZED
,
"In SignalPtr: SIN ptr not set."
,
"In SignalPtr: SIN ptr not set."
,
" (in signal <%s>)"
,
getName
().
c_str
());
" (in signal <%s>)"
,
getName
().
c_str
());
...
@@ -50,10 +50,10 @@ namespace dynamicgraph
...
@@ -50,10 +50,10 @@ namespace dynamicgraph
const
Signal
<
T
,
Time
>*
SignalPtr
<
T
,
Time
>::
const
Signal
<
T
,
Time
>*
SignalPtr
<
T
,
Time
>::
getPtr
()
const
getPtr
()
const
{
{
dgTDEBUGIN
(
25
)
<<
SignalBase
<
Time
>::
name
<<
"("
<<
isPluged
()
<<
")"
dgTDEBUGIN
(
25
)
<<
SignalBase
<
Time
>::
name
<<
"("
<<
isPlug
g
ed
()
<<
")"
<<
this
<<
"->"
<<
signalPtr
<<
std
::
endl
;
<<
this
<<
"->"
<<
signalPtr
<<
std
::
endl
;
dgTDEBUGIN
(
25
);
dgTDEBUGIN
(
25
);
if
(
!
isPluged
()
)
if
(
!
isPlug
g
ed
()
)
{
DG_THROW
ExceptionSignal
(
ExceptionSignal
::
NOT_INITIALIZED
,
{
DG_THROW
ExceptionSignal
(
ExceptionSignal
::
NOT_INITIALIZED
,
"In SignalPtr: SIN ptr not set."
,
"In SignalPtr: SIN ptr not set."
,
" (in signal <%s>)"
,
getName
().
c_str
());
}
" (in signal <%s>)"
,
getName
().
c_str
());
}
...
@@ -142,7 +142,7 @@ namespace dynamicgraph
...
@@ -142,7 +142,7 @@ namespace dynamicgraph
void
SignalPtr
<
T
,
Time
>::
void
SignalPtr
<
T
,
Time
>::
checkCompatibility
()
checkCompatibility
()
{
{
if
(
isPluged
()
&&
(
!
autoref
())
)
if
(
isPlug
g
ed
()
&&
(
!
autoref
())
)
{
getPtr
()
->
checkCompatibility
();
}
{
getPtr
()
->
checkCompatibility
();
}
else
if
(
isAbstractPluged
()
&&
(
!
autoref
())
)
else
if
(
isAbstractPluged
()
&&
(
!
autoref
())
)
{
abstractTransmitter
->
checkCompatibility
();
}
{
abstractTransmitter
->
checkCompatibility
();
}
...
@@ -177,7 +177,7 @@ namespace dynamicgraph
...
@@ -177,7 +177,7 @@ namespace dynamicgraph
access
(
const
Time
&
t
)
access
(
const
Time
&
t
)
{
{
dgTDEBUGIN
(
15
);
dgTDEBUGIN
(
15
);
if
(
modeNoThrow
&&
(
!
isPluged
())
&&
Signal
<
T
,
Time
>::
copyInit
)
if
(
modeNoThrow
&&
(
!
isPlug
g
ed
())
&&
Signal
<
T
,
Time
>::
copyInit
)
{
{
dgTDEBUGOUT
(
15
);
dgTDEBUGOUT
(
15
);
return
Signal
<
T
,
Time
>::
accessCopy
();
return
Signal
<
T
,
Time
>::
accessCopy
();
...
@@ -203,7 +203,7 @@ namespace dynamicgraph
...
@@ -203,7 +203,7 @@ namespace dynamicgraph
const
T
&
SignalPtr
<
T
,
Time
>::
const
T
&
SignalPtr
<
T
,
Time
>::
accessCopy
()
const
accessCopy
()
const
{
{
if
(
modeNoThrow
&&
(
!
isPluged
())
&&
Signal
<
T
,
Time
>::
copyInit
)
if
(
modeNoThrow
&&
(
!
isPlug
g
ed
())
&&
Signal
<
T
,
Time
>::
copyInit
)
return
Signal
<
T
,
Time
>::
accessCopy
();
return
Signal
<
T
,
Time
>::
accessCopy
();
else
if
(
autoref
()
)
return
Signal
<
T
,
Time
>::
accessCopy
();
else
if
(
autoref
()
)
return
Signal
<
T
,
Time
>::
accessCopy
();
else
if
(
transmitAbstract
)
return
*
transmitAbstractData
;
else
if
(
transmitAbstract
)
return
*
transmitAbstractData
;
...
@@ -233,7 +233,7 @@ namespace dynamicgraph
...
@@ -233,7 +233,7 @@ namespace dynamicgraph
std
::
ostream
&
SignalPtr
<
T
,
Time
>::
std
::
ostream
&
SignalPtr
<
T
,
Time
>::
display
(
std
::
ostream
&
os
)
const
display
(
std
::
ostream
&
os
)
const
{
{
dgTDEBUGIN
(
25
)
<<
SignalBase
<
Time
>::
name
<<
this
<<
"||"
<<
isPluged
()
<<
"||"
<<
signalPtr
;
dgTDEBUGIN
(
25
)
<<
SignalBase
<
Time
>::
name
<<
this
<<
"||"
<<
isPlug
g
ed
()
<<
"||"
<<
signalPtr
;
{
Signal
<
T
,
Time
>::
display
(
os
);
}
{
Signal
<
T
,
Time
>::
display
(
os
);
}
if
(
(
isAbstractPluged
())
&&
(
!
autoref
())
)
if
(
(
isAbstractPluged
())
&&
(
!
autoref
())
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment