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
b19dec6c
Commit
b19dec6c
authored
6 years ago
by
Angel Santamaria-Navarro
Browse files
Options
Downloads
Patches
Plain Diff
update state_block Notification enum names
parent
bca7b779
No related branches found
No related tags found
1 merge request
!211
State blocks
Pipeline
#2151
failed
6 years ago
Stage: build
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/problem.cpp
+1
-1
1 addition, 1 deletion
src/problem.cpp
src/solver/solver_manager.cpp
+2
-2
2 additions, 2 deletions
src/solver/solver_manager.cpp
src/state_block.h
+3
-3
3 additions, 3 deletions
src/state_block.h
src/test/gtest_trajectory.cpp
+2
-2
2 additions, 2 deletions
src/test/gtest_trajectory.cpp
with
8 additions
and
8 deletions
src/problem.cpp
+
1
−
1
View file @
b19dec6c
...
...
@@ -386,7 +386,7 @@ void Problem::updateStateBlockPtr(StateBlockPtr _state_ptr)
//std::cout << "Problem::updateStateBlockPtr " << _state_ptr.get() << std::endl;
// queue for solver manager
_state_ptr
->
addNotification
(
StateBlock
::
Notification
::
FIX_
UPDATE
);
_state_ptr
->
addNotification
(
StateBlock
::
Notification
::
UPDATE
_FIX
);
notified_state_block_list_
.
push_back
(
_state_ptr
);
notified_state_block_list_
.
sort
();
notified_state_block_list_
.
unique
();
...
...
This diff is collapsed.
Click to expand it.
src/solver/solver_manager.cpp
+
2
−
2
View file @
b19dec6c
...
...
@@ -53,7 +53,7 @@ void SolverManager::update()
break
;
}
case
StateBlock
::
Notification
::
ST
ATE_
UPD
ATE
:
case
StateBlock
::
Notification
::
UPD
ATE_
ST
ATE
:
{
WOLF_DEBUG_COND
(
state_blocks_
.
find
(
state
)
==
state_blocks_
.
end
(),
"Updating the state of an unregistered StateBlock !"
);
...
...
@@ -67,7 +67,7 @@ void SolverManager::update()
break
;
}
case
StateBlock
::
Notification
::
FIX_
UPDATE
:
case
StateBlock
::
Notification
::
UPDATE
_FIX
:
{
WOLF_DEBUG_COND
(
state_blocks_
.
find
(
state
)
==
state_blocks_
.
end
(),
"Updating the fix state of an unregistered StateBlock !"
);
...
...
This diff is collapsed.
Click to expand it.
src/state_block.h
+
3
−
3
View file @
b19dec6c
...
...
@@ -36,8 +36,8 @@ public:
{
ADD
=
0
,
REMOVE
,
ST
ATE_
UPD
ATE
,
FIX_
UPDATE
UPD
ATE_
ST
ATE
,
UPDATE
_FIX
};
using
Notifications
=
std
::
list
<
Notification
>
;
...
...
@@ -214,7 +214,7 @@ inline void StateBlock::unfix()
inline
void
StateBlock
::
setFixed
(
bool
_fixed
)
{
fixed_
.
store
(
_fixed
);
addNotification
(
Notification
::
FIX_
UPDATE
);
addNotification
(
Notification
::
UPDATE
_FIX
);
}
inline
bool
StateBlock
::
hasLocalParametrization
()
const
...
...
This diff is collapsed.
Click to expand it.
src/test/gtest_trajectory.cpp
+
2
−
2
View file @
b19dec6c
...
...
@@ -46,11 +46,11 @@ struct DummyNotificationProcessor
{
break
;
}
case
StateBlock
::
Notification
::
ST
ATE_
UPD
ATE
:
case
StateBlock
::
Notification
::
UPD
ATE_
ST
ATE
:
{
break
;
}
case
StateBlock
::
Notification
::
FIX_
UPDATE
:
case
StateBlock
::
Notification
::
UPDATE
_FIX
:
{
break
;
}
...
...
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