Skip to content

Commit

Permalink
Dont init invalid agents at first time step. (#130)
Browse files Browse the repository at this point in the history
* Dont init agents if not valid on first timestep

* Add param

* Change name and fix test

* Change comment
  • Loading branch information
aaravpandya authored May 23, 2024
1 parent eb5c004 commit 22d2db1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/bindings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ namespace gpudrive
.def_rw("collisionBehaviour", &Parameters::collisionBehaviour)
.def_rw("maxNumControlledVehicles", &Parameters::maxNumControlledVehicles)
.def_rw("IgnoreNonVehicles", &Parameters::IgnoreNonVehicles)
.def_rw("roadObservationAlgorithm", &Parameters::roadObservationAlgorithm);
.def_rw("roadObservationAlgorithm", &Parameters::roadObservationAlgorithm)
.def_rw("initOnlyValidAgentsAtFirstStep ", &Parameters::initOnlyValidAgentsAtFirstStep);

// Define CollisionBehaviour enum
nb::enum_<CollisionBehaviour>(m, "CollisionBehaviour")
Expand Down
1 change: 1 addition & 0 deletions src/init.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ namespace gpudrive
bool IgnoreNonVehicles = false; // Default: false
FindRoadObservationsWith roadObservationAlgorithm{
FindRoadObservationsWith::KNearestEntitiesWithRadiusFiltering};
bool initOnlyValidAgentsAtFirstStep = true; // Default: true
};

struct WorldInit
Expand Down
4 changes: 4 additions & 0 deletions src/level_gen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,10 @@ void createPersistentEntities(Engine &ctx, Map *map) {
}
}
const auto &agentInit = map->objects[agentCtr];
if (ctx.data().params.initOnlyValidAgentsAtFirstStep && agentInit.valid[0] == false)
{
continue;
}
auto agent = createAgent(
ctx, agentInit);
ctx.data().agents[agentIdx++] = agent;
Expand Down
1 change: 1 addition & 0 deletions tests/bicyclemodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class BicycleKinematicModelTest : public ::testing::Test {
.polylineReductionThreshold = 0.0,
.observationRadius = 100.0,
.collisionBehaviour = gpudrive::CollisionBehaviour::Ignore,
.initOnlyValidAgentsAtFirstStep = false
}
});

Expand Down

0 comments on commit 22d2db1

Please sign in to comment.