Skip to content
Snippets Groups Projects
Commit 29e350ac authored by Joan Solà Ortega's avatar Joan Solà Ortega
Browse files

Merge branch '268-set-frame-to-non-estimated-removes-its-state-blocks' into 'devel'

Resolve "set frame to non-estimated removes its state blocks"

Closes #268

See merge request !347
parents 5199d998 50912fbb
No related branches found
No related tags found
1 merge request!347Resolve "set frame to non-estimated removes its state blocks"
Pipeline #5040 passed
...@@ -140,7 +140,8 @@ void FrameBase::setNonEstimated() ...@@ -140,7 +140,8 @@ void FrameBase::setNonEstimated()
{ {
// unregister if previously estimated // unregister if previously estimated
if (isKeyOrAux()) if (isKeyOrAux())
removeStateBlocks(getProblem()); for (const auto& sb : getStateBlockVec())
getProblem()->notifyStateBlock(sb, REMOVE);
type_ = NON_ESTIMATED; type_ = NON_ESTIMATED;
if (getTrajectory()) if (getTrajectory())
......
...@@ -625,7 +625,7 @@ void ProcessorMotion::setProblem(ProblemPtr _problem) ...@@ -625,7 +625,7 @@ void ProcessorMotion::setProblem(ProblemPtr _problem)
return; return;
std::string str = "Processor works with " + std::to_string(dim_) + "D but problem is " + std::to_string(_problem->getDim()) + "D"; std::string str = "Processor works with " + std::to_string(dim_) + "D but problem is " + std::to_string(_problem->getDim()) + "D";
assert(dim_ == 0 or dim_ == _problem->getDim() && str.c_str()); assert(((dim_ == 0) or (dim_ == _problem->getDim())) && str.c_str());
if (_problem == this->getProblem()) if (_problem == this->getProblem())
return; return;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment