Skip to content

Commit 14d7543

Browse files
committed
Fix
1 parent dc0db19 commit 14d7543

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/dsf/mobility/RoadNetwork.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -548,8 +548,8 @@ namespace dsf::mobility {
548548
}
549549
// Actually going straight means remain on the same road, thus...
550550
auto const inEstFlow{pInStreet->maxSpeed() * pInStreet->nLanes()};
551-
auto const outEstFlow{outOppositeStreet->maxSpeed() *
552-
outOppositeStreet->nLanes()};
551+
auto const outEstFlow{outOppositeStreet->get()->maxSpeed() *
552+
outOppositeStreet->get()->nLanes()};
553553
if (((inEstFlow == maxEstimatedFlow) ==
554554
(outEstFlow == maxEstimatedFlow)) &&
555555
!allowedTurns.contains(Direction::STRAIGHT)) {

src/dsf/mobility/Street.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ namespace dsf::mobility {
5757
isEqual &= (this->m_maxSpeed == other.m_maxSpeed);
5858
isEqual &= (this->m_nLanes == other.m_nLanes);
5959
isEqual &= (this->m_name == other.m_name);
60-
isEqual &= (this->m_priority == other.m_priority);
60+
isEqual &= (this->m_hasPriority == other.m_hasPriority);
6161
return isEqual;
6262
}
6363

test/mobility/Test_street.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,8 @@ TEST_CASE("Road") {
387387

388388
SUBCASE("setPriority") {
389389
WHEN("Priority is set") {
390-
road.setPriority(150);
391-
THEN("Priority is updated") { CHECK_EQ(road.priority(), 150); }
390+
road.setPriority();
391+
THEN("Priority is updated") { CHECK(road.hasPriority()); }
392392
}
393393
}
394394
}

0 commit comments

Comments
 (0)