Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
wolf
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
mobile_robotics
wolf_projects
wolf_lib
wolf
Commits
b5569103
Commit
b5569103
authored
4 years ago
by
Joan Solà Ortega
Browse files
Options
Downloads
Patches
Plain Diff
Remove commented code
parent
53d10724
No related branches found
No related tags found
1 merge request
!385
Resolve "State key char instead of string"
Checking pipeline status
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/core/sensor/sensor_base.h
+0
-3
0 additions, 3 deletions
include/core/sensor/sensor_base.h
include/core/state_block/has_state_blocks.h
+0
-5
0 additions, 5 deletions
include/core/state_block/has_state_blocks.h
with
0 additions
and
8 deletions
include/core/sensor/sensor_base.h
+
0
−
3
View file @
b5569103
...
...
@@ -175,11 +175,8 @@ class SensorBase : public NodeBase, public HasStateBlocks, public std::enable_sh
// State blocks
using
HasStateBlocks
::
addStateBlock
;
StateBlockPtr
addStateBlock
(
const
char
&
_key
,
const
StateBlockPtr
&
_sb_ptr
,
const
bool
_dynamic
=
false
);
// StateBlockPtr addStateBlock(const char& _key, const StateBlockPtr& _sb_ptr, const bool _dynamic = false) { return this->addStateBlock(std::string(1, _key), _sb_ptr, _dynamic); }
StateBlockPtr
getStateBlockDynamic
(
const
char
&
_key
)
const
;
StateBlockPtr
getStateBlockDynamic
(
const
char
&
_key
,
const
TimeStamp
&
_ts
)
const
;
// StateBlockPtr getStateBlockDynamic(const char _key) const { return getStateBlockDynamic(std::string(1,_key)); }
// StateBlockPtr getStateBlockDynamic(const char _key, const TimeStamp& _ts) const { return getStateBlockDynamic(std::string(1,_key), _ts); }
// Declare a state block as dynamic or static (with _dymanic = false)
void
setStateBlockDynamic
(
const
char
&
_key
,
bool
_dynamic
=
true
);
...
...
This diff is collapsed.
Click to expand it.
include/core/state_block/has_state_blocks.h
+
0
−
5
View file @
b5569103
...
...
@@ -41,16 +41,11 @@ class HasStateBlocks
virtual
bool
isFixed
()
const
;
virtual
StateBlockPtr
addStateBlock
(
const
char
&
_sb_type
,
const
StateBlockPtr
&
_sb
,
ProblemPtr
_problem
);
// virtual StateBlockPtr addStateBlock(const char _sb_type, const StateBlockPtr& _sb, ProblemPtr _problem) { return addStateBlock(std::string(1,_sb_type), _sb, _problem); }
// virtual unsigned int removeStateBlock(const std::string& _sb_type);
virtual
unsigned
int
removeStateBlock
(
const
char
&
_sb_type
);
bool
hasStateBlock
(
const
char
&
_sb_type
)
const
{
return
state_block_map_
.
count
(
_sb_type
)
>
0
;
}
// bool hasStateBlock(const char _sb_type) const { return hasStateBlock(std::string(1, _sb_type)); }
bool
hasStateBlock
(
const
StateBlockPtr
&
_sb
)
const
;
StateBlockPtr
getStateBlock
(
const
char
&
_sb_type
)
const
;
// StateBlockPtr getStateBlock(const char _sb_type) const { return getStateBlock(std::string(1,_sb_type)); }
bool
setStateBlock
(
const
char
_sb_type
,
const
StateBlockPtr
&
_sb
);
// bool setStateBlock(const char _sb_type, const StateBlockPtr& _sb) { return setStateBlock(std::string(1, _sb_type), _sb); }
bool
stateBlockKey
(
const
StateBlockPtr
&
_sb
,
char
&
_key
)
const
;
std
::
unordered_map
<
char
,
StateBlockPtr
>::
const_iterator
find
(
const
StateBlockPtr
&
_sb
)
const
;
...
...
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