Skip to content

Commit

Permalink
improving time dependency #1922
Browse files Browse the repository at this point in the history
  • Loading branch information
@behrisch
behrisch committed May 2, 2024
1 parent b1c634e commit c7f22f0
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 47 deletions.
71 changes: 36 additions & 35 deletions src/microsim/devices/MSDevice_FCDReplay.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,35 +94,34 @@ MSDevice_FCDReplay::~MSDevice_FCDReplay() {
}


bool
MSDevice_FCDReplay::move() {
void
MSDevice_FCDReplay::move(SUMOTime currentTime) {
if (myTrajectory == nullptr || myTrajectory->empty()) {
// removal happens via the usual MSVehicle::hasArrived mechanism
// TODO we may need to set an arrivalPos
return false;
return;
}
MSVehicle* v = dynamic_cast<MSVehicle*>(&myHolder);
if (v == nullptr) {
return false;
const TrajectoryEntry& te = myTrajectory->front();
if (v == nullptr || te.time > currentTime) {
return;
}
const auto& p = myTrajectory->front();
const std::string& edgeID = SUMOXMLDefinitions::getEdgeIDFromLane(std::get<1>(p));
const int laneIdx = SUMOXMLDefinitions::getIndexFromLane(std::get<1>(p));
libsumo::Vehicle::moveToXY(myHolder.getID(), edgeID, laneIdx, std::get<0>(p).x(), std::get<0>(p).y(),
std::get<4>(p), 7);
libsumo::Vehicle::setSpeed(myHolder.getID(), std::get<3>(p));
const std::string& edgeID = SUMOXMLDefinitions::getEdgeIDFromLane(te.edgeOrLane);
const int laneIdx = SUMOXMLDefinitions::getIndexFromLane(te.edgeOrLane);
libsumo::Vehicle::moveToXY(myHolder.getID(), edgeID, laneIdx, te.pos.x(), te.pos.y(), te.angle, 7);
libsumo::Vehicle::setSpeed(myHolder.getID(), te.speed);
// libsumo::Vehicle::changeLane(myHolder.getID(), laneIdx, TS);
myTrajectory->erase(myTrajectory->begin());
return true;
}


SUMOTime
MSDevice_FCDReplay::MoveVehicles::execute(SUMOTime /* currentTime */) {
MSDevice_FCDReplay::MoveVehicles::execute(SUMOTime currentTime) {
MSVehicleControl& c = MSNet::getInstance()->getVehicleControl();
for (MSVehicleControl::constVehIt i = c.loadedVehBegin(); i != c.loadedVehEnd(); ++i) {
MSDevice_FCDReplay* device = static_cast<MSDevice_FCDReplay*>(i->second->getDevice(typeid(MSDevice_FCDReplay)));
if (device != nullptr && i->second->hasDeparted()) {
device->move();
device->move(currentTime);
}
}
return DELTA_T;
Expand All @@ -141,24 +140,26 @@ MSDevice_FCDReplay::FCDHandler::myStartElement(int element, const SUMOSAXAttribu
return;
case SUMO_TAG_VEHICLE:
case SUMO_TAG_PERSON: {
const bool isPerson = element == SUMO_TAG_PERSON;
const std::string id = attrs.getString(SUMO_ATTR_ID);
const double x = attrs.getOpt<double>(SUMO_ATTR_X, id.c_str(), ok, INVALID_DOUBLE);
const double y = attrs.getOpt<double>(SUMO_ATTR_Y, id.c_str(), ok, INVALID_DOUBLE);
const std::string type = attrs.getOpt<std::string>(SUMO_ATTR_TYPE, id.c_str(), ok, "");
const std::string edgeOrLane = attrs.getOpt<std::string>(isPerson ? SUMO_ATTR_EDGE : SUMO_ATTR_LANE, id.c_str(), ok, "");
const double speed = attrs.getOpt<double>(SUMO_ATTR_SPEED, id.c_str(), ok, INVALID_DOUBLE);
const double pos = attrs.getOpt<double>(SUMO_ATTR_POSITION, id.c_str(), ok, INVALID_DOUBLE);
const double angle = attrs.getOpt<double>(SUMO_ATTR_ANGLE, id.c_str(), ok, INVALID_DOUBLE);
myTrajectories[id].push_back(std::make_tuple(Position(x, y), edgeOrLane, pos, speed, angle));
const MSEdge* const edge = MSEdge::dictionary(isPerson ? edgeOrLane : SUMOXMLDefinitions::getEdgeIDFromLane(edgeOrLane));
if (edge != nullptr) { // TODO maybe warn for unknown edge?
if (myRoutes.count(id) == 0) {
myRoutes[id] = std::make_tuple(myTime, type, isPerson, ConstMSEdgeVector{edge});
} else {
auto& route = std::get<3>(myRoutes[id]);
if (!edge->isInternal() && edge != route.back()) {
route.push_back(edge);
if (myTime >= SIMSTEP) {
const bool isPerson = element == SUMO_TAG_PERSON;
const std::string id = attrs.getString(SUMO_ATTR_ID);
const double x = attrs.getOpt<double>(SUMO_ATTR_X, id.c_str(), ok, INVALID_DOUBLE);
const double y = attrs.getOpt<double>(SUMO_ATTR_Y, id.c_str(), ok, INVALID_DOUBLE);
const std::string type = attrs.getOpt<std::string>(SUMO_ATTR_TYPE, id.c_str(), ok, "");
const std::string edgeOrLane = attrs.getOpt<std::string>(isPerson ? SUMO_ATTR_EDGE : SUMO_ATTR_LANE, id.c_str(), ok, "");
const double speed = attrs.getOpt<double>(SUMO_ATTR_SPEED, id.c_str(), ok, INVALID_DOUBLE);
const double pos = attrs.getOpt<double>(SUMO_ATTR_POSITION, id.c_str(), ok, INVALID_DOUBLE);
const double angle = attrs.getOpt<double>(SUMO_ATTR_ANGLE, id.c_str(), ok, INVALID_DOUBLE);
myTrajectories[id].push_back({myTime, Position(x, y), edgeOrLane, pos, speed, angle});
const MSEdge* const edge = MSEdge::dictionary(isPerson ? edgeOrLane : SUMOXMLDefinitions::getEdgeIDFromLane(edgeOrLane));
if (edge != nullptr) { // TODO maybe warn for unknown edge?
if (myRoutes.count(id) == 0) {
myRoutes[id] = std::make_tuple(myTime, type, isPerson, ConstMSEdgeVector{edge});
} else {
ConstMSEdgeVector& route = std::get<3>(myRoutes[id]);
if (!edge->isInternal() && edge != route.back()) {
route.push_back(edge);
}
}
}
}
Expand All @@ -185,8 +186,8 @@ MSDevice_FCDReplay::FCDHandler::addTrafficObjects() {
SUMOVehicleParameter* params = new SUMOVehicleParameter();
params->id = id;
params->depart = std::get<0>(desc.second);
params->departPos = std::get<2>(t.front());
params->departSpeed = std::get<3>(t.front());
params->departPos = t.front().lanePos;
params->departSpeed = t.front().speed;
const bool isPerson = std::get<2>(desc.second);
std::string vType = std::get<1>(desc.second);
if (vType == "") {
Expand Down Expand Up @@ -221,7 +222,7 @@ MSDevice_FCDReplay::FCDHandler::addTrafficObjects() {
throw ProcessError("Could not add route '" + dummyRouteID + "'.");
}
params->departLaneProcedure = DepartLaneDefinition::GIVEN;
params->departLane = SUMOXMLDefinitions::getIndexFromLane(std::get<1>(t.front()));
params->departLane = SUMOXMLDefinitions::getIndexFromLane(t.front().edgeOrLane);
SUMOVehicle* vehicle = MSNet::getInstance()->getVehicleControl().buildVehicle(params, route, vehicleType, false);
if (!MSNet::getInstance()->getVehicleControl().addVehicle(id, vehicle)) {
throw ProcessError("Duplicate vehicle '" + id + "'.");
Expand Down
13 changes: 11 additions & 2 deletions src/microsim/devices/MSDevice_FCDReplay.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,23 @@ class MSDevice_FCDReplay : public MSVehicleDevice {
/// @brief Destructor.
~MSDevice_FCDReplay();

bool move();
void move(SUMOTime currentTime);

/// @brief return the name for this type of device
const std::string deviceName() const {
return "fcd-replay";
}

typedef std::vector<std::tuple<Position, std::string, double, double, double> > Trajectory;
struct TrajectoryEntry {
SUMOTime time;
Position pos;
std::string edgeOrLane;
double lanePos;
double speed;
double angle;
};

typedef std::vector<TrajectoryEntry> Trajectory;

void setTrajectory(Trajectory* const t) {
myTrajectory = t;
Expand Down
18 changes: 9 additions & 9 deletions src/microsim/devices/MSTransportableDevice_FCDReplay.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,30 +75,30 @@ MSTransportableDevice_FCDReplay::~MSTransportableDevice_FCDReplay() {


bool
MSTransportableDevice_FCDReplay::move() {
MSPerson* person = dynamic_cast<MSPerson*>(&myHolder);
if (person == nullptr || !person->hasDeparted()) {
return false;
}
MSTransportableDevice_FCDReplay::move(SUMOTime currentTime) {
if (myTrajectory == nullptr || myTrajectory->empty()) {
// removing person
return true;
}
const auto& p = myTrajectory->front();
libsumo::Person::moveToXY(person->getID(), std::get<1>(p), std::get<0>(p).x(), std::get<0>(p).y(), std::get<4>(p), 7);
MSPerson* person = dynamic_cast<MSPerson*>(&myHolder);
const auto& te = myTrajectory->front();
if (person == nullptr || !person->hasDeparted() || te.time > currentTime) {
return false;
}
libsumo::Person::moveToXY(person->getID(), te.edgeOrLane, te.pos.x(), te.pos.y(), te.angle, 7);
// person->setPreviousSpeed(std::get<3>(p), std::numeric_limits<double>::min());
myTrajectory->erase(myTrajectory->begin());
return false;
}


SUMOTime
MSTransportableDevice_FCDReplay::MovePedestrians::execute(SUMOTime /* currentTime */) {
MSTransportableDevice_FCDReplay::MovePedestrians::execute(SUMOTime currentTime) {
MSTransportableControl& c = MSNet::getInstance()->getPersonControl();
std::vector<MSTransportable*> toRemove;
for (MSTransportableControl::constVehIt i = c.loadedBegin(); i != c.loadedEnd(); ++i) {
MSTransportableDevice_FCDReplay* device = static_cast<MSTransportableDevice_FCDReplay*>(i->second->getDevice(typeid(MSTransportableDevice_FCDReplay)));
if (device != nullptr && device->move()) {
if (device != nullptr && device->move(currentTime)) {
toRemove.push_back(&device->getHolder());
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/microsim/devices/MSTransportableDevice_FCDReplay.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class MSTransportableDevice_FCDReplay : public MSTransportableDevice {
myTrajectory = t;
}

bool move();
bool move(SUMOTime currentTime);

private:
/** @brief Constructor
Expand Down

0 comments on commit c7f22f0

Please sign in to comment.