Skip to content
Snippets Groups Projects
Commit 9afbdf83 authored by Médéric Fourmy's avatar Médéric Fourmy
Browse files

Merge branch 'adapting-to-multiple-processor-motion-285' of... 

Merge branch 'adapting-to-multiple-processor-motion-285' of https://gitlab.iri.upc.edu/mobile_robotics/wolf_projects/wolf_lib/wolf into adapting-to-multiple-processor-motion-285
parents e970b211 d6a7c73d
No related branches found
No related tags found
1 merge request!339Adapting to multiple processor motion 285
Pipeline #5001 passed
Stage: build
    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 13 additions and 10 deletions
    src/problem/problem.cpp
    + 13
    − 10
    View file @ 9afbdf83
    ......@@ -1739,7 +1739,7 @@ bool Problem::check(int verbose_level) const
    if ( Fo ) // case FRAME:
    {
    if (verbose_level > 0)
    cout << " --> F" << Fo->id() << " <- ";
    cout << " ( --> F" << Fo->id() << " <- ";
    bool found = false;
    for (auto cby : Fo->getConstrainedByList())
    {
    ......@@ -1748,7 +1748,7 @@ bool Problem::check(int verbose_level) const
    found = found || (c == cby);
    }
    if (verbose_level > 0)
    cout << endl;
    cout << ")";
    // check constrained_by pointer in constrained frame
    // is_consistent = is_consistent && found;
    ......@@ -1764,7 +1764,7 @@ bool Problem::check(int verbose_level) const
    if ( Co ) // case CAPTURE:
    {
    if (verbose_level > 0)
    cout << " --> C" << Co->id() << " <- ";
    cout << " ( --> C" << Co->id() << " <- ";
    bool found = false;
    for (auto cby : Co->getConstrainedByList())
    {
    ......@@ -1773,7 +1773,7 @@ bool Problem::check(int verbose_level) const
    found = found || (c == cby);
    }
    if (verbose_level > 0)
    cout << endl;
    cout << ")";
    // check constrained_by pointer in constrained frame
    // is_consistent = is_consistent && found;
    ......@@ -1789,7 +1789,7 @@ bool Problem::check(int verbose_level) const
    if ( fo ) // case FEATURE:
    {
    if (verbose_level > 0)
    cout << " --> f" << fo->id() << " <- ";
    cout << " ( --> f" << fo->id() << " <- ";
    bool found = false;
    for (auto cby : fo->getConstrainedByList())
    {
    ......@@ -1798,7 +1798,7 @@ bool Problem::check(int verbose_level) const
    found = found || (c == cby);
    }
    if (verbose_level > 0)
    cout << endl;
    cout << ")";
    // check constrained_by pointer in constrained feature
    // is_consistent = is_consistent && found;
    ......@@ -1813,7 +1813,7 @@ bool Problem::check(int verbose_level) const
    if ( Lo ) // case LANDMARK:
    {
    if (verbose_level > 0)
    cout << " --> L" << Lo->id() << " <- ";
    cout << " ( --> L" << Lo->id() << " <- ";
    bool found = false;
    for (auto cby : Lo->getConstrainedByList())
    {
    ......@@ -1822,7 +1822,7 @@ bool Problem::check(int verbose_level) const
    found = found || (c == cby);
    }
    if (verbose_level > 0)
    cout << endl;
    cout << ")";
    // check constrained_by pointer in constrained landmark
    // is_consistent = is_consistent && found;
    ......@@ -1832,6 +1832,9 @@ bool Problem::check(int verbose_level) const
    //Clear inconsistency_explanation
    std::stringstream().swap(inconsistency_explanation);
    }
    if (verbose_level > 0)
    cout << endl;
    if (verbose_level > 0)
    {
    cout << " -> P @ " << c->getProblem().get() << endl;
    ......@@ -1890,7 +1893,7 @@ bool Problem::check(int verbose_level) const
    {
    sb_vec = FC->getStateBlockVec();
    found_here = (std::find(sb_vec.begin(), sb_vec.end(), sb) != sb_vec.end());
    if (found_here) cout << " FC" << FC->id();
    if (found_here) cout << " F" << F->id() << ".C" << FC->id();
    found = found || found_here;
    }
    ......@@ -1927,7 +1930,7 @@ bool Problem::check(int verbose_level) const
    {
    sb_vec = FoC->getStateBlockVec();
    found_here = (std::find(sb_vec.begin(), sb_vec.end(), sb) != sb_vec.end());
    if (found_here) cout << " FoC" << FoC->id();
    if (found_here) cout << " Fo" << Fo->id() << ".C" << FoC->id();
    found = found || found_here;
    }
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment