From 01c259f4cab7dd07edb36435e0391844706e11ed Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Fri, 6 Sep 2024 13:12:05 +0200 Subject: [PATCH 01/41] Fixed #15439 --- src/netedit/frames/demand/GNEStopFrame.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/netedit/frames/demand/GNEStopFrame.cpp b/src/netedit/frames/demand/GNEStopFrame.cpp index 30442006853a..c44f47f54925 100644 --- a/src/netedit/frames/demand/GNEStopFrame.cpp +++ b/src/netedit/frames/demand/GNEStopFrame.cpp @@ -487,11 +487,15 @@ GNEStopFrame::getStopParameter(const SumoXMLTag stopTag, const GNELane* lane, co } } } - if (stopBaseObject->hasBoolAttribute(SUMO_ATTR_PARKING)) { - if (stopBaseObject->getBoolAttribute(SUMO_ATTR_PARKING)) { - // temporal, currently OPPORTUNISTIC don't supported + if (stopBaseObject->hasStringAttribute(SUMO_ATTR_PARKING)) { + if (stopBaseObject->getStringAttribute(SUMO_ATTR_PARKING) == "true") { stop.parking = ParkingType::ONROAD; stop.parametersSet |= STOP_PARKING_SET; + } else if (stopBaseObject->getStringAttribute(SUMO_ATTR_PARKING) == "opportunistic") { + stop.parking = ParkingType::OPPORTUNISTIC; + stop.parametersSet |= STOP_PARKING_SET; + } else { + stop.parking = ParkingType::OFFROAD; } } if (stopBaseObject->hasTimeAttribute(SUMO_ATTR_JUMP)) { From 5171aef5ddccd58b2a788fbfdc47e58e1cb453e7 Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Fri, 6 Sep 2024 14:40:49 +0200 Subject: [PATCH 02/41] Added new enums for edit custom shapes. Refs #14858 --- src/utils/gui/windows/GUIAppEnum.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/utils/gui/windows/GUIAppEnum.h b/src/utils/gui/windows/GUIAppEnum.h index 71b23e1f3893..07677eb84b7d 100644 --- a/src/utils/gui/windows/GUIAppEnum.h +++ b/src/utils/gui/windows/GUIAppEnum.h @@ -1307,6 +1307,24 @@ enum { /// @} + /// @name GNEPoly messages + /// @{ + + /// @brief simplify shape edited geometry + MID_GNE_SHAPEEDITED_SIMPLIFY, + /// @brief close opened shape edited + MID_GNE_SHAPEEDITED_CLOSE, + /// @brief open closed shape edited + MID_GNE_SHAPEEDITED_OPEN, + /// @brief Set a vertex of shape edited as first vertex + MID_GNE_SHAPEEDITED_SET_FIRST_POINT, + /// @brief delete geometry point in shape edited + MID_GNE_SHAPEEDITED_DELETE_GEOMETRY_POINT, + /// @brief reset shape + MID_GNE_SHAPEEDITED_RESET, + + /// @} + /// @name GNEPOI messages /// @{ From 8791c135615a4308fb00bd66f78c4b876503acca Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Fri, 6 Sep 2024 15:04:59 +0200 Subject: [PATCH 03/41] Added function getShapeEditedPopUpMenu(). Refs #14858 --- .../elements/network/GNEConnection.cpp | 44 ++--- src/netedit/elements/network/GNECrossing.cpp | 40 +++-- src/netedit/elements/network/GNEJunction.cpp | 166 +++++++++--------- .../elements/network/GNENetworkElement.cpp | 67 ++++++- .../elements/network/GNENetworkElement.h | 13 ++ 5 files changed, 207 insertions(+), 123 deletions(-) diff --git a/src/netedit/elements/network/GNEConnection.cpp b/src/netedit/elements/network/GNEConnection.cpp index 90001874ff01..62924bd19088 100644 --- a/src/netedit/elements/network/GNEConnection.cpp +++ b/src/netedit/elements/network/GNEConnection.cpp @@ -347,28 +347,32 @@ GNEConnection::smootShape() { GUIGLObjectPopupMenu* GNEConnection::getPopUpMenu(GUIMainWindow& app, GUISUMOAbstractView& parent) { - GUIGLObjectPopupMenu* ret = new GUIGLObjectPopupMenu(app, parent, *this); - buildPopupHeader(ret, app); - buildCenterPopupEntry(ret); - buildNameCopyPopupEntry(ret); - // build selection and show parameters menu - myNet->getViewNet()->buildSelectionACPopupEntry(ret, this); - buildShowParamsPopupEntry(ret); - // build position copy entry - buildPositionCopyEntry(ret, app); - // check if we're in supermode network - if (myNet->getViewNet()->getEditModes().isCurrentSupermodeNetwork()) { - // create menu commands - FXMenuCommand* mcCustomShape = GUIDesigns::buildFXMenuCommand(ret, "Set custom connection shape", nullptr, &parent, MID_GNE_CONNECTION_EDIT_SHAPE); - GUIDesigns::buildFXMenuCommand(ret, "Smooth connection shape", nullptr, &parent, MID_GNE_CONNECTION_SMOOTH_SHAPE); - // check if menu commands has to be disabled - NetworkEditMode editMode = myNet->getViewNet()->getEditModes().networkEditMode; - // check if we're in the correct edit mode - if ((editMode == NetworkEditMode::NETWORK_CONNECT) || (editMode == NetworkEditMode::NETWORK_TLS) || (editMode == NetworkEditMode::NETWORK_CREATE_EDGE)) { - mcCustomShape->disable(); + if (myShapeEdited) { + return getShapeEditedPopUpMenu(app, parent, getNBEdgeConnection().customShape); + } else { + GUIGLObjectPopupMenu* ret = new GUIGLObjectPopupMenu(app, parent, *this); + buildPopupHeader(ret, app); + buildCenterPopupEntry(ret); + buildNameCopyPopupEntry(ret); + // build selection and show parameters menu + myNet->getViewNet()->buildSelectionACPopupEntry(ret, this); + buildShowParamsPopupEntry(ret); + // build position copy entry + buildPositionCopyEntry(ret, app); + // check if we're in supermode network + if (myNet->getViewNet()->getEditModes().isCurrentSupermodeNetwork()) { + // create menu commands + FXMenuCommand* mcCustomShape = GUIDesigns::buildFXMenuCommand(ret, "Set custom connection shape", nullptr, &parent, MID_GNE_CONNECTION_EDIT_SHAPE); + GUIDesigns::buildFXMenuCommand(ret, "Smooth connection shape", nullptr, &parent, MID_GNE_CONNECTION_SMOOTH_SHAPE); + // check if menu commands has to be disabled + NetworkEditMode editMode = myNet->getViewNet()->getEditModes().networkEditMode; + // check if we're in the correct edit mode + if ((editMode == NetworkEditMode::NETWORK_CONNECT) || (editMode == NetworkEditMode::NETWORK_TLS) || (editMode == NetworkEditMode::NETWORK_CREATE_EDGE)) { + mcCustomShape->disable(); + } } + return ret; } - return ret; } diff --git a/src/netedit/elements/network/GNECrossing.cpp b/src/netedit/elements/network/GNECrossing.cpp index 600430a18ecd..2208508ba0ac 100644 --- a/src/netedit/elements/network/GNECrossing.cpp +++ b/src/netedit/elements/network/GNECrossing.cpp @@ -292,26 +292,30 @@ GNECrossing::drawTLSLinkNo(const GUIVisualizationSettings& s, const NBNode::Cros GUIGLObjectPopupMenu* GNECrossing::getPopUpMenu(GUIMainWindow& app, GUISUMOAbstractView& parent) { - GUIGLObjectPopupMenu* ret = new GUIGLObjectPopupMenu(app, parent, *this); - buildPopupHeader(ret, app); - buildCenterPopupEntry(ret); - buildNameCopyPopupEntry(ret); - // build selection and show parameters menu - myNet->getViewNet()->buildSelectionACPopupEntry(ret, this); - buildShowParamsPopupEntry(ret); - // build position copy entry - buildPositionCopyEntry(ret, app); - // check if we're in supermode network - if (myNet->getViewNet()->getEditModes().isCurrentSupermodeNetwork()) { - // create menu commands - FXMenuCommand* mcCustomShape = GUIDesigns::buildFXMenuCommand(ret, TL("Set custom crossing shape"), nullptr, &parent, MID_GNE_CROSSING_EDIT_SHAPE); - // check if menu commands has to be disabled - NetworkEditMode editMode = myNet->getViewNet()->getEditModes().networkEditMode; - if ((editMode == NetworkEditMode::NETWORK_CONNECT) || (editMode == NetworkEditMode::NETWORK_TLS) || (editMode == NetworkEditMode::NETWORK_CREATE_EDGE)) { - mcCustomShape->disable(); + if (myShapeEdited) { + return getShapeEditedPopUpMenu(app, parent, getNBCrossing()->customShape); + } else { + GUIGLObjectPopupMenu* ret = new GUIGLObjectPopupMenu(app, parent, *this); + buildPopupHeader(ret, app); + buildCenterPopupEntry(ret); + buildNameCopyPopupEntry(ret); + // build selection and show parameters menu + myNet->getViewNet()->buildSelectionACPopupEntry(ret, this); + buildShowParamsPopupEntry(ret); + // build position copy entry + buildPositionCopyEntry(ret, app); + // check if we're in supermode network + if (myNet->getViewNet()->getEditModes().isCurrentSupermodeNetwork()) { + // create menu commands + FXMenuCommand* mcCustomShape = GUIDesigns::buildFXMenuCommand(ret, TL("Set custom crossing shape"), nullptr, &parent, MID_GNE_CROSSING_EDIT_SHAPE); + // check if menu commands has to be disabled + NetworkEditMode editMode = myNet->getViewNet()->getEditModes().networkEditMode; + if ((editMode == NetworkEditMode::NETWORK_CONNECT) || (editMode == NetworkEditMode::NETWORK_TLS) || (editMode == NetworkEditMode::NETWORK_CREATE_EDGE)) { + mcCustomShape->disable(); + } } + return ret; } - return ret; } diff --git a/src/netedit/elements/network/GNEJunction.cpp b/src/netedit/elements/network/GNEJunction.cpp index 8dd5f701d8e0..68fbb04d7d9c 100644 --- a/src/netedit/elements/network/GNEJunction.cpp +++ b/src/netedit/elements/network/GNEJunction.cpp @@ -442,90 +442,94 @@ GNEJunction::buildTLSOperations(GUISUMOAbstractView& parent, GUIGLObjectPopupMen GUIGLObjectPopupMenu* GNEJunction::getPopUpMenu(GUIMainWindow& app, GUISUMOAbstractView& parent) { - GUIGLObjectPopupMenu* ret = new GUIGLObjectPopupMenu(app, parent, *this); - // build common commands - buildPopupHeader(ret, app); - buildCenterPopupEntry(ret); - buildNameCopyPopupEntry(ret); - // build selection and show parameters menu - myNet->getViewNet()->buildSelectionACPopupEntry(ret, this); - buildShowParamsPopupEntry(ret); - buildPositionCopyEntry(ret, app); - // add separator - new FXMenuSeparator(ret); - // check if we're in supermode network - if (myNet->getViewNet()->getEditModes().isCurrentSupermodeNetwork()) { - const int numSelectedJunctions = myNet->getAttributeCarriers()->getNumberOfSelectedJunctions(); - const int numEndpoints = (int)myNBNode->getEndPoints().size(); - // check if we're handling a selection - bool handlingSelection = isAttributeCarrierSelected() && (numSelectedJunctions > 1); - // check if menu commands has to be disabled - const bool invalidMode = (myNet->getViewNet()->getEditModes().networkEditMode == NetworkEditMode::NETWORK_CONNECT) || - (myNet->getViewNet()->getEditModes().networkEditMode == NetworkEditMode::NETWORK_TLS) || - (myNet->getViewNet()->getEditModes().networkEditMode == NetworkEditMode::NETWORK_CREATE_EDGE); - // build TLS operation - if (!invalidMode) { - buildTLSOperations(parent, ret, numSelectedJunctions); - } - // create menu commands - GUIDesigns::buildFXMenuCommand(ret, TL("Reset edge endpoints"), nullptr, &parent, MID_GNE_JUNCTION_RESET_EDGE_ENDPOINTS); - FXMenuCommand* mcCustomShape = GUIDesigns::buildFXMenuCommand(ret, TL("Set custom junction shape"), nullptr, &parent, MID_GNE_JUNCTION_EDIT_SHAPE); - FXMenuCommand* mcResetCustomShape = GUIDesigns::buildFXMenuCommand(ret, TL("Reset junction shape"), nullptr, &parent, MID_GNE_JUNCTION_RESET_SHAPE); - FXMenuCommand* mcReplaceByGeometryPoint = GUIDesigns::buildFXMenuCommand(ret, TL("Replace junction by geometry point"), nullptr, &parent, MID_GNE_JUNCTION_REPLACE); - FXMenuCommand* mcSplitJunction = GUIDesigns::buildFXMenuCommand(ret, TLF("Split junction (% end points)", numEndpoints), nullptr, &parent, MID_GNE_JUNCTION_SPLIT); - FXMenuCommand* mcSplitJunctionAndReconnect = GUIDesigns::buildFXMenuCommand(ret, TL("Split junction and reconnect"), nullptr, &parent, MID_GNE_JUNCTION_SPLIT_RECONNECT); - // check if is a roundabout - if (myNBNode->isRoundabout()) { - GUIDesigns::buildFXMenuCommand(ret, TL("Select roundabout"), nullptr, &parent, MID_GNE_JUNCTION_SELECT_ROUNDABOUT); - } else { - // get radius - const double radius = (myNBNode->getRadius() == NBNode::UNSPECIFIED_RADIUS) ? OptionsCont::getOptions().getFloat("default.junctions.radius") : myNBNode->getRadius(); - const std::string menuEntryInfo = TLF("Convert to roundabout (using junction attribute radius %)", toString(radius)); - FXMenuCommand* mcRoundabout = GUIDesigns::buildFXMenuCommand(ret, menuEntryInfo.c_str(), nullptr, &parent, MID_GNE_JUNCTION_CONVERT_ROUNDABOUT); - // check if disable depending of number of edges - if ((getChildEdges().size() < 2) || - ((myGNEIncomingEdges.size() == 1) && (myGNEOutgoingEdges.size() == 1) && (myGNEIncomingEdges[0]->getFromJunction() == myGNEOutgoingEdges[0]->getToJunction()))) { - mcRoundabout->disable(); + if (myShapeEdited) { + return getShapeEditedPopUpMenu(app, parent, myNBNode->getShape()); + } else { + GUIGLObjectPopupMenu* ret = new GUIGLObjectPopupMenu(app, parent, *this); + // build common commands + buildPopupHeader(ret, app); + buildCenterPopupEntry(ret); + buildNameCopyPopupEntry(ret); + // build selection and show parameters menu + myNet->getViewNet()->buildSelectionACPopupEntry(ret, this); + buildShowParamsPopupEntry(ret); + buildPositionCopyEntry(ret, app); + // add separator + new FXMenuSeparator(ret); + // check if we're in supermode network + if (myNet->getViewNet()->getEditModes().isCurrentSupermodeNetwork()) { + const int numSelectedJunctions = myNet->getAttributeCarriers()->getNumberOfSelectedJunctions(); + const int numEndpoints = (int)myNBNode->getEndPoints().size(); + // check if we're handling a selection + bool handlingSelection = isAttributeCarrierSelected() && (numSelectedJunctions > 1); + // check if menu commands has to be disabled + const bool invalidMode = (myNet->getViewNet()->getEditModes().networkEditMode == NetworkEditMode::NETWORK_CONNECT) || + (myNet->getViewNet()->getEditModes().networkEditMode == NetworkEditMode::NETWORK_TLS) || + (myNet->getViewNet()->getEditModes().networkEditMode == NetworkEditMode::NETWORK_CREATE_EDGE); + // build TLS operation + if (!invalidMode) { + buildTLSOperations(parent, ret, numSelectedJunctions); + } + // create menu commands + GUIDesigns::buildFXMenuCommand(ret, TL("Reset edge endpoints"), nullptr, &parent, MID_GNE_JUNCTION_RESET_EDGE_ENDPOINTS); + FXMenuCommand* mcCustomShape = GUIDesigns::buildFXMenuCommand(ret, TL("Set custom junction shape"), nullptr, &parent, MID_GNE_JUNCTION_EDIT_SHAPE); + FXMenuCommand* mcResetCustomShape = GUIDesigns::buildFXMenuCommand(ret, TL("Reset junction shape"), nullptr, &parent, MID_GNE_JUNCTION_RESET_SHAPE); + FXMenuCommand* mcReplaceByGeometryPoint = GUIDesigns::buildFXMenuCommand(ret, TL("Replace junction by geometry point"), nullptr, &parent, MID_GNE_JUNCTION_REPLACE); + FXMenuCommand* mcSplitJunction = GUIDesigns::buildFXMenuCommand(ret, TLF("Split junction (% end points)", numEndpoints), nullptr, &parent, MID_GNE_JUNCTION_SPLIT); + FXMenuCommand* mcSplitJunctionAndReconnect = GUIDesigns::buildFXMenuCommand(ret, TL("Split junction and reconnect"), nullptr, &parent, MID_GNE_JUNCTION_SPLIT_RECONNECT); + // check if is a roundabout + if (myNBNode->isRoundabout()) { + GUIDesigns::buildFXMenuCommand(ret, TL("Select roundabout"), nullptr, &parent, MID_GNE_JUNCTION_SELECT_ROUNDABOUT); + } else { + // get radius + const double radius = (myNBNode->getRadius() == NBNode::UNSPECIFIED_RADIUS) ? OptionsCont::getOptions().getFloat("default.junctions.radius") : myNBNode->getRadius(); + const std::string menuEntryInfo = TLF("Convert to roundabout (using junction attribute radius %)", toString(radius)); + FXMenuCommand* mcRoundabout = GUIDesigns::buildFXMenuCommand(ret, menuEntryInfo.c_str(), nullptr, &parent, MID_GNE_JUNCTION_CONVERT_ROUNDABOUT); + // check if disable depending of number of edges + if ((getChildEdges().size() < 2) || + ((myGNEIncomingEdges.size() == 1) && (myGNEOutgoingEdges.size() == 1) && (myGNEIncomingEdges[0]->getFromJunction() == myGNEOutgoingEdges[0]->getToJunction()))) { + mcRoundabout->disable(); + } + } + // check multijunctions + const std::string multi = ((numSelectedJunctions > 1) && isAttributeCarrierSelected()) ? TLF(" of % junctions", numSelectedJunctions) : ""; + FXMenuCommand* mcClearConnections = GUIDesigns::buildFXMenuCommand(ret, TL("Clear connections") + multi, nullptr, &parent, MID_GNE_JUNCTION_CLEAR_CONNECTIONS); + FXMenuCommand* mcResetConnections = GUIDesigns::buildFXMenuCommand(ret, TL("Reset connections") + multi, nullptr, &parent, MID_GNE_JUNCTION_RESET_CONNECTIONS); + // check if current mode is correct + if (invalidMode) { + mcCustomShape->disable(); + mcClearConnections->disable(); + mcResetConnections->disable(); + } + // check if we're handling a selection + if (handlingSelection) { + mcResetCustomShape->setText(TL("Reset junction shapes")); + } + // disable mcClearConnections if junction hasn't connections + if (getGNEConnections().empty()) { + mcClearConnections->disable(); + } + // disable mcResetCustomShape if junction doesn't have a custom shape + if (myNBNode->getShape().size() == 0) { + mcResetCustomShape->disable(); + } + // checkIsRemovable requires turnarounds to be computed. This is ugly + if ((myNBNode->getIncomingEdges().size() == 2) && (myNBNode->getOutgoingEdges().size() == 2)) { + NBTurningDirectionsComputer::computeTurnDirectionsForNode(myNBNode, false); + } + std::string reason = TL("wrong edit mode"); + if (invalidMode || !myNBNode->checkIsRemovableReporting(reason)) { + mcReplaceByGeometryPoint->setText(mcReplaceByGeometryPoint->getText() + " (" + reason.c_str() + ")"); + mcReplaceByGeometryPoint->disable(); + } + // check if disable split junctions + if (numEndpoints == 1) { + mcSplitJunction->disable(); + mcSplitJunctionAndReconnect->disable(); } } - // check multijunctions - const std::string multi = ((numSelectedJunctions > 1) && isAttributeCarrierSelected()) ? TLF(" of % junctions", numSelectedJunctions) : ""; - FXMenuCommand* mcClearConnections = GUIDesigns::buildFXMenuCommand(ret, TL("Clear connections") + multi, nullptr, &parent, MID_GNE_JUNCTION_CLEAR_CONNECTIONS); - FXMenuCommand* mcResetConnections = GUIDesigns::buildFXMenuCommand(ret, TL("Reset connections") + multi, nullptr, &parent, MID_GNE_JUNCTION_RESET_CONNECTIONS); - // check if current mode is correct - if (invalidMode) { - mcCustomShape->disable(); - mcClearConnections->disable(); - mcResetConnections->disable(); - } - // check if we're handling a selection - if (handlingSelection) { - mcResetCustomShape->setText(TL("Reset junction shapes")); - } - // disable mcClearConnections if junction hasn't connections - if (getGNEConnections().empty()) { - mcClearConnections->disable(); - } - // disable mcResetCustomShape if junction doesn't have a custom shape - if (myNBNode->getShape().size() == 0) { - mcResetCustomShape->disable(); - } - // checkIsRemovable requires turnarounds to be computed. This is ugly - if ((myNBNode->getIncomingEdges().size() == 2) && (myNBNode->getOutgoingEdges().size() == 2)) { - NBTurningDirectionsComputer::computeTurnDirectionsForNode(myNBNode, false); - } - std::string reason = TL("wrong edit mode"); - if (invalidMode || !myNBNode->checkIsRemovableReporting(reason)) { - mcReplaceByGeometryPoint->setText(mcReplaceByGeometryPoint->getText() + " (" + reason.c_str() + ")"); - mcReplaceByGeometryPoint->disable(); - } - // check if disable split junctions - if (numEndpoints == 1) { - mcSplitJunction->disable(); - mcSplitJunctionAndReconnect->disable(); - } + return ret; } - return ret; } diff --git a/src/netedit/elements/network/GNENetworkElement.cpp b/src/netedit/elements/network/GNENetworkElement.cpp index 871768a101d2..04dc90a6da80 100644 --- a/src/netedit/elements/network/GNENetworkElement.cpp +++ b/src/netedit/elements/network/GNENetworkElement.cpp @@ -17,14 +17,17 @@ /// // A abstract class for networkElements /****************************************************************************/ -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include +#include +#include #include "GNENetworkElement.h" @@ -198,4 +201,60 @@ GNENetworkElement::checkDrawingBoundarySelection() const { } } + +GUIGLObjectPopupMenu* +GNENetworkElement::getShapeEditedPopUpMenu(GUIMainWindow& app, GUISUMOAbstractView& parent, const PositionVector& shape) { + GUIGLObjectPopupMenu* ret = new GUIGLObjectPopupMenu(app, parent, *this); + const std::string headerName = TLF("% (Edited shape)", getFullName()); + new MFXMenuHeader(ret, app.getBoldFont(), headerName.c_str(), getGLIcon(), nullptr, 0); + if (OptionsCont::getOptions().getBool("gui-testing")) { + GUIDesigns::buildFXMenuCommand(ret, TL("Copy test coordinates to clipboard"), nullptr, ret, MID_COPY_TEST_COORDINATES); + } + new FXMenuSeparator(ret); + FXMenuCommand* simplifyShape = GUIDesigns::buildFXMenuCommand(ret, TL("Simplify Shape"), TL("Replace current shape with a rectangle"), nullptr, &parent, MID_GNE_SHAPEEDITED_SIMPLIFY); + // disable simplify shape if polygon was already simplified + if (mySimplifiedShapEdited || shape.size() <= 2) { + simplifyShape->disable(); + } + // only allow open/close for non juPedSim polygons + if (!myTagProperty.isJuPedSimElement()) { + if (shape.isClosed()) { + GUIDesigns::buildFXMenuCommand(ret, TL("Open shape"), TL("Open polygon's shape"), nullptr, &parent, MID_GNE_SHAPEEDITED_OPEN); + } else { + GUIDesigns::buildFXMenuCommand(ret, TL("Close shape"), TL("Close polygon's shape"), nullptr, &parent, MID_GNE_SHAPEEDITED_CLOSE); + } + } + // create a extra FXMenuCommand if mouse is over a vertex + const int index = getVertexIndex(shape, myNet->getViewNet()->getPositionInformation()); + if (index != -1) { + // check if we're in network mode + if (myNet->getViewNet()->getEditModes().networkEditMode == NetworkEditMode::NETWORK_MOVE) { + GUIDesigns::buildFXMenuCommand(ret, "Set custom Geometry Point", nullptr, &parent, MID_GNE_CUSTOM_GEOMETRYPOINT); + } + FXMenuCommand* removeGeometryPoint = GUIDesigns::buildFXMenuCommand(ret, TL("Remove geometry point"), TL("Remove geometry point under mouse"), nullptr, &parent, MID_GNE_SHAPEEDITED_DELETE_GEOMETRY_POINT); + FXMenuCommand* setFirstPoint = GUIDesigns::buildFXMenuCommand(ret, TL("Set first geometry point"), TL("Set first geometry point"), nullptr, &parent, MID_GNE_SHAPEEDITED_SET_FIRST_POINT); + // disable setFirstPoint if shape only have three points + if ((shape.isClosed() && (shape.size() <= 4)) || (!shape.isClosed() && (shape.size() <= 2))) { + removeGeometryPoint->disable(); + } + // disable setFirstPoint if mouse is over first point + if (index == 0) { + setFirstPoint->disable(); + } + } + return ret; +} + + +int +GNENetworkElement::getVertexIndex(const PositionVector& shape, const Position& pos) { + // first check if vertex already exists + for (const auto& shapePosition : shape) { + if (shapePosition.distanceTo2D(pos) < myNet->getViewNet()->getVisualisationSettings().neteditSizeSettings.polygonGeometryPointRadius) { + return shape.indexOfClosest(shapePosition); + } + } + return -1; +} + /****************************************************************************/ diff --git a/src/netedit/elements/network/GNENetworkElement.h b/src/netedit/elements/network/GNENetworkElement.h index f0cd885acaf1..25533c905c7e 100644 --- a/src/netedit/elements/network/GNENetworkElement.h +++ b/src/netedit/elements/network/GNENetworkElement.h @@ -172,6 +172,7 @@ class GNENetworkElement : public GUIGlObject, public GNEHierarchicalElement, pub /// @brief Returns the name of the object (default "") virtual const std::string getOptionalName() const; + /// @} /// @name inherited from GNEAttributeCarrier @@ -213,12 +214,24 @@ class GNENetworkElement : public GUIGlObject, public GNEHierarchicalElement, pub /// @brief flag to check if element shape is being edited bool myShapeEdited; + /// @brief flag to indicate if shape edited is simplified + bool mySimplifiedShapEdited; + /// @brief network element contour GNEContour myNetworkElementContour; // @brief check if we're drawing using a boundary but element was already selected bool checkDrawingBoundarySelection() const; + /// @brief get shape edited popup menu + GUIGLObjectPopupMenu* getShapeEditedPopUpMenu(GUIMainWindow& app, GUISUMOAbstractView& parent, const PositionVector& shape); + + /**@brief return index of a vertex of shape, or of a new vertex if position is over an shape's edge + * @param pos position of new/existent vertex + * @return index of position vector + */ + int getVertexIndex(const PositionVector& shape, const Position& pos); + private: /// @brief set attribute after validation virtual void setAttribute(SumoXMLAttr key, const std::string& value) = 0; From cec6f6224dbf00b146ec43b4535d25d2adc748ff Mon Sep 17 00:00:00 2001 From: Jakob Erdmann Date: Fri, 6 Sep 2024 15:43:36 +0200 Subject: [PATCH 04/41] fix #15450 --- src/libsumo/Vehicle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsumo/Vehicle.cpp b/src/libsumo/Vehicle.cpp index 89c2dbef91bd..31db45fbf8dd 100644 --- a/src/libsumo/Vehicle.cpp +++ b/src/libsumo/Vehicle.cpp @@ -247,7 +247,7 @@ Vehicle::getColor(const std::string& vehID) { double Vehicle::getLanePosition(const std::string& vehID) { MSBaseVehicle* veh = Helper::getVehicle(vehID); - return veh->isOnRoad() ? veh->getPositionOnLane() : INVALID_DOUBLE_VALUE; + return (veh->isOnRoad() || veh->isParking()) ? veh->getPositionOnLane() : INVALID_DOUBLE_VALUE; } double From a618c0b78d1e16133493c8f8fdc27e62f7e5088e Mon Sep 17 00:00:00 2001 From: Jakob Erdmann Date: Fri, 6 Sep 2024 15:44:01 +0200 Subject: [PATCH 05/41] patching expected results refs #21, #15450 --- .../traci/vehicle/vehicle/output.complex | 22 +++++++++---------- .../vehicle/vehicle_sublane/output.complex | 22 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/tests/complex/traci/vehicle/vehicle/output.complex b/tests/complex/traci/vehicle/vehicle/output.complex index 77ec74d95363..b86e59972ea5 100644 --- a/tests/complex/traci/vehicle/vehicle/output.complex +++ b/tests/complex/traci/vehicle/vehicle/output.complex @@ -280,7 +280,7 @@ step 8.0 (StopData(lane=2fi_0, startPos=54.9, endPos=55.0, stopFlags=1, duration=2.0),) legacy getNextStops (('2fi_0', 55.0, '', 2, 2.0, -1073741824.0),) step 9.0 -{80: '2fi', 86: -1073741824.0} +{80: '2fi', 86: 54.99930974096434} (StopData(lane=2fi_0, startPos=54.9, endPos=55.0, stopFlags=1, duration=2.0, arrival=9.0),) legacy getNextStops (('2fi_0', 55.0, '', 3, 2.0, -1073741824.0),) step 10.0 @@ -582,23 +582,23 @@ step 84.0 step 85.0 ('veh', 'parking', 'speed', 0.10790925537257873, 'acceleration', -0.9155643100405666, 'pos', '(980.1461288319947, 501.65)', 'pos3d', '(980.1461288319947, 501.65, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '2fi_0', 'lanePos', 19.973713448697453, 'CO2', 2585.0590953287515) step 86.0 -('veh', 'parking', 'speed', 0.02507959568451514, 'acceleration', -0.08282965968806359, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', -1073741824.0, 'CO2', 0.0) +('veh', 'parking', 'speed', 0.02507959568451514, 'acceleration', -0.08282965968806359, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', 19.99879304438197, 'CO2', 0.0) step 87.0 -('veh', 'parking', 'speed', 0.0, 'acceleration', -0.02507959568451514, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', -1073741824.0, 'CO2', 0.0) +('veh', 'parking', 'speed', 0.0, 'acceleration', -0.02507959568451514, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', 19.99879304438197, 'CO2', 0.0) step 88.0 -('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', -1073741824.0, 'CO2', 0.0) +('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', 19.99879304438197, 'CO2', 0.0) step 89.0 -('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', -1073741824.0, 'CO2', 0.0) +('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', 19.99879304438197, 'CO2', 0.0) step 90.0 -('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', -1073741824.0, 'CO2', 0.0) +('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', 19.99879304438197, 'CO2', 0.0) step 91.0 -('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', -1073741824.0, 'CO2', 0.0) +('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', 19.99879304438197, 'CO2', 0.0) step 92.0 -('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', -1073741824.0, 'CO2', 0.0) +('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', 19.99879304438197, 'CO2', 0.0) step 93.0 -('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', -1073741824.0, 'CO2', 0.0) +('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', 19.99879304438197, 'CO2', 0.0) step 94.0 -('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', -1073741824.0, 'CO2', 0.0) +('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', 19.99879304438197, 'CO2', 0.0) step 95.0 ('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '2fi_0', 'lanePos', 19.99879304438197, 'CO2', 2624.722222222222) step 96.0 @@ -785,7 +785,7 @@ pav edge=2fi pos=42.845389065088064 stopState=0 step 147.0 pav edge=2fi pos=44.92678038386333 stopState=0 step 148.0 -pav edge=2fi pos=-1073741824.0 stopState=131 +pav edge=2fi pos=44.94790128400381 stopState=131 step 149.0 pav edge=2fi pos=44.97 stopState=131 step 150.0 diff --git a/tests/complex/traci/vehicle/vehicle_sublane/output.complex b/tests/complex/traci/vehicle/vehicle_sublane/output.complex index 4d690e5ae605..963f66d09cfb 100644 --- a/tests/complex/traci/vehicle/vehicle_sublane/output.complex +++ b/tests/complex/traci/vehicle/vehicle_sublane/output.complex @@ -280,7 +280,7 @@ step 8.0 (StopData(lane=2fi_0, startPos=54.9, endPos=55.0, stopFlags=1, duration=2.0),) legacy getNextStops (('2fi_0', 55.0, '', 2, 2.0, -1073741824.0),) step 9.0 -{80: '2fi', 86: -1073741824.0} +{80: '2fi', 86: 54.99930974096434} (StopData(lane=2fi_0, startPos=54.9, endPos=55.0, stopFlags=1, duration=2.0, arrival=9.0),) legacy getNextStops (('2fi_0', 55.0, '', 3, 2.0, -1073741824.0),) step 10.0 @@ -582,23 +582,23 @@ step 84.0 step 85.0 ('veh', 'parking', 'speed', 0.10790925537257873, 'acceleration', -0.9155643100405666, 'pos', '(980.1461288319947, 501.65)', 'pos3d', '(980.1461288319947, 501.65, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '2fi_0', 'lanePos', 19.973713448697453, 'CO2', 2585.0590953287515) step 86.0 -('veh', 'parking', 'speed', 0.02507959568451514, 'acceleration', -0.08282965968806359, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', -1073741824.0, 'CO2', 0.0) +('veh', 'parking', 'speed', 0.02507959568451514, 'acceleration', -0.08282965968806359, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', 19.99879304438197, 'CO2', 0.0) step 87.0 -('veh', 'parking', 'speed', 0.0, 'acceleration', -0.02507959568451514, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', -1073741824.0, 'CO2', 0.0) +('veh', 'parking', 'speed', 0.0, 'acceleration', -0.02507959568451514, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', 19.99879304438197, 'CO2', 0.0) step 88.0 -('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', -1073741824.0, 'CO2', 0.0) +('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', 19.99879304438197, 'CO2', 0.0) step 89.0 -('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', -1073741824.0, 'CO2', 0.0) +('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', 19.99879304438197, 'CO2', 0.0) step 90.0 -('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', -1073741824.0, 'CO2', 0.0) +('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', 19.99879304438197, 'CO2', 0.0) step 91.0 -('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', -1073741824.0, 'CO2', 0.0) +('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', 19.99879304438197, 'CO2', 0.0) step 92.0 -('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', -1073741824.0, 'CO2', 0.0) +('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', 19.99879304438197, 'CO2', 0.0) step 93.0 -('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', -1073741824.0, 'CO2', 0.0) +('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', 19.99879304438197, 'CO2', 0.0) step 94.0 -('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', -1073741824.0, 'CO2', 0.0) +('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '', 'lanePos', 19.99879304438197, 'CO2', 0.0) step 95.0 ('veh', 'parking', 'speed', 0.0, 'acceleration', 0.0, 'pos', '(980.1211997138844, 504.84999999999997)', 'pos3d', '(980.1211997138844, 504.84999999999997, 0.0)', 'angle', 270.0, 'road', '2fi', 'lane', '2fi_0', 'lanePos', 19.99879304438197, 'CO2', 2624.722222222222) step 96.0 @@ -785,7 +785,7 @@ pav edge=2fi pos=42.845389065088064 stopState=0 step 147.0 pav edge=2fi pos=44.92678038386333 stopState=0 step 148.0 -pav edge=2fi pos=-1073741824.0 stopState=131 +pav edge=2fi pos=44.94790128400381 stopState=131 step 149.0 pav edge=2fi pos=44.97 stopState=131 step 150.0 From fe1ff10154b100b0164dd6f5efbb0830ae44cdbd Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Fri, 6 Sep 2024 15:43:14 +0200 Subject: [PATCH 06/41] Added new functions in GNEViewNet. Refs #14858 --- src/netedit/GNEViewNet.cpp | 43 ++++++++++++++++++++++++++++++++++++++ src/netedit/GNEViewNet.h | 27 ++++++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/src/netedit/GNEViewNet.cpp b/src/netedit/GNEViewNet.cpp index 6804934626ea..e6bc116fd1ba 100644 --- a/src/netedit/GNEViewNet.cpp +++ b/src/netedit/GNEViewNet.cpp @@ -214,6 +214,13 @@ FXDEFMAP(GNEViewNet) GNEViewNetMap[] = { FXMAPFUNC(SEL_COMMAND, MID_GNE_POLYGON_SELECT, GNEViewNet::onCmdSelectPolygonElements), FXMAPFUNC(SEL_COMMAND, MID_GNE_POLYGON_SET_FIRST_POINT, GNEViewNet::onCmdSetFirstGeometryPoint), FXMAPFUNC(SEL_COMMAND, MID_GNE_POLYGON_DELETE_GEOMETRY_POINT, GNEViewNet::onCmdDeleteGeometryPoint), + // edit custom shapes + FXMAPFUNC(SEL_COMMAND, MID_GNE_SHAPEEDITED_SIMPLIFY, GNEViewNet::onCmdSimplifyShapeEdited), + FXMAPFUNC(SEL_COMMAND, MID_GNE_SHAPEEDITED_CLOSE, GNEViewNet::onCmdCloseShapeEdited), + FXMAPFUNC(SEL_COMMAND, MID_GNE_SHAPEEDITED_OPEN, GNEViewNet::onCmdOpenShapeEdited), + FXMAPFUNC(SEL_COMMAND, MID_GNE_SHAPEEDITED_SET_FIRST_POINT, GNEViewNet::onCmdSetFirstGeometryPointShapeEdited), + FXMAPFUNC(SEL_COMMAND, MID_GNE_SHAPEEDITED_DELETE_GEOMETRY_POINT, GNEViewNet::onCmdDeleteGeometryPointShapeEdited), + FXMAPFUNC(SEL_COMMAND, MID_GNE_SHAPEEDITED_RESET, GNEViewNet::onCmdResetShapeEdited), // POIs FXMAPFUNC(SEL_COMMAND, MID_GNE_POI_TRANSFORM, GNEViewNet::onCmdTransformPOI), // Demand elements @@ -2759,6 +2766,42 @@ GNEViewNet::onCmdSetFirstGeometryPoint(FXObject*, FXSelector, void*) { } +long +GNEViewNet::onCmdSimplifyShapeEdited(FXObject*, FXSelector, void*) { + return 1; +} + + +long +GNEViewNet::onCmdCloseShapeEdited(FXObject*, FXSelector, void*) { + return 1; +} + + +long +GNEViewNet::onCmdOpenShapeEdited(FXObject*, FXSelector, void*) { + return 1; +} + + +long +GNEViewNet::onCmdSetFirstGeometryPointShapeEdited(FXObject*, FXSelector, void*) { + return 1; +} + + +long +GNEViewNet::onCmdDeleteGeometryPointShapeEdited(FXObject*, FXSelector, void*) { + return 1; +} + + +long +GNEViewNet::onCmdResetShapeEdited(FXObject*, FXSelector, void*) { + return 1; +} + + long GNEViewNet::onCmdTransformPOI(FXObject*, FXSelector, void*) { // declare additional handler diff --git a/src/netedit/GNEViewNet.h b/src/netedit/GNEViewNet.h index da76e22d7c1d..a38d64afd61b 100644 --- a/src/netedit/GNEViewNet.h +++ b/src/netedit/GNEViewNet.h @@ -235,6 +235,9 @@ class GNEViewNet : public GUISUMOAbstractView { /// @brief apply template to edge long onCmdEgeApplyTemplate(FXObject*, FXSelector, void*); + /// @name specific of shape edited + /// @{ + /// @brief simply shape of current polygon long onCmdSimplifyShape(FXObject*, FXSelector, void*); @@ -253,6 +256,30 @@ class GNEViewNet : public GUISUMOAbstractView { /// @brief set as first geometry point the closes geometry point long onCmdSetFirstGeometryPoint(FXObject*, FXSelector, void*); + /// @} + + /// @name specific of shape edited + /// @{ + /// @brief simply shape edited + long onCmdSimplifyShapeEdited(FXObject*, FXSelector, void*); + + /// @brief close opened shape edited + long onCmdCloseShapeEdited(FXObject*, FXSelector, void*); + + /// @brief open closed shape edited + long onCmdOpenShapeEdited(FXObject*, FXSelector, void*); + + /// @brief set first geometry point in shape edited + long onCmdSetFirstGeometryPointShapeEdited(FXObject*, FXSelector, void*); + + /// @brief delete the closes geometry point in shape edited + long onCmdDeleteGeometryPointShapeEdited(FXObject*, FXSelector, void*); + + /// @brief reset shape edited + long onCmdResetShapeEdited(FXObject*, FXSelector, void*); + + /// @} + /// @brief transform POI to POILane, and vice versa long onCmdTransformPOI(FXObject*, FXSelector, void*); From fa9212c75785149d97c6aa7ca6dd1b143ec1bffc Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Fri, 6 Sep 2024 16:36:45 +0200 Subject: [PATCH 07/41] Added new functions for handling ShapeEdited in GNENetworkElement. Refs #14858 --- src/netedit/GNEViewNet.cpp | 77 ++++++++++++++++++- src/netedit/GNEViewNet.h | 3 + src/netedit/GNEViewNetHelper.cpp | 5 +- src/netedit/GNEViewNetHelper.h | 2 +- .../elements/network/GNENetworkElement.cpp | 60 ++++++++++++--- .../elements/network/GNENetworkElement.h | 34 ++++++-- 6 files changed, 157 insertions(+), 24 deletions(-) diff --git a/src/netedit/GNEViewNet.cpp b/src/netedit/GNEViewNet.cpp index e6bc116fd1ba..2a1c4287778a 100644 --- a/src/netedit/GNEViewNet.cpp +++ b/src/netedit/GNEViewNet.cpp @@ -1725,7 +1725,7 @@ GNEViewNet::hotkeyEnter() { myViewParent->getTLSEditorFrame()->getTLSDefinition()->onCmdSaveChanges(nullptr, 0, nullptr); } } else if ((myEditModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) && (myEditNetworkElementShapes.getEditedNetworkElement() != nullptr)) { - myEditNetworkElementShapes.commitEditedShape(); + myEditNetworkElementShapes.commitShapeEdited(); } else if (myEditModes.networkEditMode == NetworkEditMode::NETWORK_SHAPE) { if (myViewParent->getShapeFrame()->getDrawingShapeModule()->isDrawing()) { // stop current drawing @@ -2126,6 +2126,33 @@ GNEViewNet::getTAZAtPopupPosition() { } +GNENetworkElement* +GNEViewNet::getShapeEditedAtPopupPosition() { + // get first object that can be parsed to TAZ element + for (const auto& glObjectLayer : gViewObjectsHandler.getSelectedObjects()) { + for (const auto& glObject : glObjectLayer.second) { + if (glObject.object->getType() == GLO_JUNCTION) { + auto junction = myNet->getAttributeCarriers()->retrieveJunction(glObject.object); + if (junction->isShapeEdited()) { + return junction; + } + } else if (glObject.object->getType() == GLO_CROSSING) { + auto crossing = myNet->getAttributeCarriers()->retrieveCrossing(glObject.object); + if (crossing->isShapeEdited()) { + return crossing; + } + } else if (glObject.object->getType() == GLO_CONNECTION) { + auto connection = myNet->getAttributeCarriers()->retrieveConnection(glObject.object); + if (connection->isShapeEdited()) { + return connection; + } + } + } + } + return nullptr; +} + + long GNEViewNet::onCmdSetSupermode(FXObject*, FXSelector sel, void*) { // check what network mode will be set @@ -2768,36 +2795,84 @@ GNEViewNet::onCmdSetFirstGeometryPoint(FXObject*, FXSelector, void*) { long GNEViewNet::onCmdSimplifyShapeEdited(FXObject*, FXSelector, void*) { + // get shape edited under mouse + GNENetworkElement* shapeEdited = getShapeEditedAtPopupPosition(); + if (shapeEdited) { + // simplify edited shape using undo-redo + myNet->getViewNet()->getUndoList()->begin(shapeEdited, TL("simplify edited shape")); + shapeEdited->simplifyShapeEdited(); + myNet->getViewNet()->getUndoList()->end(); + } return 1; } long GNEViewNet::onCmdCloseShapeEdited(FXObject*, FXSelector, void*) { + // get shape edited under mouse + GNENetworkElement* shapeEdited = getShapeEditedAtPopupPosition(); + if (shapeEdited) { + // close edited shape using undo-redo + myNet->getViewNet()->getUndoList()->begin(shapeEdited, TL("simplify edited shape")); + shapeEdited->closeShapeEdited(); + myNet->getViewNet()->getUndoList()->end(); + } return 1; } long GNEViewNet::onCmdOpenShapeEdited(FXObject*, FXSelector, void*) { + // get shape edited under mouse + GNENetworkElement* shapeEdited = getShapeEditedAtPopupPosition(); + if (shapeEdited) { + // open edited shape using undo-redo + myNet->getViewNet()->getUndoList()->begin(shapeEdited, TL("simplify edited shape")); + shapeEdited->openShapeEdited(); + myNet->getViewNet()->getUndoList()->end(); + } return 1; } long GNEViewNet::onCmdSetFirstGeometryPointShapeEdited(FXObject*, FXSelector, void*) { + // get shape edited under mouse + GNENetworkElement* shapeEdited = getShapeEditedAtPopupPosition(); + if (shapeEdited) { + // set first geometry point in edited shape using undo-redo + myNet->getViewNet()->getUndoList()->begin(shapeEdited, TL("simplify edited shape")); + shapeEdited->setFirstGeometryPointShapeEdited(); + myNet->getViewNet()->getUndoList()->end(); + } return 1; } long GNEViewNet::onCmdDeleteGeometryPointShapeEdited(FXObject*, FXSelector, void*) { + // get shape edited under mouse + GNENetworkElement* shapeEdited = getShapeEditedAtPopupPosition(); + if (shapeEdited) { + // delete geometry point edited shape using undo-redo + myNet->getViewNet()->getUndoList()->begin(shapeEdited, TL("simplify edited shape")); + shapeEdited->deleteGeometryPointShapeEdited(); + myNet->getViewNet()->getUndoList()->end(); + } return 1; } long GNEViewNet::onCmdResetShapeEdited(FXObject*, FXSelector, void*) { + // get shape edited under mouse + GNENetworkElement* shapeEdited = getShapeEditedAtPopupPosition(); + if (shapeEdited) { + // simplify edited shape using undo-redo + myNet->getViewNet()->getUndoList()->begin(shapeEdited, TL("simplify edited shape")); + shapeEdited->resetShapeEdited(); + myNet->getViewNet()->getUndoList()->end(); + } return 1; } diff --git a/src/netedit/GNEViewNet.h b/src/netedit/GNEViewNet.h index a38d64afd61b..67110be61bde 100644 --- a/src/netedit/GNEViewNet.h +++ b/src/netedit/GNEViewNet.h @@ -814,6 +814,9 @@ class GNEViewNet : public GUISUMOAbstractView { /// @brief try to retrieve a TAZ at popup position GNETAZ* getTAZAtPopupPosition(); + /// @brief try to retreive a edited shape at popup position + GNENetworkElement* getShapeEditedAtPopupPosition(); + /// @brief Auxiliary function used by onLeftBtnPress(...) void processClick(void* eventData); diff --git a/src/netedit/GNEViewNetHelper.cpp b/src/netedit/GNEViewNetHelper.cpp index 9673e9cf1826..c49a4a96a8ca 100644 --- a/src/netedit/GNEViewNetHelper.cpp +++ b/src/netedit/GNEViewNetHelper.cpp @@ -3894,12 +3894,9 @@ GNEViewNetHelper::EditNetworkElementShapes::stopEditCustomShape() { void -GNEViewNetHelper::EditNetworkElementShapes::commitEditedShape() { +GNEViewNetHelper::EditNetworkElementShapes::commitShapeEdited() { // save edited junction's shape if (myEditedNetworkElement != nullptr) { - - /* */ - // stop edit custom shape stopEditCustomShape(); } diff --git a/src/netedit/GNEViewNetHelper.h b/src/netedit/GNEViewNetHelper.h index 631f35f2eda8..c938dd150a2a 100644 --- a/src/netedit/GNEViewNetHelper.h +++ b/src/netedit/GNEViewNetHelper.h @@ -1422,7 +1422,7 @@ struct GNEViewNetHelper { void stopEditCustomShape(); /// @brief save edited shape - void commitEditedShape(); + void commitShapeEdited(); /// @brief pointer to edited network element GNENetworkElement* getEditedNetworkElement() const; diff --git a/src/netedit/elements/network/GNENetworkElement.cpp b/src/netedit/elements/network/GNENetworkElement.cpp index 04dc90a6da80..a936da4daceb 100644 --- a/src/netedit/elements/network/GNENetworkElement.cpp +++ b/src/netedit/elements/network/GNENetworkElement.cpp @@ -64,18 +64,6 @@ GNENetworkElement::getGUIGlObject() const { } -void -GNENetworkElement::setShapeEdited(const bool value) { - myShapeEdited = value; -} - - -bool -GNENetworkElement::isShapeEdited() const { - return myShapeEdited; -} - - bool GNENetworkElement::GNENetworkElement::isNetworkElementValid() const { // implement in children @@ -171,6 +159,54 @@ GNENetworkElement::getHierarchyName() const { } +void +GNENetworkElement::setShapeEdited(const bool value) { + myShapeEdited = value; +} + + +bool +GNENetworkElement::isShapeEdited() const { + return myShapeEdited; +} + + +void +GNENetworkElement::simplifyShapeEdited() { + +} + + +void +GNENetworkElement::closeShapeEdited() { + +} + + +void +GNENetworkElement::openShapeEdited() { + +} + + +void +GNENetworkElement::setFirstGeometryPointShapeEdited() { + +} + + +void +GNENetworkElement::deleteGeometryPointShapeEdited() { + +} + + +void +GNENetworkElement::resetShapeEdited() { + +} + + void GNENetworkElement::setNetworkElementID(const std::string& newID) { // set microsim ID diff --git a/src/netedit/elements/network/GNENetworkElement.h b/src/netedit/elements/network/GNENetworkElement.h index 25533c905c7e..ce02afef4859 100644 --- a/src/netedit/elements/network/GNENetworkElement.h +++ b/src/netedit/elements/network/GNENetworkElement.h @@ -76,12 +76,6 @@ class GNENetworkElement : public GUIGlObject, public GNEHierarchicalElement, pub /// @brief get GUIGlObject associated with this AttributeCarrier (constant) const GUIGlObject* getGUIGlObject() const; - /// @brief set shape edited - void setShapeEdited(const bool value); - - /// @brief check if shape is being edited - bool isShapeEdited() const; - /// @brief check if current network element is valid to be written into XML (by default true, can be reimplemented in children) virtual bool isNetworkElementValid() const; @@ -204,6 +198,34 @@ class GNENetworkElement : public GUIGlObject, public GNEHierarchicalElement, pub std::string getHierarchyName() const; /// @} + /// @name functions related with shape editing + /// @{ + + /// @brief set shape edited + void setShapeEdited(const bool value); + + /// @brief check if shape is being edited + bool isShapeEdited() const; + + /// @brief simplify shape edited + void simplifyShapeEdited(); + + /// @brief close shape edited + void closeShapeEdited(); + + /// @brief open shape edited + void openShapeEdited(); + + /// @brief set first geometry point shape edited + void setFirstGeometryPointShapeEdited(); + + /// @brief delete geometry point shape edited + void deleteGeometryPointShapeEdited(); + + /// @brief reset shape edited + void resetShapeEdited(); + /// @} + /// @brief set network element id void setNetworkElementID(const std::string& newID); From 9fa626dccb727211019a7eec1951d89d91b012f2 Mon Sep 17 00:00:00 2001 From: Michael Behrisch Date: Sat, 7 Sep 2024 19:22:38 +0200 Subject: [PATCH 08/41] adapting test results #21 #15450 --- .../testclient_out.traci | 18 +++++++++--------- .../testclient_out.traci | 4 ++-- .../testclient_out.traci | 18 +++++++++--------- .../testclient_out.traci | 4 ++-- .../testclient_out.traci | 18 +++++++++--------- .../testclient_out.traci | 4 ++-- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_ENDING_VEHICLES_IDS/testclient_out.traci b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_ENDING_VEHICLES_IDS/testclient_out.traci index aab212c1689f..a2f013dcb13b 100644 --- a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_ENDING_VEHICLES_IDS/testclient_out.traci +++ b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_ENDING_VEHICLES_IDS/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 +TraCITestClient output file. Date: Sat Sep 7 19:20:05 2024 -> Command sent: : @@ -7,7 +7,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=111 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : @@ -21,7 +21,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=111 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : @@ -35,7 +35,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=111 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : @@ -49,13 +49,13 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=111 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=86 ObjectID=0 valueDataType=11 Double value: -1073741824.00 + CommandID=180 VariableID=86 ObjectID=0 valueDataType=11 Double value: 100.00 -> Command sent: : .. Command acknowledged (2), [description: ] @@ -63,7 +63,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=111 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ "0" ] -> Command sent: : @@ -77,7 +77,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=111 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : @@ -91,7 +91,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=111 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : diff --git a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_ENDING_VEHICLES_NUMBER/testclient_out.traci b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_ENDING_VEHICLES_NUMBER/testclient_out.traci index a25fd0b0dc7d..646ca4347480 100644 --- a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_ENDING_VEHICLES_NUMBER/testclient_out.traci +++ b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_ENDING_VEHICLES_NUMBER/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 +TraCITestClient output file. Date: Sat Sep 7 19:20:05 2024 -> Command sent: : @@ -51,7 +51,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=164 varID=86 objID=0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=86 ObjectID=0 valueDataType=11 Double value: -1073741824.00 + CommandID=180 VariableID=86 ObjectID=0 valueDataType=11 Double value: 100.00 -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_MANEUVERING_VEHICLES_IDS/testclient_out.traci b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_MANEUVERING_VEHICLES_IDS/testclient_out.traci index b76564ba502f..421f258e3abe 100644 --- a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_MANEUVERING_VEHICLES_IDS/testclient_out.traci +++ b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_MANEUVERING_VEHICLES_IDS/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 +TraCITestClient output file. Date: Sat Sep 7 19:20:05 2024 -> Command sent: : @@ -7,7 +7,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=59 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : @@ -21,7 +21,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=59 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : @@ -35,7 +35,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=59 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : @@ -49,13 +49,13 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=59 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=86 ObjectID=0 valueDataType=11 Double value: -1073741824.00 + CommandID=180 VariableID=86 ObjectID=0 valueDataType=11 Double value: 100.00 -> Command sent: : .. Command acknowledged (2), [description: ] @@ -63,7 +63,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=59 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ "0" ] -> Command sent: : @@ -77,7 +77,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=59 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : @@ -91,7 +91,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=59 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : diff --git a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_MANEUVERING_VEHICLES_NUMBER/testclient_out.traci b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_MANEUVERING_VEHICLES_NUMBER/testclient_out.traci index dac600d2bec2..4c646c9cfff5 100644 --- a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_MANEUVERING_VEHICLES_NUMBER/testclient_out.traci +++ b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_MANEUVERING_VEHICLES_NUMBER/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Thu Mar 12 11:39:09 2020 +TraCITestClient output file. Date: Sat Sep 7 19:20:05 2024 -> Command sent: : @@ -51,7 +51,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:09 2020 -> Command sent: : domID=164 varID=86 objID=0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=86 ObjectID=0 valueDataType=11 Double value: -1073741824.00 + CommandID=180 VariableID=86 ObjectID=0 valueDataType=11 Double value: 100.00 -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_STARTING_VEHICLES_IDS/testclient_out.traci b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_STARTING_VEHICLES_IDS/testclient_out.traci index b97f11b75005..cc5208a68b80 100644 --- a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_STARTING_VEHICLES_IDS/testclient_out.traci +++ b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_STARTING_VEHICLES_IDS/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Thu Mar 12 11:39:09 2020 +TraCITestClient output file. Date: Sat Sep 7 19:20:04 2024 -> Command sent: : @@ -7,7 +7,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:09 2020 -> Command sent: : domID=171 varID=109 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : @@ -21,7 +21,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:09 2020 -> Command sent: : domID=171 varID=109 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : @@ -35,7 +35,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:09 2020 -> Command sent: : domID=171 varID=109 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : @@ -49,13 +49,13 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:09 2020 -> Command sent: : domID=171 varID=109 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=164 varID=86 objID=0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=86 ObjectID=0 valueDataType=11 Double value: -1073741824.00 + CommandID=180 VariableID=86 ObjectID=0 valueDataType=11 Double value: 100.00 -> Command sent: : .. Command acknowledged (2), [description: ] @@ -63,7 +63,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:09 2020 -> Command sent: : domID=171 varID=109 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : @@ -77,7 +77,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:09 2020 -> Command sent: : domID=171 varID=109 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : @@ -91,7 +91,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:09 2020 -> Command sent: : domID=171 varID=109 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ + CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : diff --git a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_STARTING_VEHICLES_NUMBER/testclient_out.traci b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_STARTING_VEHICLES_NUMBER/testclient_out.traci index 0440c0351ffc..17f372fe69d3 100644 --- a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_STARTING_VEHICLES_NUMBER/testclient_out.traci +++ b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_STARTING_VEHICLES_NUMBER/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Thu Mar 12 11:39:09 2020 +TraCITestClient output file. Date: Sat Sep 7 19:20:04 2024 -> Command sent: : @@ -51,7 +51,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:09 2020 -> Command sent: : domID=164 varID=86 objID=0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=86 ObjectID=0 valueDataType=11 Double value: -1073741824.00 + CommandID=180 VariableID=86 ObjectID=0 valueDataType=11 Double value: 100.00 -> Command sent: : .. Command acknowledged (2), [description: ] From 8e281d2772cb4234d58f2aa5eb67bf5dcf94d564 Mon Sep 17 00:00:00 2001 From: Michael Behrisch Date: Sun, 8 Sep 2024 09:00:10 +0200 Subject: [PATCH 09/41] adapting test results #21 #15450, removing unnecessary whitespace --- src/traci_testclient/TraCITestClient.cpp | 8 +- .../ID_LIST/no_detectors/testclient_out.traci | 5 +- .../ID_LIST/one_detector/testclient_out.traci | 5 +- .../two_detectors/testclient_out.traci | 5 +- .../Edge/ID_LIST/testclient_out.traci | 5 +- .../ID_LIST_subseconds/testclient_out.traci | 5 +- .../testclient_out.traci | 8 +- .../testclient_out.traci | 8 +- .../testclient_out.traci | 8 +- .../testclient_out.traci | 8 +- .../testclient_out.traci | 8 +- .../ID_LIST/no_detectors/testclient_out.traci | 5 +- .../ID_LIST/one_detector/testclient_out.traci | 5 +- .../two_detectors/testclient_out.traci | 5 +- .../one1s_1vehicle_10m_s/testclient_out.traci | 20 ++--- .../testclient_out.traci | 23 ++---- .../two1s_1vehicle_10m_s/testclient_out.traci | 23 ++---- .../one1s_1vehicle_10m_s/testclient_out.traci | 23 ++---- .../testclient_out.traci | 44 ++++------- .../two1s_1vehicle_10m_s/testclient_out.traci | 44 ++++------- .../Junction/ID_LIST/testclient_out.traci | 5 +- .../ID_LIST_subseconds/testclient_out.traci | 5 +- .../Lane/ID_LIST/testclient_out.traci | 5 +- .../ID_LIST_subseconds/testclient_out.traci | 5 +- .../Lane/LANE_ALLOWED/testclient_out.traci | 5 +- .../testclient_out.traci | 5 +- .../Lane/LANE_DISALLOWED/testclient_out.traci | 5 +- .../testclient_out.traci | 5 +- .../Lane/LANE_LINKS/testclient_out.traci | 11 ++- .../testclient_out.traci | 11 ++- .../testclient_out.traci | 8 +- .../testclient_out.traci | 8 +- .../ID_LIST/no_detectors/testclient_out.traci | 5 +- .../ID_LIST/one_detector/testclient_out.traci | 5 +- .../two_detectors/testclient_out.traci | 5 +- .../one1s_1vehicle_10m_s/testclient_out.traci | 11 +-- .../testclient_out.traci | 20 ++--- .../two1s_1vehicle_10m_s/testclient_out.traci | 20 ++--- .../one1s_1vehicle_10m_s/testclient_out.traci | 11 +-- .../two10s_10m_s_near/testclient_out.traci | 20 ++--- .../testclient_out.traci | 20 ++--- .../two1s_10m_s_near/testclient_out.traci | 20 ++--- .../two1s_1vehicle_10m_s/testclient_out.traci | 20 ++--- .../POI/ID_LIST/testclient_out.traci | 5 +- .../ID_LIST_subseconds/testclient_out.traci | 5 +- .../Person/ID_LIST/testclient_out.traci | 5 +- .../ID_LIST_subseconds/testclient_out.traci | 5 +- .../VAR_POSITION3D/testclient_out.traci | 5 +- .../testclient_out.traci | 5 +- .../Polygon/ID_LIST/testclient_out.traci | 5 +- .../ID_LIST_subseconds/testclient_out.traci | 5 +- .../Route/ID_LIST/testclient_out.traci | 5 +- .../ID_LIST_subseconds/testclient_out.traci | 5 +- .../Route/VAR_EDGES/testclient_out.traci | 5 +- .../VAR_EDGES_subseconds/testclient_out.traci | 5 +- .../RoadPosTo3D/testclient_out.traci | 8 +- .../SameType3D/testclient_out.traci | 5 +- .../testclient_out.traci | 23 ++---- .../testclient_out.traci | 8 +- .../testclient_out.traci | 8 +- .../testclient_out.traci | 23 ++---- .../testclient_out.traci | 23 ++---- .../testclient_out.traci | 23 ++---- .../testclient_out.traci | 23 ++---- .../testclient_out.traci | 23 ++---- .../testclient_out.traci | 8 +- .../testclient_out.traci | 8 +- .../testclient_out.traci | 5 +- .../ID_LIST/no_tl/testclient_out.traci | 5 +- .../ID_LIST/one_tl/testclient_out.traci | 5 +- .../ID_LIST/two_tl/testclient_out.traci | 5 +- .../no_tl/testclient_out.traci | 5 +- .../one_tl/testclient_out.traci | 5 +- .../two_tl/testclient_out.traci | 5 +- .../TL_LANES/testclient_out.traci | 5 +- .../TL_LANES_subseconds/testclient_out.traci | 5 +- .../TL_LINKS/testclient_out.traci | 53 +++++-------- .../TL_LINKS_subseconds/testclient_out.traci | 53 +++++-------- .../TL_RYG_COMPLETE/testclient_out.traci | 74 +++++++------------ .../testclient_out.traci | 74 +++++++------------ .../Vehicle/ID_LIST/testclient_out.traci | 5 +- .../ID_LIST_subseconds/testclient_out.traci | 5 +- .../Vehicle/VAR_EDGES/testclient_out.traci | 5 +- .../VAR_EDGES_subseconds/testclient_out.traci | 5 +- .../VAR_POSITION3D/testclient_out.traci | 5 +- .../testclient_out.traci | 5 +- .../VehicleType/ID_LIST/testclient_out.traci | 5 +- .../ID_LIST_subseconds/testclient_out.traci | 5 +- .../LANE_ALLOWED/Basic/testclient_out.traci | 8 +- .../InvalidID/testclient_out.traci | 8 +- .../InvalidType/testclient_out.traci | 8 +- .../Basic/testclient_out.traci | 8 +- .../InvalidID/testclient_out.traci | 8 +- .../InvalidType/testclient_out.traci | 8 +- .../set_variable/POI/ADD/testclient_out.traci | 8 +- .../POI/REMOVE/Basic/testclient_out.traci | 8 +- .../POI/REMOVE/InvalidID/testclient_out.traci | 8 +- .../REMOVE/InvalidType/testclient_out.traci | 8 +- .../Polygon/ADD/testclient_out.traci | 8 +- .../Polygon/REMOVE/Basic/testclient_out.traci | 8 +- .../REMOVE/InvalidID/testclient_out.traci | 8 +- .../REMOVE/InvalidType/testclient_out.traci | 8 +- .../Route/ADD/testclient_out.traci | 8 +- .../testclient_out.traci | 8 +- .../CMD_SAVE_SIMSTATE/testclient_out.traci | 8 +- .../Vehicle/ADD/ADD/testclient_out.traci | 8 +- .../ADD/InvalidID/testclient_out.traci | 8 +- .../ADD/InvalidLane/testclient_out.traci | 8 +- .../ADD/InvalidPos/testclient_out.traci | 8 +- .../ADD/InvalidRoute/testclient_out.traci | 8 +- .../ADD/InvalidSpeed/testclient_out.traci | 8 +- .../ADD/InvalidType/testclient_out.traci | 8 +- .../MoveToXY/junction/testclient_out.traci | 20 ++--- .../MoveToXY/leave_net/testclient_out.traci | 8 +- .../offroute_edge/testclient_out.traci | 8 +- .../offroute_edge2/testclient_out.traci | 14 ++-- .../offroute_edge_by_id/testclient_out.traci | 8 +- .../offroute_failed/testclient_out.traci | 8 +- .../offroute_junction/testclient_out.traci | 14 ++-- .../sublane_junction/testclient_out.traci | 14 ++-- .../sublane_offroad/testclient_out.traci | 8 +- .../testclient_out.traci | 8 +- .../sublane_offroute/testclient_out.traci | 8 +- .../testclient_out.traci | 14 ++-- .../Vehicle/REMOVE/testclient_out.traci | 5 +- .../remove_parking/testclient_out.traci | 5 +- .../testclient_out.traci | 8 +- .../testclient_out.traci | 8 +- .../tt_global_reroute/testclient_out.traci | 8 +- .../tt_vehicle_reroute/testclient_out.traci | 8 +- 130 files changed, 533 insertions(+), 915 deletions(-) diff --git a/src/traci_testclient/TraCITestClient.cpp b/src/traci_testclient/TraCITestClient.cpp index 230dcd645863..4f582e74da45 100644 --- a/src/traci_testclient/TraCITestClient.cpp +++ b/src/traci_testclient/TraCITestClient.cpp @@ -594,7 +594,7 @@ TraCITestClient::readAndReportTypeDependent(tcpip::Storage& inMsg, int valueData double x = inMsg.readDouble(); double y = inMsg.readDouble(); double z = inMsg.readDouble(); - answerLog << " Position3DValue: " << std::endl; + answerLog << " Position3DValue:"; answerLog << " x: " << x << " y: " << y << " z: " << z << std::endl; } else if (valueDataType == libsumo::POSITION_ROADMAP) { @@ -606,10 +606,10 @@ TraCITestClient::readAndReportTypeDependent(tcpip::Storage& inMsg, int valueData << " laneId=" << laneId << std::endl; } else if (valueDataType == libsumo::TYPE_STRING) { std::string s = inMsg.readString(); - answerLog << " string value: " << s << std::endl; + answerLog << " string value: " << (s.empty() ? "''" : s) << std::endl; } else if (valueDataType == libsumo::TYPE_STRINGLIST) { std::vector s = inMsg.readStringList(); - answerLog << " string list value: [ " << std::endl; + answerLog << " string list value: [ "; for (std::vector::iterator i = s.begin(); i != s.end(); ++i) { if (i != s.begin()) { answerLog << ", "; @@ -619,7 +619,7 @@ TraCITestClient::readAndReportTypeDependent(tcpip::Storage& inMsg, int valueData answerLog << " ]" << std::endl; } else if (valueDataType == libsumo::TYPE_COMPOUND) { int no = inMsg.readInt(); - answerLog << " compound value with " << no << " members: [ " << std::endl; + answerLog << " compound value with " << no << " members: [ "; for (int i = 0; i < no; ++i) { int currentValueDataType = inMsg.readUnsignedByte(); answerLog << " valueDataType=" << currentValueDataType; diff --git a/tests/traci/get_variable/ArealDetector/ID_LIST/no_detectors/testclient_out.traci b/tests/traci/get_variable/ArealDetector/ID_LIST/no_detectors/testclient_out.traci index b6c77c718a88..6c920a194a79 100644 --- a/tests/traci/get_variable/ArealDetector/ID_LIST/no_detectors/testclient_out.traci +++ b/tests/traci/get_variable/ArealDetector/ID_LIST/no_detectors/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Tue Dec 16 15:25:21 2014 +TraCITestClient output file. Date: Sun Sep 8 08:50:00 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Tue Dec 16 15:25:21 2014 -> Command sent: : domID=173 varID=0 objID=dummy .. Command acknowledged (173), [description: ] - CommandID=189 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ - ] + CommandID=189 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/ArealDetector/ID_LIST/one_detector/testclient_out.traci b/tests/traci/get_variable/ArealDetector/ID_LIST/one_detector/testclient_out.traci index 8b8699e1db2f..0aa5577fcd1d 100644 --- a/tests/traci/get_variable/ArealDetector/ID_LIST/one_detector/testclient_out.traci +++ b/tests/traci/get_variable/ArealDetector/ID_LIST/one_detector/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Tue Dec 16 15:25:22 2014 +TraCITestClient output file. Date: Sun Sep 8 08:50:00 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Tue Dec 16 15:25:22 2014 -> Command sent: : domID=173 varID=0 objID=dummy .. Command acknowledged (173), [description: ] - CommandID=189 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ -"tmp" ] + CommandID=189 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ "tmp" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/ArealDetector/ID_LIST/two_detectors/testclient_out.traci b/tests/traci/get_variable/ArealDetector/ID_LIST/two_detectors/testclient_out.traci index d2b5ec550b80..06777f97c600 100644 --- a/tests/traci/get_variable/ArealDetector/ID_LIST/two_detectors/testclient_out.traci +++ b/tests/traci/get_variable/ArealDetector/ID_LIST/two_detectors/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Tue Dec 16 15:25:23 2014 +TraCITestClient output file. Date: Sun Sep 8 08:50:00 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Tue Dec 16 15:25:23 2014 -> Command sent: : domID=173 varID=0 objID=dummy .. Command acknowledged (173), [description: ] - CommandID=189 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ -"tmp1", "tmp2" ] + CommandID=189 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ "tmp1", "tmp2" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Edge/ID_LIST/testclient_out.traci b/tests/traci/get_variable/Edge/ID_LIST/testclient_out.traci index dcfc28b7bc65..d0aea999e464 100644 --- a/tests/traci/get_variable/Edge/ID_LIST/testclient_out.traci +++ b/tests/traci/get_variable/Edge/ID_LIST/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:26:46 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:12 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:46 2013 -> Command sent: : domID=170 varID=0 objID=xxx .. Command acknowledged (170), [description: ] - CommandID=186 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"0/0to0/1", "0/0to1/0", "0/1to0/0", "0/1to0/2", "0/1to1/1", "0/2to0/1", "0/2to1/2", "1/0to0/0", "1/0to1/1", "1/0to2/0", "1/1to0/1", "1/1to1/0", "1/1to1/2", "1/1to2/1", "1/2to0/2", "1/2to1/1", "1/2to2/2", "2/0to1/0", "2/0to2/1", "2/0to3/0", "2/1to1/1", "2/1to2/0", "2/1to2/2", "2/1to3/1", "2/2to1/2", "2/2to2/1", "2/2to3/2", "3/0to2/0", "3/0to3/1", "3/0to4/0", "3/1to2/1", "3/1to3/0", "3/1to3/2", "3/1to4/1", "3/2to2/2", "3/2to3/1", "3/2to4/2", "4/0to3/0", "4/0to4/1", "4/1to3/1", "4/1to4/0", "4/1to4/2", "4/2to3/2", "4/2to4/1" ] + CommandID=186 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "0/0to0/1", "0/0to1/0", "0/1to0/0", "0/1to0/2", "0/1to1/1", "0/2to0/1", "0/2to1/2", "1/0to0/0", "1/0to1/1", "1/0to2/0", "1/1to0/1", "1/1to1/0", "1/1to1/2", "1/1to2/1", "1/2to0/2", "1/2to1/1", "1/2to2/2", "2/0to1/0", "2/0to2/1", "2/0to3/0", "2/1to1/1", "2/1to2/0", "2/1to2/2", "2/1to3/1", "2/2to1/2", "2/2to2/1", "2/2to3/2", "3/0to2/0", "3/0to3/1", "3/0to4/0", "3/1to2/1", "3/1to3/0", "3/1to3/2", "3/1to4/1", "3/2to2/2", "3/2to3/1", "3/2to4/2", "4/0to3/0", "4/0to4/1", "4/1to3/1", "4/1to4/0", "4/1to4/2", "4/2to3/2", "4/2to4/1" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Edge/ID_LIST_subseconds/testclient_out.traci b/tests/traci/get_variable/Edge/ID_LIST_subseconds/testclient_out.traci index dcfc28b7bc65..d0aea999e464 100644 --- a/tests/traci/get_variable/Edge/ID_LIST_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/Edge/ID_LIST_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:26:46 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:12 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:46 2013 -> Command sent: : domID=170 varID=0 objID=xxx .. Command acknowledged (170), [description: ] - CommandID=186 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"0/0to0/1", "0/0to1/0", "0/1to0/0", "0/1to0/2", "0/1to1/1", "0/2to0/1", "0/2to1/2", "1/0to0/0", "1/0to1/1", "1/0to2/0", "1/1to0/1", "1/1to1/0", "1/1to1/2", "1/1to2/1", "1/2to0/2", "1/2to1/1", "1/2to2/2", "2/0to1/0", "2/0to2/1", "2/0to3/0", "2/1to1/1", "2/1to2/0", "2/1to2/2", "2/1to3/1", "2/2to1/2", "2/2to2/1", "2/2to3/2", "3/0to2/0", "3/0to3/1", "3/0to4/0", "3/1to2/1", "3/1to3/0", "3/1to3/2", "3/1to4/1", "3/2to2/2", "3/2to3/1", "3/2to4/2", "4/0to3/0", "4/0to4/1", "4/1to3/1", "4/1to4/0", "4/1to4/2", "4/2to3/2", "4/2to4/1" ] + CommandID=186 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "0/0to0/1", "0/0to1/0", "0/1to0/0", "0/1to0/2", "0/1to1/1", "0/2to0/1", "0/2to1/2", "1/0to0/0", "1/0to1/1", "1/0to2/0", "1/1to0/1", "1/1to1/0", "1/1to1/2", "1/1to2/1", "1/2to0/2", "1/2to1/1", "1/2to2/2", "2/0to1/0", "2/0to2/1", "2/0to3/0", "2/1to1/1", "2/1to2/0", "2/1to2/2", "2/1to3/1", "2/2to1/2", "2/2to2/1", "2/2to3/2", "3/0to2/0", "3/0to3/1", "3/0to4/0", "3/1to2/1", "3/1to3/0", "3/1to3/2", "3/1to4/1", "3/2to2/2", "3/2to3/1", "3/2to4/2", "4/0to3/0", "4/0to4/1", "4/1to3/1", "4/1to4/0", "4/1to4/2", "4/2to3/2", "4/2to4/1" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Edge/LAST_STEP_PERSON_ID_LIST/testclient_out.traci b/tests/traci/get_variable/Edge/LAST_STEP_PERSON_ID_LIST/testclient_out.traci index a9fbbce4c337..8c0b104680cf 100644 --- a/tests/traci/get_variable/Edge/LAST_STEP_PERSON_ID_LIST/testclient_out.traci +++ b/tests/traci/get_variable/Edge/LAST_STEP_PERSON_ID_LIST/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Wed Apr 15 16:37:47 2015 +TraCITestClient output file. Date: Sun Sep 8 08:53:15 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Wed Apr 15 16:37:47 2015 -> Command sent: : domID=170 varID=26 objID=0/0to1/0 .. Command acknowledged (170), [description: ] - CommandID=186 VariableID=26 ObjectID=0/0to1/0 valueDataType=14 string list value: [ -"p0" ] + CommandID=186 VariableID=26 ObjectID=0/0to1/0 valueDataType=14 string list value: [ "p0" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -16,8 +15,7 @@ TraCITestClient output file. Date: Wed Apr 15 16:37:47 2015 -> Command sent: : domID=170 varID=26 objID=0/0to1/0 .. Command acknowledged (170), [description: ] - CommandID=186 VariableID=26 ObjectID=0/0to1/0 valueDataType=14 string list value: [ -"p1", "p0" ] + CommandID=186 VariableID=26 ObjectID=0/0to1/0 valueDataType=14 string list value: [ "p1", "p0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Edge/LAST_STEP_VEHICLE_IDS/testclient_out.traci b/tests/traci/get_variable/Edge/LAST_STEP_VEHICLE_IDS/testclient_out.traci index 0562575c9744..2e441e663fe1 100644 --- a/tests/traci/get_variable/Edge/LAST_STEP_VEHICLE_IDS/testclient_out.traci +++ b/tests/traci/get_variable/Edge/LAST_STEP_VEHICLE_IDS/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:26:46 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:12 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:46 2013 -> Command sent: : domID=170 varID=18 objID=1/1to0/1 .. Command acknowledged (170), [description: ] - CommandID=186 VariableID=18 ObjectID=1/1to0/1 valueDataType=14 string list value: [ - ] + CommandID=186 VariableID=18 ObjectID=1/1to0/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -16,8 +15,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:46 2013 -> Command sent: : domID=170 varID=18 objID=4/1to3/1 .. Command acknowledged (170), [description: ] - CommandID=186 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ -"0" ] + CommandID=186 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Edge/LAST_STEP_VEHICLE_IDS_subseconds/testclient_out.traci b/tests/traci/get_variable/Edge/LAST_STEP_VEHICLE_IDS_subseconds/testclient_out.traci index 0562575c9744..f334866a9eb5 100644 --- a/tests/traci/get_variable/Edge/LAST_STEP_VEHICLE_IDS_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/Edge/LAST_STEP_VEHICLE_IDS_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:26:46 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:13 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:46 2013 -> Command sent: : domID=170 varID=18 objID=1/1to0/1 .. Command acknowledged (170), [description: ] - CommandID=186 VariableID=18 ObjectID=1/1to0/1 valueDataType=14 string list value: [ - ] + CommandID=186 VariableID=18 ObjectID=1/1to0/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -16,8 +15,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:46 2013 -> Command sent: : domID=170 varID=18 objID=4/1to3/1 .. Command acknowledged (170), [description: ] - CommandID=186 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ -"0" ] + CommandID=186 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Edge/LAST_STEP_VEHICLE_ID_LIST/testclient_out.traci b/tests/traci/get_variable/Edge/LAST_STEP_VEHICLE_ID_LIST/testclient_out.traci index 2cc9e8287d88..3b9feba6aed7 100644 --- a/tests/traci/get_variable/Edge/LAST_STEP_VEHICLE_ID_LIST/testclient_out.traci +++ b/tests/traci/get_variable/Edge/LAST_STEP_VEHICLE_ID_LIST/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:26:50 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:13 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:50 2013 -> Command sent: : domID=170 varID=18 objID=3/1to2/1 .. Command acknowledged (170), [description: ] - CommandID=186 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=186 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -16,8 +15,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:50 2013 -> Command sent: : domID=170 varID=18 objID=3/1to2/1 .. Command acknowledged (170), [description: ] - CommandID=186 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"0" ] + CommandID=186 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Edge/LAST_STEP_VEHICLE_ID_LIST_subseconds/testclient_out.traci b/tests/traci/get_variable/Edge/LAST_STEP_VEHICLE_ID_LIST_subseconds/testclient_out.traci index 2cc9e8287d88..3b9feba6aed7 100644 --- a/tests/traci/get_variable/Edge/LAST_STEP_VEHICLE_ID_LIST_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/Edge/LAST_STEP_VEHICLE_ID_LIST_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:26:50 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:13 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:50 2013 -> Command sent: : domID=170 varID=18 objID=3/1to2/1 .. Command acknowledged (170), [description: ] - CommandID=186 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=186 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -16,8 +15,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:50 2013 -> Command sent: : domID=170 varID=18 objID=3/1to2/1 .. Command acknowledged (170), [description: ] - CommandID=186 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"0" ] + CommandID=186 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/InductionLoop/ID_LIST/no_detectors/testclient_out.traci b/tests/traci/get_variable/InductionLoop/ID_LIST/no_detectors/testclient_out.traci index 403ef5f51866..eefff9a0fa38 100644 --- a/tests/traci/get_variable/InductionLoop/ID_LIST/no_detectors/testclient_out.traci +++ b/tests/traci/get_variable/InductionLoop/ID_LIST/no_detectors/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:17 2013 +TraCITestClient output file. Date: Sun Sep 8 08:52:49 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:17 2013 -> Command sent: : domID=160 varID=0 objID=dummy .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/InductionLoop/ID_LIST/one_detector/testclient_out.traci b/tests/traci/get_variable/InductionLoop/ID_LIST/one_detector/testclient_out.traci index ee26ef886d34..2be9381b68ce 100644 --- a/tests/traci/get_variable/InductionLoop/ID_LIST/one_detector/testclient_out.traci +++ b/tests/traci/get_variable/InductionLoop/ID_LIST/one_detector/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:18 2013 +TraCITestClient output file. Date: Sun Sep 8 08:52:49 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:18 2013 -> Command sent: : domID=160 varID=0 objID=dummy .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ -"3/1to2/1" ] + CommandID=176 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ "3/1to2/1" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/InductionLoop/ID_LIST/two_detectors/testclient_out.traci b/tests/traci/get_variable/InductionLoop/ID_LIST/two_detectors/testclient_out.traci index 6f9a9584ec0e..6b03a15f73ea 100644 --- a/tests/traci/get_variable/InductionLoop/ID_LIST/two_detectors/testclient_out.traci +++ b/tests/traci/get_variable/InductionLoop/ID_LIST/two_detectors/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:19 2013 +TraCITestClient output file. Date: Sun Sep 8 08:52:49 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:19 2013 -> Command sent: : domID=160 varID=0 objID=dummy .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ -"3/1to2/1", "4/1to3/1" ] + CommandID=176 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ "3/1to2/1", "4/1to3/1" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/InductionLoop/one_vehicle/one1s_1vehicle_10m_s/testclient_out.traci b/tests/traci/get_variable/InductionLoop/one_vehicle/one1s_1vehicle_10m_s/testclient_out.traci index bff9d526eb1a..7d8694e066f9 100644 --- a/tests/traci/get_variable/InductionLoop/one_vehicle/one1s_1vehicle_10m_s/testclient_out.traci +++ b/tests/traci/get_variable/InductionLoop/one_vehicle/one1s_1vehicle_10m_s/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 +TraCITestClient output file. Date: Sun Sep 8 08:52:49 2024 -> Command sent: : @@ -17,8 +17,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -38,8 +37,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=23 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=23 ObjectID=3/1to2/1 valueDataType=15 compound value with 1 members: [ - valueDataType=9 Int value: 0 + CommandID=176 VariableID=23 ObjectID=3/1to2/1 valueDataType=15 compound value with 1 members: [ valueDataType=9 Int value: 0 ] -> Command sent: : @@ -58,8 +56,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"0" ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -79,8 +76,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=23 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=23 ObjectID=3/1to2/1 valueDataType=15 compound value with 6 members: [ - valueDataType=9 Int value: 1 + CommandID=176 VariableID=23 ObjectID=3/1to2/1 valueDataType=15 compound value with 6 members: [ valueDataType=9 Int value: 1 valueDataType=12 string value: 0 valueDataType=11 Double value: 3.00 valueDataType=11 Double value: 51.00 @@ -104,8 +100,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"0" ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -125,8 +120,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=23 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=23 ObjectID=3/1to2/1 valueDataType=15 compound value with 6 members: [ - valueDataType=9 Int value: 1 + CommandID=176 VariableID=23 ObjectID=3/1to2/1 valueDataType=15 compound value with 6 members: [ valueDataType=9 Int value: 1 valueDataType=12 string value: 0 valueDataType=11 Double value: 3.00 valueDataType=11 Double value: 51.00 diff --git a/tests/traci/get_variable/InductionLoop/one_vehicle/two10s_1vehicle_10m_s/testclient_out.traci b/tests/traci/get_variable/InductionLoop/one_vehicle/two10s_1vehicle_10m_s/testclient_out.traci index f9fc362823a4..9c3bfac65135 100644 --- a/tests/traci/get_variable/InductionLoop/one_vehicle/two10s_1vehicle_10m_s/testclient_out.traci +++ b/tests/traci/get_variable/InductionLoop/one_vehicle/two10s_1vehicle_10m_s/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Tue Mar 26 08:16:08 2024 +TraCITestClient output file. Date: Sun Sep 8 08:52:49 2024 -> Command sent: : @@ -17,8 +17,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:08 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -51,8 +50,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:08 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -85,8 +83,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:08 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ -"0" ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -119,8 +116,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:08 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ -"0" ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -153,8 +149,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:08 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -187,8 +182,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:08 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"0" ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -221,8 +215,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:08 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"0" ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 diff --git a/tests/traci/get_variable/InductionLoop/one_vehicle/two1s_1vehicle_10m_s/testclient_out.traci b/tests/traci/get_variable/InductionLoop/one_vehicle/two1s_1vehicle_10m_s/testclient_out.traci index 6b89562fdb6b..9c3bfac65135 100644 --- a/tests/traci/get_variable/InductionLoop/one_vehicle/two1s_1vehicle_10m_s/testclient_out.traci +++ b/tests/traci/get_variable/InductionLoop/one_vehicle/two1s_1vehicle_10m_s/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 +TraCITestClient output file. Date: Sun Sep 8 08:52:49 2024 -> Command sent: : @@ -17,8 +17,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -51,8 +50,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -85,8 +83,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ -"0" ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -119,8 +116,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ -"0" ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -153,8 +149,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -187,8 +182,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"0" ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -221,8 +215,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"0" ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 diff --git a/tests/traci/get_variable/InductionLoop/two_vehicles_diff_speed/one1s_1vehicle_10m_s/testclient_out.traci b/tests/traci/get_variable/InductionLoop/two_vehicles_diff_speed/one1s_1vehicle_10m_s/testclient_out.traci index 7348030ecf91..0dc80529e647 100644 --- a/tests/traci/get_variable/InductionLoop/two_vehicles_diff_speed/one1s_1vehicle_10m_s/testclient_out.traci +++ b/tests/traci/get_variable/InductionLoop/two_vehicles_diff_speed/one1s_1vehicle_10m_s/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Tue Mar 26 08:16:08 2024 +TraCITestClient output file. Date: Sun Sep 8 08:52:49 2024 -> Command sent: : @@ -17,8 +17,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:08 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -51,8 +50,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:08 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"0" ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -85,8 +83,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:08 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"0" ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -119,8 +116,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:08 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -153,8 +149,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:08 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -187,8 +182,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:08 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"1" ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "1" ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -221,8 +215,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:08 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 diff --git a/tests/traci/get_variable/InductionLoop/two_vehicles_diff_speed/two10s_1vehicle_10m_s/testclient_out.traci b/tests/traci/get_variable/InductionLoop/two_vehicles_diff_speed/two10s_1vehicle_10m_s/testclient_out.traci index f31ba2db6674..7a53750a76d7 100644 --- a/tests/traci/get_variable/InductionLoop/two_vehicles_diff_speed/two10s_1vehicle_10m_s/testclient_out.traci +++ b/tests/traci/get_variable/InductionLoop/two_vehicles_diff_speed/two10s_1vehicle_10m_s/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 +TraCITestClient output file. Date: Sun Sep 8 08:52:49 2024 -> Command sent: : @@ -17,8 +17,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -51,8 +50,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -85,8 +83,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ -"0" ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -119,8 +116,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ -"0" ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -153,8 +149,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -187,8 +182,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -221,8 +215,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ -"1" ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ "1" ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -255,8 +248,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -289,8 +281,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -323,8 +314,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"0" ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -357,8 +347,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"0" ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -391,8 +380,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -425,8 +413,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -459,8 +446,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"1" ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "1" ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 diff --git a/tests/traci/get_variable/InductionLoop/two_vehicles_diff_speed/two1s_1vehicle_10m_s/testclient_out.traci b/tests/traci/get_variable/InductionLoop/two_vehicles_diff_speed/two1s_1vehicle_10m_s/testclient_out.traci index f31ba2db6674..7a53750a76d7 100644 --- a/tests/traci/get_variable/InductionLoop/two_vehicles_diff_speed/two1s_1vehicle_10m_s/testclient_out.traci +++ b/tests/traci/get_variable/InductionLoop/two_vehicles_diff_speed/two1s_1vehicle_10m_s/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 +TraCITestClient output file. Date: Sun Sep 8 08:52:49 2024 -> Command sent: : @@ -17,8 +17,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -51,8 +50,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -85,8 +83,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ -"0" ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -119,8 +116,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ -"0" ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -153,8 +149,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -187,8 +182,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -221,8 +215,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ -"1" ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ "1" ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -255,8 +248,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=4/1to3/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=4/1to3/1 @@ -289,8 +281,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -323,8 +314,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"0" ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -357,8 +347,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"0" ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -391,8 +380,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -425,8 +413,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 @@ -459,8 +446,7 @@ TraCITestClient output file. Date: Tue Mar 26 08:16:09 2024 -> Command sent: : domID=160 varID=18 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"1" ] + CommandID=176 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "1" ] -> Command sent: : domID=160 varID=19 objID=3/1to2/1 diff --git a/tests/traci/get_variable/Junction/ID_LIST/testclient_out.traci b/tests/traci/get_variable/Junction/ID_LIST/testclient_out.traci index c3965aaa4e35..b9c92aafc8ad 100644 --- a/tests/traci/get_variable/Junction/ID_LIST/testclient_out.traci +++ b/tests/traci/get_variable/Junction/ID_LIST/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:26:41 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:11 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:41 2013 -> Command sent: : domID=169 varID=0 objID=dummy .. Command acknowledged (169), [description: ] - CommandID=185 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ -"0/0", "0/1", "0/2", "1/0", "1/1", "1/2", "2/0", "2/1", "2/2", "3/0", "3/1", "3/2", "4/0", "4/1", "4/2" ] + CommandID=185 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ "0/0", "0/1", "0/2", "1/0", "1/1", "1/2", "2/0", "2/1", "2/2", "3/0", "3/1", "3/2", "4/0", "4/1", "4/2" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Junction/ID_LIST_subseconds/testclient_out.traci b/tests/traci/get_variable/Junction/ID_LIST_subseconds/testclient_out.traci index c3965aaa4e35..b9c92aafc8ad 100644 --- a/tests/traci/get_variable/Junction/ID_LIST_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/Junction/ID_LIST_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:26:41 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:11 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:41 2013 -> Command sent: : domID=169 varID=0 objID=dummy .. Command acknowledged (169), [description: ] - CommandID=185 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ -"0/0", "0/1", "0/2", "1/0", "1/1", "1/2", "2/0", "2/1", "2/2", "3/0", "3/1", "3/2", "4/0", "4/1", "4/2" ] + CommandID=185 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ "0/0", "0/1", "0/2", "1/0", "1/1", "1/2", "2/0", "2/1", "2/2", "3/0", "3/1", "3/2", "4/0", "4/1", "4/2" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Lane/ID_LIST/testclient_out.traci b/tests/traci/get_variable/Lane/ID_LIST/testclient_out.traci index 83f58fc4f6fc..6c5085ab4491 100644 --- a/tests/traci/get_variable/Lane/ID_LIST/testclient_out.traci +++ b/tests/traci/get_variable/Lane/ID_LIST/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:59 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:05 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:59 2013 -> Command sent: : domID=163 varID=0 objID=dummy .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ -"0/0to0/1_0", "0/0to1/0_0", "0/1to0/0_0", "0/1to0/2_0", "0/1to1/1_0", "0/2to0/1_0", "0/2to1/2_0", "1/0to0/0_0", "1/0to1/1_0", "1/0to2/0_0", "1/1to0/1_0", "1/1to1/0_0", "1/1to1/2_0", "1/1to2/1_0", "1/2to0/2_0", "1/2to1/1_0", "1/2to2/2_0", "2/0to1/0_0", "2/0to2/1_0", "2/0to3/0_0", "2/1to1/1_0", "2/1to2/0_0", "2/1to2/2_0", "2/1to3/1_0", "2/2to1/2_0", "2/2to2/1_0", "2/2to3/2_0", "3/0to2/0_0", "3/0to3/1_0", "3/0to4/0_0", "3/1to2/1_0", "3/1to3/0_0", "3/1to3/2_0", "3/1to4/1_0", "3/2to2/2_0", "3/2to3/1_0", "3/2to4/2_0", "4/0to3/0_0", "4/0to4/1_0", "4/1to3/1_0", "4/1to4/0_0", "4/1to4/2_0", "4/2to3/2_0", "4/2to4/1_0" ] + CommandID=179 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ "0/0to0/1_0", "0/0to1/0_0", "0/1to0/0_0", "0/1to0/2_0", "0/1to1/1_0", "0/2to0/1_0", "0/2to1/2_0", "1/0to0/0_0", "1/0to1/1_0", "1/0to2/0_0", "1/1to0/1_0", "1/1to1/0_0", "1/1to1/2_0", "1/1to2/1_0", "1/2to0/2_0", "1/2to1/1_0", "1/2to2/2_0", "2/0to1/0_0", "2/0to2/1_0", "2/0to3/0_0", "2/1to1/1_0", "2/1to2/0_0", "2/1to2/2_0", "2/1to3/1_0", "2/2to1/2_0", "2/2to2/1_0", "2/2to3/2_0", "3/0to2/0_0", "3/0to3/1_0", "3/0to4/0_0", "3/1to2/1_0", "3/1to3/0_0", "3/1to3/2_0", "3/1to4/1_0", "3/2to2/2_0", "3/2to3/1_0", "3/2to4/2_0", "4/0to3/0_0", "4/0to4/1_0", "4/1to3/1_0", "4/1to4/0_0", "4/1to4/2_0", "4/2to3/2_0", "4/2to4/1_0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Lane/ID_LIST_subseconds/testclient_out.traci b/tests/traci/get_variable/Lane/ID_LIST_subseconds/testclient_out.traci index 83f58fc4f6fc..6c5085ab4491 100644 --- a/tests/traci/get_variable/Lane/ID_LIST_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/Lane/ID_LIST_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:59 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:05 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:59 2013 -> Command sent: : domID=163 varID=0 objID=dummy .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ -"0/0to0/1_0", "0/0to1/0_0", "0/1to0/0_0", "0/1to0/2_0", "0/1to1/1_0", "0/2to0/1_0", "0/2to1/2_0", "1/0to0/0_0", "1/0to1/1_0", "1/0to2/0_0", "1/1to0/1_0", "1/1to1/0_0", "1/1to1/2_0", "1/1to2/1_0", "1/2to0/2_0", "1/2to1/1_0", "1/2to2/2_0", "2/0to1/0_0", "2/0to2/1_0", "2/0to3/0_0", "2/1to1/1_0", "2/1to2/0_0", "2/1to2/2_0", "2/1to3/1_0", "2/2to1/2_0", "2/2to2/1_0", "2/2to3/2_0", "3/0to2/0_0", "3/0to3/1_0", "3/0to4/0_0", "3/1to2/1_0", "3/1to3/0_0", "3/1to3/2_0", "3/1to4/1_0", "3/2to2/2_0", "3/2to3/1_0", "3/2to4/2_0", "4/0to3/0_0", "4/0to4/1_0", "4/1to3/1_0", "4/1to4/0_0", "4/1to4/2_0", "4/2to3/2_0", "4/2to4/1_0" ] + CommandID=179 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ "0/0to0/1_0", "0/0to1/0_0", "0/1to0/0_0", "0/1to0/2_0", "0/1to1/1_0", "0/2to0/1_0", "0/2to1/2_0", "1/0to0/0_0", "1/0to1/1_0", "1/0to2/0_0", "1/1to0/1_0", "1/1to1/0_0", "1/1to1/2_0", "1/1to2/1_0", "1/2to0/2_0", "1/2to1/1_0", "1/2to2/2_0", "2/0to1/0_0", "2/0to2/1_0", "2/0to3/0_0", "2/1to1/1_0", "2/1to2/0_0", "2/1to2/2_0", "2/1to3/1_0", "2/2to1/2_0", "2/2to2/1_0", "2/2to3/2_0", "3/0to2/0_0", "3/0to3/1_0", "3/0to4/0_0", "3/1to2/1_0", "3/1to3/0_0", "3/1to3/2_0", "3/1to4/1_0", "3/2to2/2_0", "3/2to3/1_0", "3/2to4/2_0", "4/0to3/0_0", "4/0to4/1_0", "4/1to3/1_0", "4/1to4/0_0", "4/1to4/2_0", "4/2to3/2_0", "4/2to4/1_0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Lane/LANE_ALLOWED/testclient_out.traci b/tests/traci/get_variable/Lane/LANE_ALLOWED/testclient_out.traci index ba629cb40b16..141c9bf3c8c3 100644 --- a/tests/traci/get_variable/Lane/LANE_ALLOWED/testclient_out.traci +++ b/tests/traci/get_variable/Lane/LANE_ALLOWED/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:25:05 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:06 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:25:05 2013 -> Command sent: : domID=163 varID=52 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=52 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ - ] + CommandID=179 VariableID=52 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Lane/LANE_ALLOWED_subseconds/testclient_out.traci b/tests/traci/get_variable/Lane/LANE_ALLOWED_subseconds/testclient_out.traci index ba629cb40b16..141c9bf3c8c3 100644 --- a/tests/traci/get_variable/Lane/LANE_ALLOWED_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/Lane/LANE_ALLOWED_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:25:05 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:06 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:25:05 2013 -> Command sent: : domID=163 varID=52 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=52 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ - ] + CommandID=179 VariableID=52 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Lane/LANE_DISALLOWED/testclient_out.traci b/tests/traci/get_variable/Lane/LANE_DISALLOWED/testclient_out.traci index 2479ad1455e1..7a225d5764af 100644 --- a/tests/traci/get_variable/Lane/LANE_DISALLOWED/testclient_out.traci +++ b/tests/traci/get_variable/Lane/LANE_DISALLOWED/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:25:06 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:06 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:25:06 2013 -> Command sent: : domID=163 varID=53 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=53 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ - ] + CommandID=179 VariableID=53 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Lane/LANE_DISALLOWED_subseconds/testclient_out.traci b/tests/traci/get_variable/Lane/LANE_DISALLOWED_subseconds/testclient_out.traci index 2479ad1455e1..b13317ff285a 100644 --- a/tests/traci/get_variable/Lane/LANE_DISALLOWED_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/Lane/LANE_DISALLOWED_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:25:06 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:07 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:25:06 2013 -> Command sent: : domID=163 varID=53 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=53 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ - ] + CommandID=179 VariableID=53 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Lane/LANE_LINKS/testclient_out.traci b/tests/traci/get_variable/Lane/LANE_LINKS/testclient_out.traci index 0aba405cf0fa..34fc3dda3f23 100644 --- a/tests/traci/get_variable/Lane/LANE_LINKS/testclient_out.traci +++ b/tests/traci/get_variable/Lane/LANE_LINKS/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:25:00 2013 +TraCITestClient output file. Date: Sun Sep 8 08:59:42 2024 -> Command sent: : @@ -7,10 +7,9 @@ TraCITestClient output file. Date: Mon Jul 01 13:25:00 2013 -> Command sent: : domID=163 varID=51 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=51 ObjectID=2/1to2/0_0 valueDataType=15 compound value with 25 members: [ - valueDataType=9 Int value: 3 + CommandID=179 VariableID=51 ObjectID=2/1to2/0_0 valueDataType=15 compound value with 25 members: [ valueDataType=9 Int value: 3 valueDataType=12 string value: 2/0to1/0_0 - valueDataType=12 string value: + valueDataType=12 string value: '' valueDataType=7 Unsigned Byte Value: 0 valueDataType=7 Unsigned Byte Value: 0 valueDataType=7 Unsigned Byte Value: 0 @@ -18,7 +17,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:25:00 2013 valueDataType=12 string value: r valueDataType=11 Double value: 4.38 valueDataType=12 string value: 2/0to3/0_0 - valueDataType=12 string value: + valueDataType=12 string value: '' valueDataType=7 Unsigned Byte Value: 0 valueDataType=7 Unsigned Byte Value: 0 valueDataType=7 Unsigned Byte Value: 0 @@ -26,7 +25,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:25:00 2013 valueDataType=12 string value: l valueDataType=11 Double value: 9.05 valueDataType=12 string value: 2/0to2/1_0 - valueDataType=12 string value: + valueDataType=12 string value: '' valueDataType=7 Unsigned Byte Value: 0 valueDataType=7 Unsigned Byte Value: 0 valueDataType=7 Unsigned Byte Value: 0 diff --git a/tests/traci/get_variable/Lane/LANE_LINKS_subseconds/testclient_out.traci b/tests/traci/get_variable/Lane/LANE_LINKS_subseconds/testclient_out.traci index 0aba405cf0fa..34fc3dda3f23 100644 --- a/tests/traci/get_variable/Lane/LANE_LINKS_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/Lane/LANE_LINKS_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:25:00 2013 +TraCITestClient output file. Date: Sun Sep 8 08:59:42 2024 -> Command sent: : @@ -7,10 +7,9 @@ TraCITestClient output file. Date: Mon Jul 01 13:25:00 2013 -> Command sent: : domID=163 varID=51 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=51 ObjectID=2/1to2/0_0 valueDataType=15 compound value with 25 members: [ - valueDataType=9 Int value: 3 + CommandID=179 VariableID=51 ObjectID=2/1to2/0_0 valueDataType=15 compound value with 25 members: [ valueDataType=9 Int value: 3 valueDataType=12 string value: 2/0to1/0_0 - valueDataType=12 string value: + valueDataType=12 string value: '' valueDataType=7 Unsigned Byte Value: 0 valueDataType=7 Unsigned Byte Value: 0 valueDataType=7 Unsigned Byte Value: 0 @@ -18,7 +17,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:25:00 2013 valueDataType=12 string value: r valueDataType=11 Double value: 4.38 valueDataType=12 string value: 2/0to3/0_0 - valueDataType=12 string value: + valueDataType=12 string value: '' valueDataType=7 Unsigned Byte Value: 0 valueDataType=7 Unsigned Byte Value: 0 valueDataType=7 Unsigned Byte Value: 0 @@ -26,7 +25,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:25:00 2013 valueDataType=12 string value: l valueDataType=11 Double value: 9.05 valueDataType=12 string value: 2/0to2/1_0 - valueDataType=12 string value: + valueDataType=12 string value: '' valueDataType=7 Unsigned Byte Value: 0 valueDataType=7 Unsigned Byte Value: 0 valueDataType=7 Unsigned Byte Value: 0 diff --git a/tests/traci/get_variable/Lane/LAST_STEP_VEHICLE_ID_LIST/testclient_out.traci b/tests/traci/get_variable/Lane/LAST_STEP_VEHICLE_ID_LIST/testclient_out.traci index 887dd7952ec9..fd1db74df661 100644 --- a/tests/traci/get_variable/Lane/LAST_STEP_VEHICLE_ID_LIST/testclient_out.traci +++ b/tests/traci/get_variable/Lane/LAST_STEP_VEHICLE_ID_LIST/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:25:08 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:07 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:25:08 2013 -> Command sent: : domID=163 varID=18 objID=3/1to2/1_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=18 ObjectID=3/1to2/1_0 valueDataType=14 string list value: [ - ] + CommandID=179 VariableID=18 ObjectID=3/1to2/1_0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -16,8 +15,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:25:08 2013 -> Command sent: : domID=163 varID=18 objID=3/1to2/1_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=18 ObjectID=3/1to2/1_0 valueDataType=14 string list value: [ -"0" ] + CommandID=179 VariableID=18 ObjectID=3/1to2/1_0 valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Lane/LAST_STEP_VEHICLE_ID_LIST_subseconds/testclient_out.traci b/tests/traci/get_variable/Lane/LAST_STEP_VEHICLE_ID_LIST_subseconds/testclient_out.traci index 887dd7952ec9..fd1db74df661 100644 --- a/tests/traci/get_variable/Lane/LAST_STEP_VEHICLE_ID_LIST_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/Lane/LAST_STEP_VEHICLE_ID_LIST_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:25:08 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:07 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:25:08 2013 -> Command sent: : domID=163 varID=18 objID=3/1to2/1_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=18 ObjectID=3/1to2/1_0 valueDataType=14 string list value: [ - ] + CommandID=179 VariableID=18 ObjectID=3/1to2/1_0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -16,8 +15,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:25:08 2013 -> Command sent: : domID=163 varID=18 objID=3/1to2/1_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=18 ObjectID=3/1to2/1_0 valueDataType=14 string list value: [ -"0" ] + CommandID=179 VariableID=18 ObjectID=3/1to2/1_0 valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/MeMeDetector/ID_LIST/no_detectors/testclient_out.traci b/tests/traci/get_variable/MeMeDetector/ID_LIST/no_detectors/testclient_out.traci index 8f28404e44c6..b0fa84655306 100644 --- a/tests/traci/get_variable/MeMeDetector/ID_LIST/no_detectors/testclient_out.traci +++ b/tests/traci/get_variable/MeMeDetector/ID_LIST/no_detectors/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:32 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:01 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:32 2013 -> Command sent: : domID=161 varID=0 objID=dummy .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/MeMeDetector/ID_LIST/one_detector/testclient_out.traci b/tests/traci/get_variable/MeMeDetector/ID_LIST/one_detector/testclient_out.traci index 810f4ed87298..d48fb60cbbf1 100644 --- a/tests/traci/get_variable/MeMeDetector/ID_LIST/one_detector/testclient_out.traci +++ b/tests/traci/get_variable/MeMeDetector/ID_LIST/one_detector/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:32 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:01 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:32 2013 -> Command sent: : domID=161 varID=0 objID=dummy .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ -"3/1to2/1" ] + CommandID=177 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ "3/1to2/1" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/MeMeDetector/ID_LIST/two_detectors/testclient_out.traci b/tests/traci/get_variable/MeMeDetector/ID_LIST/two_detectors/testclient_out.traci index ff7c5c337f3a..90407929e624 100644 --- a/tests/traci/get_variable/MeMeDetector/ID_LIST/two_detectors/testclient_out.traci +++ b/tests/traci/get_variable/MeMeDetector/ID_LIST/two_detectors/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:33 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:01 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:33 2013 -> Command sent: : domID=161 varID=0 objID=dummy .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ -"3/1to2/1", "4/1to3/1" ] + CommandID=177 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ "3/1to2/1", "4/1to3/1" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/MeMeDetector/one_vehicle/one1s_1vehicle_10m_s/testclient_out.traci b/tests/traci/get_variable/MeMeDetector/one_vehicle/one1s_1vehicle_10m_s/testclient_out.traci index f4f73862eaa5..86e056d61db8 100644 --- a/tests/traci/get_variable/MeMeDetector/one_vehicle/one1s_1vehicle_10m_s/testclient_out.traci +++ b/tests/traci/get_variable/MeMeDetector/one_vehicle/one1s_1vehicle_10m_s/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:34 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:01 2024 -> Command sent: : @@ -17,8 +17,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:34 2013 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -36,8 +35,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:34 2013 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"0" ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -55,8 +53,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:34 2013 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/MeMeDetector/one_vehicle/two10s_1vehicle_10m_s/testclient_out.traci b/tests/traci/get_variable/MeMeDetector/one_vehicle/two10s_1vehicle_10m_s/testclient_out.traci index b8199b69706e..6be1cf1e5bf6 100644 --- a/tests/traci/get_variable/MeMeDetector/one_vehicle/two10s_1vehicle_10m_s/testclient_out.traci +++ b/tests/traci/get_variable/MeMeDetector/one_vehicle/two10s_1vehicle_10m_s/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:36 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:01 2024 -> Command sent: : @@ -17,8 +17,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:36 2013 -> Command sent: : domID=161 varID=18 objID=4/1to3/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -36,8 +35,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:36 2013 -> Command sent: : domID=161 varID=18 objID=4/1to3/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ -"0" ] + CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -55,8 +53,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:36 2013 -> Command sent: : domID=161 varID=18 objID=4/1to3/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=161 varID=16 objID=3/1to2/1 @@ -71,8 +68,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:36 2013 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -90,8 +86,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:36 2013 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"0" ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -109,8 +104,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:36 2013 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/MeMeDetector/one_vehicle/two1s_1vehicle_10m_s/testclient_out.traci b/tests/traci/get_variable/MeMeDetector/one_vehicle/two1s_1vehicle_10m_s/testclient_out.traci index f271f62ee9d5..6be1cf1e5bf6 100644 --- a/tests/traci/get_variable/MeMeDetector/one_vehicle/two1s_1vehicle_10m_s/testclient_out.traci +++ b/tests/traci/get_variable/MeMeDetector/one_vehicle/two1s_1vehicle_10m_s/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:35 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:01 2024 -> Command sent: : @@ -17,8 +17,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:35 2013 -> Command sent: : domID=161 varID=18 objID=4/1to3/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -36,8 +35,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:35 2013 -> Command sent: : domID=161 varID=18 objID=4/1to3/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ -"0" ] + CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -55,8 +53,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:35 2013 -> Command sent: : domID=161 varID=18 objID=4/1to3/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=161 varID=16 objID=3/1to2/1 @@ -71,8 +68,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:35 2013 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -90,8 +86,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:35 2013 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"0" ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -109,8 +104,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:35 2013 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/MeMeDetector/two_vehicles_diff_speed/one1s_1vehicle_10m_s/testclient_out.traci b/tests/traci/get_variable/MeMeDetector/two_vehicles_diff_speed/one1s_1vehicle_10m_s/testclient_out.traci index c0bd2b2283e4..86e056d61db8 100644 --- a/tests/traci/get_variable/MeMeDetector/two_vehicles_diff_speed/one1s_1vehicle_10m_s/testclient_out.traci +++ b/tests/traci/get_variable/MeMeDetector/two_vehicles_diff_speed/one1s_1vehicle_10m_s/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Mar 3 14:01:39 2014 +TraCITestClient output file. Date: Sun Sep 8 08:50:01 2024 -> Command sent: : @@ -17,8 +17,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:01:39 2014 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -36,8 +35,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:01:39 2014 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"0" ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -55,8 +53,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:01:39 2014 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/MeMeDetector/two_vehicles_diff_speed/two10s_10m_s_near/testclient_out.traci b/tests/traci/get_variable/MeMeDetector/two_vehicles_diff_speed/two10s_10m_s_near/testclient_out.traci index 0c2d94b1981b..38477a25b480 100644 --- a/tests/traci/get_variable/MeMeDetector/two_vehicles_diff_speed/two10s_10m_s_near/testclient_out.traci +++ b/tests/traci/get_variable/MeMeDetector/two_vehicles_diff_speed/two10s_10m_s_near/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:41 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:02 2024 -> Command sent: : @@ -17,8 +17,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:41 2013 -> Command sent: : domID=161 varID=18 objID=4/1to3/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -36,8 +35,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:41 2013 -> Command sent: : domID=161 varID=18 objID=4/1to3/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -55,8 +53,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:41 2013 -> Command sent: : domID=161 varID=18 objID=4/1to3/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=161 varID=16 objID=3/1to2/1 @@ -71,8 +68,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:41 2013 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -90,8 +86,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:41 2013 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -109,8 +104,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:41 2013 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/MeMeDetector/two_vehicles_diff_speed/two10s_1vehicle_10m_s/testclient_out.traci b/tests/traci/get_variable/MeMeDetector/two_vehicles_diff_speed/two10s_1vehicle_10m_s/testclient_out.traci index 7cca92ebd70a..aa9396124921 100644 --- a/tests/traci/get_variable/MeMeDetector/two_vehicles_diff_speed/two10s_1vehicle_10m_s/testclient_out.traci +++ b/tests/traci/get_variable/MeMeDetector/two_vehicles_diff_speed/two10s_1vehicle_10m_s/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Mar 3 14:01:41 2014 +TraCITestClient output file. Date: Sun Sep 8 08:50:01 2024 -> Command sent: : @@ -17,8 +17,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:01:41 2014 -> Command sent: : domID=161 varID=18 objID=4/1to3/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -36,8 +35,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:01:41 2014 -> Command sent: : domID=161 varID=18 objID=4/1to3/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ -"0", "1" ] + CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ "0", "1" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -55,8 +53,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:01:41 2014 -> Command sent: : domID=161 varID=18 objID=4/1to3/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=161 varID=16 objID=3/1to2/1 @@ -71,8 +68,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:01:41 2014 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -90,8 +86,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:01:41 2014 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"0" ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -109,8 +104,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:01:41 2014 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/MeMeDetector/two_vehicles_diff_speed/two1s_10m_s_near/testclient_out.traci b/tests/traci/get_variable/MeMeDetector/two_vehicles_diff_speed/two1s_10m_s_near/testclient_out.traci index ddfbca6d0225..38477a25b480 100644 --- a/tests/traci/get_variable/MeMeDetector/two_vehicles_diff_speed/two1s_10m_s_near/testclient_out.traci +++ b/tests/traci/get_variable/MeMeDetector/two_vehicles_diff_speed/two1s_10m_s_near/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:40 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:02 2024 -> Command sent: : @@ -17,8 +17,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:40 2013 -> Command sent: : domID=161 varID=18 objID=4/1to3/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -36,8 +35,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:40 2013 -> Command sent: : domID=161 varID=18 objID=4/1to3/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -55,8 +53,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:40 2013 -> Command sent: : domID=161 varID=18 objID=4/1to3/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=161 varID=16 objID=3/1to2/1 @@ -71,8 +68,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:40 2013 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -90,8 +86,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:40 2013 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -109,8 +104,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:40 2013 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/MeMeDetector/two_vehicles_diff_speed/two1s_1vehicle_10m_s/testclient_out.traci b/tests/traci/get_variable/MeMeDetector/two_vehicles_diff_speed/two1s_1vehicle_10m_s/testclient_out.traci index 519f5d694a66..aa9396124921 100644 --- a/tests/traci/get_variable/MeMeDetector/two_vehicles_diff_speed/two1s_1vehicle_10m_s/testclient_out.traci +++ b/tests/traci/get_variable/MeMeDetector/two_vehicles_diff_speed/two1s_1vehicle_10m_s/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Mar 3 14:01:40 2014 +TraCITestClient output file. Date: Sun Sep 8 08:50:01 2024 -> Command sent: : @@ -17,8 +17,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:01:40 2014 -> Command sent: : domID=161 varID=18 objID=4/1to3/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -36,8 +35,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:01:40 2014 -> Command sent: : domID=161 varID=18 objID=4/1to3/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ -"0", "1" ] + CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ "0", "1" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -55,8 +53,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:01:40 2014 -> Command sent: : domID=161 varID=18 objID=4/1to3/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=4/1to3/1 valueDataType=14 string list value: [ ] -> Command sent: : domID=161 varID=16 objID=3/1to2/1 @@ -71,8 +68,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:01:40 2014 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -90,8 +86,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:01:40 2014 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ -"0" ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -109,8 +104,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:01:40 2014 -> Command sent: : domID=161 varID=18 objID=3/1to2/1 .. Command acknowledged (161), [description: ] - CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=177 VariableID=18 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/POI/ID_LIST/testclient_out.traci b/tests/traci/get_variable/POI/ID_LIST/testclient_out.traci index 776002156af9..3fdca5f92a2c 100644 --- a/tests/traci/get_variable/POI/ID_LIST/testclient_out.traci +++ b/tests/traci/get_variable/POI/ID_LIST/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:26:25 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:09 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:25 2013 -> Command sent: : domID=167 varID=0 objID=xxx .. Command acknowledged (167), [description: ] - CommandID=183 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"p1", "p2" ] + CommandID=183 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "p1", "p2" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/POI/ID_LIST_subseconds/testclient_out.traci b/tests/traci/get_variable/POI/ID_LIST_subseconds/testclient_out.traci index 776002156af9..3fdca5f92a2c 100644 --- a/tests/traci/get_variable/POI/ID_LIST_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/POI/ID_LIST_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:26:25 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:09 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:25 2013 -> Command sent: : domID=167 varID=0 objID=xxx .. Command acknowledged (167), [description: ] - CommandID=183 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"p1", "p2" ] + CommandID=183 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "p1", "p2" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Person/ID_LIST/testclient_out.traci b/tests/traci/get_variable/Person/ID_LIST/testclient_out.traci index c0cd1a40bdef..2fdd3f46ace8 100644 --- a/tests/traci/get_variable/Person/ID_LIST/testclient_out.traci +++ b/tests/traci/get_variable/Person/ID_LIST/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Fri Feb 6 08:37:42 2015 +TraCITestClient output file. Date: Sun Sep 8 08:50:16 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Fri Feb 6 08:37:42 2015 -> Command sent: : domID=174 varID=0 objID=xxx .. Command acknowledged (174), [description: ] - CommandID=190 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"0" ] + CommandID=190 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Person/ID_LIST_subseconds/testclient_out.traci b/tests/traci/get_variable/Person/ID_LIST_subseconds/testclient_out.traci index c0cd1a40bdef..2fdd3f46ace8 100644 --- a/tests/traci/get_variable/Person/ID_LIST_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/Person/ID_LIST_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Fri Feb 6 08:37:42 2015 +TraCITestClient output file. Date: Sun Sep 8 08:50:16 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Fri Feb 6 08:37:42 2015 -> Command sent: : domID=174 varID=0 objID=xxx .. Command acknowledged (174), [description: ] - CommandID=190 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"0" ] + CommandID=190 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Person/VAR_POSITION3D/testclient_out.traci b/tests/traci/get_variable/Person/VAR_POSITION3D/testclient_out.traci index 283f693b67cc..117cf5af0527 100644 --- a/tests/traci/get_variable/Person/VAR_POSITION3D/testclient_out.traci +++ b/tests/traci/get_variable/Person/VAR_POSITION3D/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Thu Aug 16 13:56:50 2018 +TraCITestClient output file. Date: Sun Sep 8 08:53:07 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Thu Aug 16 13:56:50 2018 -> Command sent: : domID=174 varID=57 objID=0 .. Command acknowledged (174), [description: ] - CommandID=190 VariableID=57 ObjectID=0 valueDataType=3 Position3DValue: - x: 1468.65 y: 402.93 z: 0.00 + CommandID=190 VariableID=57 ObjectID=0 valueDataType=3 Position3DValue: x: 1468.65 y: 402.93 z: 0.00 -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Person/VAR_POSITION3D_subseconds/testclient_out.traci b/tests/traci/get_variable/Person/VAR_POSITION3D_subseconds/testclient_out.traci index 283f693b67cc..c8e9263d77c0 100644 --- a/tests/traci/get_variable/Person/VAR_POSITION3D_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/Person/VAR_POSITION3D_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Thu Aug 16 13:56:50 2018 +TraCITestClient output file. Date: Sun Sep 8 08:53:08 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Thu Aug 16 13:56:50 2018 -> Command sent: : domID=174 varID=57 objID=0 .. Command acknowledged (174), [description: ] - CommandID=190 VariableID=57 ObjectID=0 valueDataType=3 Position3DValue: - x: 1468.65 y: 402.93 z: 0.00 + CommandID=190 VariableID=57 ObjectID=0 valueDataType=3 Position3DValue: x: 1468.65 y: 402.93 z: 0.00 -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Polygon/ID_LIST/testclient_out.traci b/tests/traci/get_variable/Polygon/ID_LIST/testclient_out.traci index 00b4ea9ef173..c5c295e6e850 100644 --- a/tests/traci/get_variable/Polygon/ID_LIST/testclient_out.traci +++ b/tests/traci/get_variable/Polygon/ID_LIST/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:26:32 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:10 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:32 2013 -> Command sent: : domID=168 varID=0 objID=xxx .. Command acknowledged (168), [description: ] - CommandID=184 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"p1", "p2" ] + CommandID=184 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "p1", "p2" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Polygon/ID_LIST_subseconds/testclient_out.traci b/tests/traci/get_variable/Polygon/ID_LIST_subseconds/testclient_out.traci index 00b4ea9ef173..c5c295e6e850 100644 --- a/tests/traci/get_variable/Polygon/ID_LIST_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/Polygon/ID_LIST_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:26:32 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:10 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:32 2013 -> Command sent: : domID=168 varID=0 objID=xxx .. Command acknowledged (168), [description: ] - CommandID=184 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"p1", "p2" ] + CommandID=184 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "p1", "p2" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Route/ID_LIST/testclient_out.traci b/tests/traci/get_variable/Route/ID_LIST/testclient_out.traci index 10cbd2154ec4..ee95a99fbc91 100644 --- a/tests/traci/get_variable/Route/ID_LIST/testclient_out.traci +++ b/tests/traci/get_variable/Route/ID_LIST/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:26:20 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:09 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:20 2013 -> Command sent: : domID=166 varID=0 objID=xxx .. Command acknowledged (166), [description: ] - CommandID=182 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"r1" ] + CommandID=182 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "r1" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Route/ID_LIST_subseconds/testclient_out.traci b/tests/traci/get_variable/Route/ID_LIST_subseconds/testclient_out.traci index 10cbd2154ec4..ee95a99fbc91 100644 --- a/tests/traci/get_variable/Route/ID_LIST_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/Route/ID_LIST_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:26:20 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:09 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:20 2013 -> Command sent: : domID=166 varID=0 objID=xxx .. Command acknowledged (166), [description: ] - CommandID=182 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"r1" ] + CommandID=182 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "r1" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Route/VAR_EDGES/testclient_out.traci b/tests/traci/get_variable/Route/VAR_EDGES/testclient_out.traci index 69f4a42f1d47..d83e254e5d72 100644 --- a/tests/traci/get_variable/Route/VAR_EDGES/testclient_out.traci +++ b/tests/traci/get_variable/Route/VAR_EDGES/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:26:21 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:09 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:21 2013 -> Command sent: : domID=166 varID=84 objID=r1 .. Command acknowledged (166), [description: ] - CommandID=182 VariableID=84 ObjectID=r1 valueDataType=14 string list value: [ -"4/1to3/1", "3/1to2/1", "2/1to1/1", "1/1to0/1" ] + CommandID=182 VariableID=84 ObjectID=r1 valueDataType=14 string list value: [ "4/1to3/1", "3/1to2/1", "2/1to1/1", "1/1to0/1" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Route/VAR_EDGES_subseconds/testclient_out.traci b/tests/traci/get_variable/Route/VAR_EDGES_subseconds/testclient_out.traci index 69f4a42f1d47..d83e254e5d72 100644 --- a/tests/traci/get_variable/Route/VAR_EDGES_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/Route/VAR_EDGES_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:26:21 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:09 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:26:21 2013 -> Command sent: : domID=166 varID=84 objID=r1 .. Command acknowledged (166), [description: ] - CommandID=182 VariableID=84 ObjectID=r1 valueDataType=14 string list value: [ -"4/1to3/1", "3/1to2/1", "2/1to1/1", "1/1to0/1" ] + CommandID=182 VariableID=84 ObjectID=r1 valueDataType=14 string list value: [ "4/1to3/1", "3/1to2/1", "2/1to1/1", "1/1to0/1" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Simulation/POSITION_CONVERSION/RoadPosTo3D/testclient_out.traci b/tests/traci/get_variable/Simulation/POSITION_CONVERSION/RoadPosTo3D/testclient_out.traci index 31abba7cceda..76976e2ebaa2 100644 --- a/tests/traci/get_variable/Simulation/POSITION_CONVERSION/RoadPosTo3D/testclient_out.traci +++ b/tests/traci/get_variable/Simulation/POSITION_CONVERSION/RoadPosTo3D/testclient_out.traci @@ -1,17 +1,15 @@ -TraCITestClient output file. Date: Wed Jul 3 09:00:09 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:16 2024 -> Command sent: : domID=171 varID=130 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=130 ObjectID=0 valueDataType=3 Position3DValue: - x: 2467.75 y: 495.05 z: 0.00 + CommandID=187 VariableID=130 ObjectID=0 valueDataType=3 Position3DValue: x: 2467.75 y: 495.05 z: 0.00 -> Command sent: : domID=171 varID=130 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=130 ObjectID=0 valueDataType=3 Position3DValue: - x: 3501.65 y: 741.28 z: 0.00 + CommandID=187 VariableID=130 ObjectID=0 valueDataType=3 Position3DValue: x: 3501.65 y: 741.28 z: 0.00 -> Command sent: : domID=171 varID=130 objID=0 diff --git a/tests/traci/get_variable/Simulation/POSITION_CONVERSION/SameType3D/testclient_out.traci b/tests/traci/get_variable/Simulation/POSITION_CONVERSION/SameType3D/testclient_out.traci index a6905bb144bd..1d39d01eb418 100644 --- a/tests/traci/get_variable/Simulation/POSITION_CONVERSION/SameType3D/testclient_out.traci +++ b/tests/traci/get_variable/Simulation/POSITION_CONVERSION/SameType3D/testclient_out.traci @@ -1,11 +1,10 @@ -TraCITestClient output file. Date: Mon Jul 01 13:27:14 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:16 2024 -> Command sent: : domID=171 varID=130 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=130 ObjectID=0 valueDataType=3 Position3DValue: - x: 1.00 y: 1.00 z: 0.00 + CommandID=187 VariableID=130 ObjectID=0 valueDataType=3 Position3DValue: x: 1.00 y: 1.00 z: 0.00 -> Command sent: : .. Command acknowledged (127), [description: ] diff --git a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_ARRIVED_VEHICLES_IDS/testclient_out.traci b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_ARRIVED_VEHICLES_IDS/testclient_out.traci index 129991d2fc77..e4e911fd9c14 100644 --- a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_ARRIVED_VEHICLES_IDS/testclient_out.traci +++ b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_ARRIVED_VEHICLES_IDS/testclient_out.traci @@ -1,11 +1,10 @@ -TraCITestClient output file. Date: Mon Mar 3 14:32:52 2014 +TraCITestClient output file. Date: Sun Sep 8 08:53:18 2024 -> Command sent: : domID=171 varID=122 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=122 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=122 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -16,8 +15,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:32:52 2014 -> Command sent: : domID=171 varID=122 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=122 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=122 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -25,8 +23,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:32:52 2014 -> Command sent: : domID=171 varID=122 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=122 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=122 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -34,8 +31,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:32:52 2014 -> Command sent: : domID=171 varID=122 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=122 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=122 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -43,8 +39,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:32:52 2014 -> Command sent: : domID=171 varID=122 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=122 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=122 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -52,8 +47,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:32:52 2014 -> Command sent: : domID=171 varID=122 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=122 ObjectID=0 valueDataType=14 string list value: [ -"0" ] + CommandID=187 VariableID=122 ObjectID=0 valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -61,8 +55,7 @@ TraCITestClient output file. Date: Mon Mar 3 14:32:52 2014 -> Command sent: : domID=171 varID=122 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=122 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=122 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_DEPARTED_VEHICLES_IDS/testclient_out.traci b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_DEPARTED_VEHICLES_IDS/testclient_out.traci index 06d6170a2abb..49b1ec15158e 100644 --- a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_DEPARTED_VEHICLES_IDS/testclient_out.traci +++ b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_DEPARTED_VEHICLES_IDS/testclient_out.traci @@ -1,11 +1,10 @@ -TraCITestClient output file. Date: Sun Aug 11 18:09:12 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:17 2024 -> Command sent: : domID=171 varID=116 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=116 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=116 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -13,8 +12,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:09:12 2019 -> Command sent: : domID=171 varID=116 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=116 ObjectID=0 valueDataType=14 string list value: [ -"0" ] + CommandID=187 VariableID=116 ObjectID=0 valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_LOADED_VEHICLES_IDS/testclient_out.traci b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_LOADED_VEHICLES_IDS/testclient_out.traci index 80de93565618..ddd8bba2bb97 100644 --- a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_LOADED_VEHICLES_IDS/testclient_out.traci +++ b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_LOADED_VEHICLES_IDS/testclient_out.traci @@ -1,11 +1,10 @@ -TraCITestClient output file. Date: Sun Aug 11 18:09:10 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:17 2024 -> Command sent: : domID=171 varID=114 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=114 ObjectID=0 valueDataType=14 string list value: [ -"0" ] + CommandID=187 VariableID=114 ObjectID=0 valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -13,8 +12,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:09:10 2019 -> Command sent: : domID=171 varID=114 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=114 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=114 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_ENDING_VEHICLES_IDS/testclient_out.traci b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_ENDING_VEHICLES_IDS/testclient_out.traci index a2f013dcb13b..fe8f69656aea 100644 --- a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_ENDING_VEHICLES_IDS/testclient_out.traci +++ b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_ENDING_VEHICLES_IDS/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sat Sep 7 19:20:05 2024 +TraCITestClient output file. Date: Sun Sep 8 08:53:18 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:05 2024 -> Command sent: : domID=171 varID=111 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -21,8 +20,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:05 2024 -> Command sent: : domID=171 varID=111 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -35,8 +33,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:05 2024 -> Command sent: : domID=171 varID=111 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -49,8 +46,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:05 2024 -> Command sent: : domID=171 varID=111 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -63,8 +59,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:05 2024 -> Command sent: : domID=171 varID=111 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ -"0" ] + CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=164 varID=86 objID=0 @@ -77,8 +72,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:05 2024 -> Command sent: : domID=171 varID=111 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -91,8 +85,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:05 2024 -> Command sent: : domID=171 varID=111 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=111 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 diff --git a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_MANEUVERING_VEHICLES_IDS/testclient_out.traci b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_MANEUVERING_VEHICLES_IDS/testclient_out.traci index 421f258e3abe..9b6a9727f251 100644 --- a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_MANEUVERING_VEHICLES_IDS/testclient_out.traci +++ b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_MANEUVERING_VEHICLES_IDS/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sat Sep 7 19:20:05 2024 +TraCITestClient output file. Date: Sun Sep 8 08:53:18 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:05 2024 -> Command sent: : domID=171 varID=59 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -21,8 +20,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:05 2024 -> Command sent: : domID=171 varID=59 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -35,8 +33,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:05 2024 -> Command sent: : domID=171 varID=59 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -49,8 +46,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:05 2024 -> Command sent: : domID=171 varID=59 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -63,8 +59,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:05 2024 -> Command sent: : domID=171 varID=59 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ -"0" ] + CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=164 varID=86 objID=0 @@ -77,8 +72,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:05 2024 -> Command sent: : domID=171 varID=59 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -91,8 +85,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:05 2024 -> Command sent: : domID=171 varID=59 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=59 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 diff --git a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_STARTING_VEHICLES_IDS/testclient_out.traci b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_STARTING_VEHICLES_IDS/testclient_out.traci index cc5208a68b80..d52d7aef4b0d 100644 --- a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_STARTING_VEHICLES_IDS/testclient_out.traci +++ b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_PARKING_STARTING_VEHICLES_IDS/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sat Sep 7 19:20:04 2024 +TraCITestClient output file. Date: Sun Sep 8 08:53:18 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:04 2024 -> Command sent: : domID=171 varID=109 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -21,8 +20,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:04 2024 -> Command sent: : domID=171 varID=109 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -35,8 +33,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:04 2024 -> Command sent: : domID=171 varID=109 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -49,8 +46,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:04 2024 -> Command sent: : domID=171 varID=109 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ -"0" ] + CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=164 varID=86 objID=0 @@ -63,8 +59,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:04 2024 -> Command sent: : domID=171 varID=109 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -77,8 +72,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:04 2024 -> Command sent: : domID=171 varID=109 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -91,8 +85,7 @@ TraCITestClient output file. Date: Sat Sep 7 19:20:04 2024 -> Command sent: : domID=171 varID=109 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=109 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 diff --git a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_STOP_ENDING_VEHICLES_IDS/testclient_out.traci b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_STOP_ENDING_VEHICLES_IDS/testclient_out.traci index 31e0b13a6b7a..458392e33280 100644 --- a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_STOP_ENDING_VEHICLES_IDS/testclient_out.traci +++ b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_STOP_ENDING_VEHICLES_IDS/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 +TraCITestClient output file. Date: Sun Sep 8 08:53:18 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=107 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=107 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=107 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -21,8 +20,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=107 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=107 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=107 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -35,8 +33,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=107 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=107 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=107 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -49,8 +46,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=107 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=107 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=107 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -63,8 +59,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=107 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=107 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=107 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -77,8 +72,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=107 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=107 ObjectID=0 valueDataType=14 string list value: [ -"0" ] + CommandID=187 VariableID=107 ObjectID=0 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=164 varID=86 objID=0 @@ -91,8 +85,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=107 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=107 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=107 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 diff --git a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_STOP_STARTING_VEHICLES_IDS/testclient_out.traci b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_STOP_STARTING_VEHICLES_IDS/testclient_out.traci index 332948dcec0a..23c4d4e36082 100644 --- a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_STOP_STARTING_VEHICLES_IDS/testclient_out.traci +++ b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_STOP_STARTING_VEHICLES_IDS/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 +TraCITestClient output file. Date: Sun Sep 8 08:53:18 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=105 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=105 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=105 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -21,8 +20,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=105 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=105 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=105 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -35,8 +33,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=105 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=105 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=105 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -49,8 +46,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=105 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=105 ObjectID=0 valueDataType=14 string list value: [ -"0" ] + CommandID=187 VariableID=105 ObjectID=0 valueDataType=14 string list value: [ "0" ] -> Command sent: : domID=164 varID=86 objID=0 @@ -63,8 +59,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=105 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=105 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=105 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -77,8 +72,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=105 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=105 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=105 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 @@ -91,8 +85,7 @@ TraCITestClient output file. Date: Thu Mar 12 11:39:10 2020 -> Command sent: : domID=171 varID=105 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=105 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=105 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : domID=164 varID=86 objID=0 diff --git a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_TELEPORT_ENDING_VEHICLES_IDS/testclient_out.traci b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_TELEPORT_ENDING_VEHICLES_IDS/testclient_out.traci index 1d35d6c98bce..9d1b9188bf0e 100644 --- a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_TELEPORT_ENDING_VEHICLES_IDS/testclient_out.traci +++ b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_TELEPORT_ENDING_VEHICLES_IDS/testclient_out.traci @@ -1,11 +1,10 @@ -TraCITestClient output file. Date: Sun Aug 11 18:09:14 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:17 2024 -> Command sent: : domID=171 varID=120 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=120 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=120 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -13,8 +12,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:09:14 2019 -> Command sent: : domID=171 varID=120 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=120 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=120 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_TELEPORT_STARTING_VEHICLES_IDS/testclient_out.traci b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_TELEPORT_STARTING_VEHICLES_IDS/testclient_out.traci index 2739fbdc909e..c8e3381b86c0 100644 --- a/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_TELEPORT_STARTING_VEHICLES_IDS/testclient_out.traci +++ b/tests/traci/get_variable/Simulation/vehicle_state_changes/VAR_TELEPORT_STARTING_VEHICLES_IDS/testclient_out.traci @@ -1,11 +1,10 @@ -TraCITestClient output file. Date: Sun Aug 11 18:09:13 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:17 2024 -> Command sent: : domID=171 varID=118 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=118 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=118 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -13,8 +12,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:09:13 2019 -> Command sent: : domID=171 varID=118 objID=0 .. Command acknowledged (171), [description: ] - CommandID=187 VariableID=118 ObjectID=0 valueDataType=14 string list value: [ - ] + CommandID=187 VariableID=118 ObjectID=0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/StoppingPlaces/ChargingStations/VAR_STOP_STARTING_VEHICLES_IDS/testclient_out.traci b/tests/traci/get_variable/StoppingPlaces/ChargingStations/VAR_STOP_STARTING_VEHICLES_IDS/testclient_out.traci index f3eaedd00599..a9e2e4220269 100644 --- a/tests/traci/get_variable/StoppingPlaces/ChargingStations/VAR_STOP_STARTING_VEHICLES_IDS/testclient_out.traci +++ b/tests/traci/get_variable/StoppingPlaces/ChargingStations/VAR_STOP_STARTING_VEHICLES_IDS/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Wed Jun 12 15:51:38 2024 +TraCITestClient output file. Date: Sun Sep 8 08:50:09 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Wed Jun 12 15:51:38 2024 -> Command sent: : domID=37 varID=105 objID=3/1to2/1 .. Command acknowledged (37), [description: ] - CommandID=53 VariableID=105 ObjectID=3/1to2/1 valueDataType=14 string list value: [ - ] + CommandID=53 VariableID=105 ObjectID=3/1to2/1 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/TrafficLight/ID_LIST/no_tl/testclient_out.traci b/tests/traci/get_variable/TrafficLight/ID_LIST/no_tl/testclient_out.traci index 6c233296ba75..46c15720bbe7 100644 --- a/tests/traci/get_variable/TrafficLight/ID_LIST/no_tl/testclient_out.traci +++ b/tests/traci/get_variable/TrafficLight/ID_LIST/no_tl/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:47 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:03 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:47 2013 -> Command sent: : domID=162 varID=0 objID=dummy .. Command acknowledged (162), [description: ] - CommandID=178 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ - ] + CommandID=178 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/TrafficLight/ID_LIST/one_tl/testclient_out.traci b/tests/traci/get_variable/TrafficLight/ID_LIST/one_tl/testclient_out.traci index 291c27786041..e604ba738667 100644 --- a/tests/traci/get_variable/TrafficLight/ID_LIST/one_tl/testclient_out.traci +++ b/tests/traci/get_variable/TrafficLight/ID_LIST/one_tl/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:48 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:03 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:48 2013 -> Command sent: : domID=162 varID=0 objID=dummy .. Command acknowledged (162), [description: ] - CommandID=178 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ -"0/0" ] + CommandID=178 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ "0/0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/TrafficLight/ID_LIST/two_tl/testclient_out.traci b/tests/traci/get_variable/TrafficLight/ID_LIST/two_tl/testclient_out.traci index 4c9f23968644..6065cefaeae3 100644 --- a/tests/traci/get_variable/TrafficLight/ID_LIST/two_tl/testclient_out.traci +++ b/tests/traci/get_variable/TrafficLight/ID_LIST/two_tl/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:49 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:03 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:49 2013 -> Command sent: : domID=162 varID=0 objID=dummy .. Command acknowledged (162), [description: ] - CommandID=178 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ -"0/0", "2/2" ] + CommandID=178 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ "0/0", "2/2" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/TrafficLight/ID_LIST_subseconds/no_tl/testclient_out.traci b/tests/traci/get_variable/TrafficLight/ID_LIST_subseconds/no_tl/testclient_out.traci index 6c233296ba75..46c15720bbe7 100644 --- a/tests/traci/get_variable/TrafficLight/ID_LIST_subseconds/no_tl/testclient_out.traci +++ b/tests/traci/get_variable/TrafficLight/ID_LIST_subseconds/no_tl/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:47 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:03 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:47 2013 -> Command sent: : domID=162 varID=0 objID=dummy .. Command acknowledged (162), [description: ] - CommandID=178 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ - ] + CommandID=178 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/TrafficLight/ID_LIST_subseconds/one_tl/testclient_out.traci b/tests/traci/get_variable/TrafficLight/ID_LIST_subseconds/one_tl/testclient_out.traci index 291c27786041..e604ba738667 100644 --- a/tests/traci/get_variable/TrafficLight/ID_LIST_subseconds/one_tl/testclient_out.traci +++ b/tests/traci/get_variable/TrafficLight/ID_LIST_subseconds/one_tl/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:48 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:03 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:48 2013 -> Command sent: : domID=162 varID=0 objID=dummy .. Command acknowledged (162), [description: ] - CommandID=178 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ -"0/0" ] + CommandID=178 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ "0/0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/TrafficLight/ID_LIST_subseconds/two_tl/testclient_out.traci b/tests/traci/get_variable/TrafficLight/ID_LIST_subseconds/two_tl/testclient_out.traci index 4c9f23968644..6065cefaeae3 100644 --- a/tests/traci/get_variable/TrafficLight/ID_LIST_subseconds/two_tl/testclient_out.traci +++ b/tests/traci/get_variable/TrafficLight/ID_LIST_subseconds/two_tl/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:49 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:03 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:49 2013 -> Command sent: : domID=162 varID=0 objID=dummy .. Command acknowledged (162), [description: ] - CommandID=178 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ -"0/0", "2/2" ] + CommandID=178 VariableID=0 ObjectID=dummy valueDataType=14 string list value: [ "0/0", "2/2" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/TrafficLight/TL_LANES/testclient_out.traci b/tests/traci/get_variable/TrafficLight/TL_LANES/testclient_out.traci index 280606bc9bbf..5885e16e20c8 100644 --- a/tests/traci/get_variable/TrafficLight/TL_LANES/testclient_out.traci +++ b/tests/traci/get_variable/TrafficLight/TL_LANES/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:52 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:03 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:52 2013 -> Command sent: : domID=162 varID=38 objID=0 .. Command acknowledged (162), [description: ] - CommandID=178 VariableID=38 ObjectID=0 valueDataType=14 string list value: [ -"4si_0", "4si_1", "4si_2", "4si_2", "2si_0", "2si_1", "2si_2", "2si_2", "3si_0", "3si_1", "3si_2", "3si_2", "1si_0", "1si_1", "1si_2", "1si_2" ] + CommandID=178 VariableID=38 ObjectID=0 valueDataType=14 string list value: [ "4si_0", "4si_1", "4si_2", "4si_2", "2si_0", "2si_1", "2si_2", "2si_2", "3si_0", "3si_1", "3si_2", "3si_2", "1si_0", "1si_1", "1si_2", "1si_2" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/TrafficLight/TL_LANES_subseconds/testclient_out.traci b/tests/traci/get_variable/TrafficLight/TL_LANES_subseconds/testclient_out.traci index 280606bc9bbf..5885e16e20c8 100644 --- a/tests/traci/get_variable/TrafficLight/TL_LANES_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/TrafficLight/TL_LANES_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:24:52 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:03 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:24:52 2013 -> Command sent: : domID=162 varID=38 objID=0 .. Command acknowledged (162), [description: ] - CommandID=178 VariableID=38 ObjectID=0 valueDataType=14 string list value: [ -"4si_0", "4si_1", "4si_2", "4si_2", "2si_0", "2si_1", "2si_2", "2si_2", "3si_0", "3si_1", "3si_2", "3si_2", "1si_0", "1si_1", "1si_2", "1si_2" ] + CommandID=178 VariableID=38 ObjectID=0 valueDataType=14 string list value: [ "4si_0", "4si_1", "4si_2", "4si_2", "2si_0", "2si_1", "2si_2", "2si_2", "3si_0", "3si_1", "3si_2", "3si_2", "1si_0", "1si_1", "1si_2", "1si_2" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/TrafficLight/TL_LINKS/testclient_out.traci b/tests/traci/get_variable/TrafficLight/TL_LINKS/testclient_out.traci index 05dfa3e8c7cc..1c663522ba56 100644 --- a/tests/traci/get_variable/TrafficLight/TL_LINKS/testclient_out.traci +++ b/tests/traci/get_variable/TrafficLight/TL_LINKS/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Tue Aug 17 16:02:24 2021 +TraCITestClient output file. Date: Sun Sep 8 08:50:03 2024 -> Command sent: : @@ -7,56 +7,39 @@ TraCITestClient output file. Date: Tue Aug 17 16:02:24 2021 -> Command sent: : domID=162 varID=39 objID=0 .. Command acknowledged (162), [description: ] - CommandID=178 VariableID=39 ObjectID=0 valueDataType=15 compound value with 33 members: [ - valueDataType=9 Int value: 16 + CommandID=178 VariableID=39 ObjectID=0 valueDataType=15 compound value with 33 members: [ valueDataType=9 Int value: 16 valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"4si_0", "1o_0", "" ] + valueDataType=14 string list value: [ "4si_0", "1o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"4si_1", "3o_0", "" ] + valueDataType=14 string list value: [ "4si_1", "3o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"4si_2", "2o_0", "" ] + valueDataType=14 string list value: [ "4si_2", "2o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"4si_2", "4o_0", "" ] + valueDataType=14 string list value: [ "4si_2", "4o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"2si_0", "4o_0", "" ] + valueDataType=14 string list value: [ "2si_0", "4o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"2si_1", "1o_0", "" ] + valueDataType=14 string list value: [ "2si_1", "1o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"2si_2", "3o_0", "" ] + valueDataType=14 string list value: [ "2si_2", "3o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"2si_2", "2o_0", "" ] + valueDataType=14 string list value: [ "2si_2", "2o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"3si_0", "2o_0", "" ] + valueDataType=14 string list value: [ "3si_0", "2o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"3si_1", "4o_0", "" ] + valueDataType=14 string list value: [ "3si_1", "4o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"3si_2", "1o_0", "" ] + valueDataType=14 string list value: [ "3si_2", "1o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"3si_2", "3o_0", "" ] + valueDataType=14 string list value: [ "3si_2", "3o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"1si_0", "3o_0", "" ] + valueDataType=14 string list value: [ "1si_0", "3o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"1si_1", "2o_0", "" ] + valueDataType=14 string list value: [ "1si_1", "2o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"1si_2", "4o_0", "" ] + valueDataType=14 string list value: [ "1si_2", "4o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"1si_2", "1o_0", "" ] + valueDataType=14 string list value: [ "1si_2", "1o_0", "" ] ] -> Command sent: : diff --git a/tests/traci/get_variable/TrafficLight/TL_LINKS_subseconds/testclient_out.traci b/tests/traci/get_variable/TrafficLight/TL_LINKS_subseconds/testclient_out.traci index 05dfa3e8c7cc..1c663522ba56 100644 --- a/tests/traci/get_variable/TrafficLight/TL_LINKS_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/TrafficLight/TL_LINKS_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Tue Aug 17 16:02:24 2021 +TraCITestClient output file. Date: Sun Sep 8 08:50:03 2024 -> Command sent: : @@ -7,56 +7,39 @@ TraCITestClient output file. Date: Tue Aug 17 16:02:24 2021 -> Command sent: : domID=162 varID=39 objID=0 .. Command acknowledged (162), [description: ] - CommandID=178 VariableID=39 ObjectID=0 valueDataType=15 compound value with 33 members: [ - valueDataType=9 Int value: 16 + CommandID=178 VariableID=39 ObjectID=0 valueDataType=15 compound value with 33 members: [ valueDataType=9 Int value: 16 valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"4si_0", "1o_0", "" ] + valueDataType=14 string list value: [ "4si_0", "1o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"4si_1", "3o_0", "" ] + valueDataType=14 string list value: [ "4si_1", "3o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"4si_2", "2o_0", "" ] + valueDataType=14 string list value: [ "4si_2", "2o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"4si_2", "4o_0", "" ] + valueDataType=14 string list value: [ "4si_2", "4o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"2si_0", "4o_0", "" ] + valueDataType=14 string list value: [ "2si_0", "4o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"2si_1", "1o_0", "" ] + valueDataType=14 string list value: [ "2si_1", "1o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"2si_2", "3o_0", "" ] + valueDataType=14 string list value: [ "2si_2", "3o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"2si_2", "2o_0", "" ] + valueDataType=14 string list value: [ "2si_2", "2o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"3si_0", "2o_0", "" ] + valueDataType=14 string list value: [ "3si_0", "2o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"3si_1", "4o_0", "" ] + valueDataType=14 string list value: [ "3si_1", "4o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"3si_2", "1o_0", "" ] + valueDataType=14 string list value: [ "3si_2", "1o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"3si_2", "3o_0", "" ] + valueDataType=14 string list value: [ "3si_2", "3o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"1si_0", "3o_0", "" ] + valueDataType=14 string list value: [ "1si_0", "3o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"1si_1", "2o_0", "" ] + valueDataType=14 string list value: [ "1si_1", "2o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"1si_2", "4o_0", "" ] + valueDataType=14 string list value: [ "1si_2", "4o_0", "" ] valueDataType=9 Int value: 1 - valueDataType=14 string list value: [ -"1si_2", "1o_0", "" ] + valueDataType=14 string list value: [ "1si_2", "1o_0", "" ] ] -> Command sent: : diff --git a/tests/traci/get_variable/TrafficLight/TL_RYG_COMPLETE/testclient_out.traci b/tests/traci/get_variable/TrafficLight/TL_RYG_COMPLETE/testclient_out.traci index 4190e82f7df2..d0234cd23fba 100644 --- a/tests/traci/get_variable/TrafficLight/TL_RYG_COMPLETE/testclient_out.traci +++ b/tests/traci/get_variable/TrafficLight/TL_RYG_COMPLETE/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Mar 25 18:25:55 2019 +TraCITestClient output file. Date: Sun Sep 8 08:59:42 2024 -> Command sent: : @@ -7,87 +7,67 @@ TraCITestClient output file. Date: Mon Mar 25 18:25:55 2019 -> Command sent: : domID=162 varID=43 objID=0 .. Command acknowledged (162), [description: ] - CommandID=178 VariableID=43 ObjectID=0 valueDataType=15 compound value with 1 members: [ - valueDataType=15 compound value with 5 members: [ - valueDataType=12 string value: 0 + CommandID=178 VariableID=43 ObjectID=0 valueDataType=15 compound value with 1 members: [ valueDataType=15 compound value with 5 members: [ valueDataType=12 string value: 0 valueDataType=9 Int value: 0 valueDataType=9 Int value: 0 - valueDataType=15 compound value with 8 members: [ - valueDataType=15 compound value with 6 members: [ - valueDataType=11 Double value: 31.00 + valueDataType=15 compound value with 8 members: [ valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 31.00 valueDataType=12 string value: GGggrrrrGGggrrrr valueDataType=11 Double value: 31.00 valueDataType=11 Double value: 31.00 - valueDataType=15 compound value with 0 members: [ - ] - valueDataType=12 string value: + valueDataType=15 compound value with 0 members: [ ] + valueDataType=12 string value: '' ] - valueDataType=15 compound value with 6 members: [ - valueDataType=11 Double value: 4.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 valueDataType=12 string value: yyggrrrryyggrrrr valueDataType=11 Double value: 4.00 valueDataType=11 Double value: 4.00 - valueDataType=15 compound value with 0 members: [ + valueDataType=15 compound value with 0 members: [ ] + valueDataType=12 string value: '' ] - valueDataType=12 string value: - ] - valueDataType=15 compound value with 6 members: [ - valueDataType=11 Double value: 6.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 6.00 valueDataType=12 string value: rrGGrrrrrrGGrrrr valueDataType=11 Double value: 6.00 valueDataType=11 Double value: 6.00 - valueDataType=15 compound value with 0 members: [ + valueDataType=15 compound value with 0 members: [ ] + valueDataType=12 string value: '' ] - valueDataType=12 string value: - ] - valueDataType=15 compound value with 6 members: [ - valueDataType=11 Double value: 4.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 valueDataType=12 string value: rryyrrrrrryyrrrr valueDataType=11 Double value: 4.00 valueDataType=11 Double value: 4.00 - valueDataType=15 compound value with 0 members: [ + valueDataType=15 compound value with 0 members: [ ] + valueDataType=12 string value: '' ] - valueDataType=12 string value: - ] - valueDataType=15 compound value with 6 members: [ - valueDataType=11 Double value: 31.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 31.00 valueDataType=12 string value: rrrrGGggrrrrGGgg valueDataType=11 Double value: 31.00 valueDataType=11 Double value: 31.00 - valueDataType=15 compound value with 0 members: [ + valueDataType=15 compound value with 0 members: [ ] + valueDataType=12 string value: '' ] - valueDataType=12 string value: - ] - valueDataType=15 compound value with 6 members: [ - valueDataType=11 Double value: 4.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 valueDataType=12 string value: rrrryyggrrrryygg valueDataType=11 Double value: 4.00 valueDataType=11 Double value: 4.00 - valueDataType=15 compound value with 0 members: [ + valueDataType=15 compound value with 0 members: [ ] + valueDataType=12 string value: '' ] - valueDataType=12 string value: - ] - valueDataType=15 compound value with 6 members: [ - valueDataType=11 Double value: 6.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 6.00 valueDataType=12 string value: rrrrrrGGrrrrrrGG valueDataType=11 Double value: 6.00 valueDataType=11 Double value: 6.00 - valueDataType=15 compound value with 0 members: [ + valueDataType=15 compound value with 0 members: [ ] + valueDataType=12 string value: '' ] - valueDataType=12 string value: - ] - valueDataType=15 compound value with 6 members: [ - valueDataType=11 Double value: 4.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 valueDataType=12 string value: rrrrrryyrrrrrryy valueDataType=11 Double value: 4.00 valueDataType=11 Double value: 4.00 - valueDataType=15 compound value with 0 members: [ - ] - valueDataType=12 string value: - ] + valueDataType=15 compound value with 0 members: [ ] + valueDataType=12 string value: '' ] - valueDataType=15 compound value with 0 members: [ ] + valueDataType=15 compound value with 0 members: [ ] ] ] diff --git a/tests/traci/get_variable/TrafficLight/TL_RYG_COMPLETE_subseconds/testclient_out.traci b/tests/traci/get_variable/TrafficLight/TL_RYG_COMPLETE_subseconds/testclient_out.traci index 4190e82f7df2..d0234cd23fba 100644 --- a/tests/traci/get_variable/TrafficLight/TL_RYG_COMPLETE_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/TrafficLight/TL_RYG_COMPLETE_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Mar 25 18:25:55 2019 +TraCITestClient output file. Date: Sun Sep 8 08:59:42 2024 -> Command sent: : @@ -7,87 +7,67 @@ TraCITestClient output file. Date: Mon Mar 25 18:25:55 2019 -> Command sent: : domID=162 varID=43 objID=0 .. Command acknowledged (162), [description: ] - CommandID=178 VariableID=43 ObjectID=0 valueDataType=15 compound value with 1 members: [ - valueDataType=15 compound value with 5 members: [ - valueDataType=12 string value: 0 + CommandID=178 VariableID=43 ObjectID=0 valueDataType=15 compound value with 1 members: [ valueDataType=15 compound value with 5 members: [ valueDataType=12 string value: 0 valueDataType=9 Int value: 0 valueDataType=9 Int value: 0 - valueDataType=15 compound value with 8 members: [ - valueDataType=15 compound value with 6 members: [ - valueDataType=11 Double value: 31.00 + valueDataType=15 compound value with 8 members: [ valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 31.00 valueDataType=12 string value: GGggrrrrGGggrrrr valueDataType=11 Double value: 31.00 valueDataType=11 Double value: 31.00 - valueDataType=15 compound value with 0 members: [ - ] - valueDataType=12 string value: + valueDataType=15 compound value with 0 members: [ ] + valueDataType=12 string value: '' ] - valueDataType=15 compound value with 6 members: [ - valueDataType=11 Double value: 4.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 valueDataType=12 string value: yyggrrrryyggrrrr valueDataType=11 Double value: 4.00 valueDataType=11 Double value: 4.00 - valueDataType=15 compound value with 0 members: [ + valueDataType=15 compound value with 0 members: [ ] + valueDataType=12 string value: '' ] - valueDataType=12 string value: - ] - valueDataType=15 compound value with 6 members: [ - valueDataType=11 Double value: 6.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 6.00 valueDataType=12 string value: rrGGrrrrrrGGrrrr valueDataType=11 Double value: 6.00 valueDataType=11 Double value: 6.00 - valueDataType=15 compound value with 0 members: [ + valueDataType=15 compound value with 0 members: [ ] + valueDataType=12 string value: '' ] - valueDataType=12 string value: - ] - valueDataType=15 compound value with 6 members: [ - valueDataType=11 Double value: 4.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 valueDataType=12 string value: rryyrrrrrryyrrrr valueDataType=11 Double value: 4.00 valueDataType=11 Double value: 4.00 - valueDataType=15 compound value with 0 members: [ + valueDataType=15 compound value with 0 members: [ ] + valueDataType=12 string value: '' ] - valueDataType=12 string value: - ] - valueDataType=15 compound value with 6 members: [ - valueDataType=11 Double value: 31.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 31.00 valueDataType=12 string value: rrrrGGggrrrrGGgg valueDataType=11 Double value: 31.00 valueDataType=11 Double value: 31.00 - valueDataType=15 compound value with 0 members: [ + valueDataType=15 compound value with 0 members: [ ] + valueDataType=12 string value: '' ] - valueDataType=12 string value: - ] - valueDataType=15 compound value with 6 members: [ - valueDataType=11 Double value: 4.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 valueDataType=12 string value: rrrryyggrrrryygg valueDataType=11 Double value: 4.00 valueDataType=11 Double value: 4.00 - valueDataType=15 compound value with 0 members: [ + valueDataType=15 compound value with 0 members: [ ] + valueDataType=12 string value: '' ] - valueDataType=12 string value: - ] - valueDataType=15 compound value with 6 members: [ - valueDataType=11 Double value: 6.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 6.00 valueDataType=12 string value: rrrrrrGGrrrrrrGG valueDataType=11 Double value: 6.00 valueDataType=11 Double value: 6.00 - valueDataType=15 compound value with 0 members: [ + valueDataType=15 compound value with 0 members: [ ] + valueDataType=12 string value: '' ] - valueDataType=12 string value: - ] - valueDataType=15 compound value with 6 members: [ - valueDataType=11 Double value: 4.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 valueDataType=12 string value: rrrrrryyrrrrrryy valueDataType=11 Double value: 4.00 valueDataType=11 Double value: 4.00 - valueDataType=15 compound value with 0 members: [ - ] - valueDataType=12 string value: - ] + valueDataType=15 compound value with 0 members: [ ] + valueDataType=12 string value: '' ] - valueDataType=15 compound value with 0 members: [ ] + valueDataType=15 compound value with 0 members: [ ] ] ] diff --git a/tests/traci/get_variable/Vehicle/ID_LIST/testclient_out.traci b/tests/traci/get_variable/Vehicle/ID_LIST/testclient_out.traci index 4ae6912d6e6b..e4f3c08afaf3 100644 --- a/tests/traci/get_variable/Vehicle/ID_LIST/testclient_out.traci +++ b/tests/traci/get_variable/Vehicle/ID_LIST/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:25:31 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:10 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:25:31 2013 -> Command sent: : domID=164 varID=0 objID=xxx .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"0" ] + CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Vehicle/ID_LIST_subseconds/testclient_out.traci b/tests/traci/get_variable/Vehicle/ID_LIST_subseconds/testclient_out.traci index 4ae6912d6e6b..e4f3c08afaf3 100644 --- a/tests/traci/get_variable/Vehicle/ID_LIST_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/Vehicle/ID_LIST_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:25:31 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:10 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:25:31 2013 -> Command sent: : domID=164 varID=0 objID=xxx .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"0" ] + CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Vehicle/VAR_EDGES/testclient_out.traci b/tests/traci/get_variable/Vehicle/VAR_EDGES/testclient_out.traci index 47527e25ef74..a2ed5b28e1e4 100644 --- a/tests/traci/get_variable/Vehicle/VAR_EDGES/testclient_out.traci +++ b/tests/traci/get_variable/Vehicle/VAR_EDGES/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:25:41 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:11 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:25:41 2013 -> Command sent: : domID=164 varID=84 objID=0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=0 valueDataType=14 string list value: [ -"4/1to3/1", "3/1to2/1", "2/1to1/1", "1/1to0/1" ] + CommandID=180 VariableID=84 ObjectID=0 valueDataType=14 string list value: [ "4/1to3/1", "3/1to2/1", "2/1to1/1", "1/1to0/1" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Vehicle/VAR_EDGES_subseconds/testclient_out.traci b/tests/traci/get_variable/Vehicle/VAR_EDGES_subseconds/testclient_out.traci index 47527e25ef74..a2ed5b28e1e4 100644 --- a/tests/traci/get_variable/Vehicle/VAR_EDGES_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/Vehicle/VAR_EDGES_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:25:41 2013 +TraCITestClient output file. Date: Sun Sep 8 08:50:11 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:25:41 2013 -> Command sent: : domID=164 varID=84 objID=0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=0 valueDataType=14 string list value: [ -"4/1to3/1", "3/1to2/1", "2/1to1/1", "1/1to0/1" ] + CommandID=180 VariableID=84 ObjectID=0 valueDataType=14 string list value: [ "4/1to3/1", "3/1to2/1", "2/1to1/1", "1/1to0/1" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Vehicle/VAR_POSITION3D/testclient_out.traci b/tests/traci/get_variable/Vehicle/VAR_POSITION3D/testclient_out.traci index 51bdf305eb17..9a5b93038973 100644 --- a/tests/traci/get_variable/Vehicle/VAR_POSITION3D/testclient_out.traci +++ b/tests/traci/get_variable/Vehicle/VAR_POSITION3D/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Tue Feb 25 10:57:21 2014 +TraCITestClient output file. Date: Sun Sep 8 08:53:00 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Tue Feb 25 10:57:21 2014 -> Command sent: : domID=164 varID=57 objID=0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=57 ObjectID=0 valueDataType=3 Position3DValue: - x: 1458.58 y: 401.65 z: 0.00 + CommandID=180 VariableID=57 ObjectID=0 valueDataType=3 Position3DValue: x: 1458.58 y: 401.65 z: 0.00 -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/Vehicle/VAR_POSITION3D_subseconds/testclient_out.traci b/tests/traci/get_variable/Vehicle/VAR_POSITION3D_subseconds/testclient_out.traci index 89d4f0954570..9a5b93038973 100644 --- a/tests/traci/get_variable/Vehicle/VAR_POSITION3D_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/Vehicle/VAR_POSITION3D_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Tue Feb 25 10:57:22 2014 +TraCITestClient output file. Date: Sun Sep 8 08:53:00 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Tue Feb 25 10:57:22 2014 -> Command sent: : domID=164 varID=57 objID=0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=57 ObjectID=0 valueDataType=3 Position3DValue: - x: 1458.58 y: 401.65 z: 0.00 + CommandID=180 VariableID=57 ObjectID=0 valueDataType=3 Position3DValue: x: 1458.58 y: 401.65 z: 0.00 -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/VehicleType/ID_LIST/testclient_out.traci b/tests/traci/get_variable/VehicleType/ID_LIST/testclient_out.traci index 5cfc80ef2cfb..5bd606b9c46d 100644 --- a/tests/traci/get_variable/VehicleType/ID_LIST/testclient_out.traci +++ b/tests/traci/get_variable/VehicleType/ID_LIST/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Apr 3 11:34:37 2023 +TraCITestClient output file. Date: Sun Sep 8 08:53:04 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Apr 3 11:34:37 2023 -> Command sent: : domID=165 varID=0 objID=xxx .. Command acknowledged (165), [description: ] - CommandID=181 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"DEFAULT_BIKETYPE", "DEFAULT_CONTAINERTYPE", "DEFAULT_PEDTYPE", "DEFAULT_RAILTYPE", "DEFAULT_TAXITYPE", "DEFAULT_VEHTYPE", "t1" ] + CommandID=181 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "DEFAULT_BIKETYPE", "DEFAULT_CONTAINERTYPE", "DEFAULT_PEDTYPE", "DEFAULT_RAILTYPE", "DEFAULT_TAXITYPE", "DEFAULT_VEHTYPE", "t1" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/VehicleType/ID_LIST_subseconds/testclient_out.traci b/tests/traci/get_variable/VehicleType/ID_LIST_subseconds/testclient_out.traci index 5cfc80ef2cfb..5bd606b9c46d 100644 --- a/tests/traci/get_variable/VehicleType/ID_LIST_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/VehicleType/ID_LIST_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Apr 3 11:34:37 2023 +TraCITestClient output file. Date: Sun Sep 8 08:53:04 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Apr 3 11:34:37 2023 -> Command sent: : domID=165 varID=0 objID=xxx .. Command acknowledged (165), [description: ] - CommandID=181 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"DEFAULT_BIKETYPE", "DEFAULT_CONTAINERTYPE", "DEFAULT_PEDTYPE", "DEFAULT_RAILTYPE", "DEFAULT_TAXITYPE", "DEFAULT_VEHTYPE", "t1" ] + CommandID=181 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "DEFAULT_BIKETYPE", "DEFAULT_CONTAINERTYPE", "DEFAULT_PEDTYPE", "DEFAULT_RAILTYPE", "DEFAULT_TAXITYPE", "DEFAULT_VEHTYPE", "t1" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Lane/LANE_ALLOWED/Basic/testclient_out.traci b/tests/traci/set_variable/Lane/LANE_ALLOWED/Basic/testclient_out.traci index 1d6f9df116db..36a4e569eff9 100644 --- a/tests/traci/set_variable/Lane/LANE_ALLOWED/Basic/testclient_out.traci +++ b/tests/traci/set_variable/Lane/LANE_ALLOWED/Basic/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:21:07 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:31 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:21:07 2019 -> Command sent: : domID=163 varID=52 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=52 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ - ] + CommandID=179 VariableID=52 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ ] -> Command sent: : domID=195 varID=52 objID=2/1to2/0_0 @@ -17,8 +16,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:21:07 2019 -> Command sent: : domID=163 varID=52 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=52 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ -"bus" ] + CommandID=179 VariableID=52 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ "bus" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Lane/LANE_ALLOWED/InvalidID/testclient_out.traci b/tests/traci/set_variable/Lane/LANE_ALLOWED/InvalidID/testclient_out.traci index 37d79195d53d..c68b1d40308f 100644 --- a/tests/traci/set_variable/Lane/LANE_ALLOWED/InvalidID/testclient_out.traci +++ b/tests/traci/set_variable/Lane/LANE_ALLOWED/InvalidID/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:21:06 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:31 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:21:06 2019 -> Command sent: : domID=163 varID=52 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=52 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ - ] + CommandID=179 VariableID=52 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ ] -> Command sent: : domID=195 varID=52 objID=xxx @@ -17,8 +16,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:21:06 2019 -> Command sent: : domID=163 varID=52 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=52 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ - ] + CommandID=179 VariableID=52 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Lane/LANE_ALLOWED/InvalidType/testclient_out.traci b/tests/traci/set_variable/Lane/LANE_ALLOWED/InvalidType/testclient_out.traci index d25fe3dfd98e..4e7b9281016f 100644 --- a/tests/traci/set_variable/Lane/LANE_ALLOWED/InvalidType/testclient_out.traci +++ b/tests/traci/set_variable/Lane/LANE_ALLOWED/InvalidType/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Thu Feb 11 07:27:24 2021 +TraCITestClient output file. Date: Sun Sep 8 08:53:31 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Thu Feb 11 07:27:24 2021 -> Command sent: : domID=163 varID=52 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=52 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ - ] + CommandID=179 VariableID=52 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ ] -> Command sent: : domID=195 varID=52 objID=2/1to2/0_0 @@ -17,8 +16,7 @@ TraCITestClient output file. Date: Thu Feb 11 07:27:24 2021 -> Command sent: : domID=163 varID=52 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=52 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ - ] + CommandID=179 VariableID=52 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Lane/LANE_DISALLOWED/Basic/testclient_out.traci b/tests/traci/set_variable/Lane/LANE_DISALLOWED/Basic/testclient_out.traci index 08dccfb2437c..676d076deaae 100644 --- a/tests/traci/set_variable/Lane/LANE_DISALLOWED/Basic/testclient_out.traci +++ b/tests/traci/set_variable/Lane/LANE_DISALLOWED/Basic/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:29:14 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:31 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:29:14 2013 -> Command sent: : domID=163 varID=53 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=53 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ - ] + CommandID=179 VariableID=53 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ ] -> Command sent: : domID=195 varID=53 objID=2/1to2/0_0 @@ -17,8 +16,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:29:14 2013 -> Command sent: : domID=163 varID=53 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=53 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ -"bus" ] + CommandID=179 VariableID=53 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ "bus" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Lane/LANE_DISALLOWED/InvalidID/testclient_out.traci b/tests/traci/set_variable/Lane/LANE_DISALLOWED/InvalidID/testclient_out.traci index 53a4a37b6f46..beaf261f15e9 100644 --- a/tests/traci/set_variable/Lane/LANE_DISALLOWED/InvalidID/testclient_out.traci +++ b/tests/traci/set_variable/Lane/LANE_DISALLOWED/InvalidID/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:29:15 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:31 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:29:15 2013 -> Command sent: : domID=163 varID=53 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=53 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ - ] + CommandID=179 VariableID=53 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ ] -> Command sent: : domID=195 varID=53 objID=xxx @@ -17,8 +16,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:29:15 2013 -> Command sent: : domID=163 varID=53 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=53 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ - ] + CommandID=179 VariableID=53 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Lane/LANE_DISALLOWED/InvalidType/testclient_out.traci b/tests/traci/set_variable/Lane/LANE_DISALLOWED/InvalidType/testclient_out.traci index 885ae95386df..9168935b839a 100644 --- a/tests/traci/set_variable/Lane/LANE_DISALLOWED/InvalidType/testclient_out.traci +++ b/tests/traci/set_variable/Lane/LANE_DISALLOWED/InvalidType/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Thu Feb 11 07:27:24 2021 +TraCITestClient output file. Date: Sun Sep 8 08:53:31 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Thu Feb 11 07:27:24 2021 -> Command sent: : domID=163 varID=53 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=53 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ - ] + CommandID=179 VariableID=53 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ ] -> Command sent: : domID=195 varID=53 objID=2/1to2/0_0 @@ -17,8 +16,7 @@ TraCITestClient output file. Date: Thu Feb 11 07:27:24 2021 -> Command sent: : domID=163 varID=53 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=53 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ - ] + CommandID=179 VariableID=53 ObjectID=2/1to2/0_0 valueDataType=14 string list value: [ ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/POI/ADD/testclient_out.traci b/tests/traci/set_variable/POI/ADD/testclient_out.traci index c63eda9e917e..6e40facbcbc3 100644 --- a/tests/traci/set_variable/POI/ADD/testclient_out.traci +++ b/tests/traci/set_variable/POI/ADD/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:20:53 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:29 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:20:53 2019 -> Command sent: : domID=167 varID=0 objID=xxx .. Command acknowledged (167), [description: ] - CommandID=183 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"p1", "p2" ] + CommandID=183 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "p1", "p2" ] -> Command sent: : domID=199 varID=128 objID=newID @@ -17,8 +16,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:20:53 2019 -> Command sent: : domID=167 varID=0 objID=xxx .. Command acknowledged (167), [description: ] - CommandID=183 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"newID", "p1", "p2" ] + CommandID=183 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "newID", "p1", "p2" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/POI/REMOVE/Basic/testclient_out.traci b/tests/traci/set_variable/POI/REMOVE/Basic/testclient_out.traci index 1d26dabe3b09..ae487fd93af6 100644 --- a/tests/traci/set_variable/POI/REMOVE/Basic/testclient_out.traci +++ b/tests/traci/set_variable/POI/REMOVE/Basic/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:20:54 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:29 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:20:54 2019 -> Command sent: : domID=167 varID=0 objID=xxx .. Command acknowledged (167), [description: ] - CommandID=183 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"p1", "p2" ] + CommandID=183 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "p1", "p2" ] -> Command sent: : domID=199 varID=129 objID=p1 @@ -17,8 +16,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:20:54 2019 -> Command sent: : domID=167 varID=0 objID=xxx .. Command acknowledged (167), [description: ] - CommandID=183 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"p2" ] + CommandID=183 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "p2" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/POI/REMOVE/InvalidID/testclient_out.traci b/tests/traci/set_variable/POI/REMOVE/InvalidID/testclient_out.traci index bed9de0836cc..7f99adcec067 100644 --- a/tests/traci/set_variable/POI/REMOVE/InvalidID/testclient_out.traci +++ b/tests/traci/set_variable/POI/REMOVE/InvalidID/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:28:57 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:29 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:28:57 2013 -> Command sent: : domID=167 varID=0 objID=xxx .. Command acknowledged (167), [description: ] - CommandID=183 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"p1", "p2" ] + CommandID=183 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "p1", "p2" ] -> Command sent: : domID=199 varID=129 objID=xxx @@ -17,8 +16,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:28:57 2013 -> Command sent: : domID=167 varID=0 objID=xxx .. Command acknowledged (167), [description: ] - CommandID=183 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"p1", "p2" ] + CommandID=183 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "p1", "p2" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/POI/REMOVE/InvalidType/testclient_out.traci b/tests/traci/set_variable/POI/REMOVE/InvalidType/testclient_out.traci index 1de4f8f88bd2..0e66953a7113 100644 --- a/tests/traci/set_variable/POI/REMOVE/InvalidType/testclient_out.traci +++ b/tests/traci/set_variable/POI/REMOVE/InvalidType/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:28:58 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:29 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:28:58 2013 -> Command sent: : domID=167 varID=0 objID=xxx .. Command acknowledged (167), [description: ] - CommandID=183 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"p1", "p2" ] + CommandID=183 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "p1", "p2" ] -> Command sent: : domID=199 varID=129 objID=p1 @@ -17,8 +16,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:28:58 2013 -> Command sent: : domID=167 varID=0 objID=xxx .. Command acknowledged (167), [description: ] - CommandID=183 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"p1", "p2" ] + CommandID=183 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "p1", "p2" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Polygon/ADD/testclient_out.traci b/tests/traci/set_variable/Polygon/ADD/testclient_out.traci index 272afa81ac4a..16235bb400a2 100644 --- a/tests/traci/set_variable/Polygon/ADD/testclient_out.traci +++ b/tests/traci/set_variable/Polygon/ADD/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:21:03 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:30 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:21:03 2019 -> Command sent: : domID=168 varID=0 objID=xxx .. Command acknowledged (168), [description: ] - CommandID=184 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"p1", "p2" ] + CommandID=184 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "p1", "p2" ] -> Command sent: : domID=200 varID=128 objID=newID @@ -17,8 +16,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:21:03 2019 -> Command sent: : domID=168 varID=0 objID=xxx .. Command acknowledged (168), [description: ] - CommandID=184 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"newID", "p1", "p2" ] + CommandID=184 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "newID", "p1", "p2" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Polygon/REMOVE/Basic/testclient_out.traci b/tests/traci/set_variable/Polygon/REMOVE/Basic/testclient_out.traci index e70bfbe45be6..ecb6d7e2f472 100644 --- a/tests/traci/set_variable/Polygon/REMOVE/Basic/testclient_out.traci +++ b/tests/traci/set_variable/Polygon/REMOVE/Basic/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:21:04 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:30 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:21:04 2019 -> Command sent: : domID=168 varID=0 objID=xxx .. Command acknowledged (168), [description: ] - CommandID=184 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"p1", "p2" ] + CommandID=184 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "p1", "p2" ] -> Command sent: : domID=200 varID=129 objID=p1 @@ -17,8 +16,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:21:04 2019 -> Command sent: : domID=168 varID=0 objID=xxx .. Command acknowledged (168), [description: ] - CommandID=184 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"p2" ] + CommandID=184 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "p2" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Polygon/REMOVE/InvalidID/testclient_out.traci b/tests/traci/set_variable/Polygon/REMOVE/InvalidID/testclient_out.traci index 857094effdb1..5d96bc205560 100644 --- a/tests/traci/set_variable/Polygon/REMOVE/InvalidID/testclient_out.traci +++ b/tests/traci/set_variable/Polygon/REMOVE/InvalidID/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:29:10 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:30 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:29:10 2013 -> Command sent: : domID=168 varID=0 objID=xxx .. Command acknowledged (168), [description: ] - CommandID=184 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"p1", "p2" ] + CommandID=184 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "p1", "p2" ] -> Command sent: : domID=200 varID=129 objID=xxx @@ -17,8 +16,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:29:10 2013 -> Command sent: : domID=168 varID=0 objID=xxx .. Command acknowledged (168), [description: ] - CommandID=184 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"p1", "p2" ] + CommandID=184 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "p1", "p2" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Polygon/REMOVE/InvalidType/testclient_out.traci b/tests/traci/set_variable/Polygon/REMOVE/InvalidType/testclient_out.traci index 98b55480e255..f50ba6ea8314 100644 --- a/tests/traci/set_variable/Polygon/REMOVE/InvalidType/testclient_out.traci +++ b/tests/traci/set_variable/Polygon/REMOVE/InvalidType/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:29:11 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:30 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:29:11 2013 -> Command sent: : domID=168 varID=0 objID=xxx .. Command acknowledged (168), [description: ] - CommandID=184 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"p1", "p2" ] + CommandID=184 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "p1", "p2" ] -> Command sent: : domID=200 varID=129 objID=p1 @@ -17,8 +16,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:29:11 2013 -> Command sent: : domID=168 varID=0 objID=xxx .. Command acknowledged (168), [description: ] - CommandID=184 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"p1", "p2" ] + CommandID=184 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "p1", "p2" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Route/ADD/testclient_out.traci b/tests/traci/set_variable/Route/ADD/testclient_out.traci index 422a8a702fc8..f0f373f3e28a 100644 --- a/tests/traci/set_variable/Route/ADD/testclient_out.traci +++ b/tests/traci/set_variable/Route/ADD/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:21:18 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:33 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:21:18 2019 -> Command sent: : domID=166 varID=0 objID=xxx .. Command acknowledged (166), [description: ] - CommandID=182 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ - ] + CommandID=182 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ ] -> Command sent: : domID=198 varID=128 objID=newID @@ -17,8 +16,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:21:18 2019 -> Command sent: : domID=166 varID=0 objID=xxx .. Command acknowledged (166), [description: ] - CommandID=182 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"newID" ] + CommandID=182 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "newID" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Simulation/CMD_CLEAR_PENDING_VEHICLES/testclient_out.traci b/tests/traci/set_variable/Simulation/CMD_CLEAR_PENDING_VEHICLES/testclient_out.traci index 11ae3aeeb210..b5bc1d3367c7 100644 --- a/tests/traci/set_variable/Simulation/CMD_CLEAR_PENDING_VEHICLES/testclient_out.traci +++ b/tests/traci/set_variable/Simulation/CMD_CLEAR_PENDING_VEHICLES/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:21:18 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:33 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:21:18 2019 -> Command sent: : domID=164 varID=0 objID=x .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=x valueDataType=14 string list value: [ -"h" ] + CommandID=180 VariableID=0 ObjectID=x valueDataType=14 string list value: [ "h" ] -> Command sent: : domID=203 varID=148 objID=x @@ -17,8 +16,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:21:18 2019 -> Command sent: : domID=164 varID=0 objID=x .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=x valueDataType=14 string list value: [ -"h" ] + CommandID=180 VariableID=0 ObjectID=x valueDataType=14 string list value: [ "h" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Simulation/CMD_SAVE_SIMSTATE/testclient_out.traci b/tests/traci/set_variable/Simulation/CMD_SAVE_SIMSTATE/testclient_out.traci index 0b4c420ee314..91808c821f36 100644 --- a/tests/traci/set_variable/Simulation/CMD_SAVE_SIMSTATE/testclient_out.traci +++ b/tests/traci/set_variable/Simulation/CMD_SAVE_SIMSTATE/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:21:20 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:33 2024 -> Command sent: : @@ -7,8 +7,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:21:20 2019 -> Command sent: : domID=164 varID=0 objID=x .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=x valueDataType=14 string list value: [ -"h" ] + CommandID=180 VariableID=0 ObjectID=x valueDataType=14 string list value: [ "h" ] -> Command sent: : domID=203 varID=149 objID=x @@ -17,8 +16,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:21:20 2019 -> Command sent: : domID=164 varID=0 objID=x .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=x valueDataType=14 string list value: [ -"h" ] + CommandID=180 VariableID=0 ObjectID=x valueDataType=14 string list value: [ "h" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Vehicle/ADD/ADD/testclient_out.traci b/tests/traci/set_variable/Vehicle/ADD/ADD/testclient_out.traci index e13e84ab36e6..152f0aa646b6 100644 --- a/tests/traci/set_variable/Vehicle/ADD/ADD/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/ADD/ADD/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:28:46 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:24 2024 -> Command sent: : @@ -19,8 +19,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:28:46 2019 -> Command sent: : domID=164 varID=0 objID=xxx .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"veh0" ] + CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "veh0" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -47,8 +46,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:28:46 2019 -> Command sent: : domID=164 varID=0 objID=xxx .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"veh0", "veh1" ] + CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "veh0", "veh1" ] -> Command sent: : domID=164 varID=64 objID=veh1 diff --git a/tests/traci/set_variable/Vehicle/ADD/InvalidID/testclient_out.traci b/tests/traci/set_variable/Vehicle/ADD/InvalidID/testclient_out.traci index 1a0899b85a78..609227142eef 100644 --- a/tests/traci/set_variable/Vehicle/ADD/InvalidID/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/ADD/InvalidID/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Fri Aug 16 10:25:12 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:24 2024 -> Command sent: : @@ -19,8 +19,7 @@ TraCITestClient output file. Date: Fri Aug 16 10:25:12 2019 -> Command sent: : domID=164 varID=0 objID=xxx .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"veh0" ] + CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "veh0" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -47,8 +46,7 @@ TraCITestClient output file. Date: Fri Aug 16 10:25:12 2019 -> Command sent: : domID=164 varID=0 objID=xxx .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"veh0" ] + CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "veh0" ] -> Command sent: : domID=164 varID=64 objID=veh1 diff --git a/tests/traci/set_variable/Vehicle/ADD/InvalidLane/testclient_out.traci b/tests/traci/set_variable/Vehicle/ADD/InvalidLane/testclient_out.traci index d2be3a559c03..729ce5eeebab 100644 --- a/tests/traci/set_variable/Vehicle/ADD/InvalidLane/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/ADD/InvalidLane/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Fri Aug 16 10:25:14 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:24 2024 -> Command sent: : @@ -19,8 +19,7 @@ TraCITestClient output file. Date: Fri Aug 16 10:25:14 2019 -> Command sent: : domID=164 varID=0 objID=xxx .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"veh0" ] + CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "veh0" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -47,8 +46,7 @@ TraCITestClient output file. Date: Fri Aug 16 10:25:14 2019 -> Command sent: : domID=164 varID=0 objID=xxx .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"veh0" ] + CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "veh0" ] -> Command sent: : domID=164 varID=64 objID=veh1 diff --git a/tests/traci/set_variable/Vehicle/ADD/InvalidPos/testclient_out.traci b/tests/traci/set_variable/Vehicle/ADD/InvalidPos/testclient_out.traci index f7c8da961085..d32ab61f9a7f 100644 --- a/tests/traci/set_variable/Vehicle/ADD/InvalidPos/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/ADD/InvalidPos/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:28:51 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:24 2024 -> Command sent: : @@ -19,8 +19,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:28:51 2019 -> Command sent: : domID=164 varID=0 objID=xxx .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"veh0" ] + CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "veh0" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -47,8 +46,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:28:51 2019 -> Command sent: : domID=164 varID=0 objID=xxx .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"veh0", "veh1" ] + CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "veh0", "veh1" ] -> Command sent: : domID=164 varID=64 objID=veh1 diff --git a/tests/traci/set_variable/Vehicle/ADD/InvalidRoute/testclient_out.traci b/tests/traci/set_variable/Vehicle/ADD/InvalidRoute/testclient_out.traci index 59636c49195e..bc12a90e4a44 100644 --- a/tests/traci/set_variable/Vehicle/ADD/InvalidRoute/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/ADD/InvalidRoute/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Fri Aug 16 10:25:13 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:24 2024 -> Command sent: : @@ -19,8 +19,7 @@ TraCITestClient output file. Date: Fri Aug 16 10:25:13 2019 -> Command sent: : domID=164 varID=0 objID=xxx .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"veh0" ] + CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "veh0" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -47,8 +46,7 @@ TraCITestClient output file. Date: Fri Aug 16 10:25:13 2019 -> Command sent: : domID=164 varID=0 objID=xxx .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"veh0" ] + CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "veh0" ] -> Command sent: : domID=164 varID=64 objID=veh1 diff --git a/tests/traci/set_variable/Vehicle/ADD/InvalidSpeed/testclient_out.traci b/tests/traci/set_variable/Vehicle/ADD/InvalidSpeed/testclient_out.traci index 9c5377b4e92f..a34b6a10f840 100644 --- a/tests/traci/set_variable/Vehicle/ADD/InvalidSpeed/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/ADD/InvalidSpeed/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Fri Aug 16 10:25:13 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:24 2024 -> Command sent: : @@ -19,8 +19,7 @@ TraCITestClient output file. Date: Fri Aug 16 10:25:13 2019 -> Command sent: : domID=164 varID=0 objID=xxx .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"veh0" ] + CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "veh0" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -47,8 +46,7 @@ TraCITestClient output file. Date: Fri Aug 16 10:25:13 2019 -> Command sent: : domID=164 varID=0 objID=xxx .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"veh0" ] + CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "veh0" ] -> Command sent: : domID=164 varID=64 objID=veh1 diff --git a/tests/traci/set_variable/Vehicle/ADD/InvalidType/testclient_out.traci b/tests/traci/set_variable/Vehicle/ADD/InvalidType/testclient_out.traci index 3be44df0b4c5..b067810f0c49 100644 --- a/tests/traci/set_variable/Vehicle/ADD/InvalidType/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/ADD/InvalidType/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Fri Aug 16 10:25:14 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:24 2024 -> Command sent: : @@ -19,8 +19,7 @@ TraCITestClient output file. Date: Fri Aug 16 10:25:14 2019 -> Command sent: : domID=164 varID=0 objID=xxx .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"veh0" ] + CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "veh0" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -47,8 +46,7 @@ TraCITestClient output file. Date: Fri Aug 16 10:25:14 2019 -> Command sent: : domID=164 varID=0 objID=xxx .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"veh0" ] + CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "veh0" ] -> Command sent: : domID=164 varID=64 objID=veh1 diff --git a/tests/traci/set_variable/Vehicle/MoveToXY/junction/testclient_out.traci b/tests/traci/set_variable/Vehicle/MoveToXY/junction/testclient_out.traci index e2334b440200..c7e1fbc9a815 100644 --- a/tests/traci/set_variable/Vehicle/MoveToXY/junction/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/MoveToXY/junction/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:29:03 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:28 2024 -> Command sent: : @@ -11,8 +11,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:03 2019 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"SC", "CN" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "SC", "CN" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -20,8 +19,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:03 2019 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"SC", "CN" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "SC", "CN" ] -> Command sent: : domID=196 varID=180 objID=veh0 @@ -30,8 +28,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:03 2019 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"SC", "CN" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "SC", "CN" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -39,8 +36,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:03 2019 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"SC", "CN" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "SC", "CN" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -64,8 +60,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:03 2019 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"SC", "CN" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "SC", "CN" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -73,8 +68,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:03 2019 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"SC", "CN" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "SC", "CN" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Vehicle/MoveToXY/leave_net/testclient_out.traci b/tests/traci/set_variable/Vehicle/MoveToXY/leave_net/testclient_out.traci index 011d7ba89dec..0a5077826890 100644 --- a/tests/traci/set_variable/Vehicle/MoveToXY/leave_net/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/MoveToXY/leave_net/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:29:01 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:28 2024 -> Command sent: : @@ -23,8 +23,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:01 2019 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"e_m0", "e_m1", "e_m2", "e_m3", "e_m4", "e_m5", "e_m6" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "e_m0", "e_m1", "e_m2", "e_m3", "e_m4", "e_m5", "e_m6" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -32,8 +31,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:01 2019 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"e_m0", "e_m1", "e_m2", "e_m3", "e_m4", "e_m5", "e_m6" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "e_m0", "e_m1", "e_m2", "e_m3", "e_m4", "e_m5", "e_m6" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Vehicle/MoveToXY/offroute_edge/testclient_out.traci b/tests/traci/set_variable/Vehicle/MoveToXY/offroute_edge/testclient_out.traci index bd82ab39edd8..420914e0d0b4 100644 --- a/tests/traci/set_variable/Vehicle/MoveToXY/offroute_edge/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/MoveToXY/offroute_edge/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:29:00 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:27 2024 -> Command sent: : @@ -23,8 +23,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:00 2019 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"e_m0", "e_m1", "e_m2", "e_m3", "e_m4", "e_m5", "e_m6" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "e_m0", "e_m1", "e_m2", "e_m3", "e_m4", "e_m5", "e_m6" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -32,8 +31,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:00 2019 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"e_vo0" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "e_vo0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Vehicle/MoveToXY/offroute_edge2/testclient_out.traci b/tests/traci/set_variable/Vehicle/MoveToXY/offroute_edge2/testclient_out.traci index c189a9ba1de0..e38d0302f62f 100644 --- a/tests/traci/set_variable/Vehicle/MoveToXY/offroute_edge2/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/MoveToXY/offroute_edge2/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:29:00 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:27 2024 -> Command sent: : @@ -11,8 +11,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:00 2019 -> Command sent: : domID=164 varID=84 objID=VTD_EGO .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ -"SC" ] + CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ "SC" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -20,8 +19,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:00 2019 -> Command sent: : domID=164 varID=84 objID=VTD_EGO .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ -"WC", "CS" ] + CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ "WC", "CS" ] -> Command sent: : domID=196 varID=180 objID=VTD_EGO @@ -30,8 +28,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:00 2019 -> Command sent: : domID=164 varID=84 objID=VTD_EGO .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ -"WC", "CS" ] + CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ "WC", "CS" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -39,8 +36,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:00 2019 -> Command sent: : domID=164 varID=84 objID=VTD_EGO .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ -"EC", "CW" ] + CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ "EC", "CW" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Vehicle/MoveToXY/offroute_edge_by_id/testclient_out.traci b/tests/traci/set_variable/Vehicle/MoveToXY/offroute_edge_by_id/testclient_out.traci index ba046186cca5..29fd15f79e65 100644 --- a/tests/traci/set_variable/Vehicle/MoveToXY/offroute_edge_by_id/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/MoveToXY/offroute_edge_by_id/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:29:00 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:27 2024 -> Command sent: : @@ -23,8 +23,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:00 2019 -> Command sent: : domID=164 varID=84 objID=VTD_EGO .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ -"e_m0", "e_m1", "e_m2", "e_m3", "e_m4", "e_m5", "e_m6" ] + CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ "e_m0", "e_m1", "e_m2", "e_m3", "e_m4", "e_m5", "e_m6" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -32,8 +31,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:00 2019 -> Command sent: : domID=164 varID=84 objID=VTD_EGO .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ -"e_vo0" ] + CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ "e_vo0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Vehicle/MoveToXY/offroute_failed/testclient_out.traci b/tests/traci/set_variable/Vehicle/MoveToXY/offroute_failed/testclient_out.traci index a00694a02cf0..997fbe905058 100644 --- a/tests/traci/set_variable/Vehicle/MoveToXY/offroute_failed/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/MoveToXY/offroute_failed/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Fri Aug 16 10:25:33 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:27 2024 -> Command sent: : @@ -23,8 +23,7 @@ TraCITestClient output file. Date: Fri Aug 16 10:25:33 2019 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"e_m0", "e_m1", "e_m2", "e_m3", "e_m4", "e_m5", "e_m6" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "e_m0", "e_m1", "e_m2", "e_m3", "e_m4", "e_m5", "e_m6" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -32,8 +31,7 @@ TraCITestClient output file. Date: Fri Aug 16 10:25:33 2019 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"e_m0", "e_m1", "e_m2", "e_m3", "e_m4", "e_m5", "e_m6" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "e_m0", "e_m1", "e_m2", "e_m3", "e_m4", "e_m5", "e_m6" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Vehicle/MoveToXY/offroute_junction/testclient_out.traci b/tests/traci/set_variable/Vehicle/MoveToXY/offroute_junction/testclient_out.traci index 84f4870bbbcd..1996e16dc9b9 100644 --- a/tests/traci/set_variable/Vehicle/MoveToXY/offroute_junction/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/MoveToXY/offroute_junction/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:29:03 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:28 2024 -> Command sent: : @@ -11,8 +11,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:03 2019 -> Command sent: : domID=164 varID=84 objID=VTD_EGO .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ -"SC", "CN" ] + CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ "SC", "CN" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -20,8 +19,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:03 2019 -> Command sent: : domID=164 varID=84 objID=VTD_EGO .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ -"WC", "CS" ] + CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ "WC", "CS" ] -> Command sent: : domID=196 varID=180 objID=VTD_EGO @@ -30,8 +28,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:03 2019 -> Command sent: : domID=164 varID=84 objID=VTD_EGO .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ -"WC", "CS" ] + CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ "WC", "CS" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -39,8 +36,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:03 2019 -> Command sent: : domID=164 varID=84 objID=VTD_EGO .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ -"EC", "CW" ] + CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ "EC", "CW" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Vehicle/MoveToXY/sublane_junction/testclient_out.traci b/tests/traci/set_variable/Vehicle/MoveToXY/sublane_junction/testclient_out.traci index 5fa5fd1be9e5..ec0ba9733757 100644 --- a/tests/traci/set_variable/Vehicle/MoveToXY/sublane_junction/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/MoveToXY/sublane_junction/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:29:05 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:28 2024 -> Command sent: : @@ -11,8 +11,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:05 2019 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"SC", "CN" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "SC", "CN" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -20,8 +19,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:05 2019 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"SC", "CN" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "SC", "CN" ] -> Command sent: : domID=196 varID=180 objID=veh0 @@ -30,8 +28,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:05 2019 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"SC", "CN" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "SC", "CN" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -39,8 +36,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:05 2019 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"SC", "CN" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "SC", "CN" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Vehicle/MoveToXY/sublane_offroad/testclient_out.traci b/tests/traci/set_variable/Vehicle/MoveToXY/sublane_offroad/testclient_out.traci index 3316010b18f0..1435a3eb67c6 100644 --- a/tests/traci/set_variable/Vehicle/MoveToXY/sublane_offroad/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/MoveToXY/sublane_offroad/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:29:05 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:28 2024 -> Command sent: : @@ -23,8 +23,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:05 2019 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"e_m0", "e_m1", "e_m2", "e_m3", "e_m4", "e_m5", "e_m6" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "e_m0", "e_m1", "e_m2", "e_m3", "e_m4", "e_m5", "e_m6" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -32,8 +31,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:05 2019 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"e_vo0" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "e_vo0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Vehicle/MoveToXY/sublane_offroad_mode2/testclient_out.traci b/tests/traci/set_variable/Vehicle/MoveToXY/sublane_offroad_mode2/testclient_out.traci index 69f0295d77e6..1435a3eb67c6 100644 --- a/tests/traci/set_variable/Vehicle/MoveToXY/sublane_offroad_mode2/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/MoveToXY/sublane_offroad_mode2/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:29:07 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:28 2024 -> Command sent: : @@ -23,8 +23,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:07 2019 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"e_m0", "e_m1", "e_m2", "e_m3", "e_m4", "e_m5", "e_m6" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "e_m0", "e_m1", "e_m2", "e_m3", "e_m4", "e_m5", "e_m6" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -32,8 +31,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:07 2019 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"e_vo0" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "e_vo0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Vehicle/MoveToXY/sublane_offroute/testclient_out.traci b/tests/traci/set_variable/Vehicle/MoveToXY/sublane_offroute/testclient_out.traci index 0cd05f031cdc..676aa6a9ab65 100644 --- a/tests/traci/set_variable/Vehicle/MoveToXY/sublane_offroute/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/MoveToXY/sublane_offroute/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:29:06 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:28 2024 -> Command sent: : @@ -23,8 +23,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:06 2019 -> Command sent: : domID=164 varID=84 objID=VTD_EGO .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ -"e_m0", "e_m1", "e_m2", "e_m3", "e_m4", "e_m5", "e_m6" ] + CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ "e_m0", "e_m1", "e_m2", "e_m3", "e_m4", "e_m5", "e_m6" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -32,8 +31,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:06 2019 -> Command sent: : domID=164 varID=84 objID=VTD_EGO .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ -"e_vo0" ] + CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ "e_vo0" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Vehicle/MoveToXY/sublane_offroute_junction/testclient_out.traci b/tests/traci/set_variable/Vehicle/MoveToXY/sublane_offroute_junction/testclient_out.traci index 2fd720a09281..1996e16dc9b9 100644 --- a/tests/traci/set_variable/Vehicle/MoveToXY/sublane_offroute_junction/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/MoveToXY/sublane_offroute_junction/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:29:06 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:28 2024 -> Command sent: : @@ -11,8 +11,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:06 2019 -> Command sent: : domID=164 varID=84 objID=VTD_EGO .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ -"SC", "CN" ] + CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ "SC", "CN" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -20,8 +19,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:06 2019 -> Command sent: : domID=164 varID=84 objID=VTD_EGO .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ -"WC", "CS" ] + CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ "WC", "CS" ] -> Command sent: : domID=196 varID=180 objID=VTD_EGO @@ -30,8 +28,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:06 2019 -> Command sent: : domID=164 varID=84 objID=VTD_EGO .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ -"WC", "CS" ] + CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ "WC", "CS" ] -> Command sent: : .. Command acknowledged (2), [description: ] @@ -39,8 +36,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:29:06 2019 -> Command sent: : domID=164 varID=84 objID=VTD_EGO .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ -"EC", "CW" ] + CommandID=180 VariableID=84 ObjectID=VTD_EGO valueDataType=14 string list value: [ "EC", "CW" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Vehicle/REMOVE/testclient_out.traci b/tests/traci/set_variable/Vehicle/REMOVE/testclient_out.traci index 19fdbca06a0e..9d75aa3721c1 100644 --- a/tests/traci/set_variable/Vehicle/REMOVE/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/REMOVE/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:59:51 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:25 2024 -> Command sent: : @@ -64,8 +64,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:59:51 2019 -> Command sent: : domID=164 varID=0 objID=xxx .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"veh0", "veh1", "veh2", "veh3", "veh4" ] + CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "veh0", "veh1", "veh2", "veh3", "veh4" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Vehicle/remove_parking/testclient_out.traci b/tests/traci/set_variable/Vehicle/remove_parking/testclient_out.traci index 19fdbca06a0e..9d75aa3721c1 100644 --- a/tests/traci/set_variable/Vehicle/remove_parking/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/remove_parking/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:59:51 2019 +TraCITestClient output file. Date: Sun Sep 8 08:53:25 2024 -> Command sent: : @@ -64,8 +64,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:59:51 2019 -> Command sent: : domID=164 varID=0 objID=xxx .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ -"veh0", "veh1", "veh2", "veh3", "veh4" ] + CommandID=180 VariableID=0 ObjectID=xxx valueDataType=14 string list value: [ "veh0", "veh1", "veh2", "veh3", "veh4" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Vehicle/rerouting/effort_global_reroute/testclient_out.traci b/tests/traci/set_variable/Vehicle/rerouting/effort_global_reroute/testclient_out.traci index b8ba399c9310..a76a933750cb 100644 --- a/tests/traci/set_variable/Vehicle/rerouting/effort_global_reroute/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/rerouting/effort_global_reroute/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:28:29 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:25 2024 -> Command sent: : @@ -21,8 +21,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:28:29 2013 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"beg", "middle", "end", "rend" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "beg", "middle", "end", "rend" ] -> Command sent: : domID=196 varID=145 objID=veh0 @@ -31,8 +30,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:28:29 2013 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"beg", "beg2left", "left+right", "left2end", "end", "rend" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "beg", "beg2left", "left+right", "left2end", "end", "rend" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Vehicle/rerouting/effort_vehicle_reroute/testclient_out.traci b/tests/traci/set_variable/Vehicle/rerouting/effort_vehicle_reroute/testclient_out.traci index 963e0ad398c4..3d415febb450 100644 --- a/tests/traci/set_variable/Vehicle/rerouting/effort_vehicle_reroute/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/rerouting/effort_vehicle_reroute/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Tue Aug 07 14:16:05 2018 +TraCITestClient output file. Date: Sun Sep 8 08:53:25 2024 -> Command sent: : @@ -21,8 +21,7 @@ TraCITestClient output file. Date: Tue Aug 07 14:16:05 2018 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"beg", "middle", "end", "rend" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "beg", "middle", "end", "rend" ] -> Command sent: : domID=196 varID=145 objID=veh0 @@ -31,8 +30,7 @@ TraCITestClient output file. Date: Tue Aug 07 14:16:05 2018 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"beg", "beg2left", "left+right", "left2end", "end", "rend" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "beg", "beg2left", "left+right", "left2end", "end", "rend" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Vehicle/rerouting/tt_global_reroute/testclient_out.traci b/tests/traci/set_variable/Vehicle/rerouting/tt_global_reroute/testclient_out.traci index b83d866b22bc..a9819d2630ac 100644 --- a/tests/traci/set_variable/Vehicle/rerouting/tt_global_reroute/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/rerouting/tt_global_reroute/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Mon Jul 01 13:28:31 2013 +TraCITestClient output file. Date: Sun Sep 8 08:53:25 2024 -> Command sent: : @@ -21,8 +21,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:28:31 2013 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"beg", "middle", "end", "rend" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "beg", "middle", "end", "rend" ] -> Command sent: : domID=196 varID=144 objID=veh0 @@ -31,8 +30,7 @@ TraCITestClient output file. Date: Mon Jul 01 13:28:31 2013 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"beg", "beg2left", "left+right", "left2end", "end", "rend" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "beg", "beg2left", "left+right", "left2end", "end", "rend" ] -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/set_variable/Vehicle/rerouting/tt_vehicle_reroute/testclient_out.traci b/tests/traci/set_variable/Vehicle/rerouting/tt_vehicle_reroute/testclient_out.traci index 535ffea41b4e..74f2778cc9fe 100644 --- a/tests/traci/set_variable/Vehicle/rerouting/tt_vehicle_reroute/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/rerouting/tt_vehicle_reroute/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Tue Aug 07 14:16:05 2018 +TraCITestClient output file. Date: Sun Sep 8 08:53:25 2024 -> Command sent: : @@ -21,8 +21,7 @@ TraCITestClient output file. Date: Tue Aug 07 14:16:05 2018 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"beg", "middle", "end", "rend" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "beg", "middle", "end", "rend" ] -> Command sent: : domID=196 varID=144 objID=veh0 @@ -31,8 +30,7 @@ TraCITestClient output file. Date: Tue Aug 07 14:16:05 2018 -> Command sent: : domID=164 varID=84 objID=veh0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ -"beg", "beg2left", "left+right", "left2end", "end", "rend" ] + CommandID=180 VariableID=84 ObjectID=veh0 valueDataType=14 string list value: [ "beg", "beg2left", "left+right", "left2end", "end", "rend" ] -> Command sent: : .. Command acknowledged (2), [description: ] From 4334ebd637c9ed228cc2af53f53e5c7e89c00b81 Mon Sep 17 00:00:00 2001 From: Michael Behrisch Date: Sun, 8 Sep 2024 10:49:04 +0200 Subject: [PATCH 10/41] more whitespace #21 #22 --- src/traci_testclient/TraCITestClient.cpp | 2 +- .../one1s_1vehicle_10m_s/testclient_out.traci | 8 ++-- .../Lane/LANE_LINKS/testclient_out.traci | 4 +- .../testclient_out.traci | 4 +- .../Person/VAR_NEXT_EDGE/testclient_out.traci | 4 +- .../TL_LINKS/testclient_out.traci | 4 +- .../TL_LINKS_subseconds/testclient_out.traci | 4 +- .../TL_RYG_COMPLETE/testclient_out.traci | 38 +++++++++---------- .../testclient_out.traci | 38 +++++++++---------- .../Edge/VAR_PARAMETER/testclient_out.traci | 4 +- .../Lane/VAR_PARAMETER/testclient_out.traci | 4 +- .../POI/VAR_PARAMETER/testclient_out.traci | 4 +- .../VAR_PARAMETER/testclient_out.traci | 4 +- .../Route/VAR_PARAMETER/testclient_out.traci | 4 +- .../VAR_PARAMETER/testclient_out.traci | 4 +- .../VAR_PARAMETER/testclient_out.traci | 4 +- .../VAR_PARAMETER/testclient_out.traci | 4 +- 17 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/traci_testclient/TraCITestClient.cpp b/src/traci_testclient/TraCITestClient.cpp index 4f582e74da45..6f6448403b98 100644 --- a/src/traci_testclient/TraCITestClient.cpp +++ b/src/traci_testclient/TraCITestClient.cpp @@ -619,7 +619,7 @@ TraCITestClient::readAndReportTypeDependent(tcpip::Storage& inMsg, int valueData answerLog << " ]" << std::endl; } else if (valueDataType == libsumo::TYPE_COMPOUND) { int no = inMsg.readInt(); - answerLog << " compound value with " << no << " members: [ "; + answerLog << " compound value with " << no << " members: ["; for (int i = 0; i < no; ++i) { int currentValueDataType = inMsg.readUnsignedByte(); answerLog << " valueDataType=" << currentValueDataType; diff --git a/tests/traci/get_variable/InductionLoop/one_vehicle/one1s_1vehicle_10m_s/testclient_out.traci b/tests/traci/get_variable/InductionLoop/one_vehicle/one1s_1vehicle_10m_s/testclient_out.traci index 7d8694e066f9..c8fe6e109fe4 100644 --- a/tests/traci/get_variable/InductionLoop/one_vehicle/one1s_1vehicle_10m_s/testclient_out.traci +++ b/tests/traci/get_variable/InductionLoop/one_vehicle/one1s_1vehicle_10m_s/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Sep 8 08:52:49 2024 +TraCITestClient output file. Date: Sun Sep 8 10:47:24 2024 -> Command sent: : @@ -37,7 +37,7 @@ TraCITestClient output file. Date: Sun Sep 8 08:52:49 2024 -> Command sent: : domID=160 varID=23 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=23 ObjectID=3/1to2/1 valueDataType=15 compound value with 1 members: [ valueDataType=9 Int value: 0 + CommandID=176 VariableID=23 ObjectID=3/1to2/1 valueDataType=15 compound value with 1 members: [ valueDataType=9 Int value: 0 ] -> Command sent: : @@ -76,7 +76,7 @@ TraCITestClient output file. Date: Sun Sep 8 08:52:49 2024 -> Command sent: : domID=160 varID=23 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=23 ObjectID=3/1to2/1 valueDataType=15 compound value with 6 members: [ valueDataType=9 Int value: 1 + CommandID=176 VariableID=23 ObjectID=3/1to2/1 valueDataType=15 compound value with 6 members: [ valueDataType=9 Int value: 1 valueDataType=12 string value: 0 valueDataType=11 Double value: 3.00 valueDataType=11 Double value: 51.00 @@ -120,7 +120,7 @@ TraCITestClient output file. Date: Sun Sep 8 08:52:49 2024 -> Command sent: : domID=160 varID=23 objID=3/1to2/1 .. Command acknowledged (160), [description: ] - CommandID=176 VariableID=23 ObjectID=3/1to2/1 valueDataType=15 compound value with 6 members: [ valueDataType=9 Int value: 1 + CommandID=176 VariableID=23 ObjectID=3/1to2/1 valueDataType=15 compound value with 6 members: [ valueDataType=9 Int value: 1 valueDataType=12 string value: 0 valueDataType=11 Double value: 3.00 valueDataType=11 Double value: 51.00 diff --git a/tests/traci/get_variable/Lane/LANE_LINKS/testclient_out.traci b/tests/traci/get_variable/Lane/LANE_LINKS/testclient_out.traci index 34fc3dda3f23..8775724cf55e 100644 --- a/tests/traci/get_variable/Lane/LANE_LINKS/testclient_out.traci +++ b/tests/traci/get_variable/Lane/LANE_LINKS/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Sep 8 08:59:42 2024 +TraCITestClient output file. Date: Sun Sep 8 10:47:30 2024 -> Command sent: : @@ -7,7 +7,7 @@ TraCITestClient output file. Date: Sun Sep 8 08:59:42 2024 -> Command sent: : domID=163 varID=51 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=51 ObjectID=2/1to2/0_0 valueDataType=15 compound value with 25 members: [ valueDataType=9 Int value: 3 + CommandID=179 VariableID=51 ObjectID=2/1to2/0_0 valueDataType=15 compound value with 25 members: [ valueDataType=9 Int value: 3 valueDataType=12 string value: 2/0to1/0_0 valueDataType=12 string value: '' valueDataType=7 Unsigned Byte Value: 0 diff --git a/tests/traci/get_variable/Lane/LANE_LINKS_subseconds/testclient_out.traci b/tests/traci/get_variable/Lane/LANE_LINKS_subseconds/testclient_out.traci index 34fc3dda3f23..8775724cf55e 100644 --- a/tests/traci/get_variable/Lane/LANE_LINKS_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/Lane/LANE_LINKS_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Sep 8 08:59:42 2024 +TraCITestClient output file. Date: Sun Sep 8 10:47:30 2024 -> Command sent: : @@ -7,7 +7,7 @@ TraCITestClient output file. Date: Sun Sep 8 08:59:42 2024 -> Command sent: : domID=163 varID=51 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=51 ObjectID=2/1to2/0_0 valueDataType=15 compound value with 25 members: [ valueDataType=9 Int value: 3 + CommandID=179 VariableID=51 ObjectID=2/1to2/0_0 valueDataType=15 compound value with 25 members: [ valueDataType=9 Int value: 3 valueDataType=12 string value: 2/0to1/0_0 valueDataType=12 string value: '' valueDataType=7 Unsigned Byte Value: 0 diff --git a/tests/traci/get_variable/Person/VAR_NEXT_EDGE/testclient_out.traci b/tests/traci/get_variable/Person/VAR_NEXT_EDGE/testclient_out.traci index 6d9ecfc3a729..ed2cfe1f3529 100644 --- a/tests/traci/get_variable/Person/VAR_NEXT_EDGE/testclient_out.traci +++ b/tests/traci/get_variable/Person/VAR_NEXT_EDGE/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:07:56 2019 +TraCITestClient output file. Date: Sun Sep 8 10:47:43 2024 -> Command sent: : @@ -15,7 +15,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:07:56 2019 -> Command sent: : domID=174 varID=193 objID=0 .. Command acknowledged (174), [description: ] - CommandID=190 VariableID=193 ObjectID=0 valueDataType=12 string value: + CommandID=190 VariableID=193 ObjectID=0 valueDataType=12 string value: '' -> Command sent: : .. Command acknowledged (2), [description: ] diff --git a/tests/traci/get_variable/TrafficLight/TL_LINKS/testclient_out.traci b/tests/traci/get_variable/TrafficLight/TL_LINKS/testclient_out.traci index 1c663522ba56..62d826a96260 100644 --- a/tests/traci/get_variable/TrafficLight/TL_LINKS/testclient_out.traci +++ b/tests/traci/get_variable/TrafficLight/TL_LINKS/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Sep 8 08:50:03 2024 +TraCITestClient output file. Date: Sun Sep 8 10:47:28 2024 -> Command sent: : @@ -7,7 +7,7 @@ TraCITestClient output file. Date: Sun Sep 8 08:50:03 2024 -> Command sent: : domID=162 varID=39 objID=0 .. Command acknowledged (162), [description: ] - CommandID=178 VariableID=39 ObjectID=0 valueDataType=15 compound value with 33 members: [ valueDataType=9 Int value: 16 + CommandID=178 VariableID=39 ObjectID=0 valueDataType=15 compound value with 33 members: [ valueDataType=9 Int value: 16 valueDataType=9 Int value: 1 valueDataType=14 string list value: [ "4si_0", "1o_0", "" ] valueDataType=9 Int value: 1 diff --git a/tests/traci/get_variable/TrafficLight/TL_LINKS_subseconds/testclient_out.traci b/tests/traci/get_variable/TrafficLight/TL_LINKS_subseconds/testclient_out.traci index 1c663522ba56..62d826a96260 100644 --- a/tests/traci/get_variable/TrafficLight/TL_LINKS_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/TrafficLight/TL_LINKS_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Sep 8 08:50:03 2024 +TraCITestClient output file. Date: Sun Sep 8 10:47:28 2024 -> Command sent: : @@ -7,7 +7,7 @@ TraCITestClient output file. Date: Sun Sep 8 08:50:03 2024 -> Command sent: : domID=162 varID=39 objID=0 .. Command acknowledged (162), [description: ] - CommandID=178 VariableID=39 ObjectID=0 valueDataType=15 compound value with 33 members: [ valueDataType=9 Int value: 16 + CommandID=178 VariableID=39 ObjectID=0 valueDataType=15 compound value with 33 members: [ valueDataType=9 Int value: 16 valueDataType=9 Int value: 1 valueDataType=14 string list value: [ "4si_0", "1o_0", "" ] valueDataType=9 Int value: 1 diff --git a/tests/traci/get_variable/TrafficLight/TL_RYG_COMPLETE/testclient_out.traci b/tests/traci/get_variable/TrafficLight/TL_RYG_COMPLETE/testclient_out.traci index d0234cd23fba..db65db16895a 100644 --- a/tests/traci/get_variable/TrafficLight/TL_RYG_COMPLETE/testclient_out.traci +++ b/tests/traci/get_variable/TrafficLight/TL_RYG_COMPLETE/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Sep 8 08:59:42 2024 +TraCITestClient output file. Date: Sun Sep 8 10:47:28 2024 -> Command sent: : @@ -7,67 +7,67 @@ TraCITestClient output file. Date: Sun Sep 8 08:59:42 2024 -> Command sent: : domID=162 varID=43 objID=0 .. Command acknowledged (162), [description: ] - CommandID=178 VariableID=43 ObjectID=0 valueDataType=15 compound value with 1 members: [ valueDataType=15 compound value with 5 members: [ valueDataType=12 string value: 0 + CommandID=178 VariableID=43 ObjectID=0 valueDataType=15 compound value with 1 members: [ valueDataType=15 compound value with 5 members: [ valueDataType=12 string value: 0 valueDataType=9 Int value: 0 valueDataType=9 Int value: 0 - valueDataType=15 compound value with 8 members: [ valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 31.00 + valueDataType=15 compound value with 8 members: [ valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 31.00 valueDataType=12 string value: GGggrrrrGGggrrrr valueDataType=11 Double value: 31.00 valueDataType=11 Double value: 31.00 - valueDataType=15 compound value with 0 members: [ ] + valueDataType=15 compound value with 0 members: [ ] valueDataType=12 string value: '' ] - valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 valueDataType=12 string value: yyggrrrryyggrrrr valueDataType=11 Double value: 4.00 valueDataType=11 Double value: 4.00 - valueDataType=15 compound value with 0 members: [ ] + valueDataType=15 compound value with 0 members: [ ] valueDataType=12 string value: '' ] - valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 6.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 6.00 valueDataType=12 string value: rrGGrrrrrrGGrrrr valueDataType=11 Double value: 6.00 valueDataType=11 Double value: 6.00 - valueDataType=15 compound value with 0 members: [ ] + valueDataType=15 compound value with 0 members: [ ] valueDataType=12 string value: '' ] - valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 valueDataType=12 string value: rryyrrrrrryyrrrr valueDataType=11 Double value: 4.00 valueDataType=11 Double value: 4.00 - valueDataType=15 compound value with 0 members: [ ] + valueDataType=15 compound value with 0 members: [ ] valueDataType=12 string value: '' ] - valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 31.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 31.00 valueDataType=12 string value: rrrrGGggrrrrGGgg valueDataType=11 Double value: 31.00 valueDataType=11 Double value: 31.00 - valueDataType=15 compound value with 0 members: [ ] + valueDataType=15 compound value with 0 members: [ ] valueDataType=12 string value: '' ] - valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 valueDataType=12 string value: rrrryyggrrrryygg valueDataType=11 Double value: 4.00 valueDataType=11 Double value: 4.00 - valueDataType=15 compound value with 0 members: [ ] + valueDataType=15 compound value with 0 members: [ ] valueDataType=12 string value: '' ] - valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 6.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 6.00 valueDataType=12 string value: rrrrrrGGrrrrrrGG valueDataType=11 Double value: 6.00 valueDataType=11 Double value: 6.00 - valueDataType=15 compound value with 0 members: [ ] + valueDataType=15 compound value with 0 members: [ ] valueDataType=12 string value: '' ] - valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 valueDataType=12 string value: rrrrrryyrrrrrryy valueDataType=11 Double value: 4.00 valueDataType=11 Double value: 4.00 - valueDataType=15 compound value with 0 members: [ ] + valueDataType=15 compound value with 0 members: [ ] valueDataType=12 string value: '' ] ] - valueDataType=15 compound value with 0 members: [ ] + valueDataType=15 compound value with 0 members: [ ] ] ] diff --git a/tests/traci/get_variable/TrafficLight/TL_RYG_COMPLETE_subseconds/testclient_out.traci b/tests/traci/get_variable/TrafficLight/TL_RYG_COMPLETE_subseconds/testclient_out.traci index d0234cd23fba..db65db16895a 100644 --- a/tests/traci/get_variable/TrafficLight/TL_RYG_COMPLETE_subseconds/testclient_out.traci +++ b/tests/traci/get_variable/TrafficLight/TL_RYG_COMPLETE_subseconds/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Sep 8 08:59:42 2024 +TraCITestClient output file. Date: Sun Sep 8 10:47:28 2024 -> Command sent: : @@ -7,67 +7,67 @@ TraCITestClient output file. Date: Sun Sep 8 08:59:42 2024 -> Command sent: : domID=162 varID=43 objID=0 .. Command acknowledged (162), [description: ] - CommandID=178 VariableID=43 ObjectID=0 valueDataType=15 compound value with 1 members: [ valueDataType=15 compound value with 5 members: [ valueDataType=12 string value: 0 + CommandID=178 VariableID=43 ObjectID=0 valueDataType=15 compound value with 1 members: [ valueDataType=15 compound value with 5 members: [ valueDataType=12 string value: 0 valueDataType=9 Int value: 0 valueDataType=9 Int value: 0 - valueDataType=15 compound value with 8 members: [ valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 31.00 + valueDataType=15 compound value with 8 members: [ valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 31.00 valueDataType=12 string value: GGggrrrrGGggrrrr valueDataType=11 Double value: 31.00 valueDataType=11 Double value: 31.00 - valueDataType=15 compound value with 0 members: [ ] + valueDataType=15 compound value with 0 members: [ ] valueDataType=12 string value: '' ] - valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 valueDataType=12 string value: yyggrrrryyggrrrr valueDataType=11 Double value: 4.00 valueDataType=11 Double value: 4.00 - valueDataType=15 compound value with 0 members: [ ] + valueDataType=15 compound value with 0 members: [ ] valueDataType=12 string value: '' ] - valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 6.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 6.00 valueDataType=12 string value: rrGGrrrrrrGGrrrr valueDataType=11 Double value: 6.00 valueDataType=11 Double value: 6.00 - valueDataType=15 compound value with 0 members: [ ] + valueDataType=15 compound value with 0 members: [ ] valueDataType=12 string value: '' ] - valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 valueDataType=12 string value: rryyrrrrrryyrrrr valueDataType=11 Double value: 4.00 valueDataType=11 Double value: 4.00 - valueDataType=15 compound value with 0 members: [ ] + valueDataType=15 compound value with 0 members: [ ] valueDataType=12 string value: '' ] - valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 31.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 31.00 valueDataType=12 string value: rrrrGGggrrrrGGgg valueDataType=11 Double value: 31.00 valueDataType=11 Double value: 31.00 - valueDataType=15 compound value with 0 members: [ ] + valueDataType=15 compound value with 0 members: [ ] valueDataType=12 string value: '' ] - valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 valueDataType=12 string value: rrrryyggrrrryygg valueDataType=11 Double value: 4.00 valueDataType=11 Double value: 4.00 - valueDataType=15 compound value with 0 members: [ ] + valueDataType=15 compound value with 0 members: [ ] valueDataType=12 string value: '' ] - valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 6.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 6.00 valueDataType=12 string value: rrrrrrGGrrrrrrGG valueDataType=11 Double value: 6.00 valueDataType=11 Double value: 6.00 - valueDataType=15 compound value with 0 members: [ ] + valueDataType=15 compound value with 0 members: [ ] valueDataType=12 string value: '' ] - valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 + valueDataType=15 compound value with 6 members: [ valueDataType=11 Double value: 4.00 valueDataType=12 string value: rrrrrryyrrrrrryy valueDataType=11 Double value: 4.00 valueDataType=11 Double value: 4.00 - valueDataType=15 compound value with 0 members: [ ] + valueDataType=15 compound value with 0 members: [ ] valueDataType=12 string value: '' ] ] - valueDataType=15 compound value with 0 members: [ ] + valueDataType=15 compound value with 0 members: [ ] ] ] diff --git a/tests/traci/set_variable/Edge/VAR_PARAMETER/testclient_out.traci b/tests/traci/set_variable/Edge/VAR_PARAMETER/testclient_out.traci index 8eaa7efcc091..22251710e1dc 100644 --- a/tests/traci/set_variable/Edge/VAR_PARAMETER/testclient_out.traci +++ b/tests/traci/set_variable/Edge/VAR_PARAMETER/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Tue Sep 09 09:02:37 2014 +TraCITestClient output file. Date: Sun Sep 8 10:48:07 2024 -> Command sent: : @@ -7,7 +7,7 @@ TraCITestClient output file. Date: Tue Sep 09 09:02:37 2014 -> Command sent: : domID=170 varID=126 objID=e_m5 .. Command acknowledged (170), [description: ] - CommandID=186 VariableID=126 ObjectID=e_m5 valueDataType=12 string value: + CommandID=186 VariableID=126 ObjectID=e_m5 valueDataType=12 string value: '' -> Command sent: : domID=202 varID=126 objID=e_m5 diff --git a/tests/traci/set_variable/Lane/VAR_PARAMETER/testclient_out.traci b/tests/traci/set_variable/Lane/VAR_PARAMETER/testclient_out.traci index 29a45f802b8c..8f585fb1e95a 100644 --- a/tests/traci/set_variable/Lane/VAR_PARAMETER/testclient_out.traci +++ b/tests/traci/set_variable/Lane/VAR_PARAMETER/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:21:15 2019 +TraCITestClient output file. Date: Sun Sep 8 10:48:06 2024 -> Command sent: : @@ -7,7 +7,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:21:15 2019 -> Command sent: : domID=163 varID=126 objID=2/1to2/0_0 .. Command acknowledged (163), [description: ] - CommandID=179 VariableID=126 ObjectID=2/1to2/0_0 valueDataType=12 string value: + CommandID=179 VariableID=126 ObjectID=2/1to2/0_0 valueDataType=12 string value: '' -> Command sent: : domID=195 varID=126 objID=2/1to2/0_0 diff --git a/tests/traci/set_variable/POI/VAR_PARAMETER/testclient_out.traci b/tests/traci/set_variable/POI/VAR_PARAMETER/testclient_out.traci index d7c1d7bbbfac..1acb978387ab 100644 --- a/tests/traci/set_variable/POI/VAR_PARAMETER/testclient_out.traci +++ b/tests/traci/set_variable/POI/VAR_PARAMETER/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Tue Sep 09 09:19:36 2014 +TraCITestClient output file. Date: Sun Sep 8 10:48:04 2024 -> Command sent: : @@ -7,7 +7,7 @@ TraCITestClient output file. Date: Tue Sep 09 09:19:36 2014 -> Command sent: : domID=167 varID=126 objID=p1 .. Command acknowledged (167), [description: ] - CommandID=183 VariableID=126 ObjectID=p1 valueDataType=12 string value: + CommandID=183 VariableID=126 ObjectID=p1 valueDataType=12 string value: '' -> Command sent: : domID=199 varID=126 objID=p1 diff --git a/tests/traci/set_variable/Polygon/VAR_PARAMETER/testclient_out.traci b/tests/traci/set_variable/Polygon/VAR_PARAMETER/testclient_out.traci index 2c7e2af80527..2a8e95139ac1 100644 --- a/tests/traci/set_variable/Polygon/VAR_PARAMETER/testclient_out.traci +++ b/tests/traci/set_variable/Polygon/VAR_PARAMETER/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Tue Sep 09 09:19:48 2014 +TraCITestClient output file. Date: Sun Sep 8 10:48:05 2024 -> Command sent: : @@ -7,7 +7,7 @@ TraCITestClient output file. Date: Tue Sep 09 09:19:48 2014 -> Command sent: : domID=168 varID=126 objID=p1 .. Command acknowledged (168), [description: ] - CommandID=184 VariableID=126 ObjectID=p1 valueDataType=12 string value: + CommandID=184 VariableID=126 ObjectID=p1 valueDataType=12 string value: '' -> Command sent: : domID=200 varID=126 objID=p1 diff --git a/tests/traci/set_variable/Route/VAR_PARAMETER/testclient_out.traci b/tests/traci/set_variable/Route/VAR_PARAMETER/testclient_out.traci index 28f65a086a15..b79be65c5566 100644 --- a/tests/traci/set_variable/Route/VAR_PARAMETER/testclient_out.traci +++ b/tests/traci/set_variable/Route/VAR_PARAMETER/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Tue Sep 09 09:22:52 2014 +TraCITestClient output file. Date: Sun Sep 8 10:48:07 2024 -> Command sent: : @@ -7,7 +7,7 @@ TraCITestClient output file. Date: Tue Sep 09 09:22:52 2014 -> Command sent: : domID=166 varID=126 objID=r1 .. Command acknowledged (166), [description: ] - CommandID=182 VariableID=126 ObjectID=r1 valueDataType=12 string value: + CommandID=182 VariableID=126 ObjectID=r1 valueDataType=12 string value: '' -> Command sent: : domID=198 varID=126 objID=r1 diff --git a/tests/traci/set_variable/StoppingPlaces/ChargingStations/VAR_PARAMETER/testclient_out.traci b/tests/traci/set_variable/StoppingPlaces/ChargingStations/VAR_PARAMETER/testclient_out.traci index 57e625470495..35eb7d004bf5 100644 --- a/tests/traci/set_variable/StoppingPlaces/ChargingStations/VAR_PARAMETER/testclient_out.traci +++ b/tests/traci/set_variable/StoppingPlaces/ChargingStations/VAR_PARAMETER/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Thu Jun 13 09:10:21 2024 +TraCITestClient output file. Date: Sun Sep 8 10:48:05 2024 -> Command sent: : @@ -7,7 +7,7 @@ TraCITestClient output file. Date: Thu Jun 13 09:10:21 2024 -> Command sent: : domID=37 varID=126 objID=cs .. Command acknowledged (37), [description: ] - CommandID=53 VariableID=126 ObjectID=cs valueDataType=12 string value: + CommandID=53 VariableID=126 ObjectID=cs valueDataType=12 string value: '' -> Command sent: : domID=69 varID=126 objID=cs diff --git a/tests/traci/set_variable/TrafficLight/VAR_PARAMETER/testclient_out.traci b/tests/traci/set_variable/TrafficLight/VAR_PARAMETER/testclient_out.traci index 10e2103bb109..f9ff0e842cec 100644 --- a/tests/traci/set_variable/TrafficLight/VAR_PARAMETER/testclient_out.traci +++ b/tests/traci/set_variable/TrafficLight/VAR_PARAMETER/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:09:31 2019 +TraCITestClient output file. Date: Sun Sep 8 10:47:54 2024 -> Command sent: : @@ -7,7 +7,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:09:31 2019 -> Command sent: : domID=162 varID=126 objID=1/1 .. Command acknowledged (162), [description: ] - CommandID=178 VariableID=126 ObjectID=1/1 valueDataType=12 string value: + CommandID=178 VariableID=126 ObjectID=1/1 valueDataType=12 string value: '' -> Command sent: : domID=194 varID=126 objID=1/1 diff --git a/tests/traci/set_variable/Vehicle/zSimpleSetGet/VAR_PARAMETER/testclient_out.traci b/tests/traci/set_variable/Vehicle/zSimpleSetGet/VAR_PARAMETER/testclient_out.traci index bcebbddd27e7..395bacbc959c 100644 --- a/tests/traci/set_variable/Vehicle/zSimpleSetGet/VAR_PARAMETER/testclient_out.traci +++ b/tests/traci/set_variable/Vehicle/zSimpleSetGet/VAR_PARAMETER/testclient_out.traci @@ -1,4 +1,4 @@ -TraCITestClient output file. Date: Sun Aug 11 18:20:28 2019 +TraCITestClient output file. Date: Sun Sep 8 10:48:00 2024 -> Command sent: : @@ -7,7 +7,7 @@ TraCITestClient output file. Date: Sun Aug 11 18:20:28 2019 -> Command sent: : domID=164 varID=126 objID=0 .. Command acknowledged (164), [description: ] - CommandID=180 VariableID=126 ObjectID=0 valueDataType=12 string value: + CommandID=180 VariableID=126 ObjectID=0 valueDataType=12 string value: '' -> Command sent: : domID=196 varID=126 objID=0 From 029dda3198ab38d2a0102370b0d2cf38088f2aa9 Mon Sep 17 00:00:00 2001 From: Michael Behrisch Date: Sun, 8 Sep 2024 17:59:28 +0200 Subject: [PATCH 11/41] adding meso results #21 #15449 --- .../allway_stop/pedCrossing/fcd.sumo.meso | 252 ++++++++++++++++++ .../allway_stop/stopLineGap/fcd.sumo.meso | 88 ++++++ .../allway_stop/stopOffset/fcd.sumo.meso | 252 ++++++++++++++++++ 3 files changed, 592 insertions(+) create mode 100644 tests/sumo/junction_model/junction_type/allway_stop/pedCrossing/fcd.sumo.meso create mode 100644 tests/sumo/junction_model/junction_type/allway_stop/stopLineGap/fcd.sumo.meso create mode 100644 tests/sumo/junction_model/junction_type/allway_stop/stopOffset/fcd.sumo.meso diff --git a/tests/sumo/junction_model/junction_type/allway_stop/pedCrossing/fcd.sumo.meso b/tests/sumo/junction_model/junction_type/allway_stop/pedCrossing/fcd.sumo.meso new file mode 100644 index 000000000000..2e7fd69424ca --- /dev/null +++ b/tests/sumo/junction_model/junction_type/allway_stop/pedCrossing/fcd.sumo.meso @@ -0,0 +1,252 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/sumo/junction_model/junction_type/allway_stop/stopLineGap/fcd.sumo.meso b/tests/sumo/junction_model/junction_type/allway_stop/stopLineGap/fcd.sumo.meso new file mode 100644 index 000000000000..6060b70939d2 --- /dev/null +++ b/tests/sumo/junction_model/junction_type/allway_stop/stopLineGap/fcd.sumo.meso @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/sumo/junction_model/junction_type/allway_stop/stopOffset/fcd.sumo.meso b/tests/sumo/junction_model/junction_type/allway_stop/stopOffset/fcd.sumo.meso new file mode 100644 index 000000000000..2e7fd69424ca --- /dev/null +++ b/tests/sumo/junction_model/junction_type/allway_stop/stopOffset/fcd.sumo.meso @@ -0,0 +1,252 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 787212df70eb4a79b8fbc6694dd1b50ac0070d88 Mon Sep 17 00:00:00 2001 From: Michael Behrisch Date: Mon, 9 Sep 2024 06:57:06 +0200 Subject: [PATCH 12/41] only fixing contourpy for newer pythons #3 --- tools/req_ci.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/req_ci.txt b/tools/req_ci.txt index 35baada26650..c8183b3b9c17 100644 --- a/tools/req_ci.txt +++ b/tools/req_ci.txt @@ -3,4 +3,4 @@ ortools==9.5.2237; python_version < '3.12' pandas<2.2.0 matplotlib==3.8.4; python_version >= '3.9' -contourpy==1.2.1 +contourpy==1.2.1; python_version >= '3.9' From 86b194ac4824ee851e2c269203842995fb13b754 Mon Sep 17 00:00:00 2001 From: Michael Behrisch Date: Mon, 9 Sep 2024 07:12:35 +0200 Subject: [PATCH 13/41] fixing link #2 --- docs/web/docs/Simulation/Output/FCDOutput.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/web/docs/Simulation/Output/FCDOutput.md b/docs/web/docs/Simulation/Output/FCDOutput.md index ca298ca13fa0..ec05c28f1e9b 100644 --- a/docs/web/docs/Simulation/Output/FCDOutput.md +++ b/docs/web/docs/Simulation/Output/FCDOutput.md @@ -43,7 +43,7 @@ The generated XML file looks like this: ``` -The values without a tick in the "On" column need to be [enabled explicitly](#further-options) and the ones without a tick at "Meso" are not available for the [mesoscopic simulation](../Meso.md). +The values without a tick in the "On" column need to be [enabled explicitly](#further_options) and the ones without a tick at "Meso" are not available for the [mesoscopic simulation](../Meso.md). | Name | Type | On | Meso | Description | | -------- | -------------------- | -- | ---- | ----------------------------------------------------------------------------------------------------------- | From 62454eee27a9407357b4856182589971086ae74d Mon Sep 17 00:00:00 2001 From: Jakob Erdmann Date: Mon, 9 Sep 2024 09:09:28 +0200 Subject: [PATCH 14/41] added test refs #21, #15383 --- .../laneDensity_sidewalk/aggregated15.sumo | 61 ++++++++++++++++++ .../aggregated15.sumo.meso | 62 +++++++++++++++++++ .../laneDensity_sidewalk/aggregated60.sumo | 49 +++++++++++++++ .../aggregated60.sumo.meso | 50 +++++++++++++++ .../laneDensity_sidewalk/errors.sumo | 0 .../input_additional.add.xml | 4 ++ .../laneDensity_sidewalk/input_routes.rou.xml | 13 ++++ .../laneDensity_sidewalk/options.sumo | 1 + .../laneDensity_sidewalk/output.sumo | 0 .../output/meandata_edgebased/testsuite.sumo | 3 + 10 files changed, 243 insertions(+) create mode 100644 tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated15.sumo create mode 100644 tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated15.sumo.meso create mode 100644 tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated60.sumo create mode 100644 tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated60.sumo.meso create mode 100644 tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/errors.sumo create mode 100644 tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/input_additional.add.xml create mode 100644 tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/input_routes.rou.xml create mode 100644 tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/options.sumo create mode 100644 tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/output.sumo diff --git a/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated15.sumo b/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated15.sumo new file mode 100644 index 000000000000..fc53648ea274 --- /dev/null +++ b/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated15.sumo @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated15.sumo.meso b/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated15.sumo.meso new file mode 100644 index 000000000000..c778a74829ed --- /dev/null +++ b/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated15.sumo.meso @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated60.sumo b/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated60.sumo new file mode 100644 index 000000000000..538f2033ea39 --- /dev/null +++ b/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated60.sumo @@ -0,0 +1,49 @@ + + + + + + + + + + diff --git a/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated60.sumo.meso b/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated60.sumo.meso new file mode 100644 index 000000000000..8f3f2da77577 --- /dev/null +++ b/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated60.sumo.meso @@ -0,0 +1,50 @@ + + + + + + + + + + diff --git a/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/errors.sumo b/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/errors.sumo new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/input_additional.add.xml b/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/input_additional.add.xml new file mode 100644 index 000000000000..4f0a840d6917 --- /dev/null +++ b/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/input_additional.add.xml @@ -0,0 +1,4 @@ + + + + diff --git a/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/input_routes.rou.xml b/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/input_routes.rou.xml new file mode 100644 index 000000000000..749bd4fd08b1 --- /dev/null +++ b/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/input_routes.rou.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/options.sumo b/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/options.sumo new file mode 100644 index 000000000000..a80502278b05 --- /dev/null +++ b/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/options.sumo @@ -0,0 +1 @@ +--time-to-teleport -1 --no-step-log --no-duration-log --net-file=net3.net.xml -a input_routes.rou.xml,input_additional.add.xml -b 0 -e 1000 diff --git a/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/output.sumo b/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/output.sumo new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/sumo/output/meandata_edgebased/testsuite.sumo b/tests/sumo/output/meandata_edgebased/testsuite.sumo index f8b18f042e34..2baa1fbec8bf 100644 --- a/tests/sumo/output/meandata_edgebased/testsuite.sumo +++ b/tests/sumo/output/meandata_edgebased/testsuite.sumo @@ -58,6 +58,9 @@ jam_max # a jam test for reaching 100% occupancy jam_max_sublane +# discount non-driving lanes from laneDensity calculation +laneDensity_sidewalk + # a jam test with different maximum traveltime maxtraveltime From c28a4a3dc66804e547862f8ae528d5ee1b9ec9c5 Mon Sep 17 00:00:00 2001 From: Jakob Erdmann Date: Mon, 9 Sep 2024 09:29:08 +0200 Subject: [PATCH 15/41] fix #15383 --- src/microsim/MSEdge.cpp | 17 +++++++++++++++++ src/microsim/MSEdge.h | 3 +++ src/microsim/output/MSMeanData.cpp | 8 ++++---- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/microsim/MSEdge.cpp b/src/microsim/MSEdge.cpp index 685da440e77d..d5303b147394 100644 --- a/src/microsim/MSEdge.cpp +++ b/src/microsim/MSEdge.cpp @@ -1458,6 +1458,23 @@ MSEdge::getVehicles() const { return result; } +int +MSEdge::getNumDrivingLanes() const { + int result = 0; + SVCPermissions filter = SVCAll; + if ((myCombinedPermissions & ~(SVC_PEDESTRIAN | SVC_WHEELCHAIR)) != 0) { + filter = ~(SVC_PEDESTRIAN | SVC_WHEELCHAIR); + } else if ((myCombinedPermissions & (SVC_PEDESTRIAN | SVC_WHEELCHAIR)) != 0) { + // filter out green verge + filter = (SVC_PEDESTRIAN | SVC_WHEELCHAIR); + } + for (const MSLane* const l : *myLanes) { + if ((l->getPermissions() & filter) != 0) { + result++; + } + } + return result; +} int MSEdge::getVehicleNumber() const { diff --git a/src/microsim/MSEdge.h b/src/microsim/MSEdge.h index 0f69066fddd8..5bf21fbcb168 100644 --- a/src/microsim/MSEdge.h +++ b/src/microsim/MSEdge.h @@ -173,6 +173,9 @@ class MSEdge : public Named, public Parameterised { return (int)myLanes->size(); } + /// @brief return the number of lanes that permit non-weak modes if the edge allows non weak modes and the number of lanes otherwise + int getNumDrivingLanes() const; + /// @brief return total number of vehicles on this edges lanes or segments int getVehicleNumber() const; diff --git a/src/microsim/output/MSMeanData.cpp b/src/microsim/output/MSMeanData.cpp index c778385c897b..826c1c8d5967 100644 --- a/src/microsim/output/MSMeanData.cpp +++ b/src/microsim/output/MSMeanData.cpp @@ -560,7 +560,7 @@ MSMeanData::writeAggregated(OutputDevice& dev, SUMOTime startTime, SUMOTime stop double totalTT = 0; for (MSEdge* edge : myEdges) { edgeLengthSum += edge->getLength(); - laneNumber += edge->getNumLanes(); + laneNumber += edge->getNumDrivingLanes(); speedSum += edge->getSpeedLimit(); totalTT += edge->getLength() / edge->getSpeedLimit(); } @@ -610,7 +610,7 @@ MSMeanData::writeEdge(OutputDevice& dev, MeanDataValues* data = edgeValues.front(); if (writePrefix(dev, *data, SUMO_TAG_EDGE, getEdgeID(edge))) { data->write(dev, myWrittenAttributes, stopTime - startTime, - (int)edge->getLanes().size(), + edge->getNumDrivingLanes(), edge->getSpeedLimit(), myPrintDefaults ? edge->getLength() / edge->getSpeedLimit() : -1.); } @@ -651,7 +651,7 @@ MSMeanData::writeEdge(OutputDevice& dev, if (myTrackVehicles) { MeanDataValues& meanData = **edgeValues.begin(); if (writePrefix(dev, meanData, SUMO_TAG_EDGE, edge->getID())) { - meanData.write(dev, myWrittenAttributes, stopTime - startTime, (int)edge->getLanes().size(), edge->getSpeedLimit(), + meanData.write(dev, myWrittenAttributes, stopTime - startTime, edge->getNumDrivingLanes(), edge->getSpeedLimit(), myPrintDefaults ? edge->getLength() / edge->getSpeedLimit() : -1.); } if (!MSNet::getInstance()->skipFinalReset()) { @@ -667,7 +667,7 @@ MSMeanData::writeEdge(OutputDevice& dev, } } if (writePrefix(dev, *sumData, SUMO_TAG_EDGE, getEdgeID(edge))) { - sumData->write(dev, myWrittenAttributes, stopTime - startTime, (int)edge->getLanes().size(), edge->getSpeedLimit(), + sumData->write(dev, myWrittenAttributes, stopTime - startTime, edge->getNumDrivingLanes(), edge->getSpeedLimit(), myPrintDefaults ? edge->getLength() / edge->getSpeedLimit() : -1.); } delete sumData; From 7c9412c8a28a950b281419d6e1eeaed72967edae Mon Sep 17 00:00:00 2001 From: Jakob Erdmann Date: Mon, 9 Sep 2024 09:29:16 +0200 Subject: [PATCH 16/41] patching expected results refs #21, #15383 --- .../aggregated.sumo | 24 +++++----- .../net3_meandata_edges/aggregated300.sumo | 44 ++++++++++--------- .../net3_meandata_edges/aggregated900.sumo | 30 +++++++------ .../aggregated900.sumo | 30 +++++++------ .../laneDensity_sidewalk/aggregated15.sumo | 18 ++++---- .../aggregated15.sumo.meso | 33 +++++++------- .../laneDensity_sidewalk/aggregated60.sumo | 6 +-- .../aggregated60.sumo.meso | 21 +++++---- 8 files changed, 112 insertions(+), 94 deletions(-) diff --git a/tests/sumo/devices/rerouting/turn_specific_speeds/separateTurns_1_intermodal/aggregated.sumo b/tests/sumo/devices/rerouting/turn_specific_speeds/separateTurns_1_intermodal/aggregated.sumo index ddf6920d7a02..0653124ef688 100644 --- a/tests/sumo/devices/rerouting/turn_specific_speeds/separateTurns_1_intermodal/aggregated.sumo +++ b/tests/sumo/devices/rerouting/turn_specific_speeds/separateTurns_1_intermodal/aggregated.sumo @@ -1,6 +1,6 @@ - - - - - - - - - + + + + + + + + - - + + - - - - - + + + + + diff --git a/tests/sumo/output/examples_multimodal/net3_meandata_edges/aggregated900.sumo b/tests/sumo/output/examples_multimodal/net3_meandata_edges/aggregated900.sumo index 867bd01dd01c..1f271775185e 100644 --- a/tests/sumo/output/examples_multimodal/net3_meandata_edges/aggregated900.sumo +++ b/tests/sumo/output/examples_multimodal/net3_meandata_edges/aggregated900.sumo @@ -1,12 +1,17 @@ - @@ -82,13 +86,13 @@ SPDX-License-Identifier: EPL-2.0 - - - - - - - - + + + + + + + + diff --git a/tests/sumo/output/examples_multimodal/net3_meandata_edges_track/aggregated900.sumo b/tests/sumo/output/examples_multimodal/net3_meandata_edges_track/aggregated900.sumo index 867bd01dd01c..1f271775185e 100644 --- a/tests/sumo/output/examples_multimodal/net3_meandata_edges_track/aggregated900.sumo +++ b/tests/sumo/output/examples_multimodal/net3_meandata_edges_track/aggregated900.sumo @@ -1,12 +1,17 @@ - @@ -82,13 +86,13 @@ SPDX-License-Identifier: EPL-2.0 - - - - - - - - + + + + + + + + diff --git a/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated15.sumo b/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated15.sumo index fc53648ea274..4070fb993319 100644 --- a/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated15.sumo +++ b/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated15.sumo @@ -1,6 +1,6 @@ - - - + + - - + + - - + + - - + + diff --git a/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated60.sumo b/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated60.sumo index 538f2033ea39..64fd4cbe0989 100644 --- a/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated60.sumo +++ b/tests/sumo/output/meandata_edgebased/laneDensity_sidewalk/aggregated60.sumo @@ -1,6 +1,6 @@ - - - + + From 560e64be4809543b0faaa3962c1c1962638b397e Mon Sep 17 00:00:00 2001 From: Michael Behrisch Date: Mon, 9 Sep 2024 12:32:29 +0200 Subject: [PATCH 17/41] introducing another round of simplification #15199 --- src/netimport/NIImporter_OpenDrive.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/netimport/NIImporter_OpenDrive.cpp b/src/netimport/NIImporter_OpenDrive.cpp index f52e487511a1..7a272ae3a5a2 100644 --- a/src/netimport/NIImporter_OpenDrive.cpp +++ b/src/netimport/NIImporter_OpenDrive.cpp @@ -199,7 +199,7 @@ NIImporter_OpenDrive::loadNetwork(const OptionsCont& oc, NBNetBuilder& nb) { myMinWidth = oc.getFloat("opendrive.min-width"); myImportInternalShapes = oc.getBool("opendrive.internal-shapes"); myIgnoreMisplacedSignals = oc.getBool("opendrive.ignore-misplaced-signals"); - bool customLaneShapes = oc.getBool("opendrive.lane-shapes"); + const bool customLaneShapes = oc.getBool("opendrive.lane-shapes"); NBTypeCont& tc = nb.getTypeCont(); NBNodeCont& nc = nb.getNodeCont(); // build the handler @@ -486,7 +486,7 @@ NIImporter_OpenDrive::loadNetwork(const OptionsCont& oc, NBNetBuilder& nb) { } sE = nextS / cF; } - PositionVector geom = geomWithOffset.getSubpart2D(sB, sE); + const PositionVector geom = geomWithOffset.getSubpart2D(sB, sE).simplified2(false); std::string id = e->id; if (positionIDs) { if (sFrom != e->from || sTo != e->to) { From 75dc1178c3edd34a60c184394fa9df0461728f77 Mon Sep 17 00:00:00 2001 From: Michael Behrisch Date: Mon, 9 Sep 2024 12:33:25 +0200 Subject: [PATCH 18/41] adapting tests #21 #15199 --- .../openDRIVE/connections/4arm/net.netconvert | 10 ++++---- .../net.netconvert | 24 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/netconvert/import/openDRIVE/connections/4arm/net.netconvert b/tests/netconvert/import/openDRIVE/connections/4arm/net.netconvert index 09d1b9c11707..2a5a15f68894 100644 --- a/tests/netconvert/import/openDRIVE/connections/4arm/net.netconvert +++ b/tests/netconvert/import/openDRIVE/connections/4arm/net.netconvert @@ -1,6 +1,6 @@ - - - + + diff --git a/tests/netedit/elements/demands/containerplan/tranship/common/inspect/output.netedit b/tests/netedit/elements/demands/containerplan/tranship/common/inspect/output.netedit index d44dffa2c44c..943415668590 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/common/inspect/output.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/common/inspect/output.netedit @@ -6,7 +6,9 @@ TestFunctions: Clicked over position 685 - 611 tranship TestFunctions: Clicked over position 798 - 194 TestFunctions: Clicked over position 904 - 172 -custom line +dummy +-12 +7.5 TestFunctions: Clicked over position 304 - 168 TestFunctions: Clicked over position 304 - 168 TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/containerplan/tranship/common/inspect/routes.netedit b/tests/netedit/elements/demands/containerplan/tranship/common/inspect/routes.netedit index 8a17117e351f..78db0303123d 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/common/inspect/routes.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/common/inspect/routes.netedit @@ -1,12 +1,22 @@ - - - + + diff --git a/tests/netedit/elements/demands/containerplan/tranship/common/inspect_selection/output.netedit b/tests/netedit/elements/demands/containerplan/tranship/common/inspect_selection/output.netedit index 49ec0b34d7d9..00a3359da614 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/common/inspect_selection/output.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/common/inspect_selection/output.netedit @@ -2,7 +2,9 @@ TestFunctions: Netedit opened successfully Finding reference TestFunctions: 'reference.png' found. Position: 304 - 168 TestFunctions: Clicked over position 904 - 172 -custom line +dummy +-12 +7.5 TestFunctions: Clicked over position 304 - 168 TestFunctions: Clicked over position 304 - 168 TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/containerplan/tranship/common/inspect_selection/routes.netedit b/tests/netedit/elements/demands/containerplan/tranship/common/inspect_selection/routes.netedit index 41bdabf6310e..852b0fdbf3ee 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/common/inspect_selection/routes.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/common/inspect_selection/routes.netedit @@ -1,6 +1,6 @@ - - + - + diff --git a/tests/netedit/elements/demands/containerplan/tranship/common/inspect_selection/routes.rou.xml b/tests/netedit/elements/demands/containerplan/tranship/common/inspect_selection/routes.rou.xml index 34cb54637c44..7638246073aa 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/common/inspect_selection/routes.rou.xml +++ b/tests/netedit/elements/demands/containerplan/tranship/common/inspect_selection/routes.rou.xml @@ -11,11 +11,11 @@ - + - + diff --git a/tests/netedit/elements/demands/containerplan/tranship/common/load/errors.netedit b/tests/netedit/elements/demands/containerplan/tranship/common/load/errors.netedit index e69de29bb2d1..ca388d90f407 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/common/load/errors.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/common/load/errors.netedit @@ -0,0 +1,2 @@ +Error: Attribute 'speed' in definition of a tranship Invalid Number Format (double) dummy. +Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.10Sep091322.17528\netedit.gui\elements\demands\containerplan\tranship\common\load\routes.rou.xml failed. diff --git a/tests/netedit/elements/demands/containerplan/tranship/common/load/log.netedit b/tests/netedit/elements/demands/containerplan/tranship/common/load/log.netedit index e69de29bb2d1..ca388d90f407 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/common/load/log.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/common/load/log.netedit @@ -0,0 +1,2 @@ +Error: Attribute 'speed' in definition of a tranship Invalid Number Format (double) dummy. +Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.10Sep091322.17528\netedit.gui\elements\demands\containerplan\tranship\common\load\routes.rou.xml failed. diff --git a/tests/netedit/elements/demands/containerplan/tranship/common/load/routes.netedit b/tests/netedit/elements/demands/containerplan/tranship/common/load/routes.netedit index 2a2f5a778700..38da73fa799d 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/common/load/routes.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/common/load/routes.netedit @@ -1,6 +1,6 @@ - - + + + + + + + + diff --git a/tests/netedit/elements/demands/containerplan/tranship/common/load/routes.rou.xml b/tests/netedit/elements/demands/containerplan/tranship/common/load/routes.rou.xml index da78d3bec43d..597e7ea454fe 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/common/load/routes.rou.xml +++ b/tests/netedit/elements/demands/containerplan/tranship/common/load/routes.rou.xml @@ -7,6 +7,14 @@ - + + + + + + + + + diff --git a/tests/netedit/elements/demands/containerplan/tranship/from_busstop/to_taz/contextual_menu/add_to_select/routes.netedit b/tests/netedit/elements/demands/containerplan/tranship/from_busstop/to_taz/contextual_menu/add_to_select/routes.netedit index 26c1c63ea093..6778cac45617 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/from_busstop/to_taz/contextual_menu/add_to_select/routes.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/from_busstop/to_taz/contextual_menu/add_to_select/routes.netedit @@ -1,6 +1,6 @@ - - diff --git a/tests/netedit/elements/demands/containerplan/tranship/from_busstop/to_taz/contextual_menu/center/routes.netedit b/tests/netedit/elements/demands/containerplan/tranship/from_busstop/to_taz/contextual_menu/center/routes.netedit index 709f47a646e4..167c0a2f355b 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/from_busstop/to_taz/contextual_menu/center/routes.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/from_busstop/to_taz/contextual_menu/center/routes.netedit @@ -1,6 +1,6 @@ - - + diff --git a/tests/netedit/elements/demands/containerplan/tranship/from_busstop/to_taz/delete/routes.netedit b/tests/netedit/elements/demands/containerplan/tranship/from_busstop/to_taz/delete/routes.netedit index a38a18e41843..ad01c8feebd4 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/from_busstop/to_taz/delete/routes.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/from_busstop/to_taz/delete/routes.netedit @@ -1,6 +1,6 @@ - - diff --git a/tests/netedit/elements/demands/containerplan/tranship/from_chargingstation/to_taz/contextual_menu/add_to_select/routes.netedit b/tests/netedit/elements/demands/containerplan/tranship/from_chargingstation/to_taz/contextual_menu/add_to_select/routes.netedit index bdcc5e7188d3..942419a7949d 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/from_chargingstation/to_taz/contextual_menu/add_to_select/routes.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/from_chargingstation/to_taz/contextual_menu/add_to_select/routes.netedit @@ -1,6 +1,6 @@ - - diff --git a/tests/netedit/elements/demands/containerplan/tranship/from_chargingstation/to_taz/delete/routes.netedit b/tests/netedit/elements/demands/containerplan/tranship/from_chargingstation/to_taz/delete/routes.netedit index 65f6b4ec208b..f7c208ce2fb3 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/from_chargingstation/to_taz/delete/routes.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/from_chargingstation/to_taz/delete/routes.netedit @@ -1,6 +1,6 @@ - - diff --git a/tests/netedit/elements/demands/containerplan/tranship/from_containerstop/to_taz/contextual_menu/add_to_select/routes.netedit b/tests/netedit/elements/demands/containerplan/tranship/from_containerstop/to_taz/contextual_menu/add_to_select/routes.netedit index c877dd8812a0..086411fa2ba2 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/from_containerstop/to_taz/contextual_menu/add_to_select/routes.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/from_containerstop/to_taz/contextual_menu/add_to_select/routes.netedit @@ -1,6 +1,6 @@ - - diff --git a/tests/netedit/elements/demands/containerplan/tranship/from_containerstop/to_taz/delete/routes.netedit b/tests/netedit/elements/demands/containerplan/tranship/from_containerstop/to_taz/delete/routes.netedit index 17e1d4157a57..29eb460adbed 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/from_containerstop/to_taz/delete/routes.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/from_containerstop/to_taz/delete/routes.netedit @@ -1,6 +1,6 @@ - - diff --git a/tests/netedit/elements/demands/containerplan/tranship/from_edge/to_taz/contextual_menu/add_to_select/routes.netedit b/tests/netedit/elements/demands/containerplan/tranship/from_edge/to_taz/contextual_menu/add_to_select/routes.netedit index 65134ab9928e..e08311a8e0da 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/from_edge/to_taz/contextual_menu/add_to_select/routes.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/from_edge/to_taz/contextual_menu/add_to_select/routes.netedit @@ -1,6 +1,6 @@ - - diff --git a/tests/netedit/elements/demands/containerplan/tranship/from_edge/to_taz/delete/routes.netedit b/tests/netedit/elements/demands/containerplan/tranship/from_edge/to_taz/delete/routes.netedit index df0e4df209ca..3ea3c48a0aac 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/from_edge/to_taz/delete/routes.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/from_edge/to_taz/delete/routes.netedit @@ -1,6 +1,6 @@ - - diff --git a/tests/netedit/elements/demands/containerplan/tranship/from_parkingarea/to_taz/contextual_menu/add_to_select/routes.netedit b/tests/netedit/elements/demands/containerplan/tranship/from_parkingarea/to_taz/contextual_menu/add_to_select/routes.netedit index 6c77d1e6eff7..b5436fa37881 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/from_parkingarea/to_taz/contextual_menu/add_to_select/routes.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/from_parkingarea/to_taz/contextual_menu/add_to_select/routes.netedit @@ -1,6 +1,6 @@ - - diff --git a/tests/netedit/elements/demands/containerplan/tranship/from_parkingarea/to_taz/delete/routes.netedit b/tests/netedit/elements/demands/containerplan/tranship/from_parkingarea/to_taz/delete/routes.netedit index 0369d86c5fb7..5717332e2965 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/from_parkingarea/to_taz/delete/routes.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/from_parkingarea/to_taz/delete/routes.netedit @@ -1,6 +1,6 @@ - - diff --git a/tests/netedit/elements/demands/containerplan/tranship/from_taz/to_junction/delete/output.netedit b/tests/netedit/elements/demands/containerplan/tranship/from_taz/to_junction/delete/output.netedit index 4b464b5c1f79..b8a96363525f 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/from_taz/to_junction/delete/output.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/from_taz/to_junction/delete/output.netedit @@ -3,10 +3,10 @@ Finding reference TestFunctions: 'reference.png' found. Position: 304 - 168 transport TestFunctions: Clicked over position 685 - 611 -TestFunctions: Clicked over position 1143 - 596 +TestFunctions: Clicked over position 1012 - 400 tranship TestFunctions: Clicked over position 458 - 203 -TestFunctions: Clicked over position 904 - 172 +TestFunctions: Clicked over position 458 - 203 TestFunctions: Clicked over position 304 - 168 TestFunctions: Clicked over position 304 - 168 TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/containerplan/tranship/from_taz/to_junction/delete/routes.netedit b/tests/netedit/elements/demands/containerplan/tranship/from_taz/to_junction/delete/routes.netedit index 3c5b8fab358c..b46d0a5adc96 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/from_taz/to_junction/delete/routes.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/from_taz/to_junction/delete/routes.netedit @@ -1,6 +1,6 @@ - - + diff --git a/tests/netedit/elements/demands/containerplan/tranship/from_taz/to_junction/delete/test.py b/tests/netedit/elements/demands/containerplan/tranship/from_taz/to_junction/delete/test.py index fe7688735029..03e0d16fa3eb 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/from_taz/to_junction/delete/test.py +++ b/tests/netedit/elements/demands/containerplan/tranship/from_taz/to_junction/delete/test.py @@ -60,7 +60,7 @@ netedit.deleteMode() # delete created plan -netedit.leftClick(referencePosition, netedit.positions.elements.demands.planEdge2Ped) +netedit.leftClick(referencePosition, netedit.positions.elements.junction3) # Check undo redo netedit.checkUndoRedo(referencePosition) diff --git a/tests/netedit/elements/demands/containerplan/tranship/from_trainstop/to_taz/contextual_menu/add_to_select/routes.netedit b/tests/netedit/elements/demands/containerplan/tranship/from_trainstop/to_taz/contextual_menu/add_to_select/routes.netedit index 80880bc5d7fa..d2ec6996f001 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/from_trainstop/to_taz/contextual_menu/add_to_select/routes.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/from_trainstop/to_taz/contextual_menu/add_to_select/routes.netedit @@ -1,6 +1,6 @@ - - diff --git a/tests/netedit/elements/demands/containerplan/tranship/from_trainstop/to_taz/delete/routes.netedit b/tests/netedit/elements/demands/containerplan/tranship/from_trainstop/to_taz/delete/routes.netedit index 3a0186eab9e5..78ed56e55a54 100644 --- a/tests/netedit/elements/demands/containerplan/tranship/from_trainstop/to_taz/delete/routes.netedit +++ b/tests/netedit/elements/demands/containerplan/tranship/from_trainstop/to_taz/delete/routes.netedit @@ -1,6 +1,6 @@ - - diff --git a/tests/netedit/elements/demands/containerplan/transport/from_taz/to_junction/delete/output.netedit b/tests/netedit/elements/demands/containerplan/transport/from_taz/to_junction/delete/output.netedit index f35b001327d9..86294c768929 100644 --- a/tests/netedit/elements/demands/containerplan/transport/from_taz/to_junction/delete/output.netedit +++ b/tests/netedit/elements/demands/containerplan/transport/from_taz/to_junction/delete/output.netedit @@ -3,10 +3,10 @@ Finding reference TestFunctions: 'reference.png' found. Position: 304 - 168 tranship TestFunctions: Clicked over position 685 - 611 -TestFunctions: Clicked over position 1143 - 596 +TestFunctions: Clicked over position 1012 - 400 transport TestFunctions: Clicked over position 458 - 203 -TestFunctions: Clicked over position 904 - 172 +TestFunctions: Clicked over position 458 - 203 TestFunctions: Clicked over position 304 - 168 TestFunctions: Clicked over position 304 - 168 TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/containerplan/transport/from_taz/to_junction/delete/routes.netedit b/tests/netedit/elements/demands/containerplan/transport/from_taz/to_junction/delete/routes.netedit index 38185eb4cb37..8d0e9b82ff7b 100644 --- a/tests/netedit/elements/demands/containerplan/transport/from_taz/to_junction/delete/routes.netedit +++ b/tests/netedit/elements/demands/containerplan/transport/from_taz/to_junction/delete/routes.netedit @@ -1,6 +1,6 @@ - - + diff --git a/tests/netedit/elements/demands/containerplan/transport/from_taz/to_junction/delete/test.py b/tests/netedit/elements/demands/containerplan/transport/from_taz/to_junction/delete/test.py index cf4433e4ce8c..39783087485a 100644 --- a/tests/netedit/elements/demands/containerplan/transport/from_taz/to_junction/delete/test.py +++ b/tests/netedit/elements/demands/containerplan/transport/from_taz/to_junction/delete/test.py @@ -60,7 +60,7 @@ netedit.deleteMode() # delete created plan -netedit.leftClick(referencePosition, netedit.positions.elements.demands.planEdge2Ped) +netedit.leftClick(referencePosition, netedit.positions.elements.junction3) # Check undo redo netedit.checkUndoRedo(referencePosition) diff --git a/tests/netedit/scripts/failTests.txt b/tests/netedit/scripts/failTests.txt index 6e249ce08c2d..cfa575600287 100644 --- a/tests/netedit/scripts/failTests.txt +++ b/tests/netedit/scripts/failTests.txt @@ -1,35 +1,25 @@ -tp appdata=netedit.gui -elements/demands/personplan/persontrip/common/create/lines -elements/demands/personplan/persontrip/common/create/modes -elements/demands/personplan/persontrip/common/create/vtypes -elements/demands/personplan/persontrip/common/inspect/lines -elements/demands/personplan/persontrip/common/inspect/modes -elements/demands/personplan/persontrip/common/inspect/vtypes -elements/demands/personplan/persontrip/common/inspect_selection/lines -elements/demands/personplan/persontrip/common/inspect_selection/modes -elements/demands/personplan/persontrip/common/inspect_selection/vtypes -elements/demands/personplan/persontrip/from_busstop/to_edge/create/arrivalpos -elements/demands/personplan/persontrip/from_busstop/to_edge/load/arrivalpos -elements/demands/personplan/persontrip/from_chargingstation/to_edge/create/arrivalpos -elements/demands/personplan/persontrip/from_chargingstation/to_edge/load/arrivalpos -elements/demands/personplan/persontrip/from_containerstop/to_edge/create/arrivalpos -elements/demands/personplan/persontrip/from_containerstop/to_edge/inspect -elements/demands/personplan/persontrip/from_containerstop/to_edge/load/arrivalpos -elements/demands/personplan/persontrip/from_edge/to_busstop/create/ride -elements/demands/personplan/persontrip/from_edge/to_edge/create/arrivalpos -elements/demands/personplan/persontrip/from_edge/to_edge/inspect -elements/demands/personplan/persontrip/from_edge/to_edge/inspect_selection -elements/demands/personplan/persontrip/from_edge/to_edge/load/arrivalpos -elements/demands/personplan/persontrip/from_edge/to_parkingarea/create/stop -elements/demands/personplan/persontrip/from_junction/to_busstop/delete -elements/demands/personplan/persontrip/from_junction/to_edge/create/arrivalpos -elements/demands/personplan/persontrip/from_junction/to_edge/load/arrivalpos -elements/demands/personplan/persontrip/from_junction/to_trainstop/contextual_menu/copy_typed_name -elements/demands/personplan/persontrip/from_parkingarea/to_edge/create/arrivalpos -elements/demands/personplan/persontrip/from_parkingarea/to_edge/load/arrivalpos -elements/demands/personplan/persontrip/from_taz/to_edge/create/arrivalpos -elements/demands/personplan/persontrip/from_taz/to_edge/load/arrivalpos -elements/demands/personplan/persontrip/from_taz/to_junction/delete -elements/demands/personplan/persontrip/from_trainstop/to_edge/create/arrivalpos -elements/demands/personplan/persontrip/from_trainstop/to_edge/load/arrivalpos -elements/demands/personplan/persontrip/from_trainstop/to_trainstop/create/walk +elements/demands/containerplan/tranship/common/create +elements/demands/containerplan/tranship/common/inspect +elements/demands/containerplan/tranship/common/inspect_selection +elements/demands/containerplan/tranship/from_busstop/to_taz/contextual_menu/add_to_select +elements/demands/containerplan/tranship/from_busstop/to_taz/contextual_menu/center +elements/demands/containerplan/tranship/from_busstop/to_taz/delete +elements/demands/containerplan/tranship/from_chargingstation/to_taz/contextual_menu/add_to_select +elements/demands/containerplan/tranship/from_chargingstation/to_taz/contextual_menu/center/guisettingsguisettingsguisettingsguisettingsguisettingsguisettings +elements/demands/containerplan/tranship/from_chargingstation/to_taz/delete +elements/demands/containerplan/tranship/from_containerstop/to_taz/contextual_menu/add_to_select +elements/demands/containerplan/tranship/from_containerstop/to_taz/contextual_menu/center/guisettingsguisettingsguisettingsguisettingsguisettingsguisettings +elements/demands/containerplan/tranship/from_containerstop/to_taz/delete +elements/demands/containerplan/tranship/from_edge/to_taz/contextual_menu/add_to_select +elements/demands/containerplan/tranship/from_edge/to_taz/contextual_menu/center/guisettingsguisettingsguisettingsguisettingsguisettingsguisettings +elements/demands/containerplan/tranship/from_edge/to_taz/delete +elements/demands/containerplan/tranship/from_junction/to_taz/contextual_menu/center/guisettingsguisettingsguisettingsguisettingsguisettingsguisettings +elements/demands/containerplan/tranship/from_parkingarea/to_taz/contextual_menu/add_to_select +elements/demands/containerplan/tranship/from_parkingarea/to_taz/contextual_menu/center/guisettingsguisettingsguisettingsguisettingsguisettingsguisettings +elements/demands/containerplan/tranship/from_parkingarea/to_taz/delete +elements/demands/containerplan/tranship/from_taz/to_junction/delete +elements/demands/containerplan/tranship/from_taz/to_taz/contextual_menu/center/guisettingsguisettingsguisettingsguisettingsguisettingsguisettings +elements/demands/containerplan/tranship/from_trainstop/to_taz/contextual_menu/add_to_select +elements/demands/containerplan/tranship/from_trainstop/to_taz/contextual_menu/center/guisettingsguisettingsguisettingsguisettingsguisettingsguisettings +elements/demands/containerplan/tranship/from_trainstop/to_taz/delete From 6c1cb2c8cc98bf1a3dd20c3b04663570f501810f Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Tue, 10 Sep 2024 09:57:59 +0200 Subject: [PATCH 31/41] Aded new attributes in plans. Refs #15368 --- src/netedit/elements/GNEAttributeCarrier.cpp | 49 +++++++++++++++++--- 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/src/netedit/elements/GNEAttributeCarrier.cpp b/src/netedit/elements/GNEAttributeCarrier.cpp index 22e0292a0bd6..0e0f9ac6d6fb 100644 --- a/src/netedit/elements/GNEAttributeCarrier.cpp +++ b/src/netedit/elements/GNEAttributeCarrier.cpp @@ -9223,12 +9223,36 @@ GNEAttributeCarrier::fillPersonTripCommonAttributes(GNETagProperties& tagPropert TL("list of vehicle alternatives to take for the person trip"), "ANY"); tagProperties.addAttribute(attrProperty); + + attrProperty = GNEAttributeProperties(SUMO_ATTR_WALKFACTOR, + GNEAttributeProperties::FLOAT | GNEAttributeProperties::POSITIVE | GNEAttributeProperties::DEFAULTVALUE, + TL("Walk factor"), + "0.00"); + tagProperties.addAttribute(attrProperty); + + attrProperty = GNEAttributeProperties(SUMO_ATTR_GROUP, + GNEAttributeProperties::STRING | GNEAttributeProperties::DEFAULTVALUE, + TL("id of the travel group. Persons with the same group may share a taxi ride")); + tagProperties.addAttribute(attrProperty); } void -GNEAttributeCarrier::fillWalkCommonAttributes(GNETagProperties& /*tagProperties*/) { - // currently walks don't have common attributes +GNEAttributeCarrier::fillWalkCommonAttributes(GNETagProperties& tagProperties) { + // declare empty GNEAttributeProperties + GNEAttributeProperties attrProperty; + + attrProperty = GNEAttributeProperties(SUMO_ATTR_SPEED, + GNEAttributeProperties::FLOAT | GNEAttributeProperties::POSITIVE | GNEAttributeProperties::DEFAULTVALUE, + TL("speed of the person for this tranship in m/s (not together with duration)"), + "1.39"); + tagProperties.addAttribute(attrProperty); + + attrProperty = GNEAttributeProperties(SUMO_ATTR_DURATION, + GNEAttributeProperties::FLOAT | GNEAttributeProperties::POSITIVE | GNEAttributeProperties::DEFAULTVALUE, + TL("duration of the plan in second (not together with speed)"), + "0"); + tagProperties.addAttribute(attrProperty); } @@ -9237,12 +9261,16 @@ GNEAttributeCarrier::fillRideCommonAttributes(GNETagProperties& tagProperties) { // declare empty GNEAttributeProperties GNEAttributeProperties attrProperty; - // lines attrProperty = GNEAttributeProperties(SUMO_ATTR_LINES, GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::DEFAULTVALUE, TL("list of vehicle alternatives to take for the ride"), "ANY"); tagProperties.addAttribute(attrProperty); + + attrProperty = GNEAttributeProperties(SUMO_ATTR_GROUP, + GNEAttributeProperties::STRING | GNEAttributeProperties::DEFAULTVALUE, + TL("id of the travel group. Persons with the same group may share a taxi ride")); + tagProperties.addAttribute(attrProperty); } @@ -9251,12 +9279,16 @@ GNEAttributeCarrier::fillTransportCommonAttributes(GNETagProperties& tagProperti // declare empty GNEAttributeProperties GNEAttributeProperties attrProperty; - // lines attrProperty = GNEAttributeProperties(SUMO_ATTR_LINES, GNEAttributeProperties::STRING | GNEAttributeProperties::LIST | GNEAttributeProperties::DEFAULTVALUE, TL("list of vehicle alternatives to take for the transport"), "ANY"); tagProperties.addAttribute(attrProperty); + + attrProperty = GNEAttributeProperties(SUMO_ATTR_GROUP, + GNEAttributeProperties::STRING | GNEAttributeProperties::DEFAULTVALUE, + TL("id of the travel group. Persons with the same group may share a taxi ride")); + tagProperties.addAttribute(attrProperty); } @@ -9265,12 +9297,17 @@ GNEAttributeCarrier::fillTranshipCommonAttributes(GNETagProperties& tagPropertie // declare empty GNEAttributeProperties GNEAttributeProperties attrProperty; - // speed attrProperty = GNEAttributeProperties(SUMO_ATTR_SPEED, GNEAttributeProperties::FLOAT | GNEAttributeProperties::POSITIVE | GNEAttributeProperties::DEFAULTVALUE, - TL("speed of the container for this tranship in m/s"), + TL("speed of the person for this tranship in m/s (not together with duration)"), "1.39"); tagProperties.addAttribute(attrProperty); + + attrProperty = GNEAttributeProperties(SUMO_ATTR_DURATION, + GNEAttributeProperties::FLOAT | GNEAttributeProperties::POSITIVE | GNEAttributeProperties::DEFAULTVALUE, + TL("duration of the plan in second (not together with speed)"), + "0"); + tagProperties.addAttribute(attrProperty); } From 7884f883569e6b6035e4fa0c950424a7186e5a08 Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Tue, 10 Sep 2024 10:21:24 +0200 Subject: [PATCH 32/41] Updated netedit tests. Refs #3045 --- tests/netedit/attributesEnum.py | 114 +++++++ .../common/create/group/additionals.netedit | 44 +++ .../common/create/group/datas.netedit | 25 ++ .../common/create/group/errors.netedit | 0 .../create/group/errors.neteditcheckoutput | 0 .../create/group/guisettingsoutput.netedit | 225 +++++++++++++ .../common/create/group/log.netedit | 0 .../common/create/group/net.netedit | 307 ++++++++++++++++++ .../common/create/group/output.netedit | 12 + .../create/group/output.neteditcheckoutput | 0 .../common/create/group/routes.netedit | 22 ++ .../persontrip/common/create/group/test.py | 69 ++++ .../common/create/testsuite.netedit | 4 + .../create/testsuite.neteditcheckoutput | 4 + .../create/walk_factor/additionals.netedit | 44 +++ .../common/create/walk_factor/datas.netedit | 25 ++ .../common/create/walk_factor/errors.netedit | 0 .../walk_factor/errors.neteditcheckoutput | 0 .../walk_factor/guisettingsoutput.netedit | 225 +++++++++++++ .../common/create/walk_factor/log.netedit | 0 .../common/create/walk_factor/net.netedit | 307 ++++++++++++++++++ .../common/create/walk_factor/output.netedit | 12 + .../walk_factor/output.neteditcheckoutput | 0 .../common/create/walk_factor/routes.netedit | 22 ++ .../common/create/walk_factor/test.py | 81 +++++ .../common/inspect/group/additionals.netedit | 44 +++ .../common/inspect/group/datas.netedit | 25 ++ .../common/inspect/group/errors.netedit | 0 .../inspect/group/errors.neteditcheckoutput | 0 .../inspect/group/guisettingsoutput.netedit | 225 +++++++++++++ .../common/inspect/group/log.netedit | 0 .../common/inspect/group/net.netedit | 307 ++++++++++++++++++ .../common/inspect/group/output.netedit | 12 + .../inspect/group/output.neteditcheckoutput | 0 .../common/inspect/group/routes.netedit | 12 + .../persontrip/common/inspect/group/test.py | 74 +++++ .../common/inspect/testsuite.netedit | 4 + .../inspect/testsuite.neteditcheckoutput | 4 + .../inspect/walk_factor/additionals.netedit | 44 +++ .../common/inspect/walk_factor/datas.netedit | 25 ++ .../common/inspect/walk_factor/errors.netedit | 0 .../walk_factor/errors.neteditcheckoutput | 0 .../walk_factor/guisettingsoutput.netedit | 225 +++++++++++++ .../common/inspect/walk_factor/log.netedit | 0 .../common/inspect/walk_factor/net.netedit | 307 ++++++++++++++++++ .../common/inspect/walk_factor/output.netedit | 12 + .../walk_factor/output.neteditcheckoutput | 0 .../common/inspect/walk_factor/routes.netedit | 12 + .../common/inspect/walk_factor/test.py | 80 +++++ .../group/additionals.netedit | 44 +++ .../inspect_selection/group/datas.netedit | 25 ++ .../inspect_selection/group/errors.netedit | 0 .../group/errors.neteditcheckoutput | 0 .../group/guisettingsoutput.netedit | 225 +++++++++++++ .../inspect_selection/group/log.netedit | 0 .../inspect_selection/group/net.netedit | 307 ++++++++++++++++++ .../inspect_selection/group/output.netedit | 10 + .../group/output.neteditcheckoutput | 0 .../inspect_selection/group/routes.netedit | 30 ++ .../common/inspect_selection/group/test.py | 59 ++++ .../common/inspect_selection/routes.rou.xml | 4 +- .../inspect_selection/testsuite.netedit | 4 + .../testsuite.neteditcheckoutput | 4 + .../walk_factor/additionals.netedit | 44 +++ .../walk_factor/datas.netedit | 25 ++ .../walk_factor/errors.netedit | 0 .../walk_factor/errors.neteditcheckoutput | 0 .../walk_factor/guisettingsoutput.netedit | 225 +++++++++++++ .../inspect_selection/walk_factor/log.netedit | 0 .../inspect_selection/walk_factor/net.netedit | 307 ++++++++++++++++++ .../walk_factor/output.netedit | 10 + .../walk_factor/output.neteditcheckoutput | 0 .../walk_factor/routes.netedit | 30 ++ .../inspect_selection/walk_factor/test.py | 68 ++++ .../common/load/group/additionals.netedit | 44 +++ .../common/load/group/datas.netedit | 15 + .../common/load/group/errors.netedit | 0 .../load/group/errors.neteditcheckoutput | 0 .../load/group/guisettingsoutput.netedit | 225 +++++++++++++ .../persontrip/common/load/group/log.netedit | 1 + .../persontrip/common/load/group/net.netedit | 307 ++++++++++++++++++ .../common/load/group/output.netedit | 6 + .../load/group/output.neteditcheckoutput | 0 .../common/load/group/routes.netedit | 26 ++ .../common/load/group/routes.rou.xml | 12 + .../persontrip/common/load/testsuite.netedit | 4 + .../common/load/testsuite.neteditcheckoutput | 4 + .../load/walk_factor/additionals.netedit | 44 +++ .../common/load/walk_factor/datas.netedit | 15 + .../common/load/walk_factor/errors.netedit | 0 .../walk_factor/errors.neteditcheckoutput | 0 .../walk_factor/guisettingsoutput.netedit | 225 +++++++++++++ .../common/load/walk_factor/log.netedit | 1 + .../common/load/walk_factor/net.netedit | 307 ++++++++++++++++++ .../common/load/walk_factor/output.netedit | 6 + .../walk_factor/output.neteditcheckoutput | 0 .../common/load/walk_factor/routes.netedit | 26 ++ .../common/load/walk_factor/routes.rou.xml | 27 ++ 98 files changed, 5668 insertions(+), 2 deletions(-) create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/group/additionals.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/group/datas.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/group/errors.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/group/errors.neteditcheckoutput create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/group/guisettingsoutput.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/group/log.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/group/net.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/group/output.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/group/output.neteditcheckoutput create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/group/routes.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/group/test.py create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/additionals.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/datas.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/errors.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/errors.neteditcheckoutput create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/guisettingsoutput.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/log.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/net.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/output.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/output.neteditcheckoutput create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/routes.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/test.py create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/additionals.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/datas.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/errors.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/errors.neteditcheckoutput create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/guisettingsoutput.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/log.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/net.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/output.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/output.neteditcheckoutput create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/routes.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/test.py create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/additionals.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/datas.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/errors.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/errors.neteditcheckoutput create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/guisettingsoutput.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/log.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/net.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/output.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/output.neteditcheckoutput create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/routes.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/test.py create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/additionals.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/datas.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/errors.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/errors.neteditcheckoutput create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/guisettingsoutput.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/log.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/net.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/output.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/output.neteditcheckoutput create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/routes.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/test.py create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/additionals.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/datas.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/errors.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/errors.neteditcheckoutput create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/guisettingsoutput.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/log.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/net.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/output.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/output.neteditcheckoutput create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/routes.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/test.py create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/group/additionals.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/group/datas.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/group/errors.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/group/errors.neteditcheckoutput create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/group/guisettingsoutput.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/group/log.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/group/net.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/group/output.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/group/output.neteditcheckoutput create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/group/routes.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/group/routes.rou.xml create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/additionals.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/datas.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/errors.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/errors.neteditcheckoutput create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/guisettingsoutput.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/log.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/net.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/output.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/output.neteditcheckoutput create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/routes.netedit create mode 100644 tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/routes.rou.xml diff --git a/tests/netedit/attributesEnum.py b/tests/netedit/attributesEnum.py index e99ddcc238c3..64218f75d40d 100644 --- a/tests/netedit/attributesEnum.py +++ b/tests/netedit/attributesEnum.py @@ -3223,18 +3223,24 @@ class create: vTypes = 9 modes = 10 lines = 11 + walkFactor = 12 + group = 13 class inspect: arrivalPos = 1 vTypes = 2 modes = 3 lines = 4 + walkFactor = 5 + group = 6 class inspectSelection: arrivalPos = 1 vTypes = 2 modes = 3 lines = 4 + walkFactor = 5 + group = 6 class busStop: class create: @@ -3242,16 +3248,22 @@ class create: vTypes = 9 modes = 10 lines = 11 + walkFactor = 12 + group = 13 class inspect: vTypes = 1 modes = 2 lines = 3 + walkFactor = 4 + group = 5 class inspectSelection: vTypes = 1 modes = 2 lines = 3 + walkFactor = 4 + group = 5 class junction: class create: @@ -3259,16 +3271,22 @@ class create: vTypes = 9 modes = 10 lines = 11 + walkFactor = 12 + group = 13 class inspect: vTypes = 1 modes = 2 lines = 3 + walkFactor = 4 + group = 5 class inspectSelection: vTypes = 1 modes = 2 lines = 3 + walkFactor = 4 + group = 5 class busStop: class edge: @@ -3277,18 +3295,24 @@ class create: vTypes = 9 modes = 10 lines = 11 + walkFactor = 12 + group = 13 class inspect: arrivalPos = 1 vTypes = 2 modes = 3 lines = 4 + walkFactor = 5 + group = 6 class inspectSelection: arrivalPos = 1 vTypes = 2 modes = 3 lines = 4 + walkFactor = 5 + group = 6 class busStop: class create: @@ -3296,16 +3320,22 @@ class create: vTypes = 9 modes = 10 lines = 11 + walkFactor = 12 + group = 13 class inspect: vTypes = 1 modes = 2 lines = 3 + walkFactor = 4 + group = 5 class inspectSelection: vTypes = 1 modes = 2 lines = 3 + walkFactor = 4 + group = 5 class junction: class create: @@ -3313,16 +3343,22 @@ class create: vTypes = 9 modes = 10 lines = 11 + walkFactor = 12 + group = 13 class inspect: vTypes = 1 modes = 2 lines = 3 + walkFactor = 4 + group = 5 class inspectSelection: vTypes = 1 modes = 2 lines = 3 + walkFactor = 4 + group = 5 class junction: class edge: @@ -3331,18 +3367,24 @@ class create: vTypes = 9 modes = 10 lines = 11 + walkFactor = 12 + group = 13 class inspect: arrivalPos = 1 vTypes = 2 modes = 3 lines = 4 + walkFactor = 5 + group = 6 class inspectSelection: arrivalPos = 1 vTypes = 2 modes = 3 lines = 4 + walkFactor = 5 + group = 6 class busStop: class create: @@ -3350,16 +3392,22 @@ class create: vTypes = 9 modes = 10 lines = 11 + walkFactor = 12 + group = 13 class inspect: vTypes = 1 modes = 2 lines = 3 + walkFactor = 4 + group = 5 class inspectSelection: vTypes = 1 modes = 2 lines = 3 + walkFactor = 4 + group = 5 class junction: class create: @@ -3367,42 +3415,54 @@ class create: vTypes = 9 modes = 10 lines = 11 + walkFactor = 12 + group = 13 class inspect: vTypes = 1 modes = 2 lines = 3 + walkFactor = 4 + group = 5 class inspectSelection: vTypes = 1 modes = 2 lines = 3 + walkFactor = 4 + group = 5 class rideEdgeEdge: class create: arrivalPos = 8 lines = 9 + group = 10 class inspect: arrivalPos = 1 lines = 2 + group = 3 class inspectSelection: arrivalPos = 1 lines = 2 + group = 3 class rideEdgeBusStop: class create: arrivalPos = 8 lines = 9 + group = 10 class inspect: lines = 1 + group = 2 class inspectSelection: lines = 1 + group = 2 class walkEdgeEdge: @@ -3521,108 +3581,135 @@ class edge: class create: arrivalPos = 8 lines = 9 + group = 10 class inspect: arrivalPos = 1 lines = 2 + group = 3 class inspectSelection: arrivalPos = 1 lines = 2 + group = 3 class busStop: class create: arrivalPos = 8 lines = 9 + group = 10 class inspect: lines = 1 + group = 2 class inspectSelection: lines = 1 + group = 2 class junction: class create: arrivalPos = 8 lines = 9 + group = 10 class inspect: lines = 1 + group = 2 class inspectSelection: lines = 1 + group = 2 class busStop: class edge: class create: arrivalPos = 8 lines = 9 + group = 10 class inspect: arrivalPos = 1 lines = 2 + group = 3 class inspectSelection: arrivalPos = 1 lines = 2 + group = 3 class busStop: class create: arrivalPos = 8 lines = 9 + group = 10 class inspect: lines = 1 + group = 2 class inspectSelection: lines = 1 + group = 2 class junction: class create: arrivalPos = 8 lines = 9 + group = 10 class inspect: lines = 1 + group = 2 class inspectSelection: lines = 1 + group = 2 class junction: class edge: class create: arrivalPos = 8 lines = 9 + group = 10 class inspect: arrivalPos = 1 lines = 2 + group = 3 class inspectSelection: arrivalPos = 1 lines = 2 + group = 3 class busStop: class create: arrivalPos = 8 lines = 9 + group = 10 class inspect: lines = 1 + group = 2 class inspectSelection: lines = 1 + group = 2 class junction: class create: arrivalPos = 8 lines = 9 + group = 10 class inspect: lines = 1 + group = 2 class inspectSelection: lines = 1 + group = 2 class tranship: @@ -3631,107 +3718,134 @@ class edge: class create: arrivalPos = 8 speed = 9 + duration = 10 class inspect: arrivalPos = 1 speed = 2 + duration = 3 class inspectSelection: arrivalPos = 1 speed = 2 + duration = 3 class busStop: class create: arrivalPos = 8 speed = 9 + duration = 10 class inspect: speed = 1 + duration = 2 class inspectSelection: speed = 1 + duration = 2 class junction: class create: arrivalPos = 8 speed = 9 + duration = 10 class inspect: speed = 1 + duration = 2 class inspectSelection: speed = 1 + duration = 2 class busStop: class edge: class create: arrivalPos = 8 speed = 9 + duration = 10 class inspect: arrivalPos = 1 speed = 2 + duration = 3 class inspectSelection: arrivalPos = 1 speed = 2 + duration = 3 class busStop: class create: arrivalPos = 8 speed = 9 + duration = 10 class inspect: speed = 1 + duration = 2 class inspectSelection: speed = 1 + duration = 2 class junction: class create: speed = 8 + duration = 9 class inspect: speed = 1 + duration = 2 class inspectSelection: speed = 1 + duration = 2 class junction: class edge: class create: arrivalPos = 8 speed = 9 + duration = 10 class inspect: arrivalPos = 1 speed = 2 + duration = 3 class inspectSelection: arrivalPos = 1 speed = 2 + duration = 3 class busStop: class create: arrivalPos = 8 speed = 9 + duration = 10 class inspect: speed = 1 + duration = 2 class inspectSelection: speed = 1 + duration = 2 class junction: class create: arrivalPos = 8 speed = 9 + duration = 10 class inspect: speed = 1 + duration = 2 class inspectSelection: speed = 1 + duration = 2 # stop plans diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/group/additionals.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/create/group/additionals.netedit new file mode 100644 index 000000000000..c49544c5962f --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/create/group/additionals.netedit @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/group/datas.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/create/group/datas.netedit new file mode 100644 index 000000000000..e560bddc674a --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/create/group/datas.netedit @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/group/errors.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/create/group/errors.netedit new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/group/errors.neteditcheckoutput b/tests/netedit/elements/demands/personplan/persontrip/common/create/group/errors.neteditcheckoutput new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/group/guisettingsoutput.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/create/group/guisettingsoutput.netedit new file mode 100644 index 000000000000..32604708fd8e --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/create/group/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/group/log.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/create/group/log.netedit new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/group/net.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/create/group/net.netedit new file mode 100644 index 000000000000..8e28adcf2f92 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/create/group/net.netedit @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/group/output.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/create/group/output.netedit new file mode 100644 index 000000000000..51f2bce5c873 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/create/group/output.netedit @@ -0,0 +1,12 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +walk +TestFunctions: Clicked over position 685 - 611 +TestFunctions: Clicked over position 600 - 179 +personTrip +TestFunctions: Clicked over position 644 - 368 +custom line +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/group/output.neteditcheckoutput b/tests/netedit/elements/demands/personplan/persontrip/common/create/group/output.neteditcheckoutput new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/group/routes.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/create/group/routes.netedit new file mode 100644 index 000000000000..2ba5a7835f58 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/create/group/routes.netedit @@ -0,0 +1,22 @@ + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/group/test.py b/tests/netedit/elements/demands/personplan/persontrip/common/create/group/test.py new file mode 100644 index 000000000000..4ab4a61aefe9 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/create/group/test.py @@ -0,0 +1,69 @@ +#!/usr/bin/env python +# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo +# Copyright (C) 2009-2024 German Aerospace Center (DLR) and others. +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# https://www.eclipse.org/legal/epl-2.0/ +# This Source Code may also be made available under the following Secondary +# Licenses when the conditions for such availability set forth in the Eclipse +# Public License 2.0 are satisfied: GNU General Public License, version 2 +# or later which is available at +# https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html +# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + +# @file test.py +# @author Pablo Alvarez Lopez +# @date 2019-07-16 + +# import common functions for netedit tests +import os +import sys + +testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') +neteditTestRoot = os.path.join( + os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') +sys.path.append(neteditTestRoot) +import neteditTestFunctions as netedit # noqa + +# Open netedit +neteditProcess, referencePosition = netedit.setupAndStart(neteditTestRoot) + +# go to demand mode +netedit.supermodeDemand() + +# go to person mode +netedit.personMode() + +# change person plan +netedit.changePersonPlan("walk", False) + +# create route using one edge +netedit.leftClick(referencePosition, netedit.positions.elements.edge0) +netedit.leftClick(referencePosition, netedit.positions.elements.demands.busStop) + +# press enter to create route +netedit.typeEnter() + +# go to personTrip.busStop.busStop mode +netedit.personPlanMode() + +# go to personTrip.busStop.busStop mode +netedit.changePersonPlanMode("personTrip") + +# create personTrip.busStop.busStop +netedit.leftClick(referencePosition, netedit.positions.elements.demands.busStopB) + +# set invalid person number +netedit.changeDefaultValue(netedit.attrs.personTrip.busStop.busStop.create.group, "custom group") + +# press enter to create route +netedit.typeEnter() + +# Check undo redo +netedit.checkUndoRedo(referencePosition) + +# save Netedit config +netedit.saveNeteditConfig(referencePosition) + +# quit netedit +netedit.quit(neteditProcess) diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/testsuite.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/create/testsuite.netedit index a127a6de9120..15896914f1bb 100644 --- a/tests/netedit/elements/demands/personplan/persontrip/common/create/testsuite.netedit +++ b/tests/netedit/elements/demands/personplan/persontrip/common/create/testsuite.netedit @@ -3,3 +3,7 @@ vtypes modes lines + +walk_factor + +group diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/testsuite.neteditcheckoutput b/tests/netedit/elements/demands/personplan/persontrip/common/create/testsuite.neteditcheckoutput index a127a6de9120..15896914f1bb 100644 --- a/tests/netedit/elements/demands/personplan/persontrip/common/create/testsuite.neteditcheckoutput +++ b/tests/netedit/elements/demands/personplan/persontrip/common/create/testsuite.neteditcheckoutput @@ -3,3 +3,7 @@ vtypes modes lines + +walk_factor + +group diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/additionals.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/additionals.netedit new file mode 100644 index 000000000000..c49544c5962f --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/additionals.netedit @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/datas.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/datas.netedit new file mode 100644 index 000000000000..e560bddc674a --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/datas.netedit @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/errors.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/errors.netedit new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/errors.neteditcheckoutput b/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/errors.neteditcheckoutput new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/guisettingsoutput.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/guisettingsoutput.netedit new file mode 100644 index 000000000000..32604708fd8e --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/log.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/log.netedit new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/net.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/net.netedit new file mode 100644 index 000000000000..8e28adcf2f92 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/net.netedit @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/output.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/output.netedit new file mode 100644 index 000000000000..51f2bce5c873 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/output.netedit @@ -0,0 +1,12 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +walk +TestFunctions: Clicked over position 685 - 611 +TestFunctions: Clicked over position 600 - 179 +personTrip +TestFunctions: Clicked over position 644 - 368 +custom line +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/output.neteditcheckoutput b/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/output.neteditcheckoutput new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/routes.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/routes.netedit new file mode 100644 index 000000000000..2ba5a7835f58 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/routes.netedit @@ -0,0 +1,22 @@ + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/test.py b/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/test.py new file mode 100644 index 000000000000..102b97ba8c1a --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/create/walk_factor/test.py @@ -0,0 +1,81 @@ +#!/usr/bin/env python +# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo +# Copyright (C) 2009-2024 German Aerospace Center (DLR) and others. +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# https://www.eclipse.org/legal/epl-2.0/ +# This Source Code may also be made available under the following Secondary +# Licenses when the conditions for such availability set forth in the Eclipse +# Public License 2.0 are satisfied: GNU General Public License, version 2 +# or later which is available at +# https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html +# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + +# @file test.py +# @author Pablo Alvarez Lopez +# @date 2019-07-16 + +# import common functions for netedit tests +import os +import sys + +testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') +neteditTestRoot = os.path.join( + os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') +sys.path.append(neteditTestRoot) +import neteditTestFunctions as netedit # noqa + +# Open netedit +neteditProcess, referencePosition = netedit.setupAndStart(neteditTestRoot) + +# go to demand mode +netedit.supermodeDemand() + +# go to person mode +netedit.personMode() + +# change person plan +netedit.changePersonPlan("walk", False) + +# create route using one edge +netedit.leftClick(referencePosition, netedit.positions.elements.edge0) +netedit.leftClick(referencePosition, netedit.positions.elements.demands.busStop) + +# press enter to create route +netedit.typeEnter() + +# go to personTrip.busStop.busStop mode +netedit.personPlanMode() + +# go to personTrip.busStop.busStop mode +netedit.changePersonPlanMode("personTrip") + +# create personTrip.busStop.busStop +netedit.leftClick(referencePosition, netedit.positions.elements.demands.busStopB) + +# set invalid person number +netedit.changeDefaultValue(netedit.attrs.personTrip.busStop.busStop.create.walkFactor, "dummy") + +# press enter to create route +netedit.typeEnter() + +# set invalid person number +netedit.changeDefaultValue(netedit.attrs.personTrip.busStop.busStop.create.walkFactor, "-12") + +# press enter to create route +netedit.typeEnter() + +# set invalid person number +netedit.changeDefaultValue(netedit.attrs.personTrip.busStop.busStop.create.walkFactor, "7.5") + +# press enter to create route +netedit.typeEnter() + +# Check undo redo +netedit.checkUndoRedo(referencePosition) + +# save Netedit config +netedit.saveNeteditConfig(referencePosition) + +# quit netedit +netedit.quit(neteditProcess) diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/additionals.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/additionals.netedit new file mode 100644 index 000000000000..f84c804f0abb --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/additionals.netedit @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/datas.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/datas.netedit new file mode 100644 index 000000000000..f0caeba90872 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/datas.netedit @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/errors.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/errors.netedit new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/errors.neteditcheckoutput b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/errors.neteditcheckoutput new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/guisettingsoutput.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/guisettingsoutput.netedit new file mode 100644 index 000000000000..32604708fd8e --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/log.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/log.netedit new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/net.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/net.netedit new file mode 100644 index 000000000000..8e28adcf2f92 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/net.netedit @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/output.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/output.netedit new file mode 100644 index 000000000000..74ec02373633 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/output.netedit @@ -0,0 +1,12 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +walk +TestFunctions: Clicked over position 685 - 611 +personTrip +TestFunctions: Clicked over position 798 - 194 +TestFunctions: Clicked over position 904 - 172 +custom line +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/output.neteditcheckoutput b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/output.neteditcheckoutput new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/routes.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/routes.netedit new file mode 100644 index 000000000000..05ff95644a4e --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/routes.netedit @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/test.py b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/test.py new file mode 100644 index 000000000000..f651207d3cc1 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/group/test.py @@ -0,0 +1,74 @@ +#!/usr/bin/env python +# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo +# Copyright (C) 2009-2024 German Aerospace Center (DLR) and others. +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# https://www.eclipse.org/legal/epl-2.0/ +# This Source Code may also be made available under the following Secondary +# Licenses when the conditions for such availability set forth in the Eclipse +# Public License 2.0 are satisfied: GNU General Public License, version 2 +# or later which is available at +# https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html +# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + +# @file test.py +# @author Pablo Alvarez Lopez +# @date 2019-07-16 + +# import common functions for netedit tests +import os +import sys + +testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') +neteditTestRoot = os.path.join( + os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') +sys.path.append(neteditTestRoot) +import neteditTestFunctions as netedit # noqa + +# Open netedit +neteditProcess, referencePosition = netedit.setupAndStart(neteditTestRoot) + +# go to demand mode +netedit.supermodeDemand() + +# go to person mode +netedit.personMode() + +# change person plan +netedit.changePersonPlan("walk", False) + +# create route using one edge +netedit.leftClick(referencePosition, netedit.positions.elements.edge0) + +# press enter to create route +netedit.typeEnter() + +# go to personTrip.edge.edge mode +netedit.personPlanMode() + +# go to personTrip.edge.edge mode +netedit.changePersonPlanMode("personTrip") + +# create personTrip.edge.edge +netedit.leftClick(referencePosition, netedit.positions.elements.edge2) + +# press enter to create route +netedit.typeEnter() + +# go to inspect mode +netedit.inspectMode() + +# now inspect plan top +netedit.leftClick(referencePosition, netedit.positions.elements.demands.planEdge2Ped) + +# change depart with an invalid value +netedit.modifyAttribute(netedit.attrs.personTrip.edge.edge.inspect.group, "custom group", False) + +# Check undo redo +netedit.checkUndoRedo(referencePosition) + +# save Netedit config +netedit.saveNeteditConfig(referencePosition) + +# quit netedit +netedit.quit(neteditProcess) diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/testsuite.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/testsuite.netedit index a127a6de9120..15896914f1bb 100644 --- a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/testsuite.netedit +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/testsuite.netedit @@ -3,3 +3,7 @@ vtypes modes lines + +walk_factor + +group diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/testsuite.neteditcheckoutput b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/testsuite.neteditcheckoutput index a127a6de9120..15896914f1bb 100644 --- a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/testsuite.neteditcheckoutput +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/testsuite.neteditcheckoutput @@ -3,3 +3,7 @@ vtypes modes lines + +walk_factor + +group diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/additionals.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/additionals.netedit new file mode 100644 index 000000000000..f84c804f0abb --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/additionals.netedit @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/datas.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/datas.netedit new file mode 100644 index 000000000000..f0caeba90872 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/datas.netedit @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/errors.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/errors.netedit new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/errors.neteditcheckoutput b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/errors.neteditcheckoutput new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/guisettingsoutput.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/guisettingsoutput.netedit new file mode 100644 index 000000000000..32604708fd8e --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/log.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/log.netedit new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/net.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/net.netedit new file mode 100644 index 000000000000..8e28adcf2f92 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/net.netedit @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/output.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/output.netedit new file mode 100644 index 000000000000..74ec02373633 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/output.netedit @@ -0,0 +1,12 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +walk +TestFunctions: Clicked over position 685 - 611 +personTrip +TestFunctions: Clicked over position 798 - 194 +TestFunctions: Clicked over position 904 - 172 +custom line +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/output.neteditcheckoutput b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/output.neteditcheckoutput new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/routes.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/routes.netedit new file mode 100644 index 000000000000..05ff95644a4e --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/routes.netedit @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/test.py b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/test.py new file mode 100644 index 000000000000..c5a480bd5df1 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect/walk_factor/test.py @@ -0,0 +1,80 @@ +#!/usr/bin/env python +# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo +# Copyright (C) 2009-2024 German Aerospace Center (DLR) and others. +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# https://www.eclipse.org/legal/epl-2.0/ +# This Source Code may also be made available under the following Secondary +# Licenses when the conditions for such availability set forth in the Eclipse +# Public License 2.0 are satisfied: GNU General Public License, version 2 +# or later which is available at +# https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html +# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + +# @file test.py +# @author Pablo Alvarez Lopez +# @date 2019-07-16 + +# import common functions for netedit tests +import os +import sys + +testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') +neteditTestRoot = os.path.join( + os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') +sys.path.append(neteditTestRoot) +import neteditTestFunctions as netedit # noqa + +# Open netedit +neteditProcess, referencePosition = netedit.setupAndStart(neteditTestRoot) + +# go to demand mode +netedit.supermodeDemand() + +# go to person mode +netedit.personMode() + +# change person plan +netedit.changePersonPlan("walk", False) + +# create route using one edge +netedit.leftClick(referencePosition, netedit.positions.elements.edge0) + +# press enter to create route +netedit.typeEnter() + +# go to personTrip.edge.edge mode +netedit.personPlanMode() + +# go to personTrip.edge.edge mode +netedit.changePersonPlanMode("personTrip") + +# create personTrip.edge.edge +netedit.leftClick(referencePosition, netedit.positions.elements.edge2) + +# press enter to create route +netedit.typeEnter() + +# go to inspect mode +netedit.inspectMode() + +# now inspect plan top +netedit.leftClick(referencePosition, netedit.positions.elements.demands.planEdge2Ped) + +# change depart with an invalid value +netedit.modifyAttribute(netedit.attrs.personTrip.edge.edge.inspect.walkFactor, "dummy", False) + +# change depart with an invalid value +netedit.modifyAttribute(netedit.attrs.personTrip.edge.edge.inspect.walkFactor, "-13", False) + +# change depart with an invalid value +netedit.modifyAttribute(netedit.attrs.personTrip.edge.edge.inspect.walkFactor, "11.23", False) + +# Check undo redo +netedit.checkUndoRedo(referencePosition) + +# save Netedit config +netedit.saveNeteditConfig(referencePosition) + +# quit netedit +netedit.quit(neteditProcess) diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/additionals.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/additionals.netedit new file mode 100644 index 000000000000..a57a0cc7eed6 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/additionals.netedit @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/datas.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/datas.netedit new file mode 100644 index 000000000000..1c75c38e542c --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/datas.netedit @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/errors.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/errors.netedit new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/errors.neteditcheckoutput b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/errors.neteditcheckoutput new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/guisettingsoutput.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/guisettingsoutput.netedit new file mode 100644 index 000000000000..32604708fd8e --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/log.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/log.netedit new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/net.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/net.netedit new file mode 100644 index 000000000000..8e28adcf2f92 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/net.netedit @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/output.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/output.netedit new file mode 100644 index 000000000000..77bd08a84a15 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/output.netedit @@ -0,0 +1,10 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +TestFunctions: Clicked over position 904 - 172 +dummy + +car +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/output.neteditcheckoutput b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/output.neteditcheckoutput new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/routes.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/routes.netedit new file mode 100644 index 000000000000..d82d378312d5 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/routes.netedit @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/test.py b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/test.py new file mode 100644 index 000000000000..864b29d278eb --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/group/test.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python +# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo +# Copyright (C) 2009-2024 German Aerospace Center (DLR) and others. +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# https://www.eclipse.org/legal/epl-2.0/ +# This Source Code may also be made available under the following Secondary +# Licenses when the conditions for such availability set forth in the Eclipse +# Public License 2.0 are satisfied: GNU General Public License, version 2 +# or later which is available at +# https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html +# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + +# @file test.py +# @author Pablo Alvarez Lopez +# @date 2019-07-16 + +# import common functions for netedit tests +import os +import sys + +testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') +neteditTestRoot = os.path.join( + os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') +sys.path.append(neteditTestRoot) +import neteditTestFunctions as netedit # noqa + +# Open netedit +neteditProcess, referencePosition = netedit.setupAndStart(neteditTestRoot) + +# go to demand mode +netedit.supermodeDemand() + +# select two-way mode +netedit.changeEditMode(netedit.attrs.modes.demand.showPersonPlans) + +# go to select mode +netedit.selectMode() + +# select all using invert +netedit.selectionInvert() + +# go to inspect mode +netedit.inspectMode() + +# now inspect plan top +netedit.leftClick(referencePosition, netedit.positions.elements.demands.planEdge2Ped) + +# change depart with an invalid value +netedit.modifyAttribute(netedit.attrs.personTrip.edge.edge.inspectSelection.group, "custom group", False) + +# Check undo redo +netedit.checkUndoRedo(referencePosition) + +# save Netedit config +netedit.saveNeteditConfig(referencePosition) + +# quit netedit +netedit.quit(neteditProcess) diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/routes.rou.xml b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/routes.rou.xml index 614f1b752d6f..875c84d54c79 100644 --- a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/routes.rou.xml +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/routes.rou.xml @@ -11,11 +11,11 @@ - + - + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/testsuite.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/testsuite.netedit index a127a6de9120..15896914f1bb 100644 --- a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/testsuite.netedit +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/testsuite.netedit @@ -3,3 +3,7 @@ vtypes modes lines + +walk_factor + +group diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/testsuite.neteditcheckoutput b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/testsuite.neteditcheckoutput index a127a6de9120..15896914f1bb 100644 --- a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/testsuite.neteditcheckoutput +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/testsuite.neteditcheckoutput @@ -3,3 +3,7 @@ vtypes modes lines + +walk_factor + +group diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/additionals.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/additionals.netedit new file mode 100644 index 000000000000..a57a0cc7eed6 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/additionals.netedit @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/datas.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/datas.netedit new file mode 100644 index 000000000000..1c75c38e542c --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/datas.netedit @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/errors.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/errors.netedit new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/errors.neteditcheckoutput b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/errors.neteditcheckoutput new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/guisettingsoutput.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/guisettingsoutput.netedit new file mode 100644 index 000000000000..32604708fd8e --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/log.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/log.netedit new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/net.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/net.netedit new file mode 100644 index 000000000000..8e28adcf2f92 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/net.netedit @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/output.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/output.netedit new file mode 100644 index 000000000000..77bd08a84a15 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/output.netedit @@ -0,0 +1,10 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +TestFunctions: Clicked over position 904 - 172 +dummy + +car +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/output.neteditcheckoutput b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/output.neteditcheckoutput new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/routes.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/routes.netedit new file mode 100644 index 000000000000..d82d378312d5 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/routes.netedit @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/test.py b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/test.py new file mode 100644 index 000000000000..5458712f191e --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/inspect_selection/walk_factor/test.py @@ -0,0 +1,68 @@ +#!/usr/bin/env python +# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo +# Copyright (C) 2009-2024 German Aerospace Center (DLR) and others. +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# https://www.eclipse.org/legal/epl-2.0/ +# This Source Code may also be made available under the following Secondary +# Licenses when the conditions for such availability set forth in the Eclipse +# Public License 2.0 are satisfied: GNU General Public License, version 2 +# or later which is available at +# https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html +# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later + +# @file test.py +# @author Pablo Alvarez Lopez +# @date 2019-07-16 + +# import common functions for netedit tests +import os +import sys + +testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') +neteditTestRoot = os.path.join( + os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') +sys.path.append(neteditTestRoot) +import neteditTestFunctions as netedit # noqa + +# Open netedit +neteditProcess, referencePosition = netedit.setupAndStart(neteditTestRoot) + +# go to demand mode +netedit.supermodeDemand() + +# select two-way mode +netedit.changeEditMode(netedit.attrs.modes.demand.showPersonPlans) + +# go to select mode +netedit.selectMode() + +# select all using invert +netedit.selectionInvert() + +# go to inspect mode +netedit.inspectMode() + +# now inspect plan top +netedit.leftClick(referencePosition, netedit.positions.elements.demands.planEdge2Ped) + +# change depart with an invalid value +netedit.modifyAttribute(netedit.attrs.personTrip.edge.edge.inspectSelection.walkFactor, "dummy", False) + +# change depart with an invalid value +netedit.modifyAttribute(netedit.attrs.personTrip.edge.edge.inspectSelection.walkFactor, "-7", False) + +# change depart with an invalid value +netedit.modifyAttribute(netedit.attrs.personTrip.edge.edge.inspectSelection.walkFactor, "6", False) + +# change depart with an invalid value +netedit.modifyAttribute(netedit.attrs.personTrip.edge.edge.inspectSelection.walkFactor, "11.3", False) + +# Check undo redo +netedit.checkUndoRedo(referencePosition) + +# save Netedit config +netedit.saveNeteditConfig(referencePosition) + +# quit netedit +netedit.quit(neteditProcess) diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/group/additionals.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/load/group/additionals.netedit new file mode 100644 index 000000000000..bce542ef41c3 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/load/group/additionals.netedit @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/group/datas.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/load/group/datas.netedit new file mode 100644 index 000000000000..59fc6a5c0a2c --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/load/group/datas.netedit @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/group/errors.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/load/group/errors.netedit new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/group/errors.neteditcheckoutput b/tests/netedit/elements/demands/personplan/persontrip/common/load/group/errors.neteditcheckoutput new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/group/guisettingsoutput.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/load/group/guisettingsoutput.netedit new file mode 100644 index 000000000000..32604708fd8e --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/load/group/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/group/log.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/load/group/log.netedit new file mode 100644 index 000000000000..ebf45b517d94 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/load/group/log.netedit @@ -0,0 +1 @@ +Warning: Unknown person mode 'dummy'. Must be a combination of ("car", "taxi", "bicycle" or "public") diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/group/net.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/load/group/net.netedit new file mode 100644 index 000000000000..8e28adcf2f92 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/load/group/net.netedit @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/group/output.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/load/group/output.netedit new file mode 100644 index 000000000000..8de053ef27d4 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/load/group/output.netedit @@ -0,0 +1,6 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/group/output.neteditcheckoutput b/tests/netedit/elements/demands/personplan/persontrip/common/load/group/output.neteditcheckoutput new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/group/routes.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/load/group/routes.netedit new file mode 100644 index 000000000000..7ff388988a2e --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/load/group/routes.netedit @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/group/routes.rou.xml b/tests/netedit/elements/demands/personplan/persontrip/common/load/group/routes.rou.xml new file mode 100644 index 000000000000..827d1d59b347 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/load/group/routes.rou.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/testsuite.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/load/testsuite.netedit index a127a6de9120..c9a7aefe15f2 100644 --- a/tests/netedit/elements/demands/personplan/persontrip/common/load/testsuite.netedit +++ b/tests/netedit/elements/demands/personplan/persontrip/common/load/testsuite.netedit @@ -3,3 +3,7 @@ vtypes modes lines + +group + +walk_factor diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/testsuite.neteditcheckoutput b/tests/netedit/elements/demands/personplan/persontrip/common/load/testsuite.neteditcheckoutput index a127a6de9120..c9a7aefe15f2 100644 --- a/tests/netedit/elements/demands/personplan/persontrip/common/load/testsuite.neteditcheckoutput +++ b/tests/netedit/elements/demands/personplan/persontrip/common/load/testsuite.neteditcheckoutput @@ -3,3 +3,7 @@ vtypes modes lines + +group + +walk_factor diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/additionals.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/additionals.netedit new file mode 100644 index 000000000000..bce542ef41c3 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/additionals.netedit @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/datas.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/datas.netedit new file mode 100644 index 000000000000..59fc6a5c0a2c --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/datas.netedit @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/errors.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/errors.netedit new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/errors.neteditcheckoutput b/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/errors.neteditcheckoutput new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/guisettingsoutput.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/guisettingsoutput.netedit new file mode 100644 index 000000000000..32604708fd8e --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/log.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/log.netedit new file mode 100644 index 000000000000..ebf45b517d94 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/log.netedit @@ -0,0 +1 @@ +Warning: Unknown person mode 'dummy'. Must be a combination of ("car", "taxi", "bicycle" or "public") diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/net.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/net.netedit new file mode 100644 index 000000000000..8e28adcf2f92 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/net.netedit @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/output.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/output.netedit new file mode 100644 index 000000000000..8de053ef27d4 --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/output.netedit @@ -0,0 +1,6 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/output.neteditcheckoutput b/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/output.neteditcheckoutput new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/routes.netedit b/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/routes.netedit new file mode 100644 index 000000000000..7ff388988a2e --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/routes.netedit @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/routes.rou.xml b/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/routes.rou.xml new file mode 100644 index 000000000000..18ef97d9bbbe --- /dev/null +++ b/tests/netedit/elements/demands/personplan/persontrip/common/load/walk_factor/routes.rou.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + From c4449c1c946da2fc6032b32c1ca7a9bdddecf679 Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Tue, 10 Sep 2024 11:11:12 +0200 Subject: [PATCH 33/41] Added new attributes in personTrips. Refs #15368 --- src/netedit/elements/demand/GNEPersonTrip.cpp | 29 +++++++++++++++++-- src/netedit/elements/demand/GNEPersonTrip.h | 12 ++++++-- .../elements/demand/GNERouteHandler.cpp | 14 ++++++--- src/netedit/elements/demand/GNERouteHandler.h | 3 +- src/utils/handlers/RouteHandler.cpp | 8 ++++- src/utils/handlers/RouteHandler.h | 3 +- 6 files changed, 58 insertions(+), 11 deletions(-) diff --git a/src/netedit/elements/demand/GNEPersonTrip.cpp b/src/netedit/elements/demand/GNEPersonTrip.cpp index 6e64ae158c5e..66abfd7f673b 100644 --- a/src/netedit/elements/demand/GNEPersonTrip.cpp +++ b/src/netedit/elements/demand/GNEPersonTrip.cpp @@ -41,7 +41,8 @@ GNEDemandElementPlan(this, -1, -1) { GNEPersonTrip::GNEPersonTrip(GNENet* net, SumoXMLTag tag, GUIIcon icon, GNEDemandElement* personParent, const GNEPlanParents& planParameters, - double arrivalPosition, const std::vector& types, const std::vector& modes, const std::vector& lines) : + const double arrivalPosition, const std::vector& types, const std::vector& modes, + const std::vector& lines, const double walkFactor, const std::string& group) : GNEDemandElement(personParent, net, GLO_PERSONTRIP, tag, GUIIconSubSys::getIcon(icon), GNEPathManager::PathElement::Options::DEMAND_ELEMENT, planParameters.getJunctions(), planParameters.getEdges(), {}, @@ -49,7 +50,9 @@ planParameters.getAdditionalElements(), planParameters.getDemandElements(personP GNEDemandElementPlan(this, -1, arrivalPosition), myVTypes(types), myModes(modes), -myLines(lines) { +myLines(lines), +myWalkFactor(walkFactor), +myGroup(group) { } @@ -84,6 +87,12 @@ GNEPersonTrip::writeDemandElement(OutputDevice& device) const { if (myVTypes.size() > 0) { device.writeAttr(SUMO_ATTR_VTYPES, myVTypes); } + if (myWalkFactor > 0) { + device.writeAttr(SUMO_ATTR_WALKFACTOR, myWalkFactor); + } + if (myGroup.size() > 0) { + device.writeAttr(SUMO_ATTR_GROUP, myGroup); + } device.closeTag(); } @@ -194,6 +203,10 @@ GNEPersonTrip::getAttribute(SumoXMLAttr key) const { return joinToString(myVTypes, " "); case SUMO_ATTR_LINES: return joinToString(myLines, " "); + case SUMO_ATTR_WALKFACTOR: + return toString(myWalkFactor); + case SUMO_ATTR_GROUP: + return toString(myGroup); default: return getPlanAttribute(key); } @@ -218,6 +231,8 @@ GNEPersonTrip::setAttribute(SumoXMLAttr key, const std::string& value, GNEUndoLi case SUMO_ATTR_MODES: case SUMO_ATTR_VTYPES: case SUMO_ATTR_LINES: + case SUMO_ATTR_WALKFACTOR: + case SUMO_ATTR_GROUP: GNEChange_Attribute::changeAttribute(this, key, value, undoList); break; default: @@ -240,6 +255,10 @@ GNEPersonTrip::isValid(SumoXMLAttr key, const std::string& value) { return canParse >(value); case SUMO_ATTR_LINES: return canParse >(value); + case SUMO_ATTR_WALKFACTOR: + return canParse(value) && (parse(value) >= 0); + case SUMO_ATTR_GROUP: + return true; default: return isPlanValid(key, value); } @@ -286,6 +305,12 @@ GNEPersonTrip::setAttribute(SumoXMLAttr key, const std::string& value) { case SUMO_ATTR_LINES: myLines = GNEAttributeCarrier::parse >(value); break; + case SUMO_ATTR_WALKFACTOR: + myWalkFactor = parse(value); + break; + case SUMO_ATTR_GROUP: + myGroup = value; + break; default: setPlanAttribute(key, value); break; diff --git a/src/netedit/elements/demand/GNEPersonTrip.h b/src/netedit/elements/demand/GNEPersonTrip.h index 8620c7d8bee7..10c43419670a 100644 --- a/src/netedit/elements/demand/GNEPersonTrip.h +++ b/src/netedit/elements/demand/GNEPersonTrip.h @@ -50,10 +50,12 @@ class GNEPersonTrip : public GNEDemandElement, public Parameterised, public GNED * @param[in] types list of possible vehicle types to take * @param[in] modes list of possible traffic modes * @param[in] lines list of lines + * @param[in] walkFactor walk factor + * @param[in] group group */ GNEPersonTrip(GNENet* net, SumoXMLTag tag, GUIIcon icon, GNEDemandElement* personParent, const GNEPlanParents& planParameters, - double arrivalPosition, const std::vector& types, const std::vector& modes, - const std::vector& lines); + const double arrivalPosition, const std::vector& types, const std::vector& modes, + const std::vector& lines, const double walkFactor, const std::string& group); /// @brief destructor ~GNEPersonTrip(); @@ -216,6 +218,12 @@ class GNEPersonTrip : public GNEDemandElement, public Parameterised, public GNED /// @brief valid line or vehicle ids or ANY std::vector myLines; + /// @brief walk factor + double myWalkFactor = 0; + + /// @brief group + std::string myGroup; + private: /// @brief method for setting the attribute and nothing else void setAttribute(SumoXMLAttr key, const std::string& value); diff --git a/src/netedit/elements/demand/GNERouteHandler.cpp b/src/netedit/elements/demand/GNERouteHandler.cpp index 0aa022731fcb..b203f9185043 100644 --- a/src/netedit/elements/demand/GNERouteHandler.cpp +++ b/src/netedit/elements/demand/GNERouteHandler.cpp @@ -608,7 +608,8 @@ GNERouteHandler::buildPersonFlow(const CommonXMLStructure::SumoBaseObject* /*sum void GNERouteHandler::buildPersonTrip(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, - double arrivalPos, const std::vector& types, const std::vector& modes, const std::vector& lines) { + const double arrivalPos, const std::vector& types, const std::vector& modes, + const std::vector& lines, const double walkFactor, const std::string& group) { // get values GNEDemandElement* personParent = getPersonParent(sumoBaseObject); const auto tagIcon = GNEDemandElementPlan::getPersonTripTagIcon(planParameters); @@ -620,7 +621,8 @@ GNERouteHandler::buildPersonTrip(const CommonXMLStructure::SumoBaseObject* sumoB WRITE_WARNING(TL("invalid combination for personTrip")); } else if (planParents.checkIntegrity(tagIcon.first, personParent, planParameters)) { // build person trip - GNEDemandElement* personTrip = new GNEPersonTrip(myNet, tagIcon.first, tagIcon.second, personParent, planParents, arrivalPos, types, modes, lines); + GNEDemandElement* personTrip = new GNEPersonTrip(myNet, tagIcon.first, tagIcon.second, personParent, planParents, + arrivalPos, types, modes, lines, walkFactor, group); // continue depending of undo.redo if (myAllowUndoRedo) { myNet->getViewNet()->getUndoList()->begin(personTrip, TLF("add % in '%'", personTrip->getTagStr(), personParent->getID())); @@ -1093,11 +1095,13 @@ GNERouteHandler::buildPersonPlan(const GNEDemandElement* planTemplate, GNEDemand const bool friendlyPos = personPlanObject->hasBoolAttribute(SUMO_ATTR_FRIENDLY_POS) ? personPlanObject->getBoolAttribute(SUMO_ATTR_FRIENDLY_POS) : personPlanObject->hasStringAttribute(SUMO_ATTR_FRIENDLY_POS) ? GNEAttributeCarrier::parse(personPlanObject->getStringAttribute(SUMO_ATTR_FRIENDLY_POS)) : false; + const double walkFactor = personPlanObject->hasDoubleAttribute(SUMO_ATTR_WALKFACTOR) ? personPlanObject->getDoubleAttribute(SUMO_ATTR_WALKFACTOR) : 0; + const std::string group = personPlanObject->hasStringAttribute(SUMO_ATTR_GROUP) ? personPlanObject->getStringAttribute(SUMO_ATTR_GROUP) : ""; // build depending of plan type if (planTemplate->getTagProperty().isPlanWalk()) { buildWalk(personPlanObject, planCreator->getPlanParameteres(), arrivalPos); } else if (planTemplate->getTagProperty().isPlanPersonTrip()) { - buildPersonTrip(personPlanObject, planCreator->getPlanParameteres(), arrivalPos, types, modes, lines); + buildPersonTrip(personPlanObject, planCreator->getPlanParameteres(), arrivalPos, types, modes, lines, walkFactor, group); } else if (planTemplate->getTagProperty().isPlanRide()) { buildRide(personPlanObject, planCreator->getPlanParameteres(), arrivalPos, lines); } else if (planTemplate->getTagProperty().isPlanStopPerson()) { @@ -1301,7 +1305,9 @@ GNERouteHandler::duplicatePlan(const GNEDemandElement* originalPlan, GNEDemandEl planObject->getDoubleAttribute(SUMO_ATTR_ARRIVALPOS), planObject->getStringListAttribute(SUMO_ATTR_VTYPES), planObject->getStringListAttribute(SUMO_ATTR_MODES), - planObject->getStringListAttribute(SUMO_ATTR_LINES)); + planObject->getStringListAttribute(SUMO_ATTR_LINES), + planObject->getDoubleAttribute(SUMO_ATTR_WALKFACTOR), + planObject->getStringAttribute(SUMO_ATTR_GROUP)); } else if (tagProperty.isPlanWalk()) { buildWalk(planObject, planParameters, planObject->getDoubleAttribute(SUMO_ATTR_ARRIVALPOS)); diff --git a/src/netedit/elements/demand/GNERouteHandler.h b/src/netedit/elements/demand/GNERouteHandler.h index 2bb4ad841ada..f598856d8560 100644 --- a/src/netedit/elements/demand/GNERouteHandler.h +++ b/src/netedit/elements/demand/GNERouteHandler.h @@ -123,7 +123,8 @@ class GNERouteHandler : public RouteHandler { /// @brief build person trip void buildPersonTrip(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, - double arrivalPos, const std::vector& types, const std::vector& modes, const std::vector& lines); + const double arrivalPos, const std::vector& types, const std::vector& modes, + const std::vector& lines, const double walkFactor, const std::string& group); /// @brief build walk void buildWalk(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, diff --git a/src/utils/handlers/RouteHandler.cpp b/src/utils/handlers/RouteHandler.cpp index 09774b81c215..87eec66a42a2 100644 --- a/src/utils/handlers/RouteHandler.cpp +++ b/src/utils/handlers/RouteHandler.cpp @@ -308,7 +308,9 @@ RouteHandler::parseSumoBaseObject(CommonXMLStructure::SumoBaseObject* obj) { obj->getDoubleAttribute(SUMO_ATTR_ARRIVALPOS), obj->getStringListAttribute(SUMO_ATTR_VTYPES), obj->getStringListAttribute(SUMO_ATTR_MODES), - obj->getStringListAttribute(SUMO_ATTR_LINES)); + obj->getStringListAttribute(SUMO_ATTR_LINES), + obj->getDoubleAttribute(SUMO_ATTR_WALKFACTOR), + obj->getStringAttribute(SUMO_ATTR_GROUP)); break; case SUMO_TAG_RIDE: buildRide(obj, @@ -716,6 +718,8 @@ RouteHandler::parsePersonTrip(const SUMOSAXAttributes& attrs) { std::vector modes = attrs.getOpt >(SUMO_ATTR_MODES, "", parsedOk); const double departPos = attrs.getOpt(SUMO_ATTR_DEPARTPOS, "", parsedOk, -1); const double arrivalPos = attrs.getOpt(SUMO_ATTR_ARRIVALPOS, "", parsedOk, -1); + const double walkFactor = attrs.getOpt(SUMO_ATTR_WALKFACTOR, "", parsedOk, 0); + const std::string group = attrs.getOpt(SUMO_ATTR_GROUP, "", parsedOk, ""); // check modes SVCPermissions dummyModeSet; std::string dummyError; @@ -733,6 +737,8 @@ RouteHandler::parsePersonTrip(const SUMOSAXAttributes& attrs) { myCommonXMLStructure.getCurrentSumoBaseObject()->addStringListAttribute(SUMO_ATTR_LINES, lines); myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_DEPARTPOS, departPos); myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_ARRIVALPOS, arrivalPos); + myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_WALKFACTOR, walkFactor); + myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_GROUP, group); } } diff --git a/src/utils/handlers/RouteHandler.h b/src/utils/handlers/RouteHandler.h index cbfe68155aed..0f74d02afd9c 100644 --- a/src/utils/handlers/RouteHandler.h +++ b/src/utils/handlers/RouteHandler.h @@ -110,7 +110,8 @@ class RouteHandler { /// @brief build person trip virtual void buildPersonTrip(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, - double arrivalPos, const std::vector& types, const std::vector& modes, const std::vector& lines) = 0; + const double arrivalPos, const std::vector& types, const std::vector& modes, + const std::vector& lines, const double walkFactor, const std::string& group) = 0; /// @brief build walk virtual void buildWalk(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, From cd85a4f7103cccf00e9d6c8eea296a10ca10ea90 Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Tue, 10 Sep 2024 11:18:51 +0200 Subject: [PATCH 34/41] Added new attributes in rides. Refs #15368 --- src/netedit/elements/demand/GNERide.cpp | 13 +++++++++++-- src/netedit/elements/demand/GNERide.h | 6 +++++- src/netedit/elements/demand/GNERouteHandler.cpp | 9 +++++---- src/netedit/elements/demand/GNERouteHandler.h | 2 +- src/utils/handlers/RouteHandler.cpp | 5 ++++- src/utils/handlers/RouteHandler.h | 2 +- 6 files changed, 27 insertions(+), 10 deletions(-) diff --git a/src/netedit/elements/demand/GNERide.cpp b/src/netedit/elements/demand/GNERide.cpp index 9f3c30c4e3eb..56074481ec14 100644 --- a/src/netedit/elements/demand/GNERide.cpp +++ b/src/netedit/elements/demand/GNERide.cpp @@ -32,13 +32,14 @@ // =========================================================================== GNERide::GNERide(GNENet* net, SumoXMLTag tag, GUIIcon icon, GNEDemandElement* personParent, const GNEPlanParents& planParameters, - double arrivalPosition, const std::vector& lines) : + const double arrivalPosition, const std::vector& lines, const std::string& group) : GNEDemandElement(personParent, net, GLO_PERSONTRIP, tag, GUIIconSubSys::getIcon(icon), GNEPathManager::PathElement::Options::DEMAND_ELEMENT, planParameters.getJunctions(), planParameters.getEdges(), {}, planParameters.getAdditionalElements(), planParameters.getDemandElements(personParent), {}), GNEDemandElementPlan(this, -1, arrivalPosition), -myLines(lines) { + myLines(lines), +myGroup(group) { } @@ -199,6 +200,8 @@ GNERide::getAttribute(SumoXMLAttr key) const { switch (key) { case SUMO_ATTR_LINES: return joinToString(myLines, " "); + case SUMO_ATTR_GROUP: + return myGroup; default: return getPlanAttribute(key); } @@ -221,6 +224,7 @@ void GNERide::setAttribute(SumoXMLAttr key, const std::string& value, GNEUndoList* undoList) { switch (key) { case SUMO_ATTR_LINES: + case SUMO_ATTR_GROUP: GNEChange_Attribute::changeAttribute(this, key, value, undoList); break; default: @@ -235,6 +239,8 @@ GNERide::isValid(SumoXMLAttr key, const std::string& value) { switch (key) { case SUMO_ATTR_LINES: return canParse >(value); + case SUMO_ATTR_GROUP: + return true; default: return isPlanValid(key, value); } @@ -274,6 +280,9 @@ GNERide::setAttribute(SumoXMLAttr key, const std::string& value) { case SUMO_ATTR_LINES: myLines = GNEAttributeCarrier::parse >(value); break; + case SUMO_ATTR_GROUP: + myGroup = value; + break; default: setPlanAttribute(key, value); break; diff --git a/src/netedit/elements/demand/GNERide.h b/src/netedit/elements/demand/GNERide.h index 4be1741201d3..fe3efb04b696 100644 --- a/src/netedit/elements/demand/GNERide.h +++ b/src/netedit/elements/demand/GNERide.h @@ -49,9 +49,10 @@ class GNERide : public GNEDemandElement, public Parameterised, public GNEDemandE * @param[in] personParent person parent * @param[in] planParameters plan parameters * @param[in] lines list of lines + * @param[in] group group */ GNERide(GNENet* net, SumoXMLTag tag, GUIIcon icon, GNEDemandElement* personParent, const GNEPlanParents& planParameters, - double arrivalPosition, const std::vector& lines); + const double arrivalPosition, const std::vector& lines, const std::string& group); /// @brief destructor ~GNERide(); @@ -208,6 +209,9 @@ class GNERide : public GNEDemandElement, public Parameterised, public GNEDemandE /// @brief valid line or vehicle ids or ANY std::vector myLines; + /// @brief group + std::string myGroup; + private: /// @brief method for setting the attribute and nothing else void setAttribute(SumoXMLAttr key, const std::string& value); diff --git a/src/netedit/elements/demand/GNERouteHandler.cpp b/src/netedit/elements/demand/GNERouteHandler.cpp index b203f9185043..7fde01e114ef 100644 --- a/src/netedit/elements/demand/GNERouteHandler.cpp +++ b/src/netedit/elements/demand/GNERouteHandler.cpp @@ -674,7 +674,7 @@ GNERouteHandler::buildWalk(const CommonXMLStructure::SumoBaseObject* sumoBaseObj void GNERouteHandler::buildRide(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, - double arrivalPos, const std::vector& lines) { + const double arrivalPos, const std::vector& lines, const std::string& group) { // get values GNEDemandElement* personParent = getPersonParent(sumoBaseObject); const auto tagIcon = GNEDemandElementPlan::getRideTagIcon(planParameters); @@ -686,7 +686,7 @@ GNERouteHandler::buildRide(const CommonXMLStructure::SumoBaseObject* sumoBaseObj WRITE_WARNING(TL("invalid combination for ride")); } else if (planParents.checkIntegrity(tagIcon.first, personParent, planParameters)) { // build ride - GNEDemandElement* ride = new GNERide(myNet, tagIcon.first, tagIcon.second, personParent, planParents, arrivalPos, lines); + GNEDemandElement* ride = new GNERide(myNet, tagIcon.first, tagIcon.second, personParent, planParents, arrivalPos, lines, group); // continue depending of undo-redo if (myAllowUndoRedo) { myNet->getViewNet()->getUndoList()->begin(ride, TLF("add % in '%'", ride->getTagStr(), personParent->getID())); @@ -1103,7 +1103,7 @@ GNERouteHandler::buildPersonPlan(const GNEDemandElement* planTemplate, GNEDemand } else if (planTemplate->getTagProperty().isPlanPersonTrip()) { buildPersonTrip(personPlanObject, planCreator->getPlanParameteres(), arrivalPos, types, modes, lines, walkFactor, group); } else if (planTemplate->getTagProperty().isPlanRide()) { - buildRide(personPlanObject, planCreator->getPlanParameteres(), arrivalPos, lines); + buildRide(personPlanObject, planCreator->getPlanParameteres(), arrivalPos, lines, group); } else if (planTemplate->getTagProperty().isPlanStopPerson()) { // set specific stop parameters int parameterSet = 0; @@ -1314,7 +1314,8 @@ GNERouteHandler::duplicatePlan(const GNEDemandElement* originalPlan, GNEDemandEl } else if (tagProperty.isPlanRide()) { buildRide(planObject, planParameters, planObject->getDoubleAttribute(SUMO_ATTR_ARRIVALPOS), - planObject->getStringListAttribute(SUMO_ATTR_LINES)); + planObject->getStringListAttribute(SUMO_ATTR_LINES), + planObject->getStringAttribute(SUMO_ATTR_GROUP)); } else if (tagProperty.isPlanStopPerson()) { // set parameters int parameterSet = 0; diff --git a/src/netedit/elements/demand/GNERouteHandler.h b/src/netedit/elements/demand/GNERouteHandler.h index f598856d8560..43ffb61f40c8 100644 --- a/src/netedit/elements/demand/GNERouteHandler.h +++ b/src/netedit/elements/demand/GNERouteHandler.h @@ -132,7 +132,7 @@ class GNERouteHandler : public RouteHandler { /// @brief build ride void buildRide(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, - double arrivalPos, const std::vector& lines); + const double arrivalPos, const std::vector& lines, const std::string& group); /// @brief build container void buildContainer(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const SUMOVehicleParameter& containerParameters); diff --git a/src/utils/handlers/RouteHandler.cpp b/src/utils/handlers/RouteHandler.cpp index 87eec66a42a2..493f2f4912e5 100644 --- a/src/utils/handlers/RouteHandler.cpp +++ b/src/utils/handlers/RouteHandler.cpp @@ -316,7 +316,8 @@ RouteHandler::parseSumoBaseObject(CommonXMLStructure::SumoBaseObject* obj) { buildRide(obj, obj->getPlanParameters(), obj->getDoubleAttribute(SUMO_ATTR_ARRIVALPOS), - obj->getStringListAttribute(SUMO_ATTR_LINES)); + obj->getStringListAttribute(SUMO_ATTR_LINES), + obj->getStringAttribute(SUMO_ATTR_GROUP)); break; case SUMO_TAG_WALK: buildWalk(obj, @@ -778,6 +779,7 @@ RouteHandler::parseRide(const SUMOSAXAttributes& attrs) { // optional attributes const std::vector lines = attrs.getOpt >(SUMO_ATTR_LINES, "", parsedOk); const double arrivalPos = attrs.getOpt(SUMO_ATTR_ARRIVALPOS, "", parsedOk, -1); + const std::string group = attrs.getOpt(SUMO_ATTR_GROUP, "", parsedOk, ""); if (parsedOk) { // set tag myCommonXMLStructure.getCurrentSumoBaseObject()->setTag(SUMO_TAG_RIDE); @@ -785,6 +787,7 @@ RouteHandler::parseRide(const SUMOSAXAttributes& attrs) { myCommonXMLStructure.getCurrentSumoBaseObject()->setPlanParameters(planParameters); myCommonXMLStructure.getCurrentSumoBaseObject()->addStringListAttribute(SUMO_ATTR_LINES, lines); myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_ARRIVALPOS, arrivalPos); + myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_GROUP, group); } } diff --git a/src/utils/handlers/RouteHandler.h b/src/utils/handlers/RouteHandler.h index 0f74d02afd9c..e2cbd1eab52a 100644 --- a/src/utils/handlers/RouteHandler.h +++ b/src/utils/handlers/RouteHandler.h @@ -119,7 +119,7 @@ class RouteHandler { /// @brief build ride virtual void buildRide(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, - double arrivalPos, const std::vector& lines) = 0; + const double arrivalPos, const std::vector& lines, const std::string& group) = 0; /// @brief build container virtual void buildContainer(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const SUMOVehicleParameter& containerParameters) = 0; From 0c1f35fc64c1ec838cec92fd6ef0d747cda61c1a Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Tue, 10 Sep 2024 14:39:01 +0200 Subject: [PATCH 35/41] Added new attributes in walks. Refs #15368 --- src/netedit/elements/GNEAttributeCarrier.cpp | 4 +- .../elements/demand/GNERouteHandler.cpp | 12 ++-- src/netedit/elements/demand/GNERouteHandler.h | 2 +- src/netedit/elements/demand/GNEWalk.cpp | 61 ++++++++++++++++--- src/netedit/elements/demand/GNEWalk.h | 11 +++- src/utils/handlers/RouteHandler.cpp | 18 +++--- src/utils/handlers/RouteHandler.h | 2 +- 7 files changed, 86 insertions(+), 24 deletions(-) diff --git a/src/netedit/elements/GNEAttributeCarrier.cpp b/src/netedit/elements/GNEAttributeCarrier.cpp index 0e0f9ac6d6fb..733e293253f9 100644 --- a/src/netedit/elements/GNEAttributeCarrier.cpp +++ b/src/netedit/elements/GNEAttributeCarrier.cpp @@ -9249,7 +9249,7 @@ GNEAttributeCarrier::fillWalkCommonAttributes(GNETagProperties& tagProperties) { tagProperties.addAttribute(attrProperty); attrProperty = GNEAttributeProperties(SUMO_ATTR_DURATION, - GNEAttributeProperties::FLOAT | GNEAttributeProperties::POSITIVE | GNEAttributeProperties::DEFAULTVALUE, + GNEAttributeProperties::SUMOTIME | GNEAttributeProperties::POSITIVE | GNEAttributeProperties::DEFAULTVALUE, TL("duration of the plan in second (not together with speed)"), "0"); tagProperties.addAttribute(attrProperty); @@ -9304,7 +9304,7 @@ GNEAttributeCarrier::fillTranshipCommonAttributes(GNETagProperties& tagPropertie tagProperties.addAttribute(attrProperty); attrProperty = GNEAttributeProperties(SUMO_ATTR_DURATION, - GNEAttributeProperties::FLOAT | GNEAttributeProperties::POSITIVE | GNEAttributeProperties::DEFAULTVALUE, + GNEAttributeProperties::SUMOTIME | GNEAttributeProperties::POSITIVE | GNEAttributeProperties::DEFAULTVALUE, TL("duration of the plan in second (not together with speed)"), "0"); tagProperties.addAttribute(attrProperty); diff --git a/src/netedit/elements/demand/GNERouteHandler.cpp b/src/netedit/elements/demand/GNERouteHandler.cpp index 7fde01e114ef..7080774fd783 100644 --- a/src/netedit/elements/demand/GNERouteHandler.cpp +++ b/src/netedit/elements/demand/GNERouteHandler.cpp @@ -642,7 +642,7 @@ GNERouteHandler::buildPersonTrip(const CommonXMLStructure::SumoBaseObject* sumoB void GNERouteHandler::buildWalk(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, - double arrivalPos) { + const double arrivalPos, const double speed, const SUMOTime duration) { // get values GNEDemandElement* personParent = getPersonParent(sumoBaseObject); const auto tagIcon = GNEDemandElementPlan::getWalkTagIcon(planParameters); @@ -654,7 +654,7 @@ GNERouteHandler::buildWalk(const CommonXMLStructure::SumoBaseObject* sumoBaseObj WRITE_WARNING(TL("invalid combination for personTrip")); } else if (planParents.checkIntegrity(tagIcon.first, personParent, planParameters)) { // build person trip - GNEDemandElement* walk = new GNEWalk(myNet, tagIcon.first, tagIcon.second, personParent, planParents, arrivalPos); + GNEDemandElement* walk = new GNEWalk(myNet, tagIcon.first, tagIcon.second, personParent, planParents, arrivalPos, speed, duration); // continue depending of undo.redo if (myAllowUndoRedo) { myNet->getViewNet()->getUndoList()->begin(walk, TLF("add % in '%'", walk->getTagStr(), personParent->getID())); @@ -1097,9 +1097,11 @@ GNERouteHandler::buildPersonPlan(const GNEDemandElement* planTemplate, GNEDemand false; const double walkFactor = personPlanObject->hasDoubleAttribute(SUMO_ATTR_WALKFACTOR) ? personPlanObject->getDoubleAttribute(SUMO_ATTR_WALKFACTOR) : 0; const std::string group = personPlanObject->hasStringAttribute(SUMO_ATTR_GROUP) ? personPlanObject->getStringAttribute(SUMO_ATTR_GROUP) : ""; + + const double speed = personPlanObject->hasDoubleAttribute(SUMO_ATTR_SPEED) ? personPlanObject->getDoubleAttribute(SUMO_ATTR_SPEED) : 0; // build depending of plan type if (planTemplate->getTagProperty().isPlanWalk()) { - buildWalk(personPlanObject, planCreator->getPlanParameteres(), arrivalPos); + buildWalk(personPlanObject, planCreator->getPlanParameteres(), arrivalPos, speed, duration); } else if (planTemplate->getTagProperty().isPlanPersonTrip()) { buildPersonTrip(personPlanObject, planCreator->getPlanParameteres(), arrivalPos, types, modes, lines, walkFactor, group); } else if (planTemplate->getTagProperty().isPlanRide()) { @@ -1310,7 +1312,9 @@ GNERouteHandler::duplicatePlan(const GNEDemandElement* originalPlan, GNEDemandEl planObject->getStringAttribute(SUMO_ATTR_GROUP)); } else if (tagProperty.isPlanWalk()) { buildWalk(planObject, planParameters, - planObject->getDoubleAttribute(SUMO_ATTR_ARRIVALPOS)); + planObject->getDoubleAttribute(SUMO_ATTR_ARRIVALPOS), + planObject->getDoubleAttribute(SUMO_ATTR_SPEED), + planObject->getTimeAttribute(SUMO_ATTR_DURATION)); } else if (tagProperty.isPlanRide()) { buildRide(planObject, planParameters, planObject->getDoubleAttribute(SUMO_ATTR_ARRIVALPOS), diff --git a/src/netedit/elements/demand/GNERouteHandler.h b/src/netedit/elements/demand/GNERouteHandler.h index 43ffb61f40c8..08bc3d5b19d3 100644 --- a/src/netedit/elements/demand/GNERouteHandler.h +++ b/src/netedit/elements/demand/GNERouteHandler.h @@ -128,7 +128,7 @@ class GNERouteHandler : public RouteHandler { /// @brief build walk void buildWalk(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, - double arrivalPos); + const double arrivalPos, const double speed, const SUMOTime duration); /// @brief build ride void buildRide(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, diff --git a/src/netedit/elements/demand/GNEWalk.cpp b/src/netedit/elements/demand/GNEWalk.cpp index eba711f53676..3a5b47a6e834 100644 --- a/src/netedit/elements/demand/GNEWalk.cpp +++ b/src/netedit/elements/demand/GNEWalk.cpp @@ -43,12 +43,14 @@ GNEDemandElementPlan(this, -1, -1) { GNEWalk::GNEWalk(GNENet* net, SumoXMLTag tag, GUIIcon icon, GNEDemandElement* personParent, const GNEPlanParents& planParameters, - const double arrivalPosition) : + const double arrivalPosition, const double speed, const SUMOTime duration) : GNEDemandElement(personParent, net, GLO_WALK, tag, GUIIconSubSys::getIcon(icon), GNEPathManager::PathElement::Options::DEMAND_ELEMENT, planParameters.getJunctions(), planParameters.getEdges(), {}, planParameters.getAdditionalElements(), planParameters.getDemandElements(personParent), {}), -GNEDemandElementPlan(this, -1, arrivalPosition) { +GNEDemandElementPlan(this, -1, arrivalPosition), +mySpeed(speed), +myDuration(duration) { } @@ -74,6 +76,14 @@ GNEWalk::writeDemandElement(OutputDevice& device) const { // write rest of attributes device.openTag(SUMO_TAG_WALK); writeLocationAttributes(device); + // speed + if (mySpeed > 0) { + device.writeAttr(SUMO_ATTR_SPEED, mySpeed); + } + // duration + if (myDuration > 0) { + device.writeAttr(SUMO_ATTR_DURATION, myDuration); + } device.closeTag(); } @@ -184,13 +194,25 @@ GNEWalk::getLastPathLane() const { std::string GNEWalk::getAttribute(SumoXMLAttr key) const { - return getPlanAttribute(key); + switch (key) { + case SUMO_ATTR_SPEED: + return toString(mySpeed); + case SUMO_ATTR_DURATION: + return toString(myDuration); + default: + return getPlanAttribute(key); + } } double GNEWalk::getAttributeDouble(SumoXMLAttr key) const { - return getPlanAttributeDouble(key); + switch (key) { + case SUMO_ATTR_SPEED: + return mySpeed; + default: + return getPlanAttributeDouble(key); + } } @@ -202,13 +224,28 @@ GNEWalk::getAttributePosition(SumoXMLAttr key) const { void GNEWalk::setAttribute(SumoXMLAttr key, const std::string& value, GNEUndoList* undoList) { - setPlanAttribute(key, value, undoList); + switch (key) { + case SUMO_ATTR_SPEED: + case SUMO_ATTR_DURATION: + GNEChange_Attribute::changeAttribute(this, key, value, undoList); + break; + default: + setPlanAttribute(key, value, undoList); + break; + } } bool GNEWalk::isValid(SumoXMLAttr key, const std::string& value) { - return isPlanValid(key, value); + switch (key) { + case SUMO_ATTR_SPEED: + return canParse(value) && (parse(value) >= 0); + case SUMO_ATTR_DURATION: + return canParse(value) && (parse(value) >= 0); + default: + return isPlanValid(key, value); + } } @@ -241,7 +278,17 @@ GNEWalk::getACParametersMap() const { void GNEWalk::setAttribute(SumoXMLAttr key, const std::string& value) { - setPlanAttribute(key, value); + switch (key) { + case SUMO_ATTR_SPEED: + mySpeed = GNEAttributeCarrier::parse(value); + break; + case SUMO_ATTR_DURATION: + myDuration = GNEAttributeCarrier::parse(value); + break; + default: + setPlanAttribute(key, value); + break; + } } diff --git a/src/netedit/elements/demand/GNEWalk.h b/src/netedit/elements/demand/GNEWalk.h index c256dca01925..036e4d517047 100644 --- a/src/netedit/elements/demand/GNEWalk.h +++ b/src/netedit/elements/demand/GNEWalk.h @@ -49,9 +49,11 @@ class GNEWalk : public GNEDemandElement, public Parameterised, public GNEDemandE * @param[in] personParent person parent * @param[in] planParameters plan parameters * @param[in] arrivalPosition arrival position + * @param[in] speed speed (not together with duration) + * @param[in] duration duration (not together with speed) */ GNEWalk(GNENet* net, SumoXMLTag tag, GUIIcon icon, GNEDemandElement* personParent, const GNEPlanParents& planParameters, - const double arrivalPosition); + const double arrivalPosition, const double speed, const SUMOTime duration); /// @brief destructor ~GNEWalk(); @@ -204,6 +206,13 @@ class GNEWalk : public GNEDemandElement, public Parameterised, public GNEDemandE /// @brief get parameters map const Parameterised::Map& getACParametersMap() const; +protected: + /// @brief speed + double mySpeed = 0; + + /// @brief duration + SUMOTime myDuration = 0; + private: /// @brief method for setting the attribute and nothing else void setAttribute(SumoXMLAttr key, const std::string& value); diff --git a/src/utils/handlers/RouteHandler.cpp b/src/utils/handlers/RouteHandler.cpp index 493f2f4912e5..04121b1855dc 100644 --- a/src/utils/handlers/RouteHandler.cpp +++ b/src/utils/handlers/RouteHandler.cpp @@ -322,7 +322,9 @@ RouteHandler::parseSumoBaseObject(CommonXMLStructure::SumoBaseObject* obj) { case SUMO_TAG_WALK: buildWalk(obj, obj->getPlanParameters(), - obj->getDoubleAttribute(SUMO_ATTR_ARRIVALPOS)); + obj->getDoubleAttribute(SUMO_ATTR_ARRIVALPOS), + obj->getDoubleAttribute(SUMO_ATTR_SPEED), + obj->getTimeAttribute(SUMO_ATTR_DURATION)); break; // container case SUMO_TAG_CONTAINER: @@ -751,21 +753,21 @@ RouteHandler::parseWalk(const SUMOSAXAttributes& attrs) { // plan parameters const auto planParameters = CommonXMLStructure::PlanParameters(myCommonXMLStructure.getCurrentSumoBaseObject(), attrs, parsedOk); // optional attributes - const double duration = attrs.getOpt(SUMO_ATTR_DURATION, "", parsedOk, 0); - const double speed = attrs.getOpt(SUMO_ATTR_SPEED, "", parsedOk, 0); const double departPos = attrs.getOpt(SUMO_ATTR_DEPARTPOS, "", parsedOk, -1); const double arrivalPos = attrs.getOpt(SUMO_ATTR_ARRIVALPOS, "", parsedOk, -1); - const double departPosLat = attrs.getOpt(SUMO_ATTR_DEPARTPOS_LAT, "", parsedOk, 0); - if (parsedOk) { + const double speed = attrs.getOpt(SUMO_ATTR_SPEED, "", parsedOk, 0); + const SUMOTime duration = attrs.getOptSUMOTimeReporting(SUMO_ATTR_DURATION, "", parsedOk, 0); + if ((speed > 0) && (duration > 0)) { + WRITE_ERROR(TL("Speed and duration attributes cannot be defined together in walks")); + } else if (parsedOk) { // set tag myCommonXMLStructure.getCurrentSumoBaseObject()->setTag(SUMO_TAG_WALK); // add all attributes myCommonXMLStructure.getCurrentSumoBaseObject()->setPlanParameters(planParameters); - myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_DURATION, duration); - myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_SPEED, speed); myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_DEPARTPOS, departPos); myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_ARRIVALPOS, arrivalPos); - myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_DEPARTPOS_LAT, departPosLat); + myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_SPEED, speed); + myCommonXMLStructure.getCurrentSumoBaseObject()->addTimeAttribute(SUMO_ATTR_DURATION, duration); } } diff --git a/src/utils/handlers/RouteHandler.h b/src/utils/handlers/RouteHandler.h index e2cbd1eab52a..3a8b1135f7b6 100644 --- a/src/utils/handlers/RouteHandler.h +++ b/src/utils/handlers/RouteHandler.h @@ -115,7 +115,7 @@ class RouteHandler { /// @brief build walk virtual void buildWalk(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, - double arrivalPos) = 0; + const double arrivalPos, const double speed, const SUMOTime duration) = 0; /// @brief build ride virtual void buildRide(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, From 33a1290388669815d3979c7753a1559103d46468 Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Tue, 10 Sep 2024 14:39:26 +0200 Subject: [PATCH 36/41] Disabled ANY as default line for rides. Refs #15368 --- src/netedit/elements/demand/GNERide.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/netedit/elements/demand/GNERide.cpp b/src/netedit/elements/demand/GNERide.cpp index 56074481ec14..fbc8eddc7108 100644 --- a/src/netedit/elements/demand/GNERide.cpp +++ b/src/netedit/elements/demand/GNERide.cpp @@ -74,9 +74,8 @@ GNERide::writeDemandElement(OutputDevice& device) const { // write rest of attributes device.openTag(SUMO_TAG_RIDE); writeLocationAttributes(device); - if (myLines.empty()) { - device.writeAttr(SUMO_ATTR_LINES, "ANY"); - } else { + // lines + if (myLines.size() > 0) { device.writeAttr(SUMO_ATTR_LINES, myLines); } device.closeTag(); From 332879137255b57cc31c2de20ef317206df172ed Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Tue, 10 Sep 2024 15:09:50 +0200 Subject: [PATCH 37/41] Added new attributes in tranships. Refs #15368 --- .../elements/demand/GNERouteHandler.cpp | 10 ++- src/netedit/elements/demand/GNERouteHandler.h | 2 +- src/netedit/elements/demand/GNETranship.cpp | 32 +++++--- src/netedit/elements/demand/GNETranship.h | 10 ++- src/utils/handlers/RouteHandler.cpp | 81 ++++++++++--------- src/utils/handlers/RouteHandler.h | 2 +- 6 files changed, 83 insertions(+), 54 deletions(-) diff --git a/src/netedit/elements/demand/GNERouteHandler.cpp b/src/netedit/elements/demand/GNERouteHandler.cpp index 7080774fd783..3ac59e17a033 100644 --- a/src/netedit/elements/demand/GNERouteHandler.cpp +++ b/src/netedit/elements/demand/GNERouteHandler.cpp @@ -792,7 +792,7 @@ GNERouteHandler::buildTransport(const CommonXMLStructure::SumoBaseObject* sumoBa void GNERouteHandler::buildTranship(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, - const double arrivalPosition, const double departPosition, const double speed) { + const double arrivalPosition, const double departPosition, const double speed, const SUMOTime duration) { // get values GNEDemandElement* containerParent = getContainerParent(sumoBaseObject); const auto tagIcon = GNEDemandElementPlan::getTranshipTagIcon(planParameters); @@ -804,7 +804,8 @@ GNERouteHandler::buildTranship(const CommonXMLStructure::SumoBaseObject* sumoBas WRITE_WARNING(TL("invalid combination for personTrip")); } else if (planParents.checkIntegrity(tagIcon.first, containerParent, planParameters)) { // build tranship - GNEDemandElement* tranship = new GNETranship(myNet, tagIcon.first, tagIcon.second, containerParent, planParents, arrivalPosition, departPosition, speed); + GNEDemandElement* tranship = new GNETranship(myNet, tagIcon.first, tagIcon.second, containerParent, planParents, + arrivalPosition, departPosition, speed, duration); // continue depending of undo-redo if (myAllowUndoRedo) { myNet->getViewNet()->getUndoList()->begin(tranship, TLF("add % in '%'", tranship->getTagStr(), containerParent->getID())); @@ -1175,7 +1176,7 @@ GNERouteHandler::buildContainerPlan(const GNEDemandElement* planTemplate, GNEDem false; // build depending of plan type if (planTemplate->getTagProperty().isPlanTranship()) { - buildTranship(containerPlanObject, planCreator->getPlanParameteres(), arrivalPos, departPos, speed); + buildTranship(containerPlanObject, planCreator->getPlanParameteres(), arrivalPos, departPos, speed, duration); } else if (planTemplate->getTagProperty().isPlanTransport()) { buildTransport(containerPlanObject, planCreator->getPlanParameteres(), arrivalPos, lines); } else if (planTemplate->getTagProperty().isPlanStopContainer()) { @@ -1344,7 +1345,8 @@ GNERouteHandler::duplicatePlan(const GNEDemandElement* originalPlan, GNEDemandEl buildTranship(planObject, planParameters, planObject->getDoubleAttribute(SUMO_ATTR_ARRIVALPOS), planObject->getDoubleAttribute(SUMO_ATTR_DEPARTPOS), - planObject->getDoubleAttribute(SUMO_ATTR_SPEED)); + planObject->getDoubleAttribute(SUMO_ATTR_SPEED), + planObject->getTimeAttribute(SUMO_ATTR_DURATION)); } else if (tagProperty.isPlanStopContainer()) { // set parameters int parameterSet = 0; diff --git a/src/netedit/elements/demand/GNERouteHandler.h b/src/netedit/elements/demand/GNERouteHandler.h index 08bc3d5b19d3..922c23a5e8d9 100644 --- a/src/netedit/elements/demand/GNERouteHandler.h +++ b/src/netedit/elements/demand/GNERouteHandler.h @@ -146,7 +146,7 @@ class GNERouteHandler : public RouteHandler { /// @brief build tranship void buildTranship(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, - const double arrivalPosition, const double departPosition, const double speed); + const double arrivalPosition, const double departPosition, const double speed, const SUMOTime duration); /// @brief build person stop void buildPersonStop(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, diff --git a/src/netedit/elements/demand/GNETranship.cpp b/src/netedit/elements/demand/GNETranship.cpp index b6e0c0294ebe..b69a7725fdb8 100644 --- a/src/netedit/elements/demand/GNETranship.cpp +++ b/src/netedit/elements/demand/GNETranship.cpp @@ -43,13 +43,14 @@ mySpeed(0) { GNETranship::GNETranship(GNENet* net, SumoXMLTag tag, GUIIcon icon, GNEDemandElement* containerParent, const GNEPlanParents& planParameters, - const double departPosition, const double arrivalPosition, const double speed) : + const double departPosition, const double arrivalPosition, const double speed, const SUMOTime duration) : GNEDemandElement(containerParent, net, GLO_TRANSHIP, tag, GUIIconSubSys::getIcon(icon), GNEPathManager::PathElement::Options::DEMAND_ELEMENT, planParameters.getJunctions(), planParameters.getEdges(), {}, planParameters.getAdditionalElements(), planParameters.getDemandElements(containerParent), {}), GNEDemandElementPlan(this, departPosition, arrivalPosition), -mySpeed(speed) { +mySpeed(speed), +myDuration(duration) { } @@ -74,10 +75,14 @@ GNETranship::writeDemandElement(OutputDevice& device) const { writeOriginStop(device); // write rest of attributes device.openTag(SUMO_TAG_TRANSHIP); - writeLocationAttributes(device); + // speed if (toString(mySpeed) != myTagProperty.getDefaultValue(SUMO_ATTR_SPEED)) { device.writeAttr(SUMO_ATTR_SPEED, mySpeed); } + // duration + if (toString(myDuration) != myTagProperty.getDefaultValue(SUMO_ATTR_DURATION)) { + device.writeAttr(SUMO_ATTR_DURATION, myDuration); + } device.closeTag(); } @@ -189,9 +194,10 @@ GNETranship::getLastPathLane() const { std::string GNETranship::getAttribute(SumoXMLAttr key) const { switch (key) { - // Common attributes case SUMO_ATTR_SPEED: return toString(mySpeed); + case SUMO_ATTR_DURATION: + return toString(myDuration); default: return getPlanAttribute(key); } @@ -200,7 +206,12 @@ GNETranship::getAttribute(SumoXMLAttr key) const { double GNETranship::getAttributeDouble(SumoXMLAttr key) const { - return getPlanAttributeDouble(key); + switch (key) { + case SUMO_ATTR_SPEED: + return mySpeed; + default: + return getPlanAttributeDouble(key); + } } @@ -213,8 +224,8 @@ GNETranship::getAttributePosition(SumoXMLAttr key) const { void GNETranship::setAttribute(SumoXMLAttr key, const std::string& value, GNEUndoList* undoList) { switch (key) { - // Common attributes case SUMO_ATTR_SPEED: + case SUMO_ATTR_DURATION: GNEChange_Attribute::changeAttribute(this, key, value, undoList); break; default: @@ -227,9 +238,10 @@ GNETranship::setAttribute(SumoXMLAttr key, const std::string& value, GNEUndoList bool GNETranship::isValid(SumoXMLAttr key, const std::string& value) { switch (key) { - // Common attributes case SUMO_ATTR_SPEED: return canParse(value) && (parse(value) >= 0); + case SUMO_ATTR_DURATION: + return canParse(value) && (parse(value) >= 0); default: return isPlanValid(key, value); } @@ -266,9 +278,11 @@ GNETranship::getACParametersMap() const { void GNETranship::setAttribute(SumoXMLAttr key, const std::string& value) { switch (key) { - // Common attributes case SUMO_ATTR_SPEED: - mySpeed = parse(value); + mySpeed = GNEAttributeCarrier::parse(value); + break; + case SUMO_ATTR_DURATION: + myDuration = GNEAttributeCarrier::parse(value); break; default: setPlanAttribute(key, value); diff --git a/src/netedit/elements/demand/GNETranship.h b/src/netedit/elements/demand/GNETranship.h index 565b41e7d8a4..1e30e384bc74 100644 --- a/src/netedit/elements/demand/GNETranship.h +++ b/src/netedit/elements/demand/GNETranship.h @@ -50,10 +50,11 @@ class GNETranship : public GNEDemandElement, public Parameterised, public GNEDem * @param[in] planParameters plan parameters * @param[in] departPosition depart pos * @param[in] arrivalPosition arrival pos - * @param[in] speed tranship speed + * @param[in] speed tranship speed (not together with duration) + * @param[in] duraiton tranship duration (not together with speed) */ GNETranship(GNENet* net, SumoXMLTag tag, GUIIcon icon, GNEDemandElement* containerParent, const GNEPlanParents& planParameters, - const double departPosition, const double arrivalPosition, const double speed); + const double departPosition, const double arrivalPosition, const double speed, const SUMOTime duration); /// @brief destructor ~GNETranship(); @@ -208,7 +209,10 @@ class GNETranship : public GNEDemandElement, public Parameterised, public GNEDem protected: /// @brief speed - double mySpeed; + double mySpeed = 0; + + /// @brief duration + SUMOTime myDuration = 0; private: /// @brief method for setting the attribute and nothing else diff --git a/src/utils/handlers/RouteHandler.cpp b/src/utils/handlers/RouteHandler.cpp index 04121b1855dc..6d875800a64d 100644 --- a/src/utils/handlers/RouteHandler.cpp +++ b/src/utils/handlers/RouteHandler.cpp @@ -347,7 +347,8 @@ RouteHandler::parseSumoBaseObject(CommonXMLStructure::SumoBaseObject* obj) { obj->getPlanParameters(), obj->getDoubleAttribute(SUMO_ATTR_ARRIVALPOS), obj->getDoubleAttribute(SUMO_ATTR_DEPARTPOS), - obj->getDoubleAttribute(SUMO_ATTR_SPEED)); + obj->getDoubleAttribute(SUMO_ATTR_SPEED), + obj->getTimeAttribute(SUMO_ATTR_DURATION)); break; // stopss case SUMO_TAG_STOP: @@ -748,26 +749,28 @@ RouteHandler::parsePersonTrip(const SUMOSAXAttributes& attrs) { void RouteHandler::parseWalk(const SUMOSAXAttributes& attrs) { - // declare Ok Flag - bool parsedOk = true; - // plan parameters - const auto planParameters = CommonXMLStructure::PlanParameters(myCommonXMLStructure.getCurrentSumoBaseObject(), attrs, parsedOk); - // optional attributes - const double departPos = attrs.getOpt(SUMO_ATTR_DEPARTPOS, "", parsedOk, -1); - const double arrivalPos = attrs.getOpt(SUMO_ATTR_ARRIVALPOS, "", parsedOk, -1); - const double speed = attrs.getOpt(SUMO_ATTR_SPEED, "", parsedOk, 0); - const SUMOTime duration = attrs.getOptSUMOTimeReporting(SUMO_ATTR_DURATION, "", parsedOk, 0); - if ((speed > 0) && (duration > 0)) { + if (attrs.hasAttribute(SUMO_ATTR_SPEED) && attrs.hasAttribute(SUMO_ATTR_DURATION)) { WRITE_ERROR(TL("Speed and duration attributes cannot be defined together in walks")); - } else if (parsedOk) { - // set tag - myCommonXMLStructure.getCurrentSumoBaseObject()->setTag(SUMO_TAG_WALK); - // add all attributes - myCommonXMLStructure.getCurrentSumoBaseObject()->setPlanParameters(planParameters); - myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_DEPARTPOS, departPos); - myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_ARRIVALPOS, arrivalPos); - myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_SPEED, speed); - myCommonXMLStructure.getCurrentSumoBaseObject()->addTimeAttribute(SUMO_ATTR_DURATION, duration); + } else { + // declare Ok Flag + bool parsedOk = true; + // plan parameters + const auto planParameters = CommonXMLStructure::PlanParameters(myCommonXMLStructure.getCurrentSumoBaseObject(), attrs, parsedOk); + // optional attributes + const double departPos = attrs.getOpt(SUMO_ATTR_DEPARTPOS, "", parsedOk, -1); + const double arrivalPos = attrs.getOpt(SUMO_ATTR_ARRIVALPOS, "", parsedOk, -1); + const double speed = attrs.getOpt(SUMO_ATTR_SPEED, "", parsedOk, 0); + const SUMOTime duration = attrs.getOptSUMOTimeReporting(SUMO_ATTR_DURATION, "", parsedOk, 0); + if (parsedOk) { + // set tag + myCommonXMLStructure.getCurrentSumoBaseObject()->setTag(SUMO_TAG_WALK); + // add all attributes + myCommonXMLStructure.getCurrentSumoBaseObject()->setPlanParameters(planParameters); + myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_DEPARTPOS, departPos); + myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_ARRIVALPOS, arrivalPos); + myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_SPEED, speed); + myCommonXMLStructure.getCurrentSumoBaseObject()->addTimeAttribute(SUMO_ATTR_DURATION, duration); + } } } @@ -846,22 +849,28 @@ RouteHandler::parseTransport(const SUMOSAXAttributes& attrs) { void RouteHandler::parseTranship(const SUMOSAXAttributes& attrs) { - // declare Ok Flag - bool parsedOk = true; - // plan parameters - const auto planParameters = CommonXMLStructure::PlanParameters(myCommonXMLStructure.getCurrentSumoBaseObject(), attrs, parsedOk); - // optional attributes - const double arrivalPos = attrs.getOpt(SUMO_ATTR_ARRIVALPOS, "", parsedOk, -1); - const double speed = attrs.getOpt(SUMO_ATTR_SPEED, "", parsedOk, 1.39); - const double departPos = attrs.getOpt(SUMO_ATTR_DEPARTPOS, "", parsedOk, -1); - if (parsedOk) { - // set tag - myCommonXMLStructure.getCurrentSumoBaseObject()->setTag(SUMO_TAG_TRANSHIP); - // add all attributes - myCommonXMLStructure.getCurrentSumoBaseObject()->setPlanParameters(planParameters); - myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_ARRIVALPOS, arrivalPos); - myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_SPEED, speed); - myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_DEPARTPOS, departPos); + if (attrs.hasAttribute(SUMO_ATTR_SPEED) && attrs.hasAttribute(SUMO_ATTR_DURATION)) { + WRITE_ERROR(TL("Speed and duration attributes cannot be defined together in walks")); + } else { + // declare Ok Flag + bool parsedOk = true; + // plan parameters + const auto planParameters = CommonXMLStructure::PlanParameters(myCommonXMLStructure.getCurrentSumoBaseObject(), attrs, parsedOk); + // optional attributes + const double arrivalPos = attrs.getOpt(SUMO_ATTR_ARRIVALPOS, "", parsedOk, -1); + const double departPos = attrs.getOpt(SUMO_ATTR_DEPARTPOS, "", parsedOk, -1); + const double speed = attrs.getOpt(SUMO_ATTR_SPEED, "", parsedOk, 1.39); + const SUMOTime duration = attrs.getOptSUMOTimeReporting(SUMO_ATTR_DURATION, "", parsedOk, 0); + if (parsedOk) { + // set tag + myCommonXMLStructure.getCurrentSumoBaseObject()->setTag(SUMO_TAG_TRANSHIP); + // add all attributes + myCommonXMLStructure.getCurrentSumoBaseObject()->setPlanParameters(planParameters); + myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_ARRIVALPOS, arrivalPos); + myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_DEPARTPOS, departPos); + myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_SPEED, speed); + myCommonXMLStructure.getCurrentSumoBaseObject()->addTimeAttribute(SUMO_ATTR_DURATION, duration); + } } } diff --git a/src/utils/handlers/RouteHandler.h b/src/utils/handlers/RouteHandler.h index 3a8b1135f7b6..504e88c99c4f 100644 --- a/src/utils/handlers/RouteHandler.h +++ b/src/utils/handlers/RouteHandler.h @@ -133,7 +133,7 @@ class RouteHandler { /// @brief build tranship virtual void buildTranship(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, - const double arrivalPosition, const double departPosition, const double speed) = 0; + const double arrivalPosition, const double departPosition, const double speed, const SUMOTime duration) = 0; /// @brief build stop virtual void buildStop(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, From 860e21c4bb9d92b06c3feed797f35cc16921bd77 Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Tue, 10 Sep 2024 15:10:21 +0200 Subject: [PATCH 38/41] Updated GNEWalk::writeDemandElement. Refs #15368 --- src/netedit/elements/demand/GNEWalk.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/netedit/elements/demand/GNEWalk.cpp b/src/netedit/elements/demand/GNEWalk.cpp index 3a5b47a6e834..a0d635d3b312 100644 --- a/src/netedit/elements/demand/GNEWalk.cpp +++ b/src/netedit/elements/demand/GNEWalk.cpp @@ -77,11 +77,11 @@ GNEWalk::writeDemandElement(OutputDevice& device) const { device.openTag(SUMO_TAG_WALK); writeLocationAttributes(device); // speed - if (mySpeed > 0) { + if (toString(mySpeed) != myTagProperty.getDefaultValue(SUMO_ATTR_SPEED)) { device.writeAttr(SUMO_ATTR_SPEED, mySpeed); } // duration - if (myDuration > 0) { + if (toString(myDuration) != myTagProperty.getDefaultValue(SUMO_ATTR_DURATION)) { device.writeAttr(SUMO_ATTR_DURATION, myDuration); } device.closeTag(); From 1029270c6cfba198b73b2b5a47a38cab4f6506fd Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Tue, 10 Sep 2024 15:26:03 +0200 Subject: [PATCH 39/41] Added new attributes in transports. Refs #15368 --- src/netedit/elements/demand/GNERouteHandler.cpp | 11 ++++++----- src/netedit/elements/demand/GNERouteHandler.h | 2 +- src/netedit/elements/demand/GNETransport.cpp | 16 ++++++++++++++-- src/netedit/elements/demand/GNETransport.h | 8 ++++++-- src/utils/handlers/RouteHandler.cpp | 5 ++++- src/utils/handlers/RouteHandler.h | 2 +- 6 files changed, 32 insertions(+), 12 deletions(-) diff --git a/src/netedit/elements/demand/GNERouteHandler.cpp b/src/netedit/elements/demand/GNERouteHandler.cpp index 3ac59e17a033..8069f7b87b55 100644 --- a/src/netedit/elements/demand/GNERouteHandler.cpp +++ b/src/netedit/elements/demand/GNERouteHandler.cpp @@ -760,7 +760,7 @@ GNERouteHandler::buildContainerFlow(const CommonXMLStructure::SumoBaseObject* /* void GNERouteHandler::buildTransport(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, - const double arrivalPos, const std::vector& lines) { + const double arrivalPos, const std::vector& lines, const std::string& group) { // get values GNEDemandElement* containerParent = getContainerParent(sumoBaseObject); const auto tagIcon = GNEDemandElementPlan::getTransportTagIcon(planParameters); @@ -772,7 +772,7 @@ GNERouteHandler::buildTransport(const CommonXMLStructure::SumoBaseObject* sumoBa WRITE_WARNING(TL("invalid combination for personTrip")); } else if (planParents.checkIntegrity(tagIcon.first, containerParent, planParameters)) { // build transport - GNEDemandElement* transport = new GNETransport(myNet, tagIcon.first, tagIcon.second, containerParent, planParents, arrivalPos, lines); + GNEDemandElement* transport = new GNETransport(myNet, tagIcon.first, tagIcon.second, containerParent, planParents, arrivalPos, lines, group); // continue depending of undo-redo if (myAllowUndoRedo) { myNet->getViewNet()->getUndoList()->begin(transport, TLF("add % in '%'", transport->getTagStr(), containerParent->getID())); @@ -1098,7 +1098,6 @@ GNERouteHandler::buildPersonPlan(const GNEDemandElement* planTemplate, GNEDemand false; const double walkFactor = personPlanObject->hasDoubleAttribute(SUMO_ATTR_WALKFACTOR) ? personPlanObject->getDoubleAttribute(SUMO_ATTR_WALKFACTOR) : 0; const std::string group = personPlanObject->hasStringAttribute(SUMO_ATTR_GROUP) ? personPlanObject->getStringAttribute(SUMO_ATTR_GROUP) : ""; - const double speed = personPlanObject->hasDoubleAttribute(SUMO_ATTR_SPEED) ? personPlanObject->getDoubleAttribute(SUMO_ATTR_SPEED) : 0; // build depending of plan type if (planTemplate->getTagProperty().isPlanWalk()) { @@ -1174,11 +1173,12 @@ GNERouteHandler::buildContainerPlan(const GNEDemandElement* planTemplate, GNEDem const bool friendlyPos = containerPlanObject->hasBoolAttribute(SUMO_ATTR_FRIENDLY_POS) ? containerPlanObject->getBoolAttribute(SUMO_ATTR_FRIENDLY_POS) : containerPlanObject->hasStringAttribute(SUMO_ATTR_FRIENDLY_POS) ? GNEAttributeCarrier::parse(containerPlanObject->getStringAttribute(SUMO_ATTR_FRIENDLY_POS)) : false; + const std::string group = containerPlanObject->hasStringAttribute(SUMO_ATTR_GROUP) ? containerPlanObject->getStringAttribute(SUMO_ATTR_GROUP) : ""; // build depending of plan type if (planTemplate->getTagProperty().isPlanTranship()) { buildTranship(containerPlanObject, planCreator->getPlanParameteres(), arrivalPos, departPos, speed, duration); } else if (planTemplate->getTagProperty().isPlanTransport()) { - buildTransport(containerPlanObject, planCreator->getPlanParameteres(), arrivalPos, lines); + buildTransport(containerPlanObject, planCreator->getPlanParameteres(), arrivalPos, lines, group); } else if (planTemplate->getTagProperty().isPlanStopContainer()) { // set stops specific parameters int parameterSet = 0; @@ -1340,7 +1340,8 @@ GNERouteHandler::duplicatePlan(const GNEDemandElement* originalPlan, GNEDemandEl } else if (tagProperty.isPlanTransport()) { buildTransport(planObject, planParameters, planObject->getDoubleAttribute(SUMO_ATTR_ARRIVALPOS), - planObject->getStringListAttribute(SUMO_ATTR_LINES)); + planObject->getStringListAttribute(SUMO_ATTR_LINES), + planObject->getStringAttribute(SUMO_ATTR_GROUP)); } else if (tagProperty.isPlanTranship()) { buildTranship(planObject, planParameters, planObject->getDoubleAttribute(SUMO_ATTR_ARRIVALPOS), diff --git a/src/netedit/elements/demand/GNERouteHandler.h b/src/netedit/elements/demand/GNERouteHandler.h index 922c23a5e8d9..f55effd882af 100644 --- a/src/netedit/elements/demand/GNERouteHandler.h +++ b/src/netedit/elements/demand/GNERouteHandler.h @@ -142,7 +142,7 @@ class GNERouteHandler : public RouteHandler { /// @brief build transport void buildTransport(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, - const double arrivalPos, const std::vector& lines); + const double arrivalPos, const std::vector& lines, const std::string& group); /// @brief build tranship void buildTranship(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, diff --git a/src/netedit/elements/demand/GNETransport.cpp b/src/netedit/elements/demand/GNETransport.cpp index a56c22bf998f..ebe6b136b7d5 100644 --- a/src/netedit/elements/demand/GNETransport.cpp +++ b/src/netedit/elements/demand/GNETransport.cpp @@ -41,13 +41,14 @@ GNEDemandElementPlan(this, -1, -1) { GNETransport::GNETransport(GNENet* net, SumoXMLTag tag, GUIIcon icon, GNEDemandElement* containerParent, const GNEPlanParents& planParameters, - const double arrivalPosition, const std::vector& lines) : + const double arrivalPosition, const std::vector& lines, const std::string& group) : GNEDemandElement(containerParent, net, GLO_TRANSPORT, tag, GUIIconSubSys::getIcon(icon), GNEPathManager::PathElement::Options::DEMAND_ELEMENT, planParameters.getJunctions(), planParameters.getEdges(), {}, planParameters.getAdditionalElements(), planParameters.getDemandElements(containerParent), {}), GNEDemandElementPlan(this, -1, arrivalPosition), -myLines(lines) { +myLines(lines), +myGroup(group) { } @@ -76,6 +77,9 @@ GNETransport::writeDemandElement(OutputDevice& device) const { if (myLines.size() > 0) { device.writeAttr(SUMO_ATTR_LINES, myLines); } + if (myGroup.size() > 0) { + device.writeAttr(SUMO_ATTR_GROUP, myGroup); + } device.closeTag(); } @@ -182,6 +186,8 @@ GNETransport::getAttribute(SumoXMLAttr key) const { // specific person plan attributes case SUMO_ATTR_LINES: return joinToString(myLines, " "); + case SUMO_ATTR_GROUP: + return myGroup; default: return getPlanAttribute(key); } @@ -204,6 +210,7 @@ void GNETransport::setAttribute(SumoXMLAttr key, const std::string& value, GNEUndoList* undoList) { switch (key) { case SUMO_ATTR_LINES: + case SUMO_ATTR_GROUP: GNEChange_Attribute::changeAttribute(this, key, value, undoList); break; default: @@ -219,6 +226,8 @@ GNETransport::isValid(SumoXMLAttr key, const std::string& value) { // specific person plan attributes case SUMO_ATTR_LINES: return canParse >(value); + case SUMO_ATTR_GROUP: + return true; default: return isPlanValid(key, value); } @@ -259,6 +268,9 @@ GNETransport::setAttribute(SumoXMLAttr key, const std::string& value) { case SUMO_ATTR_LINES: myLines = GNEAttributeCarrier::parse >(value); break; + case SUMO_ATTR_GROUP: + myGroup = value; + break; default: setPlanAttribute(key, value); break; diff --git a/src/netedit/elements/demand/GNETransport.h b/src/netedit/elements/demand/GNETransport.h index 7f8f67b6377e..0c0b480e9bb6 100644 --- a/src/netedit/elements/demand/GNETransport.h +++ b/src/netedit/elements/demand/GNETransport.h @@ -49,10 +49,11 @@ class GNETransport : public GNEDemandElement, public Parameterised, public GNEDe * @param[in] containerParent container parent * @param[in] planParameters plan parameters * @param[in] arrivalPosition arrival position - * @param[in] lines lines + * @param[in] lines transport lines + * @param[in] group transport group */ GNETransport(GNENet* net, SumoXMLTag tag, GUIIcon icon, GNEDemandElement* containerParent, const GNEPlanParents& planParameters, - const double arrivalPosition, const std::vector& lines); + const double arrivalPosition, const std::vector& lines, const std::string& group); /// @brief destructor ~GNETransport(); @@ -209,6 +210,9 @@ class GNETransport : public GNEDemandElement, public Parameterised, public GNEDe /// @brief The list of lines that are assigned to this stop std::vector myLines; + /// @brief group + std::string myGroup; + private: /// @brief method for setting the attribute and nothing else void setAttribute(SumoXMLAttr key, const std::string& value); diff --git a/src/utils/handlers/RouteHandler.cpp b/src/utils/handlers/RouteHandler.cpp index 6d875800a64d..c1b2061dfec5 100644 --- a/src/utils/handlers/RouteHandler.cpp +++ b/src/utils/handlers/RouteHandler.cpp @@ -340,7 +340,8 @@ RouteHandler::parseSumoBaseObject(CommonXMLStructure::SumoBaseObject* obj) { buildTransport(obj, obj->getPlanParameters(), obj->getDoubleAttribute(SUMO_ATTR_ARRIVALPOS), - obj->getStringListAttribute(SUMO_ATTR_LINES)); + obj->getStringListAttribute(SUMO_ATTR_LINES), + obj->getStringAttribute(SUMO_ATTR_GROUP)); break; case SUMO_TAG_TRANSHIP: buildTranship(obj, @@ -836,6 +837,7 @@ RouteHandler::parseTransport(const SUMOSAXAttributes& attrs) { // optional attributes const std::vector lines = attrs.getOpt >(SUMO_ATTR_LINES, "", parsedOk); const double arrivalPos = attrs.getOpt(SUMO_ATTR_ARRIVALPOS, "", parsedOk, -1); + const std::string group = attrs.getOpt(SUMO_ATTR_GROUP, "", parsedOk, ""); if (parsedOk) { // set tag myCommonXMLStructure.getCurrentSumoBaseObject()->setTag(SUMO_TAG_TRANSPORT); @@ -843,6 +845,7 @@ RouteHandler::parseTransport(const SUMOSAXAttributes& attrs) { myCommonXMLStructure.getCurrentSumoBaseObject()->setPlanParameters(planParameters); myCommonXMLStructure.getCurrentSumoBaseObject()->addStringListAttribute(SUMO_ATTR_LINES, lines); myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_ARRIVALPOS, arrivalPos); + myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_GROUP, group); } } diff --git a/src/utils/handlers/RouteHandler.h b/src/utils/handlers/RouteHandler.h index 504e88c99c4f..5950c525109d 100644 --- a/src/utils/handlers/RouteHandler.h +++ b/src/utils/handlers/RouteHandler.h @@ -129,7 +129,7 @@ class RouteHandler { /// @brief build transport virtual void buildTransport(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, - const double arrivalPos, const std::vector& lines) = 0; + const double arrivalPos, const std::vector& lines, const std::string& group) = 0; /// @brief build tranship virtual void buildTranship(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const CommonXMLStructure::PlanParameters& planParameters, From 3faa6de6e8c5ef19118620f353244d19b54c5f6f Mon Sep 17 00:00:00 2001 From: Angelo Banse Date: Tue, 10 Sep 2024 15:41:04 +0200 Subject: [PATCH 40/41] replacing NBSP with regular spaces - refs #2 and closes #15441 --- docs/web/docs/Basics/Basic_Computer_Skills.md | 4 +- docs/web/docs/Basics/Notation.md | 6 +- .../Using_the_Command_Line_Applications.md | 22 +-- ...Changes_from_version_0.9.0_up_to_0.9.10.md | 2 +- .../ChangeLog/Changes_in_2011_releases.md | 6 +- docs/web/docs/Contributed/SUMOPlayer.md | 2 +- docs/web/docs/Contributed/SUMOPy.md | 2 +- docs/web/docs/Contributed/SmallMaps.md | 28 ++-- ..._of_Vehicles,_Vehicle_Types,_and_Routes.md | 10 +- .../Activity-based_Demand_Generation.md | 30 ++-- docs/web/docs/Demand/Automatic_Routing.md | 2 +- .../docs/Demand/Dynamic_User_Assignment.md | 2 +- ...Ways_to_import_VISUM_Demand_Definitions.md | 4 +- ...ays_to_import_Vissim_Demand_Definitions.md | 4 +- .../web/docs/Demand/Importing_O/D_Matrices.md | 78 +++++----- .../Demand/Routes_from_Observation_Points.md | 10 +- .../Demand/Routing_by_Turn_Probabilities.md | 4 +- .../Shortest_or_Optimal_Path_Routing.md | 2 +- docs/web/docs/Developer/CodeStyle.md | 4 +- docs/web/docs/Developer/CppFileTemplate.md | 76 +++++----- docs/web/docs/Developer/Debugging.md | 26 ++-- docs/web/docs/Developer/GUI_Testing.md | 14 +- docs/web/docs/Developer/GitStuff.md | 8 +- docs/web/docs/Developer/HFileTemplate.md | 140 +++++++++--------- docs/web/docs/Developer/HowToRelease.md | 4 +- .../Developer/How_To/Car-Following_Model.md | 46 +++--- .../docs/Developer/How_To/Extend_Vehicles.md | 42 +++--- .../Developer/How_To/Lane-Changing_Model.md | 2 +- .../web/docs/Developer/How_To/Net_Importer.md | 4 +- .../Implementation_Notes/Error_Handling.md | 44 +++--- .../Options_Sub_System.md | 42 +++--- docs/web/docs/Developer/PythonFileTemplate.md | 32 ++-- docs/web/docs/Developer/Tests.md | 18 +-- docs/web/docs/Developer/Unit_Tests.md | 10 +- docs/web/docs/DiplomStudArb.md | 10 +- docs/web/docs/Downloads.md | 6 +- docs/web/docs/FAQ.md | 26 ++-- docs/web/docs/Fun.md | 126 ++++++++-------- docs/web/docs/Geo-Coordinates.md | 2 +- docs/web/docs/Installing/Linux_Build.md | 62 ++++---- .../docs/Installing/Linux_Build_Libraries.md | 98 ++++++------ docs/web/docs/Installing/MacOS_Build.md | 8 +- docs/web/docs/Installing/Windows_Libraries.md | 4 +- docs/web/docs/Installing/index.md | 16 +- docs/web/docs/Libsumo.md | 8 +- docs/web/docs/Libtraci.md | 8 +- .../Networks/Abstract_Network_Generation.md | 18 +-- docs/web/docs/Networks/Export.md | 12 +- docs/web/docs/Networks/Import.md | 2 +- docs/web/docs/Networks/Import/ArcView.md | 12 +- docs/web/docs/Networks/Import/DlrNavteq.md | 2 +- docs/web/docs/Networks/Import/MATsim.md | 4 +- docs/web/docs/Networks/Import/OpenDRIVE.md | 2 +- .../web/docs/Networks/Import/OpenStreetMap.md | 80 +++++----- .../Networks/Import/OpenStreetMapDownload.md | 8 +- .../Networks/Import/SUMO_Road_Networks.md | 4 +- docs/web/docs/Networks/Import/VISUM.md | 4 +- docs/web/docs/Networks/Import/Vissim.md | 2 +- docs/web/docs/Networks/PlainXML.md | 24 +-- docs/web/docs/Networks/SUMO_Road_Networks.md | 18 +-- docs/web/docs/Publications.md | 22 +-- docs/web/docs/Simulation/Basic_Definition.md | 2 +- docs/web/docs/Simulation/Bicycles.md | 2 +- docs/web/docs/Simulation/Calibrator.md | 12 +- docs/web/docs/Simulation/Intersections.md | 2 +- docs/web/docs/Simulation/Meso.md | 6 +- .../Output/Amitran_Traffic_Measures.md | 14 +- .../Output/Induction_Loops_Detectors_(E1).md | 6 +- docs/web/docs/Simulation/Output/RouteProbe.md | 8 +- docs/web/docs/Simulation/Output/TripInfo.md | 12 +- docs/web/docs/Simulation/ParkingArea.md | 20 +-- docs/web/docs/Simulation/Public_Transport.md | 26 ++-- docs/web/docs/Simulation/Routing.md | 4 +- docs/web/docs/Simulation/SaveAndLoad.md | 4 +- docs/web/docs/Simulation/Traffic_Lights.md | 2 +- .../docs/Simulation/Variable_Speed_Signs.md | 14 +- .../Why_Vehicles_are_teleporting.md | 2 +- docs/web/docs/Specification/Containers.md | 30 ++-- docs/web/docs/Specification/Persons.md | 30 ++-- docs/web/docs/Tools/Assign.md | 26 ++-- docs/web/docs/Tools/Build.md | 4 +- docs/web/docs/Tools/Detector.md | 16 +- docs/web/docs/Tools/District.md | 14 +- docs/web/docs/Tools/Import/OSM.md | 10 +- docs/web/docs/Tools/Import/VISSIM.md | 70 ++++----- docs/web/docs/Tools/Misc.md | 46 +++--- docs/web/docs/Tools/Net.md | 20 +-- docs/web/docs/Tools/Output.md | 54 +++---- docs/web/docs/Tools/Routes.md | 72 ++++----- docs/web/docs/Tools/Shapes.md | 4 +- docs/web/docs/Tools/Sumolib.md | 124 ++++++++-------- docs/web/docs/Tools/TraceExporter.md | 2 +- docs/web/docs/Tools/Trip.md | 28 ++-- docs/web/docs/Tools/Turns.md | 30 ++-- docs/web/docs/Tools/Visualization.md | 130 ++++++++-------- docs/web/docs/Tools/Xml.md | 12 +- docs/web/docs/Tools/devel.md | 2 +- docs/web/docs/Tools/tls.md | 28 ++-- docs/web/docs/TraCI.md | 18 +-- docs/web/docs/TraCI/C++TraCIAPI.md | 14 +- docs/web/docs/TraCI/Protocol.md | 48 +++--- docs/web/docs/TraCI/TraaS.md | 2 +- docs/web/docs/Tutorials/Autobahn.md | 34 ++--- .../Tutorials/Calibration/San_Pablo_Dam.md | 8 +- docs/web/docs/Tutorials/CityMobil.md | 2 +- docs/web/docs/Tutorials/CityMobil_old.md | 2 +- docs/web/docs/Tutorials/Driving_in_Circles.md | 38 ++--- docs/web/docs/Tutorials/FundamentalDiagram.md | 50 +++---- docs/web/docs/Tutorials/Hello_SUMO.md | 6 +- docs/web/docs/Tutorials/HighwayDetector.md | 12 +- docs/web/docs/Tutorials/Manhattan.md | 10 +- docs/web/docs/Tutorials/OSMWebWizard.md | 24 +-- docs/web/docs/Tutorials/Output_Parsing.md | 108 +++++++------- .../docs/Tutorials/PT_from_OpenStreetMap.md | 8 +- docs/web/docs/Tutorials/Plotting_Cookbook.md | 14 +- .../docs/Tutorials/Quick_Start_old_style.md | 4 +- docs/web/docs/Tutorials/SUMOlympics.md | 20 +-- docs/web/docs/Tutorials/ScenarioGuide.md | 12 +- .../docs/Tutorials/TraCI4Traffic_Lights.md | 2 +- docs/web/docs/Tutorials/TraCIPedCrossing.md | 14 +- .../docs/Tutorials/Trace_File_Generation.md | 10 +- docs/web/docs/Tutorials/quick_start.md | 2 +- docs/web/docs/netconvert.md | 6 +- docs/web/docs/polyconvert.md | 2 +- docs/web/docs/sumo.md | 8 +- 125 files changed, 1342 insertions(+), 1342 deletions(-) diff --git a/docs/web/docs/Basics/Basic_Computer_Skills.md b/docs/web/docs/Basics/Basic_Computer_Skills.md index 61ef658893a7..110c37b2814f 100644 --- a/docs/web/docs/Basics/Basic_Computer_Skills.md +++ b/docs/web/docs/Basics/Basic_Computer_Skills.md @@ -66,7 +66,7 @@ potentially more comfortable for repetitive tasks than using a GUI. Commands look like this ``` -netconvert --node-files=hello.nod.xml --edge-files=hello.edg.xml --output-file=hello.net.xml +netconvert --node-files=hello.nod.xml --edge-files=hello.edg.xml --output-file=hello.net.xml ``` Here *netconvert* is the name of the program and the rest of the command sets options for this program. @@ -95,7 +95,7 @@ makes sure that you can execute SUMO-programs. 3. enter a command such as ``` -netconvert --node-files=hello.nod.xml --edge-files=hello.edg.xml --output-file=hello.net.xml +netconvert --node-files=hello.nod.xml --edge-files=hello.edg.xml --output-file=hello.net.xml ``` and press `enter` diff --git a/docs/web/docs/Basics/Notation.md b/docs/web/docs/Basics/Notation.md index 0440ce9eba2c..e1cfbf6b9a5a 100644 --- a/docs/web/docs/Basics/Notation.md +++ b/docs/web/docs/Basics/Notation.md @@ -11,7 +11,7 @@ described. If you encounter something like this: ``` -netconvert --visum=MyVisumNet.inp --output-file=MySUMONet.net.xml +netconvert --visum=MyVisumNet.inp --output-file=MySUMONet.net.xml ``` you should know that this is a call on the command line. There may be @@ -21,8 +21,8 @@ following newline). The following example means exactly the same as the one above: ``` -netconvert --visum=MyVisumNet.inp \ -  --output-file=MySUMONet.net.xml +netconvert --visum=MyVisumNet.inp \ + --output-file=MySUMONet.net.xml ``` ## Application Options diff --git a/docs/web/docs/Basics/Using_the_Command_Line_Applications.md b/docs/web/docs/Basics/Using_the_Command_Line_Applications.md index fad19fbc3613..af7060e2543c 100644 --- a/docs/web/docs/Basics/Using_the_Command_Line_Applications.md +++ b/docs/web/docs/Basics/Using_the_Command_Line_Applications.md @@ -33,11 +33,11 @@ has been given, the application does not know what to do and prints only an information about itself: ``` -Eclipse SUMO netgenerate Version {{Version}} - Build features: Linux-4.1.39-56-default Proj GDAL GUI - Copyright (C) 2001-2020 German Aerospace Center (DLR) and others; https://sumo.dlr.de - License EPL-2.0: Eclipse Public License Version 2  - Use --help to get the list of options. +Eclipse SUMO netgenerate Version {{Version}} + Build features: Linux-4.1.39-56-default Proj GDAL GUI + Copyright (C) 2001-2020 German Aerospace Center (DLR) and others; https://sumo.dlr.de + License EPL-2.0: Eclipse Public License Version 2 + Use --help to get the list of options. ``` # Options @@ -61,7 +61,7 @@ example, if one wants the simulation to load a certain road network, "mynet.net.xml", the following must be written: ``` ---net mynet.net.xml +--net mynet.net.xml ``` The '--' in front indicates that the option's long name is following @@ -77,7 +77,7 @@ Some often used options can be abbreviated. The abbreviation for the above: ``` --n mynet.net.xml +-n mynet.net.xml ``` Please note that an abbreviation is indicated using a single '-'. @@ -89,7 +89,7 @@ If you want to append options to a list of values given in a [configuration file](#configuration_files_vs_command_line_parameter) you will use the following syntax: ``` -+a myAdditional.add.xml ++a myAdditional.add.xml ``` Please note that you can use the abbreviated or the non-abbreviated name here but always a single '+'. @@ -156,7 +156,7 @@ The according [sumo](../sumo.md) execution call - working with both configuration versions - would be: ``` -sumo.exe -c test.sumocfg +sumo.exe -c test.sumocfg ``` This means that instead of the parameters, we only give the name of the @@ -165,7 +165,7 @@ options on the command line it is possible to leave out the "-c" as well: ``` -sumo.exe test.sumocfg +sumo.exe test.sumocfg ``` ## Naming Conventions for Configuration Files @@ -393,7 +393,7 @@ the python tools. The easiest (but somewhat cumbersome) method is to run the tool using its full path: ``` -C:\Users\yourname>D:\path_to_sumo\tools\randomTrips.py  ... arguments ... +C:\Users\yourname>D:\path_to_sumo\tools\randomTrips.py ... arguments ... ``` Alternatively, you can add the directory in which the tool lies to your diff --git a/docs/web/docs/ChangeLog/Changes_from_version_0.9.0_up_to_0.9.10.md b/docs/web/docs/ChangeLog/Changes_from_version_0.9.0_up_to_0.9.10.md index f380c0bc6349..13e3a64d87f3 100644 --- a/docs/web/docs/ChangeLog/Changes_from_version_0.9.0_up_to_0.9.10.md +++ b/docs/web/docs/ChangeLog/Changes_from_version_0.9.0_up_to_0.9.10.md @@ -501,7 +501,7 @@ Together with this extension, the import of ArcView-files has been rechecked and now allows to import networks stored in other schemes than the one NavTeq uses. The new options are described [here](../Networks/Import/ArcView.md). -Some further comments on importing ArcView-files are available [here](../Networks/Import/ArcView.md#arcview_import_options). By now, they include only some comments on importing an open-source network of Osnabrück. You can take a look at this [here](../Networks/Import/ArcView.md#frida_network_city_of_osnabruck) and also download it from [here](https://frida.intevation.org/download.html). +Some further comments on importing ArcView-files are available [here](../Networks/Import/ArcView.md#arcview_import_options). By now, they include only some comments on importing an open-source network of Osnabrück. You can take a look at this [here](../Networks/Import/ArcView.md#frida_network_city_of_osnabruck) and also download it from [here](https://frida.intevation.org/download.html). **3.** The developer documentation has been split into several parts. diff --git a/docs/web/docs/ChangeLog/Changes_in_2011_releases.md b/docs/web/docs/ChangeLog/Changes_in_2011_releases.md index c70447ea1f98..017c9c238fd2 100644 --- a/docs/web/docs/ChangeLog/Changes_in_2011_releases.md +++ b/docs/web/docs/ChangeLog/Changes_in_2011_releases.md @@ -186,9 +186,9 @@ to get a list of supported options including synonyms. correct code for reading length is: ``` -int length = readByte() -if length==0: -length = readInt() +int length = readByte() +if length==0: +length = readInt() ``` - added [Contributed/SUMO Traffic Modeler](../Contributed/SUMO_Traffic_Modeler.md) diff --git a/docs/web/docs/Contributed/SUMOPlayer.md b/docs/web/docs/Contributed/SUMOPlayer.md index 18a76fbc8d81..3ef590734f3c 100644 --- a/docs/web/docs/Contributed/SUMOPlayer.md +++ b/docs/web/docs/Contributed/SUMOPlayer.md @@ -73,7 +73,7 @@ title: SUMOPlayer You can run the player as following: ``` -sumo ... --no-step-log --netstate-dump - | java -jar SUMOPlayer.jar -d - -c  -n  ... +sumo ... --no-step-log --netstate-dump - | java -jar SUMOPlayer.jar -d - -c -n ... ``` ("-" redirects the dump to stdout) diff --git a/docs/web/docs/Contributed/SUMOPy.md b/docs/web/docs/Contributed/SUMOPy.md index e75dd2d71819..60375aefaaaa 100644 --- a/docs/web/docs/Contributed/SUMOPy.md +++ b/docs/web/docs/Contributed/SUMOPy.md @@ -21,7 +21,7 @@ as a simple to use scripting language which facilitates the use of SUMO. # Introduction SUMO rapidly developed into a flexible and powerful open-source -micro-simulator for multi-modal urban traffic networks . The features +micro-simulator for multi-modal urban traffic networks . The features and the number of tools provided are constantly increasing, making simulations ever more realistic. However, the different functionalities consist at the present state of a large number of binaries and scripts diff --git a/docs/web/docs/Contributed/SmallMaps.md b/docs/web/docs/Contributed/SmallMaps.md index 00800c18d1e4..83478fbcfe4d 100644 --- a/docs/web/docs/Contributed/SmallMaps.md +++ b/docs/web/docs/Contributed/SmallMaps.md @@ -16,21 +16,21 @@ improvements. SUMO 0.17.1 was the last release this tool was part of. ## Original Message ``` -Von: Florides Andreas [xxx] -Gesendet: Freitag, 8. Dezember 2006 15:43 -An: Krajzewicz, Daniel -Betreff: Frida map pruning +Von: Florides Andreas [xxx] +Gesendet: Freitag, 8. Dezember 2006 15:43 +An: Krajzewicz, Daniel +Betreff: Frida map pruning -Hello Daniel, -I have added a simple GUI to the script that makes the pruning to the -Frida maps and I believe that is more usable now. -You can find attached the sources and a compiled file for Linux that -you can try out. A lot of information are still hard-coded in the -source code which means that the program is not totally generic but -maybe is useful for a lot of people that are looking for small maps -that can "play"with in SUMO. -The readme file contains some general information. +Hello Daniel, +I have added a simple GUI to the script that makes the pruning to the +Frida maps and I believe that is more usable now. +You can find attached the sources and a compiled file for Linux that +you can try out. A lot of information are still hard-coded in the +source code which means that the program is not totally generic but +maybe is useful for a lot of people that are looking for small maps +that can "play"with in SUMO. +The readme file contains some general information. Regards -Andreas Florides +Andreas Florides ``` diff --git a/docs/web/docs/Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md b/docs/web/docs/Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md index 92a8aa7d4474..d321dd8b68a1 100644 --- a/docs/web/docs/Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md +++ b/docs/web/docs/Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md @@ -239,7 +239,7 @@ device](Demand/Automatic_Routing.md). ```xml - + ... ``` @@ -599,14 +599,14 @@ Note, that the given type id refers to an edge type rather than a vehicle type. Define a flow of vehicles that desire to drive at 120% of the speed limit without any deviation: ```xml - + ``` Define a vehicle type with high speed deviation and no cut-off ```xml - + ``` ## Vehicle Length @@ -1005,7 +1005,7 @@ the driver has to stop unintentionally (i.e. due to a jam or waiting at an intersection). The impatience value is computed as ```xml -MAX(0, MIN(1.0, baseImpatience + waitingTime / timeToMaxImpatience)) +MAX(0, MIN(1.0, baseImpatience + waitingTime / timeToMaxImpatience)) ``` Where baseImpatience is configured by setting the vType-attribute @@ -1280,7 +1280,7 @@ By default color components should be given as integers in the range of (0,255) but other definitions are also supported: ```xml -color="0.5, 0.5, 1.0" +color="0.5, 0.5, 1.0" color="#FF0000" color="red" ``` diff --git a/docs/web/docs/Demand/Activity-based_Demand_Generation.md b/docs/web/docs/Demand/Activity-based_Demand_Generation.md index 07fc86887a75..1270980d9b48 100644 --- a/docs/web/docs/Demand/Activity-based_Demand_Generation.md +++ b/docs/web/docs/Demand/Activity-based_Demand_Generation.md @@ -11,7 +11,7 @@ have their start or stop location outside the map. ## Typical Command Line ``` -activitygen --net-file  --stat-file  --output-file  --random +activitygen --net-file --stat-file --output-file --random ``` is a map in form of a SUMO net file, contains the @@ -32,18 +32,18 @@ files [{{SUMO}}/tests/activitygen/activitygen-example.net.xml]({{Source}}tests/a To run this example, use the following commands: ``` -activitygen --net-file activitygen-example.net.xml \ -            --stat-file activitygen-example.stat.xml \ -            --output-file activitygen-example.trips.rou.xml \ -            --random - -duarouter --net-file activitygen-example.net.xml \ -          --route-files activitygen-example.trips.rou.xml \ -          --output-file activitygen-example.rou.xml \ -          --ignore-errors - -sumo --net-file activitygen-example.net.xml \ -     --route-files activitygen-example.rou.xml +activitygen --net-file activitygen-example.net.xml \ + --stat-file activitygen-example.stat.xml \ + --output-file activitygen-example.trips.rou.xml \ + --random + +duarouter --net-file activitygen-example.net.xml \ + --route-files activitygen-example.trips.rou.xml \ + --output-file activitygen-example.rou.xml \ + --ignore-errors + +sumo --net-file activitygen-example.net.xml \ + --route-files activitygen-example.rou.xml ``` The first command generates the net file from the node and edge @@ -69,8 +69,8 @@ the time of their departure into account during routing (see [Demand/Automatic_Routing](../Demand/Automatic_Routing.md)) ``` -sumo --net-file activitygen-example.net.xml \ -     --route-files activitygen-example.trips.rou.xml +sumo --net-file activitygen-example.net.xml \ + --route-files activitygen-example.trips.rou.xml ``` ## The Statistics File diff --git a/docs/web/docs/Demand/Automatic_Routing.md b/docs/web/docs/Demand/Automatic_Routing.md index b14de636fc6f..907dd776bdc2 100644 --- a/docs/web/docs/Demand/Automatic_Routing.md +++ b/docs/web/docs/Demand/Automatic_Routing.md @@ -69,7 +69,7 @@ interval may be altered using the ".adaptation-interval" option. By setting the option **--device.rerouting.adaptation-weight** {{DT_FLOAT}} the travel speed of each edge is computed as ``` -FLOAT * priorValue + (1 - FLOAT) * currentMeanSpeed +FLOAT * priorValue + (1 - FLOAT) * currentMeanSpeed ``` This averaging takes place with the period set by **--device.rerouting.adaptation-interval**. diff --git a/docs/web/docs/Demand/Dynamic_User_Assignment.md b/docs/web/docs/Demand/Dynamic_User_Assignment.md index a9058c02291b..b39d3f1a4c1a 100644 --- a/docs/web/docs/Demand/Dynamic_User_Assignment.md +++ b/docs/web/docs/Demand/Dynamic_User_Assignment.md @@ -31,7 +31,7 @@ The tool [duaIterate.py](../Tools/Assign.md#duaiteratepy) can be used to compute This script will require copious amounts of disk space ``` -python tools/assign/duaIterate.py -n  -t  -l  +python tools/assign/duaIterate.py -n -t -l ``` *duaIterate.py* supports many of the same options as diff --git a/docs/web/docs/Demand/Further_Ways_to_import_VISUM_Demand_Definitions.md b/docs/web/docs/Demand/Further_Ways_to_import_VISUM_Demand_Definitions.md index ee65695b3217..0c1419be5976 100644 --- a/docs/web/docs/Demand/Further_Ways_to_import_VISUM_Demand_Definitions.md +++ b/docs/web/docs/Demand/Further_Ways_to_import_VISUM_Demand_Definitions.md @@ -24,7 +24,7 @@ probabilities from VISUM, and the name of the file into which the converted turning probabilities shall be written: ``` -visum_convertTurnPercentages.py  +visum_convertTurnPercentages.py ``` The script is located in {{SUMO}}/tools/import/visum. It is written in Python. @@ -70,7 +70,7 @@ written. Additional options are shown in the following table: Example call: ``` -visum_convertRoutes.py -n  -r  -o --uniform +visum_convertRoutes.py -n -r -o --uniform ``` The script is located in {{SUMO}}/tools/import/visum. It is written diff --git a/docs/web/docs/Demand/Further_Ways_to_import_Vissim_Demand_Definitions.md b/docs/web/docs/Demand/Further_Ways_to_import_Vissim_Demand_Definitions.md index 399fccd60c09..ffa452882578 100644 --- a/docs/web/docs/Demand/Further_Ways_to_import_Vissim_Demand_Definitions.md +++ b/docs/web/docs/Demand/Further_Ways_to_import_Vissim_Demand_Definitions.md @@ -24,7 +24,7 @@ route definitions, you may also (ab)use this facility to delete the edge from all relevant routes, e.g. edgemap\["10000"\] = "" ``` -vissim_parseRoutes.py   +vissim_parseRoutes.py ``` The script is located in {{SUMO}}/tools/import/vissim. It is written in Python. @@ -38,7 +38,7 @@ parameter). The read bus lines are saved as renamed by setting them within "edgemap" variable (see below). ``` -vissim_parseBusStops.py   +vissim_parseBusStops.py ``` The script is located in {{SUMO}}/tools/import/vissim. It is written in Python. diff --git a/docs/web/docs/Demand/Importing_O/D_Matrices.md b/docs/web/docs/Demand/Importing_O/D_Matrices.md index f1885a4fdd66..ec7734baaaa0 100644 --- a/docs/web/docs/Demand/Importing_O/D_Matrices.md +++ b/docs/web/docs/Demand/Importing_O/D_Matrices.md @@ -182,7 +182,7 @@ assumed to be in the form .. Please note that the end is exclusive; for example, if ``` -0.00 1.00 +0.00 1.00 ``` is given, the generated vehicles' depart times will be second 0 to @@ -198,27 +198,27 @@ list. An example may look like this: ``` $VMR -* vehicle type +* vehicle type 4 -* From-Time  To-Time -7.00 8.00 -* Factor +* From-Time To-Time +7.00 8.00 +* Factor 1.00 * -* some -* additional -* comments -* District number +* some +* additional +* comments +* District number 3 -* names: -         1          2          3 +* names: + 1 2 3 * -* District 1 Sum = 6 -         1          2          3 -* District 2 Sum = 15 -         4          5          6 -* District 2 Sum = 24 -         7          8          9 +* District 1 Sum = 6 + 1 2 3 +* District 2 Sum = 15 + 4 5 6 +* District 2 Sum = 24 + 7 8 9 ``` The 'M' in the type name indicates that a vehicle type is used, the "R" @@ -240,22 +240,22 @@ ignore the string after the ';' that occurs after the type identifier ``` $OR;D2 -* From-Time  To-Time -7.00 8.00 -* Factor +* From-Time To-Time +7.00 8.00 +* Factor 1.00 -* some -* additional -* comments -         1          1       1.00 -         1          2       2.00 -         1          3       3.00 -         2          1       4.00 -         2          2       5.00 -         2          3       6.00 -         3          1       7.00 -         3          2       8.00 -         3          3       9.00 +* some +* additional +* comments + 1 1 1.00 + 1 2 2.00 + 1 3 3.00 + 2 1 4.00 + 2 2 5.00 + 2 3 6.00 + 3 1 7.00 + 3 2 8.00 + 3 3 9.00 ``` - The first line is a format specifier that must be included verbatim. @@ -274,11 +274,11 @@ every vehicle type as follows: ```xml -    -        -            -        -    + + + + + ``` @@ -404,8 +404,8 @@ defined within the O/D-matrix may be scaled via **--scale **. Example call to [od2trips](../../od2trips.md): ``` -od2trips -n  -d  -o --scale \ -   --timeline.day-in-hours --timeline  +od2trips -n -d -o --scale \ + --timeline.day-in-hours --timeline ``` # Generated traffic modes diff --git a/docs/web/docs/Demand/Routes_from_Observation_Points.md b/docs/web/docs/Demand/Routes_from_Observation_Points.md index 3816bf5dbe45..d1c999f1b8e8 100644 --- a/docs/web/docs/Demand/Routes_from_Observation_Points.md +++ b/docs/web/docs/Demand/Routes_from_Observation_Points.md @@ -126,7 +126,7 @@ follows: ``` Detector;Time;qPKW;qLKW;vPKW;vLKW myDet1;0;10;2;100;80 -... further entries ... +... further entries ... ``` This means the first time has to name the entries (columns). Their order @@ -240,13 +240,13 @@ vehicles in its emitters-output. Assuming that [dfrouter](../dfrouter.md) was called with the options ``` -dfrouter --net-file net.net.xml --routes-output routes.rou.xml --emitters-output vehicles.rou.xml --measure-files flows.txt +dfrouter --net-file net.net.xml --routes-output routes.rou.xml --emitters-output vehicles.rou.xml --measure-files flows.txt ``` sumo must be called in the following way: ``` -sumo --net-file net.net.xml --additional-files routes.rou.xml,vehicles.rou.xml +sumo --net-file net.net.xml --additional-files routes.rou.xml,vehicles.rou.xml ``` If you run the tool @@ -254,8 +254,8 @@ If you run the tool to sort the vehicles, either of the following will work: ``` -sumo --net-file net.net.xml --route-files routes.rou.xml,sorted_vehicles.rou.xml -sumo --net-file net.net.xml --route-files sorted_vehicles.rou.xml --additional-files routes.rou.xml +sumo --net-file net.net.xml --route-files routes.rou.xml,sorted_vehicles.rou.xml +sumo --net-file net.net.xml --route-files sorted_vehicles.rou.xml --additional-files routes.rou.xml ``` # flowrouter.py diff --git a/docs/web/docs/Demand/Routing_by_Turn_Probabilities.md b/docs/web/docs/Demand/Routing_by_Turn_Probabilities.md index 2034be711bd4..4dc3384bf95a 100644 --- a/docs/web/docs/Demand/Routing_by_Turn_Probabilities.md +++ b/docs/web/docs/Demand/Routing_by_Turn_Probabilities.md @@ -14,8 +14,8 @@ parameter must be supplied: A call may look like this: ``` -jtrrouter --route-files= --turn-ratio-files= --net-file= \ -  --output-file=MySUMORoutes.rou.xml --begin  --end  +jtrrouter --route-files= --turn-ratio-files= --net-file= \ + --output-file=MySUMORoutes.rou.xml --begin --end ``` !!! note diff --git a/docs/web/docs/Demand/Shortest_or_Optimal_Path_Routing.md b/docs/web/docs/Demand/Shortest_or_Optimal_Path_Routing.md index e8ae5104da16..0e0b82a4889d 100644 --- a/docs/web/docs/Demand/Shortest_or_Optimal_Path_Routing.md +++ b/docs/web/docs/Demand/Shortest_or_Optimal_Path_Routing.md @@ -252,7 +252,7 @@ When running [duarouter](../duarouter.md) you may encounter errors of the type ``` -Error: No connection between 'edge1' and 'edge2' found +Error: No connection between 'edge1' and 'edge2' found ``` This is caused be an unconnected network. If your network has vehicle diff --git a/docs/web/docs/Developer/CodeStyle.md b/docs/web/docs/Developer/CodeStyle.md index e6052b36ea0c..6259ffdda4e7 100644 --- a/docs/web/docs/Developer/CodeStyle.md +++ b/docs/web/docs/Developer/CodeStyle.md @@ -21,7 +21,7 @@ code use the following call to AStyle (or execute tools/build_config/checkStyle.py --fix before committing): ```sh -astyle --style=java --unpad-paren --pad-header --pad-oper --add-brackets --indent-switches --align-pointer=type -n  +astyle --style=java --unpad-paren --pad-header --pad-oper --add-brackets --indent-switches --align-pointer=type -n ``` Still, there are several other things you should keep in mind (The @@ -160,7 +160,7 @@ Executable files should also contain a so called shebang in the first line: ``` -!#/usr/bin/env python +!#/usr/bin/env python ``` If your script needs Python 3 then state python3 there. diff --git a/docs/web/docs/Developer/CppFileTemplate.md b/docs/web/docs/Developer/CppFileTemplate.md index 8f99cdbc20fd..b49df234bb65 100644 --- a/docs/web/docs/Developer/CppFileTemplate.md +++ b/docs/web/docs/Developer/CppFileTemplate.md @@ -4,8 +4,8 @@ title: CppFileTemplate ```cpp /****************************************************************************/ -// Eclipse SUMO, Simulation of Urban MObility; see  -// Copyright (C) - German Aerospace Center (DLR) and others. +// Eclipse SUMO, Simulation of Urban MObility; see +// Copyright (C) - German Aerospace Center (DLR) and others. // This program and the accompanying materials are made available under the // terms of the Eclipse Public License 2.0 which is available at // https://www.eclipse.org/legal/epl-2.0/ @@ -16,65 +16,65 @@ title: CppFileTemplate // https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later /****************************************************************************/ -/// @file     -/// @author   -/// @author   -/// @author   -/// @date     +/// @file +/// @author +/// @author +/// @author +/// @date /// -//  +// /****************************************************************************/ -#include  +#include -#include      // Standard libraries -#include          // SUMO libraries +#include // Standard libraries +#include // SUMO libraries -#include "myHeaderFile1"       // Header files from the same directory -#include "myHeaderFile2" +#include "myHeaderFile1" // Header files from the same directory +#include "myHeaderFile2" -// =========================================================================== -// static member definitions -// =========================================================================== - OwnClass::myStaticMember = value;    // Define here values of static members +// =========================================================================== +// static member definitions +// =========================================================================== + OwnClass::myStaticMember = value; // Define here values of static members -// =========================================================================== -// member method definitions -// =========================================================================== -OwnClass::OwnClass( parameter1,  parameter2,...  parametern) : -    parentClass(),             // Call to parent class (if inherit) -    myParameter1(parameter1),  // values of members should be initialized with this method -    myParameter2(parameter1),  // keep the order coherent with the order of the members in the header file -    ... -    myParametern(parametern) { -    // Code of constructor +// =========================================================================== +// member method definitions +// =========================================================================== +OwnClass::OwnClass( parameter1, parameter2,... parametern) : + parentClass(), // Call to parent class (if inherit) + myParameter1(parameter1), // values of members should be initialized with this method + myParameter2(parameter1), // keep the order coherent with the order of the members in the header file + ... + myParametern(parametern) { + // Code of constructor } void -OwnClass::function() const { -    // code +OwnClass::function() const { + // code } -OwnClass::getParameter1() const { -    return myParameter1; +OwnClass::getParameter1() const { + return myParameter1; } ``` ```cpp -// --------------------------------------------------------------------------- -// Class::InnerClass - methods  -// --------------------------------------------------------------------------- -OwnClass::InnerClass::InnerClass() : -    myPrivateParameter(0) { -    // code of constructor +// --------------------------------------------------------------------------- +// Class::InnerClass - methods +// --------------------------------------------------------------------------- +OwnClass::InnerClass::InnerClass() : + myPrivateParameter(0) { + // code of constructor } -OwnClass::InnerClass::~InnerClass() {} +OwnClass::InnerClass::~InnerClass() {} /****************************************************************************/ diff --git a/docs/web/docs/Developer/Debugging.md b/docs/web/docs/Developer/Debugging.md index 9b07b4dd744f..164a2b81cd2c 100644 --- a/docs/web/docs/Developer/Debugging.md +++ b/docs/web/docs/Developer/Debugging.md @@ -28,8 +28,8 @@ below any other `#include` or `#define` macros). The debugging code (e.g. some output to `std::cout`) should then be surrounded by ``` -#ifdef DEBUG_THIS_CODE -    ... +#ifdef DEBUG_THIS_CODE + ... #endif ``` @@ -49,10 +49,10 @@ you should insert a corresponding debug condition the debug code further as ``` -#ifdef DEBUG_THIS_CODE -    if DEBUG_COND { -        ... -    } +#ifdef DEBUG_THIS_CODE + if DEBUG_COND { + ... + } #endif ``` @@ -62,12 +62,12 @@ also define debug conditions with arguments to become a bit more flexible. For example: ``` -#define DEBUG_COND(x) (x != 0 && x->getID() == "my_new_ferrari") -    ... -#ifdef DEBUG_THIS_CODE -    if DEBUG_COND(veh_pointer) { -        ... -    } +#define DEBUG_COND(x) (x != 0 && x->getID() == "my_new_ferrari") + ... +#ifdef DEBUG_THIS_CODE + if DEBUG_COND(veh_pointer) { + ... + } #endif ``` @@ -94,4 +94,4 @@ corresponding macro is activated). Debugging symbols (`.pdb` files) are available **for some** of the external libraries included in [SUMOLibraries](https://github.com/DLR-TS/SUMOLibraries). To use them in Visual Studio, simply add the path of the desired symbol to the "Symbol file locations" in the Options menu. Do so by going to *Tools* > *Options...* > *Debugging* > *Symbols* and adding the path to the `.pdb` file of the desired external library as a new location (see the example image below). The `.pdb` files are usually located in the **lib** or **bin** directory, for each library. ![](../images/ExternalDebuggingSymbols.png)
-*Example: Adding the FOX debugging symbol* \ No newline at end of file +*Example: Adding the FOX debugging symbol* diff --git a/docs/web/docs/Developer/GUI_Testing.md b/docs/web/docs/Developer/GUI_Testing.md index 8e4ef893a9a5..6f53486ceed7 100644 --- a/docs/web/docs/Developer/GUI_Testing.md +++ b/docs/web/docs/Developer/GUI_Testing.md @@ -29,16 +29,16 @@ them reside in the relevant test directory in a test.py script that starts always with the same header: ```py -import os -import sys +import os +import sys -testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') -neteditTestRoot = os.path.join(os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') +testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') +neteditTestRoot = os.path.join(os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') sys.path.append(neteditTestRoot) -import neteditTestFunctions as netedit +import neteditTestFunctions as netedit -# Open netedit -neteditProcess, match = netedit.setupAndStart(neteditTestRoot, ['--new']) +# Open netedit +neteditProcess, match = netedit.setupAndStart(neteditTestRoot, ['--new']) ``` This code will find the directory with the netedit tests using the diff --git a/docs/web/docs/Developer/GitStuff.md b/docs/web/docs/Developer/GitStuff.md index 5f4a6e099eaa..bf4695214d74 100644 --- a/docs/web/docs/Developer/GitStuff.md +++ b/docs/web/docs/Developer/GitStuff.md @@ -11,16 +11,16 @@ repository, a working copy may enter a state with changes that can not be reverted (by stash or checkout). ``` -warning: CRLF will be replaced by LF in build_config/wix/sumo.wxs. -The file will have its original line endings in your working directory. +warning: CRLF will be replaced by LF in build_config/wix/sumo.wxs. +The file will have its original line endings in your working directory. ``` Solution ([stackoverflow](https://stackoverflow.com/questions/1967370/git-replacing-lf-with-crlf)): ``` -git rm --cached -r . -git reset --hard +git rm --cached -r . +git reset --hard ``` ## Plot number of issues over time diff --git a/docs/web/docs/Developer/HFileTemplate.md b/docs/web/docs/Developer/HFileTemplate.md index 3546b74c51c0..0afd0eda2019 100644 --- a/docs/web/docs/Developer/HFileTemplate.md +++ b/docs/web/docs/Developer/HFileTemplate.md @@ -4,8 +4,8 @@ title: HFileTemplate ```cpp /****************************************************************************/ -// Eclipse SUMO, Simulation of Urban MObility; see  -// Copyright (C) - German Aerospace Center (DLR) and others. +// Eclipse SUMO, Simulation of Urban MObility; see +// Copyright (C) - German Aerospace Center (DLR) and others. // This program and the accompanying materials are made available under the // terms of the Eclipse Public License 2.0 which is available at // https://www.eclipse.org/legal/epl-2.0/ @@ -16,90 +16,90 @@ title: HFileTemplate // https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later /****************************************************************************/ -/// @file     -/// @author   -/// @author   -/// @author   -/// @date     +/// @file +/// @author +/// @author +/// @author +/// @date /// -//  +// /****************************************************************************/ #pragma once -#include  // you can leave this one out if you don't need any defines from config.h, especially in libsumo / utils +#include // you can leave this one out if you don't need any defines from config.h, especially in libsumo / utils -#include  -#include "myOtherClass2.h" +#include +#include "myOtherClass2.h" -// =========================================================================== -// class declarations -// =========================================================================== -class myOwnClass1; // always prefer a declaration over an include -class myOwnClass2; +// =========================================================================== +// class declarations +// =========================================================================== +class myOwnClass1; // always prefer a declaration over an include +class myOwnClass2; -// =========================================================================== -// class definitions -// =========================================================================== +// =========================================================================== +// class definitions +// =========================================================================== /** - * @class OwnClass (Can be preceded by GNE, MS, NB, etc. depending on the project) - * brief description of the class - */ -class OwnClass : public ParentClass  { + * @class OwnClass (Can be preceded by GNE, MS, NB, etc. depending on the project) + * brief description of the class + */ +class OwnClass : public ParentClass { public: -     /** -      * @class InnerClass -      * brief description of the inner class -      */ -     class InnerClass { - -     public: -         /// @brief Constructor -         InnerClass(); - -         /// @brief Destructor -         ~InnerClass(); - -     private: -         /// @brief description of parameter -          myPrivateParameter; -     }; - -    /** @brief Constructor -     * @param[in] parameter1 each parameter must be documented -     * @param[in] parameter2 each parameter must be documented -       ... -     */ -    OwnClass( parameter1,  parameter2,...  parametern); - -    /// @brief Destructor (don't need documentation) -    ~OwnClass(); - -    /// @brief Returns parameter1 (Simple functions should be documented with one line) -     getParameter1() const; - -    /** @brief some functions can throw exceptions but don't use throw declarations -     * @param[in] parameter1 description of the parameter -     * @throw  description of the situation that provokes an exception -     * @return description of the returned value -     */ -    bool setParameter1( parameter1) const; - -    /// @brief if the class is abstract, should have pure virtual functions (virtual .... = 0;) -    //  @note: Extra information about a function should be written using @note -    virtual void pureVirtualFunction() = 0; + /** + * @class InnerClass + * brief description of the inner class + */ + class InnerClass { + + public: + /// @brief Constructor + InnerClass(); + + /// @brief Destructor + ~InnerClass(); + + private: + /// @brief description of parameter + myPrivateParameter; + }; + + /** @brief Constructor + * @param[in] parameter1 each parameter must be documented + * @param[in] parameter2 each parameter must be documented + ... + */ + OwnClass( parameter1, parameter2,... parametern); + + /// @brief Destructor (don't need documentation) + ~OwnClass(); + + /// @brief Returns parameter1 (Simple functions should be documented with one line) + getParameter1() const; + + /** @brief some functions can throw exceptions but don't use throw declarations + * @param[in] parameter1 description of the parameter + * @throw description of the situation that provokes an exception + * @return description of the returned value + */ + bool setParameter1( parameter1) const; + + /// @brief if the class is abstract, should have pure virtual functions (virtual .... = 0;) + // @note: Extra information about a function should be written using @note + virtual void pureVirtualFunction() = 0; protected: -    /// @brief description of the parameter -     myProtectedParameter1; + /// @brief description of the parameter + myProtectedParameter1; private: -    /// @brief every private parameter must start with "my" -     myPrivateParameter2; + /// @brief every private parameter must start with "my" + myPrivateParameter2; -    /// @brief C++ Standard Library classes must be preceded by std:: -    std::vector myPrivateParameter3; + /// @brief C++ Standard Library classes must be preceded by std:: + std::vector myPrivateParameter3; }; ``` diff --git a/docs/web/docs/Developer/HowToRelease.md b/docs/web/docs/Developer/HowToRelease.md index eb6ae28338ab..d8d024bd496c 100644 --- a/docs/web/docs/Developer/HowToRelease.md +++ b/docs/web/docs/Developer/HowToRelease.md @@ -98,8 +98,8 @@ and committing the changes after careful inspection - add a new version tag ``` -> git tag -a v0_13_7 -m "tagging release 0.13.7, refs #563" -> git push --tags +> git tag -a v0_13_7 -m "tagging release 0.13.7, refs #563" +> git push --tags ``` ### Release day diff --git a/docs/web/docs/Developer/How_To/Car-Following_Model.md b/docs/web/docs/Developer/How_To/Car-Following_Model.md index 28e8215bcf83..d60ddd869fd4 100644 --- a/docs/web/docs/Developer/How_To/Car-Following_Model.md +++ b/docs/web/docs/Developer/How_To/Car-Following_Model.md @@ -39,7 +39,7 @@ SUMO_TAG_CF_SMART_SK, In SUMOXMLDefinitions.cpp: ``` -{ "carFollowing-SmartSK",     SUMO_TAG_CF_SMART_SK }, +{ "carFollowing-SmartSK", SUMO_TAG_CF_SMART_SK }, ``` Furthermore you need to add an entry to @@ -47,7 +47,7 @@ SUMOXMLDefinitions::carFollowModelValues\[\] also in SUMOXMLDefinitions.cpp: ``` -{ "SmartSK",     SUMO_TAG_CF_SMART_SK }, +{ "SmartSK", SUMO_TAG_CF_SMART_SK }, ``` Car-following models are instantiated in MSVehicleType::build(...) @@ -55,17 +55,17 @@ located in [{{SUMO}}/src/microsim/MSVehicleType.cpp]({{Source}}src/microsim/MSVe where you have to put the call to your model's constructor into. ``` -case SUMO_TAG_CF_SMART_SK: -  model = new MSCFModel_SmartSK(vtype, -                                from.getCFParam(SUMO_ATTR_ACCEL, SUMOVTypeParameter::getDefaultAccel(from.vehicleClass)), -                                from.getCFParam(SUMO_ATTR_DECEL, SUMOVTypeParameter::getDefaultDecel(from.vehicleClass)), -                                from.getCFParam(SUMO_ATTR_SIGMA, SUMOVTypeParameter::getDefaultImperfection(from.vehicleClass)), -                                from.getCFParam(SUMO_ATTR_TAU, 1.), -                                from.getCFParam(SUMO_ATTR_TMP1, 1.), -                                from.getCFParam(SUMO_ATTR_TMP1, 1.), -                                from.getCFParam(SUMO_ATTR_TMP1, 1.), -                                from.getCFParam(SUMO_ATTR_TMP1, 1.), -                                from.getCFParam(SUMO_ATTR_TMP1, 1.)); +case SUMO_TAG_CF_SMART_SK: + model = new MSCFModel_SmartSK(vtype, + from.getCFParam(SUMO_ATTR_ACCEL, SUMOVTypeParameter::getDefaultAccel(from.vehicleClass)), + from.getCFParam(SUMO_ATTR_DECEL, SUMOVTypeParameter::getDefaultDecel(from.vehicleClass)), + from.getCFParam(SUMO_ATTR_SIGMA, SUMOVTypeParameter::getDefaultImperfection(from.vehicleClass)), + from.getCFParam(SUMO_ATTR_TAU, 1.), + from.getCFParam(SUMO_ATTR_TMP1, 1.), + from.getCFParam(SUMO_ATTR_TMP1, 1.), + from.getCFParam(SUMO_ATTR_TMP1, 1.), + from.getCFParam(SUMO_ATTR_TMP1, 1.), + from.getCFParam(SUMO_ATTR_TMP1, 1.)); ``` You may note that the constructor is read with values from "from". The @@ -83,11 +83,11 @@ SUMO_ATTR_TMP5, In SUMOXMLDefinitions.cpp: ``` -{ "tmp1",           SUMO_ATTR_TMP1 }, -{ "tmp2",           SUMO_ATTR_TMP2 }, -{ "tmp3",           SUMO_ATTR_TMP3 }, -{ "tmp4",           SUMO_ATTR_TMP4 }, -{ "tmp5",           SUMO_ATTR_TMP5 }, +{ "tmp1", SUMO_ATTR_TMP1 }, +{ "tmp2", SUMO_ATTR_TMP2 }, +{ "tmp3", SUMO_ATTR_TMP3 }, +{ "tmp4", SUMO_ATTR_TMP4 }, +{ "tmp5", SUMO_ATTR_TMP5 }, ``` The second parameter denotes the default value. There are two different @@ -101,7 +101,7 @@ have floating point values as model parameters at the moment. You also have to define which parameter must be read in [{{SUMO}}/src/utils/vehicle/SUMOVehicleParserHelper.cpp]({{Source}}src/utils/vehicle/SUMOVehicleParserHelper.cpp), method getAllowedCFModelAttrs(): ``` -std::set smartSKParams; +std::set smartSKParams; smartSKParams.insert(SUMO_ATTR_ACCEL); smartSKParams.insert(SUMO_ATTR_DECEL); smartSKParams.insert(SUMO_ATTR_SIGMA); @@ -111,7 +111,7 @@ smartSKParams.insert(SUMO_ATTR_TMP2); smartSKParams.insert(SUMO_ATTR_TMP3); smartSKParams.insert(SUMO_ATTR_TMP4); smartSKParams.insert(SUMO_ATTR_TMP5); -allowedCFModelAttrs[SUMO_TAG_CF_SMART_SK] = smartSKParams; +allowedCFModelAttrs[SUMO_TAG_CF_SMART_SK] = smartSKParams; ``` Note, that we have to adapt the constructor to retrieve the additional @@ -122,8 +122,8 @@ For further interaction, you also have to adapt the "id" of the model in the model's .h class: ``` -virtual int getModelID() const { - return SUMO_TAG_CF_SMART_SK; +virtual int getModelID() const { + return SUMO_TAG_CF_SMART_SK; } ``` @@ -144,5 +144,5 @@ XML elements or attributes you either need to adapt the XML schema files in {{SUMO}}/data/xsd or add the option ``` ---xml-validation never +--xml-validation never ``` diff --git a/docs/web/docs/Developer/How_To/Extend_Vehicles.md b/docs/web/docs/Developer/How_To/Extend_Vehicles.md index 1ee9828c1f0e..13a2a7f59e8a 100644 --- a/docs/web/docs/Developer/How_To/Extend_Vehicles.md +++ b/docs/web/docs/Developer/How_To/Extend_Vehicles.md @@ -13,17 +13,17 @@ src/utils/vehicle/SUMOVehicleParameter. At first, we extend the class (.h) by two further parameter: ``` -/// @brief The vehicle's capacity (persons) -unsigned int personCapacity; +/// @brief The vehicle's capacity (persons) +unsigned int personCapacity; -/// @brief The number of persons in the vehicle -unsigned int personNumber; +/// @brief The number of persons in the vehicle +unsigned int personNumber; ``` We also assign default values for those in the constructor (.cpp): ``` -... personCapacity(0), personNumber(0), ... +... personCapacity(0), personNumber(0), ... ``` Our vehicles now have the attribute, and we can use it within the @@ -36,8 +36,8 @@ writing it back if necessary. We have to define constants (bitset) which describe whether the value was given (.h): ``` -const int VEHPARS_PERSON_CAPACITY_SET = 2 << 14; -const int VEHPARS_PERSONS_NUMBER_SET = 2 << 15; +const int VEHPARS_PERSON_CAPACITY_SET = 2 << 14; +const int VEHPARS_PERSONS_NUMBER_SET = 2 << 15; ``` ## Writing a Vehicle @@ -46,11 +46,11 @@ We extend the vehicle writing method stored in void SUMOVehicleParameter::writeAs(...) const by the new attributes: ``` -if (wasSet(VEHPARS_PERSON_CAPACITY_SET)) { - dev.writeAttr(SUMO_ATTR_PERSON_CAPACITY, personCapacity); +if (wasSet(VEHPARS_PERSON_CAPACITY_SET)) { + dev.writeAttr(SUMO_ATTR_PERSON_CAPACITY, personCapacity); } -if (wasSet(VEHPARS_PERSON_NUMBER_SET)) { - dev.writeAttr(SUMO_ATTR_PERSON_NUMBER, personNumber); +if (wasSet(VEHPARS_PERSON_NUMBER_SET)) { + dev.writeAttr(SUMO_ATTR_PERSON_NUMBER, personNumber); } ``` @@ -67,8 +67,8 @@ SUMO_ATTR_PERSON_NUMBER, In SUMOXMLDefinitions.cpp we have to extend SumoXMLAttr, too: ``` -{ "personCapacity", SUMO_ATTR_PERSON_CAPACITY }, -{ "personNumber",   SUMO_ATTR_PERSON_NUMBER }, +{ "personCapacity", SUMO_ATTR_PERSON_CAPACITY }, +{ "personNumber", SUMO_ATTR_PERSON_NUMBER }, ``` The given strings will be later used as XML-attributes. @@ -81,14 +81,14 @@ new attributes in void SUMOVehicleParserHelper::parseCommonAttributes(...) ``` -// parse person number -if (attrs.hasAttribute(SUMO_ATTR_PERSON_NUMBER)) { - ret->setParameter |= VEHPARS_PERSON_NUMBER_SET; - ret->personNumber = attrs.getIntReporting(SUMO_ATTR_PERSON_NUMBER, 0, ok); +// parse person number +if (attrs.hasAttribute(SUMO_ATTR_PERSON_NUMBER)) { + ret->setParameter |= VEHPARS_PERSON_NUMBER_SET; + ret->personNumber = attrs.getIntReporting(SUMO_ATTR_PERSON_NUMBER, 0, ok); } -// parse person capacity -if (attrs.hasAttribute(SUMO_ATTR_PERSON_CAPACITY)) { - ret->setParameter |= VEHPARS_PERSON_CAPACITY_SET; - ret->personCapacity = attrs.getIntReporting(SUMO_ATTR_PERSON_CAPACITY, 0, ok); +// parse person capacity +if (attrs.hasAttribute(SUMO_ATTR_PERSON_CAPACITY)) { + ret->setParameter |= VEHPARS_PERSON_CAPACITY_SET; + ret->personCapacity = attrs.getIntReporting(SUMO_ATTR_PERSON_CAPACITY, 0, ok); } ``` diff --git a/docs/web/docs/Developer/How_To/Lane-Changing_Model.md b/docs/web/docs/Developer/How_To/Lane-Changing_Model.md index c8bb17d5e51a..751d47bc8342 100644 --- a/docs/web/docs/Developer/How_To/Lane-Changing_Model.md +++ b/docs/web/docs/Developer/How_To/Lane-Changing_Model.md @@ -89,5 +89,5 @@ XML elements or attributes you either need to adapt the XML schema files in {{SUMO}}/data/xsd or add the option ``` ---xml-validation never +--xml-validation never ``` diff --git a/docs/web/docs/Developer/How_To/Net_Importer.md b/docs/web/docs/Developer/How_To/Net_Importer.md index fa03007410c7..2242a6fa9ef8 100644 --- a/docs/web/docs/Developer/How_To/Net_Importer.md +++ b/docs/web/docs/Developer/How_To/Net_Importer.md @@ -90,7 +90,7 @@ structure be given to the importer, making the call have the following fingerprint: ``` -static void loadNetwork(const OptionsCont &oc, NBNetBuilder &nb); +static void loadNetwork(const OptionsCont &oc, NBNetBuilder &nb); ``` At first, this method asks whether the option which makes @@ -130,7 +130,7 @@ example), a ProcessError should be thrown. The exception must have an information about the error, for example: ``` -throw ProcessError("Number of lanes is <0"); +throw ProcessError("Number of lanes is <0"); ``` Yes, the decision whether a strange value is an error or a warning is diff --git a/docs/web/docs/Developer/Implementation_Notes/Error_Handling.md b/docs/web/docs/Developer/Implementation_Notes/Error_Handling.md index 6ff88f4ac74a..589ea10eb2ca 100644 --- a/docs/web/docs/Developer/Implementation_Notes/Error_Handling.md +++ b/docs/web/docs/Developer/Implementation_Notes/Error_Handling.md @@ -76,30 +76,30 @@ ProcessError has really one set. ``` int -main(int argc, char **argv) +main(int argc, char **argv) { -    // initialise return code -    int ret = 0; -    ... make uncritical initialisation ... -    try { -       ... do some critical stuff ... -    } catch (ProcessError &e) { -        if(string(e.what())!=string("Process Error") && string(e.what())!=string("")) { -            MsgHandler::getErrorInstance()->inform(e.what()); -        } -        MsgHandler::getErrorInstance()->inform("Quitting (on error).", false); -        // set return code to "failure" -        ret = 1; -#ifndef _DEBUG -    } catch (...) { -        MsgHandler::getErrorInstance()->inform("Quitting (on unknown error).", false); -        // set return code to "failure" -        ret = 1; + // initialise return code + int ret = 0; + ... make uncritical initialisation ... + try { + ... do some critical stuff ... + } catch (ProcessError &e) { + if(string(e.what())!=string("Process Error") && string(e.what())!=string("")) { + MsgHandler::getErrorInstance()->inform(e.what()); + } + MsgHandler::getErrorInstance()->inform("Quitting (on error).", false); + // set return code to "failure" + ret = 1; +#ifndef _DEBUG + } catch (...) { + MsgHandler::getErrorInstance()->inform("Quitting (on unknown error).", false); + // set return code to "failure" + ret = 1; #endif -    } -    ... clean up ... -    // return the return code -    return ret; + } + ... clean up ... + // return the return code + return ret; } ``` diff --git a/docs/web/docs/Developer/Implementation_Notes/Options_Sub_System.md b/docs/web/docs/Developer/Implementation_Notes/Options_Sub_System.md index ce1c0afba2bf..c9080c9ade7a 100644 --- a/docs/web/docs/Developer/Implementation_Notes/Options_Sub_System.md +++ b/docs/web/docs/Developer/Implementation_Notes/Options_Sub_System.md @@ -20,7 +20,7 @@ Each application has exactly one instance of the **OptionsCont** using ``` -static OptionsCont &OptionsCont::getOptions(); +static OptionsCont &OptionsCont::getOptions(); ``` Before an application starts registering its options, it must let @@ -32,13 +32,13 @@ touch of the options sub system for each application looks similar to the following which is borrowed from netconvert_main.cpp: ``` -   OptionsCont &oc = OptionsCont::getOptions(); -   // give some application descriptions -   oc.setApplicationDescription("Road network importer / builder for the road traffic simulation SUMO."); -#ifdef WIN32 -   oc.setApplicationName("netconvert.exe", "SUMO netconvert Version " + (string)VERSION_STRING); + OptionsCont &oc = OptionsCont::getOptions(); + // give some application descriptions + oc.setApplicationDescription("Road network importer / builder for the road traffic simulation SUMO."); +#ifdef WIN32 + oc.setApplicationName("netconvert.exe", "SUMO netconvert Version " + (string)VERSION_STRING); #else -   oc.setApplicationName("sumo-netconvert", "SUMO netconvert Version " + (string)VERSION_STRING); + oc.setApplicationName("sumo-netconvert", "SUMO netconvert Version " + (string)VERSION_STRING); #endif ``` @@ -60,13 +60,13 @@ To insert an application option into the container, use one of the following polymorphs: ``` -void doRegister(const std::string &name1, Option *v); +void doRegister(const std::string &name1, Option *v); ``` or ``` -void doRegister(const std::string &name1, char abbr, Option *v); +void doRegister(const std::string &name1, char abbr, Option *v); ``` The parameter "name1" is the name (or one of the possible names, better @@ -74,7 +74,7 @@ to say) of the inserted option. The character "abbr" within the second call is the possible one-char abbreviation of the name. ``` -Caution: The behavior after adding the same abbreviation for two different options is not defined. +Caution: The behavior after adding the same abbreviation for two different options is not defined. ``` The third parameter is an option that shall be assigned to the name(s). @@ -108,7 +108,7 @@ example: settings the "verbose"-switch as following, lets the application run quiet as default: ``` -oc.doRegister("verbose", 'v', new Option_Bool(false)); +oc.doRegister("verbose", 'v', new Option_Bool(false)); ``` #### Adding Synonyms @@ -119,8 +119,8 @@ shorter name, too, use the following to make the same option accessible using both "**name-of-vehicle-that-shall-halt**" and "**v2h**": ``` -oc.doRegister("name-of-vehicle-that-shall-halt", new Option_String()); -oc.addSynonyme("name-of-vehicle-that-shall-halt", "v2h"); +oc.doRegister("name-of-vehicle-that-shall-halt", new Option_String()); +oc.addSynonyme("name-of-vehicle-that-shall-halt", "v2h"); ``` ## Retrieving Options @@ -133,26 +133,26 @@ to assure security of the code. One can determine whether an option is set using ``` -bool OptionsCont::isSet(const std::string &name) const; +bool OptionsCont::isSet(const std::string &name) const; ``` If one has to know whether an option still stores the default value or a value was supplied by the user, he/she may call ``` -bool OptionsCont::isDefault(const std::string &name) const; +bool OptionsCont::isDefault(const std::string &name) const; ``` Dependent on the type of an option, one can retrieve its value using the following methods from OptionsCont: ``` -int OptionsCont::getInt(const std::string &name) const; -long OptionsCont::getLong(const std::string &name) const; -std::string OptionsCont::getString(const std::string &name) const; -float OptionsCont::getFloat(const std::string &name) const; -const IntVector &OptionsCont::getIntVector(const std::string &name) const; -const StringVector &OptionsCont::getStringVector(const std::string &name) const; +int OptionsCont::getInt(const std::string &name) const; +long OptionsCont::getLong(const std::string &name) const; +std::string OptionsCont::getString(const std::string &name) const; +float OptionsCont::getFloat(const std::string &name) const; +const IntVector &OptionsCont::getIntVector(const std::string &name) const; +const StringVector &OptionsCont::getStringVector(const std::string &name) const; ``` Using an improper method yields an exception. diff --git a/docs/web/docs/Developer/PythonFileTemplate.md b/docs/web/docs/Developer/PythonFileTemplate.md index 9db8717ec67c..d60578c5ff63 100644 --- a/docs/web/docs/Developer/PythonFileTemplate.md +++ b/docs/web/docs/Developer/PythonFileTemplate.md @@ -3,8 +3,8 @@ title: PythonFileTemplate --- ```py -#!/usr/bin/env python # Leave this one out for non executable python files -# -*- coding: utf-8 -*- # optional encoding line, use if non-ASCII characters are in the code +#!/usr/bin/env python # Leave this one out for non executable python files +# -*- coding: utf-8 -*- # optional encoding line, use if non-ASCII characters are in the code # Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo # Copyright (C) - German Aerospace Center (DLR) and others. # This program and the accompanying materials are made available under the @@ -17,27 +17,27 @@ title: PythonFileTemplate # https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later -# @file     -# @author   -# @author   -# @date     +# @file +# @author +# @author +# @date """ - + """ -from __future__ import print_function -from __future__ import absolute_import +from __future__ import print_function +from __future__ import absolute_import -import os  # imports one per line -import sys -import ... +import os # imports one per line +import sys +import ... -# use the following when you depend on sumolib or traci +# use the following when you depend on sumolib or traci if "SUMO_HOME" in os.environ: - sys.path.append(os.path.join(os.environ["SUMO_HOME"], 'tools')) -import sumolib  # noqa -# the noqa is needed to tell the style checker that it is OK to have an import which is not at the top of the file + sys.path.append(os.path.join(os.environ["SUMO_HOME"], 'tools')) +import sumolib # noqa +# the noqa is needed to tell the style checker that it is OK to have an import which is not at the top of the file ``` diff --git a/docs/web/docs/Developer/Tests.md b/docs/web/docs/Developer/Tests.md index b194be152e32..d27cb3c64bd6 100644 --- a/docs/web/docs/Developer/Tests.md +++ b/docs/web/docs/Developer/Tests.md @@ -26,7 +26,7 @@ We use [TextTest](https://texttest.org/) 4.x as our testing environment which is Python based and currently available for Python 3. To install it on Linux / MacOS, you can open a terminal and type: -`pip3 install texttest` +`pip3 install texttest` For a "naked" python installation, the following may be needed to allow TextTest to work: @@ -57,9 +57,9 @@ Common options added to the personal config file to collapse the static test suites on program start. E.g.: ``` -   diff_program:meld -   view_program:geany -   static_collapse_suites:1 + diff_program:meld + view_program:geany + static_collapse_suites:1 ``` ## Recommended python packages @@ -100,8 +100,8 @@ example application. this: ``` -call %~dp0\testEnv.bat %1 -start %TEXTTESTPY% -a polyconvert +call %~dp0\testEnv.bat %1 +start %TEXTTESTPY% -a polyconvert ``` - add the application to the list of applications that are tested each @@ -110,13 +110,13 @@ night by was added: ``` -export POLYCONVERT_BINARY="$SUMO_BINDIR/polyconvert" +export POLYCONVERT_BINARY="$SUMO_BINDIR/polyconvert" ``` - adding it to **testEnv.bat**; in our case, the following line was added: ``` -set POLYCONVERT_BINARY=%~dp0\..\bin\polyconvert%1.exe +set POLYCONVERT_BINARY=%~dp0\..\bin\polyconvert%1.exe ``` - build a test folder for the application, named as the application @@ -144,7 +144,7 @@ copy_test_path:input_net.net.xml config:config.cfg log:log.txt [run_dependent_text] -output:polyconvert.exe{REPLACE polyconvert} +output:polyconvert.exe{REPLACE polyconvert} net:Version ``` diff --git a/docs/web/docs/Developer/Unit_Tests.md b/docs/web/docs/Developer/Unit_Tests.md index 688a24d5c058..765e30c89254 100644 --- a/docs/web/docs/Developer/Unit_Tests.md +++ b/docs/web/docs/Developer/Unit_Tests.md @@ -21,15 +21,15 @@ Test should be found and set up automatically then. # Linux setup -For Ubuntu 22.04 a simple `sudo apt install libgtest-dev` suffices. +For Ubuntu 22.04 a simple `sudo apt install libgtest-dev` suffices. For older Ubuntu versions follow [this recipe](https://stackoverflow.com/questions/24295876/cmake-cannot-find-googletest-required-library-in-ubuntu), which boils down to: ``` -sudo apt install libgtest-dev build-essential cmake -cd /usr/src/googletest -sudo cmake . -sudo cmake --build . --target install +sudo apt install libgtest-dev build-essential cmake +cd /usr/src/googletest +sudo cmake . +sudo cmake --build . --target install ``` diff --git a/docs/web/docs/DiplomStudArb.md b/docs/web/docs/DiplomStudArb.md index 12ba80b3e97a..265fc56bcf64 100644 --- a/docs/web/docs/DiplomStudArb.md +++ b/docs/web/docs/DiplomStudArb.md @@ -36,11 +36,11 @@ Die Arbeit würde auf bereits vorhandenen Ergebnissen aufbauen. ### Elektromobilität - Simulation der Auswirkung von Verkehrsmanagementstrategien ``` -Gegenwärtig hält eine neue Entwicklung mit all ihren Chancen und Herausforderungen Einzug in den Verkehrsraum – die Elektromobilität. Sie hat den Vorteil -nur geringe Lärm- und Schadstoff-emissionen zu verursachen. Doch die Elektromobilität wird die bisherigen Probleme im Verkehrsmanagement nicht automatisch lösen -Ganz im Gegenteil – im Zuge der Elektrifizierung des Verkehrs kommen neue Herausforderungen auf das Verkehrsmanagement zu -Die begrenzte Reichweite und langen Ladevorgänge der bisherigen Elektrofahrzeuge bedingen eine neuartige Lade- und Verkehrsinfrastruktur -Hinzu kommen unklare Rahmenbedingungen wie Kaufbereitschaft und Marktpreise. Die Konsequenzen für das Verkehrsmanagement sind daher kaum absehbar. +Gegenwärtig hält eine neue Entwicklung mit all ihren Chancen und Herausforderungen Einzug in den Verkehrsraum – die Elektromobilität. Sie hat den Vorteil +nur geringe Lärm- und Schadstoff-emissionen zu verursachen. Doch die Elektromobilität wird die bisherigen Probleme im Verkehrsmanagement nicht automatisch lösen +Ganz im Gegenteil – im Zuge der Elektrifizierung des Verkehrs kommen neue Herausforderungen auf das Verkehrsmanagement zu +Die begrenzte Reichweite und langen Ladevorgänge der bisherigen Elektrofahrzeuge bedingen eine neuartige Lade- und Verkehrsinfrastruktur +Hinzu kommen unklare Rahmenbedingungen wie Kaufbereitschaft und Marktpreise. Die Konsequenzen für das Verkehrsmanagement sind daher kaum absehbar. ``` Wir möchten zusammen mit einem Studenten/einer Studentin diff --git a/docs/web/docs/Downloads.md b/docs/web/docs/Downloads.md index 1f15eb450111..abfcbcce361f 100644 --- a/docs/web/docs/Downloads.md +++ b/docs/web/docs/Downloads.md @@ -44,9 +44,9 @@ There is also a [flatpak](https://flathub.org/apps/org.eclipse.sumo) available f To add the most recent sumo to your ubuntu you will need to do: ``` -sudo add-apt-repository ppa:sumo/stable -sudo apt-get update -sudo apt-get install sumo sumo-tools sumo-doc +sudo add-apt-repository ppa:sumo/stable +sudo apt-get update +sudo apt-get install sumo sumo-tools sumo-doc ``` ### Repositories diff --git a/docs/web/docs/FAQ.md b/docs/web/docs/FAQ.md index 95596074c721..c6d13bf150a6 100644 --- a/docs/web/docs/FAQ.md +++ b/docs/web/docs/FAQ.md @@ -77,7 +77,7 @@ title: FAQ that you used when registering for your account: ``` -git config --global user.email "email@example.com" +git config --global user.email "email@example.com" ``` - Create an [Eclipse account](https://accounts.eclipse.org/user/register) if you do not @@ -90,15 +90,15 @@ git config --global user.email "email@example.com" - Clone the forked repository to your computer ``` -git clone https://github.com/yourgithubid/sumo.git +git clone https://github.com/yourgithubid/sumo.git ``` - Modify the files in the created sumo clone directory - From within this directory Commit your changes with ``` -git add src -git commit -m "your change message" -s +git add src +git commit -m "your change message" -s ``` !!! caution @@ -107,7 +107,7 @@ git commit -m "your change message" -s - Push your changes to your fork on GitHub with ``` -git push +git push ``` - Send us a [pull request on GitHub](https://help.github.com/en/articles/creating-a-pull-request-from-a-fork) @@ -379,7 +379,7 @@ There are plenty of git clients for all platforms. If you use the command line c can checkout sumo using the following command: ``` -git clone --recursive https://github.com/eclipse-sumo/sumo +git clone --recursive https://github.com/eclipse-sumo/sumo ``` If you want to see the full project history in your git checkout please @@ -518,8 +518,8 @@ and simply type `git pull`. Errors such as ``` -Error: attribute name expected at -At line/column 10/46 +Error: attribute name expected at +At line/column 10/46 ``` can be caused by non-printing characters in the XML-file. Open your @@ -1267,10 +1267,10 @@ as explained [here](TraCI/Interfacing_TraCI_from_Python.md) and path to your SUMO-installation into your script: ``` - import sys - sys.path.append('/your/path/to/sumo/tools') - import traci - import sumolib + import sys + sys.path.append('/your/path/to/sumo/tools') + import traci + import sumolib ``` ### the python scripts do not accept command line arguments (windows only) @@ -1287,7 +1287,7 @@ script.py you do ``` -python script.py +python script.py ``` ### [osmWebWizard.py](Tools/Import/OSM.md#osmwebwizardpy) fails to generate Scenario on Windows 10 diff --git a/docs/web/docs/Fun.md b/docs/web/docs/Fun.md index b1a37ac23436..6d90751ae6db 100644 --- a/docs/web/docs/Fun.md +++ b/docs/web/docs/Fun.md @@ -8,105 +8,105 @@ title: Fun YouTube pendant. ``` - C                                                   F      C -Sie trafen sich täglich um viertel nach Acht, oh ho ho, oh yeah. + C F C +Sie trafen sich täglich um viertel nach Acht, oh ho ho, oh yeah. -                                            F      C -In ... Zimmer es wurde laut gedacht, oh ho ho, oh yeah. + F C +In ... Zimmer es wurde laut gedacht, oh ho ho, oh yeah. -     F                          C -Die Füße auf dem Tisch, den Kaffee schwarz und heiß + F C +Die Füße auf dem Tisch, den Kaffee schwarz und heiß -     F                          G -Das Hämmern im Kopf: ..., was'n das für'n Scheiß + F G +Das Hämmern im Kopf: ..., was'n das für'n Scheiß -     C                               F              F F# G -Wir simulieren viel besser, viel schneller und soooo + C F F F# G +Wir simulieren viel besser, viel schneller und soooo -              C -Und zwar mit SUMO - aber bitte mit SUMO. + C +Und zwar mit SUMO - aber bitte mit SUMO. - C                                                 F      C -Die Entwicklung begann vor einem Jahrzehnt, oh ho ho, oh yeah. + C F C +Die Entwicklung begann vor einem Jahrzehnt, oh ho ho, oh yeah. -                                                           F      C -Es war ... Traum, wonach er sich immer gesehnt, oh ho ho, oh yeah. + F C +Es war ... Traum, wonach er sich immer gesehnt, oh ho ho, oh yeah. - F                 C -Fußgänger, Ampeln, Autos und Straßen + F C +Fußgänger, Ampeln, Autos und Straßen -     F                  G -Das war seine Welt über alle Maßen + F G +Das war seine Welt über alle Maßen -     C                                   F               F F# G -Mit C++ ging's dann ans Werk - manchmal sogar auf dem Klo + C F F F# G +Mit C++ ging's dann ans Werk - manchmal sogar auf dem Klo -              C -Immer wieder SUUUMO - aber bitte mit SUMO + C +Immer wieder SUUUMO - aber bitte mit SUMO -C                                             F      C -Es wurde entwickelt tagaus und tagein, oh ho ho, oh yeah. +C F C +Es wurde entwickelt tagaus und tagein, oh ho ho, oh yeah. -                                                       F      C -Kompiliert und debugged, ja, das musste so sein, oh ho ho, oh yeah. + F C +Kompiliert und debugged, ja, das musste so sein, oh ho ho, oh yeah. -    F                      C -Da waren die Bugs und die feature requests + F C +Da waren die Bugs und die feature requests -     F                           G -Die ... fertig machten, ja, das war kein Fest + F G +Die ... fertig machten, ja, das war kein Fest -    C                F                F F# G -Es wurde gehackt, gefixed und getestet + C F F F# G +Es wurde gehackt, gefixed und getestet -                      C -Version 0.11 war die Beste - aber bitte mit SUMO + C +Version 0.11 war die Beste - aber bitte mit SUMO - C                                              F      C -... war glücklich, denn er hatte zu tun, oh ho ho, oh yeah + C F C +... war glücklich, denn er hatte zu tun, oh ho ho, oh yeah -                                                F      C -Immerzu hacken, nie Zeit, um auszuruh'n, oh ho ho, oh yeah + F C +Immerzu hacken, nie Zeit, um auszuruh'n, oh ho ho, oh yeah -     F                               C -Bei SUMO gibt's kein Diabetis, kein Meckern und Hau'n + F C +Bei SUMO gibt's kein Diabetis, kein Meckern und Hau'n -      F                          G -Viel besser als Schokolade, Zigaretten und Frau'n + F G +Viel besser als Schokolade, Zigaretten und Frau'n -      C                            F               F F# G -... grinste breit, er jubelte und war sehr frooh-ho + C F F F# G +... grinste breit, er jubelte und war sehr frooh-ho -              C -Es war wegen SUMO - aber bitte mit SUMO + C +Es war wegen SUMO - aber bitte mit SUMO - C                                              F      C -Das Ende vom Lied hat wohl jeder erahnt, oh ho ho, oh yeah + C F C +Das Ende vom Lied hat wohl jeder erahnt, oh ho ho, oh yeah -                                        F      C -Der Tod hat ... und co abgesahnt, oh ho ho, oh yeah + F C +Der Tod hat ... und co abgesahnt, oh ho ho, oh yeah - F                    C -Übrig blieb SUMO als einzige Simulation von allen + F C +Übrig blieb SUMO als einzige Simulation von allen - F                 G -Sie lebe hoch dem ... sei Dank + F G +Sie lebe hoch dem ... sei Dank -    C                         F           F F# G -Wäre .. nicht gewesen, wäre ... nun krank + C F F F# G +Wäre .. nicht gewesen, wäre ... nun krank -                     C -Dann aber bitte mit SUMO - aber bitte mit SUMO. + C +Dann aber bitte mit SUMO - aber bitte mit SUMO. -Noch ein Schnippsel Code - aber bitte mit SUMO -Zum Emissionsmodell dazu - aber bitte mit SUMO -Oder doch Intermodalität - aber bitte mit SUMO +Noch ein Schnippsel Code - aber bitte mit SUMO +Zum Emissionsmodell dazu - aber bitte mit SUMO +Oder doch Intermodalität - aber bitte mit SUMO ``` diff --git a/docs/web/docs/Geo-Coordinates.md b/docs/web/docs/Geo-Coordinates.md index fa959da03fe0..2543c5dcfefd 100644 --- a/docs/web/docs/Geo-Coordinates.md +++ b/docs/web/docs/Geo-Coordinates.md @@ -61,7 +61,7 @@ The [duarouter](duarouter.md) and [sumo](sumo.md) applications supports attribut the netconvert command ``` -netconvert --sumo-net-file myNet.net.xml --plain-output-prefix plain --proj.plain-geo +netconvert --sumo-net-file myNet.net.xml --plain-output-prefix plain --proj.plain-geo ``` - [FCD-output](Simulation/Output/FCDOutput.md) can be obtained diff --git a/docs/web/docs/Installing/Linux_Build.md b/docs/web/docs/Installing/Linux_Build.md index c5f0a469a70d..829fb0623995 100644 --- a/docs/web/docs/Installing/Linux_Build.md +++ b/docs/web/docs/Installing/Linux_Build.md @@ -16,12 +16,12 @@ To be able to run SUMO on Linux, just follow these steps: For ubuntu this boils down to ``` -sudo apt-get install git cmake python3 g++ libxerces-c-dev libfox-1.6-dev libgdal-dev libproj-dev libgl2ps-dev python3-dev swig default-jdk maven libeigen3-dev -git clone --recursive https://github.com/eclipse-sumo/sumo +sudo apt-get install git cmake python3 g++ libxerces-c-dev libfox-1.6-dev libgdal-dev libproj-dev libgl2ps-dev python3-dev swig default-jdk maven libeigen3-dev +git clone --recursive https://github.com/eclipse-sumo/sumo cd sumo -export SUMO_HOME="$PWD" -cmake -B build . -cmake --build build -j$(nproc) +export SUMO_HOME="$PWD" +cmake -B build . +cmake --build build -j$(nproc) ``` !!! note @@ -60,7 +60,7 @@ alternatives below. The package names above are for openSUSE, for ubuntu the call to get the most important optional libraries and tools is: ``` -sudo apt-get install ccache libavformat-dev libswscale-dev libopenscenegraph-dev python3-pip python3-build +sudo apt-get install ccache libavformat-dev libswscale-dev libopenscenegraph-dev python3-pip python3-build sudo apt-get install libgtest-dev gettext tkdiff xvfb flake8 astyle python3-autopep8 python3-gi-cairo gir1.2-gtk-3.0 sudo apt-get install python3-pyproj python3-rtree python3-pandas python3-pulp python3-ezdxf python3 -m pip install texttest @@ -83,9 +83,9 @@ of sumo. The following commands should be issued: ``` -git clone --recursive https://github.com/eclipse-sumo/sumo -cd sumo -git fetch origin refs/replace/*:refs/replace/* +git clone --recursive https://github.com/eclipse-sumo/sumo +cd sumo +git fetch origin refs/replace/*:refs/replace/* pwd ``` @@ -98,8 +98,8 @@ Download [sumo-src-{{Version}}.tar.gz](https://sumo.dlr.de/releases/{{Version}}/sumo-src-{{Version}}.tar.gz) or ``` -tar xzf sumo-src-.tar.gz -cd sumo-/ +tar xzf sumo-src-.tar.gz +cd sumo-/ pwd ``` @@ -112,7 +112,7 @@ SUMO in the folder "*/home//sumo-*", if you want to define only for the current session, type in the console ``` -export SUMO_HOME="/home//sumo-" +export SUMO_HOME="/home//sumo-" ``` If you want to define for all sessions (i.e. for every time that you run @@ -125,7 +125,7 @@ end and restart your session. You can check that SUMO_HOME was successfully set if you type ``` -echo $SUMO_HOME +echo $SUMO_HOME ``` and console shows "/home//sumo-" @@ -170,7 +170,7 @@ cmake -B build . to build the debug version just use ``` -cmake -D CMAKE_BUILD_TYPE=Debug -B build . +cmake -D CMAKE_BUILD_TYPE=Debug -B build . ``` !!! note @@ -182,7 +182,7 @@ Other useful cmake configuration options: - `-D COVERAGE=ON` enable coverage instrumentation for lcov (gcc build only) - `-D CHECK_OPTIONAL_LIBS=OFF` disable all optional libraries (only include EPL compatible licensed code) -- `-D CMAKE_BUILD_TYPE=RelWithDebInfo` enable debug symbols for +- `-D CMAKE_BUILD_TYPE=RelWithDebInfo` enable debug symbols for debugging the release build or using a different profiler - `-D PROJ_LIBRARY=` disable PROJ - `-D FOX_CONFIG=` disable FOX toolkit (GUI and multithreading) @@ -193,7 +193,7 @@ Other useful cmake configuration options: After this is finished, run ``` -cmake --build build -j $(nproc) +cmake --build build -j $(nproc) ``` The `nproc` command gives you the number of logical cores on your @@ -202,7 +202,7 @@ build a lot faster. If `nproc` is not available on your system, insert a fixed number here or leave the option out. You may also try ``` -cmake --build build -j $(grep -c ^processor /proc/cpuinfo) +cmake --build build -j $(grep -c ^processor /proc/cpuinfo) ``` ## Building with clang @@ -213,7 +213,7 @@ Our current clang configuration for additional static code checking enables the following CXXFLAGS: ``` --stdlib=libstdc++ -fsanitize=undefined,address,integer -fno-omit-frame-pointer -fsanitize-blacklist=$SUMO_HOME/build_config/clang_sanitize_blacklist.txt +-stdlib=libstdc++ -fsanitize=undefined,address,integer -fno-omit-frame-pointer -fsanitize-blacklist=$SUMO_HOME/build_config/clang_sanitize_blacklist.txt ``` You may of course leave out all the sanitizer-checks you don't want but @@ -225,7 +225,7 @@ build, so for building with CMake and clang just change to your build dir and use ``` -CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Debug --build build -j $(nproc) +CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Debug --build build -j $(nproc) ``` The clang-debug-build will detect memory leaks (among other things) @@ -259,20 +259,20 @@ sudo cmake --install build You have to adjust your SUMO_HOME variable to the install dir (usually /usr/local/share/sumo) ``` -export SUMO_HOME=/usr/local/share/sumo +export SUMO_HOME=/usr/local/share/sumo ``` ## Uninstalling CMake provides no `make uninstall` so if you ever want to uninstall, run ``` -sudo xargs rm < install_manifest.txt +sudo xargs rm < install_manifest.txt ``` from the same folder you ran `make install`. This will leave some empty directories, so if you want to remove them as well, double check that $SUMO_HOME points to the right directory (see above) and run ``` -sudo xargs rm -r $SUMO_HOME +sudo xargs rm -r $SUMO_HOME ``` ## Building Python wheels for sumolib, traci and libsumo @@ -306,7 +306,7 @@ platform and Python you built it with. If you did a repository clone you can simply update it by doing `git pull` from inside the SUMO_HOME folder. Then change to the build directory and run -`make -j $(nproc)` again. +`make -j $(nproc)` again. If your underlying system changed (updated libraries) or you experience other build problems please try a clean build first by removing the build directory (or at @@ -364,7 +364,7 @@ For further remarks on the use of JuPedSim inside SUMO, please consult [the docu Problem: ``` -recv ./foreign/tcpip/libtcpip.a(socket.o) (symbol belongs to implicit dependency /usr/lib/libsocket.so.1) +recv ./foreign/tcpip/libtcpip.a(socket.o) (symbol belongs to implicit dependency /usr/lib/libsocket.so.1) ``` Solution: @@ -375,16 +375,16 @@ Solution: Problem: ``` -/usr/bin/ld: cannot find -lfreetype -ls -lah /usr/lib64/libfreetype* - lrwxrwxrwx. 1 root root   21 Jul 28 15:54 /usr/lib64/libfreetype.so.6 -> libfreetype.so.6.12.0 - lrwxr-xr-x. 1 root root 689K Jul 28 15:54 /usr/lib64/libfreetype.so.6.12.0 +/usr/bin/ld: cannot find -lfreetype +ls -lah /usr/lib64/libfreetype* + lrwxrwxrwx. 1 root root 21 Jul 28 15:54 /usr/lib64/libfreetype.so.6 -> libfreetype.so.6.12.0 + lrwxr-xr-x. 1 root root 689K Jul 28 15:54 /usr/lib64/libfreetype.so.6.12.0 ``` Solution: Install the dev package; for fedora: ``` -sudo yum install freetype-devel +sudo yum install freetype-devel ``` For details see @@ -403,8 +403,8 @@ GUI only and had to change the installed libFOX-1.4.la such that it contains ``` -dependency_libs=' -lgdi32 -lglaux -ldl -lcomctl32 -lwsock32 -lwinspool -lmpr --lpthread -lpng /usr/lib/libtiff.la /usr/lib/libjpeg.la -lz -lbz2 -lopengl32 -lglu32' +dependency_libs=' -lgdi32 -lglaux -ldl -lcomctl32 -lwsock32 -lwinspool -lmpr +-lpthread -lpng /usr/lib/libtiff.la /usr/lib/libjpeg.la -lz -lbz2 -lopengl32 -lglu32' ``` Your mileage may vary. diff --git a/docs/web/docs/Installing/Linux_Build_Libraries.md b/docs/web/docs/Installing/Linux_Build_Libraries.md index 4f5f98dca020..f8f42ccbbb68 100644 --- a/docs/web/docs/Installing/Linux_Build_Libraries.md +++ b/docs/web/docs/Installing/Linux_Build_Libraries.md @@ -61,17 +61,17 @@ Unix-like environments. Documentation can be found in the For GDAL, Fox and Proj this is more or less straightforward: ``` -tar xzf fox-1.6.36.tar.gz -cd fox-1.6.36 -./configure --prefix=$HOME && make install -cd .. -tar xzf gdal-1.5.1.tar.gz -cd gdal-1.5.1 -./configure --prefix=$HOME && make install -cd .. -tar xzf proj-4.6.0.tar.gz -cd proj-4.6.0 -./configure --prefix=$HOME && make install +tar xzf fox-1.6.36.tar.gz +cd fox-1.6.36 +./configure --prefix=$HOME && make install +cd .. +tar xzf gdal-1.5.1.tar.gz +cd gdal-1.5.1 +./configure --prefix=$HOME && make install +cd .. +tar xzf proj-4.6.0.tar.gz +cd proj-4.6.0 +./configure --prefix=$HOME && make install ``` - Note: The "make install" for GDAL may fail due to the Python @@ -100,13 +100,13 @@ cd proj-4.6.0 somewhat more involved: ``` -tar xzf xerces-c-current.tar.gz -export XERCESCROOT=${HOME}/xerces-c-src_3_0_1 -cd $XERCESCROOT/src/xercesc +tar xzf xerces-c-current.tar.gz +export XERCESCROOT=${HOME}/xerces-c-src_3_0_1 +cd $XERCESCROOT/src/xercesc autoconf -./runConfigure -plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthread -P$HOME +./runConfigure -plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthread -P$HOME make -make install +make install ``` #### Concluding Remarks @@ -116,7 +116,7 @@ fashion, note that, when building SUMO, the following parameters will be required for the "./configure" run: ``` -./configure --with-fox-config=$HOME/bin/fox-config --with-proj-gdal=$HOME --with-xerces=$HOME +./configure --with-fox-config=$HOME/bin/fox-config --with-proj-gdal=$HOME --with-xerces=$HOME ``` ### Distribution-specific instructions @@ -127,56 +127,56 @@ may want to follow the instructions below. #### Ubuntu 12.04 (tested with SUMO 0.22.0) ``` -sudo apt-get install autoconf -sudo apt-get install proj  libtool libgdal1-dev libxerces-c2-dev libfox-1.6-0 libfox-1.6-dev -cd /usr/lib; sudo ln -s libgdal1.7.0.so libgdal.so cd /usr/local/src/sumo-0.22.0 -tar xzf sumo-src-0.22.0.tar.gz -sudo mv -v sumo-0.22.0 /usr/local/src -cd /usr/local/src/sumo-0.22.0 -./configure --with-fox-includes=/usr/include/fox-1.6 --with-gdal-includes=/usr/include/gdal --with-proj-libraries=/usr --with-gdal-libraries=/usr --with-proj-gdal +sudo apt-get install autoconf +sudo apt-get install proj libtool libgdal1-dev libxerces-c2-dev libfox-1.6-0 libfox-1.6-dev +cd /usr/lib; sudo ln -s libgdal1.7.0.so libgdal.so cd /usr/local/src/sumo-0.22.0 +tar xzf sumo-src-0.22.0.tar.gz +sudo mv -v sumo-0.22.0 /usr/local/src +cd /usr/local/src/sumo-0.22.0 +./configure --with-fox-includes=/usr/include/fox-1.6 --with-gdal-includes=/usr/include/gdal --with-proj-libraries=/usr --with-gdal-libraries=/usr --with-proj-gdal make -cd bin -sudo mv activitygen emissionsDrivingCycle netconvert polyconvert TraCITestClient dfrouter emissionsMap netgenerate  sumo duarouter jtrrouter od2trips sumo-gui /usr/local/bin +cd bin +sudo mv activitygen emissionsDrivingCycle netconvert polyconvert TraCITestClient dfrouter emissionsMap netgenerate sumo duarouter jtrrouter od2trips sumo-gui /usr/local/bin ``` #### Ubuntu 14.04 "Trusty Tahr" (tested with SUMO 0.22.0) ``` -sudo apt-get install autoconf -sudo apt-get install libproj-dev proj-bin proj-data  libtool libgdal1-dev libxerces-c3-dev libfox-1.6-0 libfox-1.6-dev -cd /usr/lib; +sudo apt-get install autoconf +sudo apt-get install libproj-dev proj-bin proj-data libtool libgdal1-dev libxerces-c3-dev libfox-1.6-0 libfox-1.6-dev +cd /usr/lib; ``` create this link ...if it complains that it exists, even better ``` -sudo ln -s libgdal1.7.0.so libgdal.so -sudo ln -s libproj.so.0.7.0 proj-lib.so +sudo ln -s libgdal1.7.0.so libgdal.so +sudo ln -s libproj.so.0.7.0 proj-lib.so ``` ``` -cd sumo-0.22.0 -tar xzf sumo-src-0.22.0.tar.gz -open file "configure" and  change: am__api_version='1.13' to am__api_version='1.14' -cd .. -sudo mv -v sumo-0.22.0 /usr/local/src -cd /usr/local/src/sumo-0.22.0 -sudo aclocal -sudo automake --add-missing -sudo ./configure --with-fox-includes=/usr/include/fox-1.6 --with-gdal-includes=/usr/include/gdal --with-proj-libraries=/usr/lib --with-gdal-libraries=/usr --with-proj-gdal -sudo make -cd bin -sudo mv activitygen emissionsDrivingCycle netconvert polyconvert TraCITestClient dfrouter emissionsMap netgenerate  sumo duarouter jtrrouter od2trips sumo-gui /usr/local/bin -cd /usr/local/share -sudo mkdir sumo-0.22.0 -sudo mv /usr/local/src/sumo-0.22.0/tools /usr/local/share/sumo-0.22.0/ -sudo mv  /usr/local/src/sumo-0.22.0/data /usr/local/share/sumo-0.22.0/ +cd sumo-0.22.0 +tar xzf sumo-src-0.22.0.tar.gz +open file "configure" and change: am__api_version='1.13' to am__api_version='1.14' +cd .. +sudo mv -v sumo-0.22.0 /usr/local/src +cd /usr/local/src/sumo-0.22.0 +sudo aclocal +sudo automake --add-missing +sudo ./configure --with-fox-includes=/usr/include/fox-1.6 --with-gdal-includes=/usr/include/gdal --with-proj-libraries=/usr/lib --with-gdal-libraries=/usr --with-proj-gdal +sudo make +cd bin +sudo mv activitygen emissionsDrivingCycle netconvert polyconvert TraCITestClient dfrouter emissionsMap netgenerate sumo duarouter jtrrouter od2trips sumo-gui /usr/local/bin +cd /usr/local/share +sudo mkdir sumo-0.22.0 +sudo mv /usr/local/src/sumo-0.22.0/tools /usr/local/share/sumo-0.22.0/ +sudo mv /usr/local/src/sumo-0.22.0/data /usr/local/share/sumo-0.22.0/ ``` if exist... ``` -sudo mv  /usr/local/src/sumo-0.22.0/doc /usr/local/share/sumo-0.22.0/ +sudo mv /usr/local/src/sumo-0.22.0/doc /usr/local/share/sumo-0.22.0/ ``` #### Ubuntu 18.04 (tested with SUMO 0.32.0) @@ -200,7 +200,7 @@ it you need to make a symbolic link in /usr/lib such that the linker finds the correct library: ``` -cd /usr/lib; ln -s /usr/lib/libxerces-c25.dll.a /usr/lib/libxerces-c.dll.a +cd /usr/lib; ln -s /usr/lib/libxerces-c25.dll.a /usr/lib/libxerces-c.dll.a ``` Now everything (but the GUI) should build fine. diff --git a/docs/web/docs/Installing/MacOS_Build.md b/docs/web/docs/Installing/MacOS_Build.md index 4e7ed2f5a5b5..ae484450885d 100644 --- a/docs/web/docs/Installing/MacOS_Build.md +++ b/docs/web/docs/Installing/MacOS_Build.md @@ -16,7 +16,7 @@ The installation requires [Homebrew](https://brew.sh). If you did not already in ``` and make sure your homebrew db is up-to-date. ``` -brew update +brew update ``` In order to compile the C++ source code files of SUMO, a C++ compiler is needed. On macOS the default C/C++ compiler is Clang. If you want to install the Clang compilers, please use the following command: @@ -186,7 +186,7 @@ Type "help", "copyright", "credits" or "license" for more information. You should start by [installing Macports](https://www.macports.org/install.php). Afterwards start a terminal session and run ``` -sudo port install sumo +sudo port install sumo ``` While this will install a SUMO version you maybe do not want to use, it will pull in all dependencies you need. @@ -194,7 +194,7 @@ While this will install a SUMO version you maybe do not want to use, it will pul If you want to build from a repository checkout you should additionally do ``` -sudo port install automake autoconf +sudo port install automake autoconf ``` After obtaining the [required libraries](Linux_Build.md#installing_required_tools_and_libraries) @@ -204,5 +204,5 @@ might want to add another --prefix=/opt/sumo to the configure line. If you wish to use clang rather than gcc for compilation do: ``` -./configure CXX=clang++ CXXFLAGS="-stdlib=libstdc++" +./configure CXX=clang++ CXXFLAGS="-stdlib=libstdc++" ``` diff --git a/docs/web/docs/Installing/Windows_Libraries.md b/docs/web/docs/Installing/Windows_Libraries.md index 990bbe6f4425..71d866cd3299 100644 --- a/docs/web/docs/Installing/Windows_Libraries.md +++ b/docs/web/docs/Installing/Windows_Libraries.md @@ -71,8 +71,8 @@ broken - open a visual studio command prompt, cd to the jpeg dir and execute ``` -nmake /f makefile.vc setup-v10 -nmake /f makefile.vc +nmake /f makefile.vc setup-v10 +nmake /f makefile.vc ``` - you will get a libjpeg lib (and no dll\!) in the jpeg dir diff --git a/docs/web/docs/Installing/index.md b/docs/web/docs/Installing/index.md index 85a59f686a0a..58ca59f930ab 100644 --- a/docs/web/docs/Installing/index.md +++ b/docs/web/docs/Installing/index.md @@ -41,21 +41,21 @@ If you run debian or ubuntu, SUMO is part of the regular distribution and can be installed like this: ``` -sudo apt-get install sumo sumo-tools sumo-doc +sudo apt-get install sumo sumo-tools sumo-doc ``` If you need a more up-to-date ubuntu version, it may be found in a separate ppa, which is added like this: ``` -sudo add-apt-repository ppa:sumo/stable -sudo apt-get update +sudo add-apt-repository ppa:sumo/stable +sudo apt-get update ``` and then again ``` -sudo apt-get install sumo sumo-tools sumo-doc +sudo apt-get install sumo sumo-tools sumo-doc ``` Precompiled binaries for different distributions like openSUSE and @@ -85,17 +85,17 @@ SUMO can be easily installed on macOS by using [Homebrew](https://brew.sh). If y ``` Please make sure your homebrew installation is up-to-date: ``` -brew update +brew update ``` If you want to use sumo-gui and/or netedit, you need to install XQuartz as a requirement: ``` -brew install --cask xquartz +brew install --cask xquartz ``` It may be necessary to logout and login again or even reboot to activate the XQuartz integration. You can then install the latest stable release of SUMO (with minimal requirements: ```fox```, ```proj```, ```xerces-c```) with the following commands: ``` -brew tap dlr-ts/sumo -brew install sumo +brew tap dlr-ts/sumo +brew install sumo ``` !!! note It is possible to install older vesions of SUMO using Homebrew. Running `brew search sumo` will list all available versions (v1.0.1 or newer). To install a specific version (e.g. version 1.9.0), just run `brew install sumo@1.9.0`. diff --git a/docs/web/docs/Libsumo.md b/docs/web/docs/Libsumo.md index 7af301d65f98..3bbc3f87d57b 100644 --- a/docs/web/docs/Libsumo.md +++ b/docs/web/docs/Libsumo.md @@ -71,15 +71,15 @@ in your start command instead of `sumo` or define the environment variable Make sure you have libsumo installed (`pip install libsumo`). ```py -import libsumo -libsumo.start(["sumo", "-c", "test.sumocfg"]) +import libsumo +libsumo.start(["sumo", "-c", "test.sumocfg"]) libsumo.simulationStep() ``` Existing traci scripts can be reused (subject to the [limitations](#limitations) mentioned above) by calling ```py -import libsumo as traci +import libsumo as traci ``` In case you have a lot of scripts you can also set the environment @@ -183,6 +183,6 @@ Please install the [Python package](#python). You can then use all commands insi just as in Python by adding the `py.` prefix. ``` -py.libsumo.start(["sumo", "-c", "test.sumocfg"]) +py.libsumo.start(["sumo", "-c", "test.sumocfg"]) py.libsumo.simulationStep() ``` diff --git a/docs/web/docs/Libtraci.md b/docs/web/docs/Libtraci.md index dd61e69f8e80..9d493452356b 100644 --- a/docs/web/docs/Libtraci.md +++ b/docs/web/docs/Libtraci.md @@ -63,8 +63,8 @@ you have `ENABLE_CS_BINDINGS` set in your cmake configuration. library. The method below is mostly used for testing libtraci. ```py -import libtraci -libtraci.start(["sumo", "-c", "test.sumocfg"]) +import libtraci +libtraci.start(["sumo", "-c", "test.sumocfg"]) libtraci.simulationStep() libtraci.close() ``` @@ -72,7 +72,7 @@ libtraci.close() Existing traci scripts can mostly be reused by calling ```py -import libtraci as traci +import libtraci as traci ``` In case you have a lot of scripts you can also set the environment @@ -157,6 +157,6 @@ just as in Python by adding the `py.` prefix. (Please note that this is actually implementation.) ``` -py.traci.start(["sumo", "-c", "test.sumocfg"]) +py.traci.start(["sumo", "-c", "test.sumocfg"]) py.traci.simulationStep() ``` diff --git a/docs/web/docs/Networks/Abstract_Network_Generation.md b/docs/web/docs/Networks/Abstract_Network_Generation.md index c3e614d0e433..a9748f7be1be 100644 --- a/docs/web/docs/Networks/Abstract_Network_Generation.md +++ b/docs/web/docs/Networks/Abstract_Network_Generation.md @@ -24,14 +24,14 @@ lengths for x and y directions). An example usage for building could be: ``` -netgenerate --grid --grid.number=10 --grid.length=400 --output-file=MySUMOFile.net.xml +netgenerate --grid --grid.number=10 --grid.length=400 --output-file=MySUMOFile.net.xml ``` or: ``` -netgenerate --grid --grid.x-number=20 --grid.y-number=5 \ - --grid.y-length=40 --grid.x-length=200 --output-file=MySUMOFile.net.xml +netgenerate --grid --grid.x-number=20 --grid.y-number=5 \ + --grid.y-length=40 --grid.x-length=200 --output-file=MySUMOFile.net.xml ``` These calls will generate the following networks, respectively: @@ -54,7 +54,7 @@ specifying **--spider.omit-center** or **--nocenter**. This also gives an easy w network. Using for instance ``` -netgenerate --spider --spider-omit-center --output-file=MySUMOFile.net.xml +netgenerate --spider --spider-omit-center --output-file=MySUMOFile.net.xml ``` will create a circle consisting of 13 elements with a radius of 100m. @@ -62,15 +62,15 @@ will create a circle consisting of 13 elements with a radius of 100m. Two examples of usage: ``` -netgenerate --spider --spider.arm-number=10 --spider.circle-number=10 \ - --spider.space-radius=100 --output-file=MySUMOFile.net.xml +netgenerate --spider --spider.arm-number=10 --spider.circle-number=10 \ + --spider.space-radius=100 --output-file=MySUMOFile.net.xml ``` and: ``` -netgenerate --spider --spider.arm-number=4 --spider.circle-number=3 \ - --spider.space-radius=100 --output-file=MySUMOFile.net.xml +netgenerate --spider --spider.arm-number=4 --spider.circle-number=3 \ + --spider.space-radius=100 --output-file=MySUMOFile.net.xml ``` These calls will generate the following networks, respectively: @@ -100,7 +100,7 @@ random networks. Several settings may be changed: An example: ``` -netgenerate --rand -o MySUMOFile.net.xml --rand.iterations=200 +netgenerate --rand -o MySUMOFile.net.xml --rand.iterations=200 ``` This call will generate the following network: diff --git a/docs/web/docs/Networks/Export.md b/docs/web/docs/Networks/Export.md index 44a229200bef..fa0ac01bcb04 100644 --- a/docs/web/docs/Networks/Export.md +++ b/docs/web/docs/Networks/Export.md @@ -105,7 +105,7 @@ Please note that the capacity is computed by multiplying an edge's lane number with the capacity norm: ``` -MAXIMUM_FLOW = LANE_NUMBER * CAPACITY_NORM +MAXIMUM_FLOW = LANE_NUMBER * CAPACITY_NORM ``` The value of CAPACITY_NORM is controlled via the option **--capacity-norm** {{DT_FLOAT}} (default: 1800). @@ -126,11 +126,11 @@ writes the data to a file with the following format -    -    -   ... -    -   ... + + + ... + + ... ``` diff --git a/docs/web/docs/Networks/Import.md b/docs/web/docs/Networks/Import.md index 8eb91550f820..6f0002cb2fcf 100644 --- a/docs/web/docs/Networks/Import.md +++ b/docs/web/docs/Networks/Import.md @@ -29,7 +29,7 @@ file (using the **--output-file** option). In the case, a VISUM network shall be imported, the following code will convert it into a SUMO-network: ``` -netconvert --visum=MyVisumNet.inp --output-file=MySUMONet.net.xml +netconvert --visum=MyVisumNet.inp --output-file=MySUMONet.net.xml ``` The import can be influenced using [further netconvert options](../Networks/Further_Options.md). diff --git a/docs/web/docs/Networks/Import/ArcView.md b/docs/web/docs/Networks/Import/ArcView.md index 0e5310bb7d73..1da1c1739a17 100644 --- a/docs/web/docs/Networks/Import/ArcView.md +++ b/docs/web/docs/Networks/Import/ArcView.md @@ -123,9 +123,9 @@ As a begin, we try to import the road graph. We use the information we have found and apply a projection: ``` -netconvert -v --shapefile-prefix tl_2008_36061_edges -o net.net.xml \ -   --shapefile.from-id TNIDF --shapefile.to-id TNIDT --arcview.street-id tlid \ -   --shapefile.use-defaults-on-failure +netconvert -v --shapefile-prefix tl_2008_36061_edges -o net.net.xml \ + --shapefile.from-id TNIDF --shapefile.to-id TNIDT --arcview.street-id tlid \ + --shapefile.use-defaults-on-failure ``` As a result, we obtain the network shown below. @@ -221,9 +221,9 @@ looked quite messy. After having played with geocoordinate projections, this was fixed. So the call (so far) looks like this: ``` -netconvert --arcview strassen -o frida.net.xml \ -  --arcview.street-id strShapeID -t frida.typ.xml \ -  --arcview.type-id strTypID --use-projection +netconvert --arcview strassen -o frida.net.xml \ + --arcview.street-id strShapeID -t frida.typ.xml \ + --arcview.type-id strTypID --use-projection ``` ### Data Quality diff --git a/docs/web/docs/Networks/Import/DlrNavteq.md b/docs/web/docs/Networks/Import/DlrNavteq.md index 85996ca30d22..5468e112fae2 100644 --- a/docs/web/docs/Networks/Import/DlrNavteq.md +++ b/docs/web/docs/Networks/Import/DlrNavteq.md @@ -8,7 +8,7 @@ option for reading them is **--dlr-navteq-prefix** {{DT_FILE}} or **--dlr-navteq must be given only, example: ``` -netconvert --dlr-navteq=berlin_ --output-file=MySUMOFile.net.xml +netconvert --dlr-navteq=berlin_ --output-file=MySUMOFile.net.xml ``` # Format diff --git a/docs/web/docs/Networks/Import/MATsim.md b/docs/web/docs/Networks/Import/MATsim.md index 98bd2edeb2ae..9f6212a845e8 100644 --- a/docs/web/docs/Networks/Import/MATsim.md +++ b/docs/web/docs/Networks/Import/MATsim.md @@ -7,7 +7,7 @@ For reading MATsim networks, give [netconvert](../../netconvert.md) the option **--matsim-files** {{DT_FILE}}\[,{{DT_FILE}}\]\* or **--matsim** {{DT_FILE}}\[,{{DT_FILE}}\]\* for short. For example: ``` -netconvert --matsim myMATsimNetwork.xml -o mySUMOnetwork.net.xml +netconvert --matsim myMATsimNetwork.xml -o mySUMOnetwork.net.xml ``` MATsim does not work with the lane numbers of streets, instead, the @@ -16,7 +16,7 @@ information about the edges' lane numbers are missing. The importer tries to determine the lane number from the given edges' capacities using: ``` -LANE_NUMBER = MAXIMUM_FLOW / CAPACITY_NORM +LANE_NUMBER = MAXIMUM_FLOW / CAPACITY_NORM ``` The value of CAPACITY_NORM is controlled via the option **--capacity-norm** {{DT_FLOAT}} (default: diff --git a/docs/web/docs/Networks/Import/OpenDRIVE.md b/docs/web/docs/Networks/Import/OpenDRIVE.md index cef163c35833..a1b9a9900462 100644 --- a/docs/web/docs/Networks/Import/OpenDRIVE.md +++ b/docs/web/docs/Networks/Import/OpenDRIVE.md @@ -6,7 +6,7 @@ For reading [OpenDRIVE networks](https://www.opendrive.org/), give [netconvert](../../netconvert.md) the option **--opendrive-files** {{DT_FILE}}\[,{{DT_FILE}}\]\* or **--opendrive** {{DT_FILE}}\[,{{DT_FILE}}\]\* for short. ``` -netconvert --opendrive myOpenDriveNetwork.xodr -o mySUMOnetwork.net.xml +netconvert --opendrive myOpenDriveNetwork.xodr -o mySUMOnetwork.net.xml ``` [netconvert](../../netconvert.md) can also [write OpenDrive diff --git a/docs/web/docs/Networks/Import/OpenStreetMap.md b/docs/web/docs/Networks/Import/OpenStreetMap.md index a36329c64789..b95d24fc134b 100644 --- a/docs/web/docs/Networks/Import/OpenStreetMap.md +++ b/docs/web/docs/Networks/Import/OpenStreetMap.md @@ -32,7 +32,7 @@ road network stored in "berlin.osm.xml" and stores the SUMO-network generated from this data into "berlin.net.xml": ``` -netconvert --osm-files berlin.osm.xml -o berlin.net.xml +netconvert --osm-files berlin.osm.xml -o berlin.net.xml ``` OSM-data always uses WGS84 geo coordinates, which are automatically @@ -49,7 +49,7 @@ The number of tiles given in both calls must match. ### Recommended [netconvert](../../netconvert.md) Options ``` - --geometry.remove --ramps.guess --junctions.join --tls.guess-signals --tls.discard-simple --tls.join --tls.default-type actuated + --geometry.remove --ramps.guess --junctions.join --tls.guess-signals --tls.discard-simple --tls.join --tls.default-type actuated ``` Rationale: @@ -183,7 +183,7 @@ Using the typemap file *typemap.xml* the following call to produces a Sumo-polygon file. ``` -polyconvert --net-file berlin.net.xml --osm-files berlin.osm --type-file typemap.xml -o berlin.poly.xml +polyconvert --net-file berlin.net.xml --osm-files berlin.osm --type-file typemap.xml -o berlin.poly.xml ``` The created polygon file *berlin.poly.xml* can then be added to a @@ -219,8 +219,8 @@ script *osmBuild.Py*. Both scripts are located in {{SUMO}}/tools. The call is: ``` -osmGet.py --bbox  --prefix  -osmBuild.py --osm-file .osm.xml  [--vehicle-classes (all|road|passenger)] [--type-file ] [--netconvert-options ] [--polyconvert-options ] +osmGet.py --bbox --prefix +osmBuild.py --osm-file .osm.xml [--vehicle-classes (all|road|passenger)] [--type-file ] [--netconvert-options ] [--polyconvert-options ] ``` If "road" is given as parameter, only roads usable by road vehicles are @@ -244,8 +244,8 @@ large areas by splitting them into multiple tiles and download requests. In this case the calls look like this: ``` -osmGet.py --bbox  --prefix  --oldapi --tiles  -osmBuild.py --oldapi-prefix  [--vehicle-classes (all|road|passenger),ramps,tls] [--type-file ] +osmGet.py --bbox --prefix --oldapi --tiles +osmBuild.py --oldapi-prefix [--vehicle-classes (all|road|passenger),ramps,tls] [--type-file ] ``` # Elevation Data @@ -369,13 +369,13 @@ in a separate file in a second run of [netconvert](../../netconvert.md): ``` -# 1. Import the OSM file to SUMO, discarding TLS information. -netconvert --osm-files berlin.osm.xml --output-file berlin-without-tls.net.xml \ -   --osm.discard-tls +# 1. Import the OSM file to SUMO, discarding TLS information. +netconvert --osm-files berlin.osm.xml --output-file berlin-without-tls.net.xml \ + --osm.discard-tls -# 2. Set traffic light information. -netconvert --sumo-net-file berlin-without-tls.net.xml --node-files tls-controlled-nodes.nod.xml \ -   --output-file berlin-with-tls.net.xml +# 2. Set traffic light information. +netconvert --sumo-net-file berlin-without-tls.net.xml --node-files tls-controlled-nodes.nod.xml \ + --output-file berlin-with-tls.net.xml ``` where **tls-controlled-nodes.nod.xml** overwrites the type of node to @@ -438,7 +438,7 @@ deletes the nodes. xmlstarlet can be used like this: ``` -xmlstarlet ed -d "/osm/*[@action='delete']" < input.osm > output.osm +xmlstarlet ed -d "/osm/*[@action='delete']" < input.osm > output.osm ``` !!! caution @@ -454,9 +454,9 @@ following command keeps motorways and motorway links while filtering out everything else: ``` -java -jar osmosis.jar --read-xml file="orginal.osm.xml" --way-key-value \ -    keyValueList="highway.motorway,highway.motorway_link" \ -    --used-node --write-xml file="filtered.osm.xml" +java -jar osmosis.jar --read-xml file="orginal.osm.xml" --way-key-value \ + keyValueList="highway.motorway,highway.motorway_link" \ + --used-node --write-xml file="filtered.osm.xml" ``` ## osmfilter / osmconvert @@ -514,15 +514,15 @@ For removing all edges which can not be used by passenger vehicles the call must be extended by: ``` ---remove-edges.by-vclass hov,taxi,bus,delivery,transport,lightrail,cityrail, \ -  rail_slow,rail_fast,motorcycle,bicycle,pedestrian +--remove-edges.by-vclass hov,taxi,bus,delivery,transport,lightrail,cityrail, \ + rail_slow,rail_fast,motorcycle,bicycle,pedestrian ``` For removing all edges which can not be used by road vehicles the call must be extended by: ``` ---remove-edges.by-vclass rail_slow,rail_fast,bicycle,pedestrian +--remove-edges.by-vclass rail_slow,rail_fast,bicycle,pedestrian ``` ## Relationship between OSM ids and SUMO-ids @@ -576,15 +576,15 @@ whole of Scotland) but some precautions should be taken: - reduce the network size with the following options ``` ---no-internal-links, --keep-edges.by-vclass passenger,  - --remove-edges.by-type highway.track,highway.services,highway.unsurfaced +--no-internal-links, --keep-edges.by-vclass passenger, + --remove-edges.by-type highway.track,highway.services,highway.unsurfaced ``` - if you only need major roads you can reduce the network further by setting the option ``` ---keep-edges.by-type  +--keep-edges.by-type highway.motorway,highway.motorway_link,highway.trunk,highway.trunk_link,highway.primary,highway.primary_link ``` @@ -640,26 +640,26 @@ python. Python Example (Get OSM River Data from OSM in BBox) ``` -   import requests -   import json + import requests + import json ``` ``` -   def getData(lsouthern-most latitude, western-most longitude, northern-most latitude, eastern-most longitude): -     query = 'way["waterway"="river"]["ship"="yes"](bbox:%s, %s, %s, %s)' %(southern-most latitude, western-most longitude, northern-most latitude, eastern-most longitude) -     overpass_url = "https://overpass-api.de/api/interpreter" -     overpass_query = """ -     [out:json][timeout:25]; -     ( -       """+query+"""; -     ); -     out body; -     >; -     out skel qt; -     """ -     response = requests.get(overpass_url, params={'data': overpass_query}) -     data = response.json() -     return data, query + def getData(lsouthern-most latitude, western-most longitude, northern-most latitude, eastern-most longitude): + query = 'way["waterway"="river"]["ship"="yes"](bbox:%s, %s, %s, %s)' %(southern-most latitude, western-most longitude, northern-most latitude, eastern-most longitude) + overpass_url = "https://overpass-api.de/api/interpreter" + overpass_query = """ + [out:json][timeout:25]; + ( + """+query+"""; + ); + out body; + >; + out skel qt; + """ + response = requests.get(overpass_url, params={'data': overpass_query}) + data = response.json() + return data, query ``` Caution: If the data volume is too large, the overpass API aborts. diff --git a/docs/web/docs/Networks/Import/OpenStreetMapDownload.md b/docs/web/docs/Networks/Import/OpenStreetMapDownload.md index daf24ac93769..99049593568a 100644 --- a/docs/web/docs/Networks/Import/OpenStreetMapDownload.md +++ b/docs/web/docs/Networks/Import/OpenStreetMapDownload.md @@ -72,8 +72,8 @@ the appropriate map location and observing the coordinates in the status bar. The inner city of Berlin lies within the following coordinates: ``` -SW-corner: 13.278 52.473 -NE-corner: 13.471 52.552 +SW-corner: 13.278 52.473 +NE-corner: 13.471 52.552 ``` ## Download the area @@ -97,7 +97,7 @@ you can download your data by entering the URI in a web-browers or by using another program such as [wget](http://wget.addictivecode.org/). ``` -wget.exe "https://api.openstreetmap.org/api/0.6/map?bbox=13.278,52.473,13.471,52.552" -O berlin.osm.xml +wget.exe "https://api.openstreetmap.org/api/0.6/map?bbox=13.278,52.473,13.471,52.552" -O berlin.osm.xml ``` **Important:** the API version number *0.6* will eventually be outdated. @@ -231,7 +231,7 @@ help script *osmGet.py* located within {{SUMO}}/tools allows to extract a larger area by splitting the requests. The call is: ``` -osmGet.py    +osmGet.py ``` The bounding box must be given as diff --git a/docs/web/docs/Networks/Import/SUMO_Road_Networks.md b/docs/web/docs/Networks/Import/SUMO_Road_Networks.md index ab3e2c5d22f8..9564d64bc4f3 100644 --- a/docs/web/docs/Networks/Import/SUMO_Road_Networks.md +++ b/docs/web/docs/Networks/Import/SUMO_Road_Networks.md @@ -7,7 +7,7 @@ generated SUMO road networks. Use the option **--sumo-net-file** {{DT_FILE}} for network, the shorter options **--sumo-net** {{DT_FILE}} and **--sumo** {{DT_FILE}} are synonymes. An example call: ``` -netconvert --sumo-net-file mySUMOnet.net.xml -o mySUMOnet2.net.xml +netconvert --sumo-net-file mySUMOnet.net.xml -o mySUMOnet2.net.xml ``` If your original network has been generated with the same SUMO version, @@ -35,7 +35,7 @@ prepare a file like this: patch.nod.xml : and patch the network like this: ``` -netconvert --sumo-net-file your.net.xml --node-files patch.nod.xml -o yourpatched.net.xml +netconvert --sumo-net-file your.net.xml --node-files patch.nod.xml -o yourpatched.net.xml ``` ## Patching in stages diff --git a/docs/web/docs/Networks/Import/VISUM.md b/docs/web/docs/Networks/Import/VISUM.md index 4f00d1a1d960..1bd9c769ef92 100644 --- a/docs/web/docs/Networks/Import/VISUM.md +++ b/docs/web/docs/Networks/Import/VISUM.md @@ -18,7 +18,7 @@ SUMO-network is named **--visum-file** {{DT_FILE}} or **--visum** {{DT_FILE}} fo data into "my_sumo_net.net.xml": ``` -netconvert --visum my_visum_net.net -o my_sumo_net.net.xml +netconvert --visum my_visum_net.net -o my_sumo_net.net.xml ``` !!! caution @@ -71,7 +71,7 @@ numbers are missing. Still, one can try to obtain the lane number from the given edges' capacities. An approximation is: ``` -LANE_NUMBER = MAXIMUM_FLOW / CAPACITY_NORM +LANE_NUMBER = MAXIMUM_FLOW / CAPACITY_NORM ``` The value of CAPACITY_NORM is controlled via the option **--capacity-norm** {{DT_FLOAT}} (default: diff --git a/docs/web/docs/Networks/Import/Vissim.md b/docs/web/docs/Networks/Import/Vissim.md index 94541671cb53..8c8d8794ebb4 100644 --- a/docs/web/docs/Networks/Import/Vissim.md +++ b/docs/web/docs/Networks/Import/Vissim.md @@ -11,7 +11,7 @@ short. A usage example for [netconvert](../../netconvert.md)'s Vissim import may look like: ``` -netconvert --vissim-file= --output-file=MySUMOFile.net.xml +netconvert --vissim-file= --output-file=MySUMOFile.net.xml ``` Vissim-networks do possibly not contain explicit definitions of an diff --git a/docs/web/docs/Networks/PlainXML.md b/docs/web/docs/Networks/PlainXML.md index 8e7f50078dc0..4abdb0e0e787 100644 --- a/docs/web/docs/Networks/PlainXML.md +++ b/docs/web/docs/Networks/PlainXML.md @@ -37,16 +37,16 @@ build the network. If you only use edges and nodes, stored in look like: ``` -netconvert --node-files=MyNodes.nod.xml --edge-files=MyEdges.edg.xml \ -  --output-file=MySUMONet.net.xml +netconvert --node-files=MyNodes.nod.xml --edge-files=MyEdges.edg.xml \ + --output-file=MySUMONet.net.xml ``` If you also use connections and types the call is: ``` -netconvert --node-files=MyNodes.nod.xml --edge-files=MyEdges.edg.xml \ -  --connection-files=MyConnections.con.xml --type-files=MyTypes.typ.xml \ -  --output-file=MySUMONet.net.xml +netconvert --node-files=MyNodes.nod.xml --edge-files=MyEdges.edg.xml \ + --connection-files=MyConnections.con.xml --type-files=MyTypes.typ.xml \ + --output-file=MySUMONet.net.xml ``` The options used here, including their abbreviations, are documented on @@ -681,15 +681,15 @@ With the example below, one new node is created which splits the forward and backward edge: ```xml -    -        -    + + + ``` ```xml -    -        -    + + + ``` The definition of a split uses the following attributes: @@ -835,7 +835,7 @@ limits: ```xml -    + ``` diff --git a/docs/web/docs/Networks/SUMO_Road_Networks.md b/docs/web/docs/Networks/SUMO_Road_Networks.md index 256f06285c78..8571f6d1a1e8 100644 --- a/docs/web/docs/Networks/SUMO_Road_Networks.md +++ b/docs/web/docs/Networks/SUMO_Road_Networks.md @@ -103,16 +103,16 @@ parameters from `projParameter`, first. For proj-projected networks this would look like: ``` -Position2D cartesian = sumoXY(x, y); -projPJ myProjection = pj_init_plus(projParameter.c_str()); +Position2D cartesian = sumoXY(x, y); +projPJ myProjection = pj_init_plus(projParameter.c_str()); cartesian.sub(netOffset); -projUV p; -p.u = cartesian.x(); -p.v = cartesian.y(); -p = pj_inv(p, myProjection); -p.u *= RAD_TO_DEG; -p.v *= RAD_TO_DEG; -cartesian.set(p.u, p.v); +projUV p; +p.u = cartesian.x(); +p.v = cartesian.y(); +p = pj_inv(p, myProjection); +p.u *= RAD_TO_DEG; +p.v *= RAD_TO_DEG; +cartesian.set(p.u, p.v); ``` For networks with no projection diff --git a/docs/web/docs/Publications.md b/docs/web/docs/Publications.md index b6e59b5fd341..4dbfb69c7e81 100644 --- a/docs/web/docs/Publications.md +++ b/docs/web/docs/Publications.md @@ -13,15 +13,15 @@ BibTex: ``` @inproceedings{SUMO2018, -          title = {Microscopic Traffic Simulation using SUMO}, -         author = {Pablo Alvarez Lopez and Michael Behrisch and Laura Bieker-Walz and Jakob Erdmann and Yun-Pang Fl{\"o}tter{\"o}d and Robert Hilbrich and Leonhard L{\"u}cken and Johannes Rummel and Peter Wagner and Evamarie Wie{\ss}ner}, -      publisher = {IEEE}, -      booktitle = {The 21st IEEE International Conference on Intelligent Transportation Systems}, -           year = {2018}, -        journal = {IEEE Intelligent Transportation Systems Conference (ITSC)}, -       keywords = {traffic simulation, modelling, optimization}, -            url = {https://elib.dlr.de/124092/} - } + title = {Microscopic Traffic Simulation using SUMO}, + author = {Pablo Alvarez Lopez and Michael Behrisch and Laura Bieker-Walz and Jakob Erdmann and Yun-Pang Fl{\"o}tter{\"o}d and Robert Hilbrich and Leonhard L{\"u}cken and Johannes Rummel and Peter Wagner and Evamarie Wie{\ss}ner}, + publisher = {IEEE}, + booktitle = {The 21st IEEE International Conference on Intelligent Transportation Systems}, + year = {2018}, + journal = {IEEE Intelligent Transportation Systems Conference (ITSC)}, + keywords = {traffic simulation, modelling, optimization}, + url = {https://elib.dlr.de/124092/} + } ``` # Conference Proceedings @@ -76,7 +76,7 @@ this list of publications. | Validation, Calibration, and Tests | Krajzewicz, Daniel and Georg Hertkorn, Christian Rössel, Peter Wagner | [An Example of Microscopic Car Models Validation using the open source Traffic Simulation SUMO](https://sumo.dlr.de/pdf/dkrajzew_ESS2002_LOG14_Validation.pdf) | Proceedings of Simulation in Industry, 14th European Simulation Symposium 2002, SCS European Publishing House, pp. 318-322, Dresden | 2002 | | Validation, Calibration, and Tests | Heppner, Matthias | [Einführung von Unit Tests in das bestehende C++ Softwaresystem SUMO](https://web.archive.org/web/20140701052250/https://www2.informatik.hu-berlin.de/swt/dipl/MatthiasHeppner.2010.pdf) | Diploma Thesis, Humboldt-Universität zu Berlin | 2010 | | Traffic Lights | Krajzewicz, Daniel and Elmar Brockfeld, Jürgen Mikat, Julia Ringel, Christian Rössel, Wolfram Tuchscheerer, Peter Wagner, Richard Woesler | [Simulation of modern Traffic Lights Control Systems using the open source Traffic Simulation SUMO](https://sumo.dlr.de/pdf/dkrajzew_TRAF9_AgentbasedTLS.pdf) | Proceedings of the 3rd Industrial Simulation Conference 2005, EUROSIS-ETI, pp. 299-302, Berlin, ISBN 90-77381-18-X | 2005 | -| Traffic Lights | Zubillaga D, Cruz G, Aguilar LD, Zapot‚catl J, Fern ndez N, Aguilar J, Rosenblueth DA, Gershenson C | [Measuring the Complexity of Self-Organizing Traffic Lights](https://www.mdpi.com/1099-4300/16/5/2384) | Entropy 2014, 16(5), 2384-2407 | 2014 | +| Traffic Lights | Zubillaga D, Cruz G, Aguilar LD, Zapot‚catl J, Fern ndez N, Aguilar J, Rosenblueth DA, Gershenson C | [Measuring the Complexity of Self-Organizing Traffic Lights](https://www.mdpi.com/1099-4300/16/5/2384) | Entropy 2014, 16(5), 2384-2407 | 2014 | | Car2Car Communication | Bauza, R. and J. Gozalvez and M. Sepulcre | [Operation and Performance of Vehicular Ad-hoc Routing Protocols in Realistic Environments](https://uwicore.umh.es/files/paper/2008_international/uwicore_WiVeC08_Operation%20and%20Performance%20of%20Vehicular%20Ad-hoc%20Routing%20Protocols%20in%20Realistic%20Environments.pdf) | Proceedings of the 2nd IEEE International Symposium on Wireless Vehicular Communications (WiVeC), Calgary (Canada) | 2008 | | Car2Car Communication | Cottingham, David N. and Jonathan J. Davies and Alastair R. Beresford | [Congestion-Aware Vehicular Traffic Routing Using WiFi Hotspots](https://www.cottinghams.com/david/downloads/ciiCongestionPoster.pdf) | Proceedings of Communications Innovation Institute Workshop, Cambridge-MIT Institute, pp. 4-6 | 2005 | | Car2Car Communication | Kristianto Karnadi, Feliz and Zhi Hai Mo and Kun-chan Lan | [Rapid Generation of Realistic Mobility Models for VANET](https://web.archive.org/web/20070226210528/https://www.cse.unsw.edu.au/~klan/paper/sumo.pdf) | ACM MOBICOMM | 2005 | @@ -93,7 +93,7 @@ this list of publications. | ITS - other topics | Morenz, Tino | [iTranSIM - Simulation-based Vehicle Location](https://www.cs.tcd.ie/publications/tech-reports/reports.07/TCD-CS-2007-56.pdf) | Master thesis, University of Dublin | 2008 | | ITS - other topics | Willigens, Michael | Development and Evaluation of a Centralized Traffic Information System using UMTS and GPS | Master Thesis, Universität Düsseldorf | 2008 | | ITS - other topics | Kerekes, John P. and Michael D. Presnar, Kenneth D. Fourspring, Zoran Ninkov, David R. Pogorzala, Alan D. Raisanen, Andrew C. Rice, Juan R. Vasquez, Jeffrey P. Patel, Robert T. MacIntyre, and Scott D. Brown | [Sensor modeling and demonstration of a multi-object spectrometer for performance-driven sensing](https://doi.org/10.1117/12.819265) | Proc. SPIE 7334, 73340J, | 2009 | -| ITS - other topics | Pereira, Jos‚ Luis Ferr s | [An Integrated Architecture for Autonomous Vehicles Simulation](https://sumo.dlr.de/pdf/mieec1.pdf) | Master Thesis, Faculdade de Engenharia da Universidade do Porto | 2011 | +| ITS - other topics | Pereira, Jos‚ Luis Ferr s | [An Integrated Architecture for Autonomous Vehicles Simulation](https://sumo.dlr.de/pdf/mieec1.pdf) | Master Thesis, Faculdade de Engenharia da Universidade do Porto | 2011 | | ITS - other topics | Bajpai, Ashutosh and Tom V Mathew | [Development of an Interface between Signal Controller and Traffic Simulator](https://sumo.dlr.de/pdf/CTRG_Interface-SUMO.pdf) | 1st Conference of Transportation Research Group of India (CTRG) | 2011 | | ITS - other topics | Xie, X.-F. and Y. Feng, K. Larry Head | [Unified route choice framework: Specification and application to urban traffic control](https://www.wiomax.com/team/xie/paper/TRB14RCTC.pdf) | Transportation Research Record: Journal of the Transportation Research Board, 2466: 105-113 | 2014 | | Traffic Lights | Xie, X.-F. et al. | [Schedule-driven intersection control](https://www.wiomax.com/team/xie/paper/TRC12.pdf) | Transportation Research Part C: Emerging Technologies, 24: 168-189 | 2012 | diff --git a/docs/web/docs/Simulation/Basic_Definition.md b/docs/web/docs/Simulation/Basic_Definition.md index 0fcc62f0fffe..2b5a56e6f6aa 100644 --- a/docs/web/docs/Simulation/Basic_Definition.md +++ b/docs/web/docs/Simulation/Basic_Definition.md @@ -153,7 +153,7 @@ configuration file: ```xml -    + ``` diff --git a/docs/web/docs/Simulation/Bicycles.md b/docs/web/docs/Simulation/Bicycles.md index abea84b6f644..19c2e9040809 100644 --- a/docs/web/docs/Simulation/Bicycles.md +++ b/docs/web/docs/Simulation/Bicycles.md @@ -23,7 +23,7 @@ type: ```xml - + ``` Note, that that the `guiShape="bicycle"` along with [sensible default diff --git a/docs/web/docs/Simulation/Calibrator.md b/docs/web/docs/Simulation/Calibrator.md index c77520039b2a..d8902cff65f1 100644 --- a/docs/web/docs/Simulation/Calibrator.md +++ b/docs/web/docs/Simulation/Calibrator.md @@ -246,13 +246,13 @@ Example {{AdditionalFile}}: ```xml -    -    + + -    -       -       -    + + + + ``` diff --git a/docs/web/docs/Simulation/Intersections.md b/docs/web/docs/Simulation/Intersections.md index e8d4549e5b0e..0172d3395ed5 100644 --- a/docs/web/docs/Simulation/Intersections.md +++ b/docs/web/docs/Simulation/Intersections.md @@ -128,7 +128,7 @@ their [individual speedFactor](VehicleSpeed.md#edgelane_speed_and_speedfactor). The speedLimit is computed as ``` -speedLimit = sqrt(radius * factor) +speedLimit = sqrt(radius * factor) ``` where *factor* is set by **--junctions.limit-turn-speed** {{DT_FLOAT}} (default 5.5) If factor is set to 0, the diff --git a/docs/web/docs/Simulation/Meso.md b/docs/web/docs/Simulation/Meso.md index d2fa3da67f27..e78ed0a6fc31 100644 --- a/docs/web/docs/Simulation/Meso.md +++ b/docs/web/docs/Simulation/Meso.md @@ -163,7 +163,7 @@ For an option value of *p*, The time penalty is computed by scaling the expected waiting time for random arrival within the cycle ``` -travelTimePenalty = p * (redTime * redTime + redTime) / (2 * cycleTime) +travelTimePenalty = p * (redTime * redTime + redTime) / (2 * cycleTime) ``` ### TLS-Flow-Penalty @@ -174,8 +174,8 @@ according to the proportion of green time to cycle time. Higher penalty values can be used to reduce the flow even further while lower values increase the maximum flow. The latter is useful if the green split is not known exactly (because the traffic light program is guessed heuristically). ``` -greenFraction = MIN2(1.0, (cycleTime - redDuration) / cycleTime) / penalty)) -headway = defaultHeadway / greenFraction +greenFraction = MIN2(1.0, (cycleTime - redDuration) / cycleTime) / penalty)) +headway = defaultHeadway / greenFraction ``` Note, that the maximum flow cannot exceed the value at permanent green light regardless of penalty value. diff --git a/docs/web/docs/Simulation/Output/Amitran_Traffic_Measures.md b/docs/web/docs/Simulation/Output/Amitran_Traffic_Measures.md index 9a7ca8efaaa2..7dc4ebac4907 100644 --- a/docs/web/docs/Simulation/Output/Amitran_Traffic_Measures.md +++ b/docs/web/docs/Simulation/Output/Amitran_Traffic_Measures.md @@ -30,13 +30,13 @@ file="" \[vTypes=""\] \[excludeEmpty="true"\]/\> ```xml -    -    -        -        -        -    -   ... + + + + + + + ... ``` diff --git a/docs/web/docs/Simulation/Output/Induction_Loops_Detectors_(E1).md b/docs/web/docs/Simulation/Output/Induction_Loops_Detectors_(E1).md index 746dccf9ccb3..fda52f6e4b7f 100644 --- a/docs/web/docs/Simulation/Output/Induction_Loops_Detectors_(E1).md +++ b/docs/web/docs/Simulation/Output/Induction_Loops_Detectors_(E1).md @@ -28,9 +28,9 @@ level of tags like so: ```xml -   -   -  .... + + + .... ``` diff --git a/docs/web/docs/Simulation/Output/RouteProbe.md b/docs/web/docs/Simulation/Output/RouteProbe.md index dd2aec80564a..dc21a5b52184 100644 --- a/docs/web/docs/Simulation/Output/RouteProbe.md +++ b/docs/web/docs/Simulation/Output/RouteProbe.md @@ -15,7 +15,7 @@ loaded by the simulation. ```xml -   + ``` @@ -37,9 +37,9 @@ file](../../duarouter.md#outputs) which can be loaded directly in ```xml -   -       -    + + + ``` diff --git a/docs/web/docs/Simulation/Output/TripInfo.md b/docs/web/docs/Simulation/Output/TripInfo.md index 006e5e364daa..34f58b36e420 100644 --- a/docs/web/docs/Simulation/Output/TripInfo.md +++ b/docs/web/docs/Simulation/Output/TripInfo.md @@ -124,17 +124,17 @@ will be added to the output: ```xml -  -  -  + + + ``` ```xml -   -   -   + + + ``` diff --git a/docs/web/docs/Simulation/ParkingArea.md b/docs/web/docs/Simulation/ParkingArea.md index efd0ff0b8676..1437eaef237d 100644 --- a/docs/web/docs/Simulation/ParkingArea.md +++ b/docs/web/docs/Simulation/ParkingArea.md @@ -27,16 +27,16 @@ Additionally, individual parking spaces can be defined: ```xml -     -     -     -     -     -     -     -     -     -     + + + + + + + + + + ``` diff --git a/docs/web/docs/Simulation/Public_Transport.md b/docs/web/docs/Simulation/Public_Transport.md index 837569458ae6..0c446fe0723a 100644 --- a/docs/web/docs/Simulation/Public_Transport.md +++ b/docs/web/docs/Simulation/Public_Transport.md @@ -46,7 +46,7 @@ network). This takes the following form: ```xml -    + ``` @@ -109,24 +109,24 @@ It is also possible to define a bus route without defining all intermediate edges: ```xml -    -       -        -        -        -    + + + + + + ``` The vehicle will take the fastest path between *from*-edge and *to*-edge that visits all stops in their correct order. Even the trip attributes 'from' and 'to' can be omitted to let the bus start at the first stop and end at the last. Using `departPos="stop"`, the vehicle will be inserted directly at the first stop in its route: ```xml -    -       -        -        -        -    + + + + + + ``` # Public Transport Schedules diff --git a/docs/web/docs/Simulation/Routing.md b/docs/web/docs/Simulation/Routing.md index 9b131b6506f4..2dc87cf8aac2 100644 --- a/docs/web/docs/Simulation/Routing.md +++ b/docs/web/docs/Simulation/Routing.md @@ -175,8 +175,8 @@ same speed on all edges: and then using that type to find the fastest route: ``` -stageResult = traci.simulation.findRoute(fromEdge, toEdge, "routeByDistance") -shortestDistance = stage.length +stageResult = traci.simulation.findRoute(fromEdge, toEdge, "routeByDistance") +shortestDistance = stage.length ``` !!! note diff --git a/docs/web/docs/Simulation/SaveAndLoad.md b/docs/web/docs/Simulation/SaveAndLoad.md index a888f50db62a..452cb287ebbd 100644 --- a/docs/web/docs/Simulation/SaveAndLoad.md +++ b/docs/web/docs/Simulation/SaveAndLoad.md @@ -12,7 +12,7 @@ To save the state at specified times during the simulation add the option **--save-state.times** ``` -sumo --save-state.times TIME1,TIME2,TIME3 +sumo --save-state.times TIME1,TIME2,TIME3 ``` By default the state will be written to files named *_* where ** can be set via option **--save-state.prefix** (default *state*), ** is the simulation time and ** is either one of *.xml.gz* or *.xml* as controlled by the option **--save-state.suffix** (default *.xml.gz*). @@ -24,7 +24,7 @@ When using the option **--save-state.times**, output files can also be specified option **--save-state.files** ``` -sumo --save-state.files FILE1,FILE2,FILE3 +sumo --save-state.files FILE1,FILE2,FILE3 ``` to set the file names explicitly. In particular if a plain text xml-file diff --git a/docs/web/docs/Simulation/Traffic_Lights.md b/docs/web/docs/Simulation/Traffic_Lights.md index 811f4543609c..6547609f92d5 100644 --- a/docs/web/docs/Simulation/Traffic_Lights.md +++ b/docs/web/docs/Simulation/Traffic_Lights.md @@ -758,7 +758,7 @@ Assuming the program as defined above is put in a file called [sumo](../sumo.md)/[sumo-gui](../sumo-gui.md) like this ``` -sumo -a tls.add.xml ... +sumo -a tls.add.xml ... ``` ## Switching TLS 'off' diff --git a/docs/web/docs/Simulation/Variable_Speed_Signs.md b/docs/web/docs/Simulation/Variable_Speed_Signs.md index fcbe43653959..8425cc6decf4 100644 --- a/docs/web/docs/Simulation/Variable_Speed_Signs.md +++ b/docs/web/docs/Simulation/Variable_Speed_Signs.md @@ -40,12 +40,12 @@ Instead of defining the speed changes of a `` in the same fil ```xml -   -      + + -     ... further entries ... + ... further entries ... -   + ``` @@ -55,10 +55,10 @@ file has the following format: ```xml -   -   + + -  ... further entries ... + ... further entries ... ``` diff --git a/docs/web/docs/Simulation/Why_Vehicles_are_teleporting.md b/docs/web/docs/Simulation/Why_Vehicles_are_teleporting.md index 8a69e9d2ece2..ce1d6b5c4b18 100644 --- a/docs/web/docs/Simulation/Why_Vehicles_are_teleporting.md +++ b/docs/web/docs/Simulation/Why_Vehicles_are_teleporting.md @@ -5,7 +5,7 @@ title: Why Vehicles are teleporting When running a simulation, one may encounter the following warning: ``` -Warning: Teleporting vehicle '...'; waited too long, lane='...', time=.... +Warning: Teleporting vehicle '...'; waited too long, lane='...', time=.... ``` What does it mean? diff --git a/docs/web/docs/Specification/Containers.md b/docs/web/docs/Specification/Containers.md index 7f254ea6afbd..6309e57fc9de 100644 --- a/docs/web/docs/Specification/Containers.md +++ b/docs/web/docs/Specification/Containers.md @@ -18,11 +18,11 @@ below. Each container must have at least one stage in its plan. ```xml -     -     -     -     -     + + + + + ``` @@ -196,19 +196,19 @@ See also [personFlows](Persons.md#repeated_persons_personflows) ## Examples ```xml -    -        -    + + + ``` ```xml -    -        -        -        -        -        -    + + + + + + + ``` # Starting the simulation in a Vehicle diff --git a/docs/web/docs/Specification/Persons.md b/docs/web/docs/Specification/Persons.md index 349f31dae097..b5bb878a586b 100644 --- a/docs/web/docs/Specification/Persons.md +++ b/docs/web/docs/Specification/Persons.md @@ -16,11 +16,11 @@ below. Each person must have at least one stage in its plan. ```xml -    -     -     -     -     + + + + + ``` @@ -87,19 +87,19 @@ known: ## Examples ```xml -    -        -    + + + ``` ```xml -    -        -        -        -        -        -    + + + + + + + ``` # Simulation input diff --git a/docs/web/docs/Tools/Assign.md b/docs/web/docs/Tools/Assign.md index 758495318ae3..f17ebeb8cd3c 100644 --- a/docs/web/docs/Tools/Assign.md +++ b/docs/web/docs/Tools/Assign.md @@ -34,7 +34,7 @@ For further options of the script either look at the source code or start it with the "--help" option. ``` -python tools/assign/duaIterate.py -n  -t +python tools/assign/duaIterate.py -n -t ``` ### Loading vehicle types from an additional file @@ -59,7 +59,7 @@ estimation an additional script is provided which analyses teleport counts and how they evolve over the iterations. ``` -python tools/assign/duaIterate_analysis.py dualog.txt +python tools/assign/duaIterate_analysis.py dualog.txt ``` ## cadytsIterate.py @@ -73,7 +73,7 @@ SUMO and Cadyts is work in progress. You will need to download reference to the jar file to the call. ``` -python tools/assign/cadytsIterate.py -n input_net.net.xml -r routes.rou.xml -d input_measurements.xml --classpath cadyts.jar +python tools/assign/cadytsIterate.py -n input_net.net.xml -r routes.rou.xml -d input_measurements.xml --classpath cadyts.jar ``` ## one-shot.py @@ -93,11 +93,11 @@ use of this script. An exemplary execution command is shown below. ``` - one-shot.py -f  -n  -t  + one-shot.py -f -n -t - where -f travel-time updating interval (sec); -1 means no travel-time updating (default: -1,1800,300,15) -       -n network file name and the respective path -       -t trip file name and the respective path + where -f travel-time updating interval (sec); -1 means no travel-time updating (default: -1,1800,300,15) + -n network file name and the respective path + -t trip file name and the respective path ``` Additional setting, such as outputs of summary and trip-information as @@ -111,15 +111,15 @@ The traffic demand of the traffic zones, which have the same connection links, will be integrated. The exemplary command is indicated below. ``` -matrixDailyToHourly.py -m  -z  -t  -o  +matrixDailyToHourly.py -m -z -t -o -where -m: matrix file name -      -z: district file name -      -t: name of the file containing traffic flow time series (optional); If not specified, the defined  - daily matrix will be regularly divided into 24 hours. -      -o: output directory name and the respective path +where -m: matrix file name + -z: district file name + -t: name of the file containing traffic flow time series (optional); If not specified, the defined + daily matrix will be regularly divided into 24 hours. + -o: output directory name and the respective path ``` ## costFunctionChecker.py diff --git a/docs/web/docs/Tools/Build.md b/docs/web/docs/Tools/Build.md index ebd966ba43a7..f6b37323e994 100644 --- a/docs/web/docs/Tools/Build.md +++ b/docs/web/docs/Tools/Build.md @@ -34,7 +34,7 @@ Call: ``` checkStyle.py -checkStyle.py --fix /tools +checkStyle.py --fix /tools ``` # Documentation Tools @@ -52,7 +52,7 @@ the [table of contents](../index.md). Call Call: ``` -buildHTMLDocs.py SUMO +buildHTMLDocs.py SUMO ``` ## checkAuthors.py diff --git a/docs/web/docs/Tools/Detector.md b/docs/web/docs/Tools/Detector.md index a33ff402bd60..da1a34c39ca3 100644 --- a/docs/web/docs/Tools/Detector.md +++ b/docs/web/docs/Tools/Detector.md @@ -17,7 +17,7 @@ aggregated over the whole file but can be split into intervals by setting **-i** as time **in minutes**. Example call for hourly aggregation: ``` -/tools/detector/flowrouter.py -n input_net.net.xml -d detectors.xml -f flows20140520.csv -o routes.xml -e flows.xml -i 60 +/tools/detector/flowrouter.py -n input_net.net.xml -d detectors.xml -f flows20140520.csv -o routes.xml -e flows.xml -i 60 ``` Detectors which have no data (in the specified interval) or are @@ -27,7 +27,7 @@ calculations use **--respect-zero**. For additional parameters call ``` -/tools/detector/flowrouter.py --help +/tools/detector/flowrouter.py --help ``` !!! caution @@ -56,7 +56,7 @@ With the option **--params** {{DT_STR}}, additional parameters can be given to t vehicles (note, usage of the quoting characters). ``` -/tools/detector/flowrouter.py -n input_net.net.xml --params="departLane=\"best\" departSpeed=\"max\" type=\"myType"" +/tools/detector/flowrouter.py -n input_net.net.xml --params="departLane=\"best\" departSpeed=\"max\" type=\"myType"" ``` This would insert the vehicle with high speed on a reasonable lane. The @@ -80,7 +80,7 @@ proportion to the incoming and outgoing flows (similar to the behavior of With the option **--flow-restrictions** {{DT_FILE}}, flow restriction for routes may be given. Each line in the input file takes the form: ``` -  ...  + ... ``` This specifies the maximum flow for a route that consists of the given @@ -101,7 +101,7 @@ input counts with the outputs of flowrouter.py and [dfrouter](../dfrouter.md). Example: ``` -/tools/detector/flowFromRoutes.py -d detectors.xml -r routes.xml -e flows.xml +/tools/detector/flowFromRoutes.py -d detectors.xml -r routes.xml -e flows.xml ``` # flowFromEdgeData @@ -109,7 +109,7 @@ input counts with the outputs of flowrouter.py and This script is similar to [flowFromRoutes.py](#flowfromroutespy). It generates traffic counts for detectors but uses [edgeData files](../Simulation/Output/Lane-_or_Edge-based_Traffic_Measures.md) as input instead of routes. It requires the use of an input flow file and then performs a comparison between input flows and edgdata flows ``` -/tools/detector/flowFromEdgeData.py -d detectors.xml -e edgedata.xml -f flows.txt +/tools/detector/flowFromEdgeData.py -d detectors.xml -e edgedata.xml -f flows.txt ``` @@ -118,14 +118,14 @@ It requires the use of an input flow file and then performs a comparison between This script converts [detector flow files](../Demand/Routes_from_Observation_Points.md#computing_flows) to into [edgeData format](../Simulation/Output/Lane-_or_Edge-based_Traffic_Measures.md#edge-based_network_states) (i.e. to be used by [routeSampler.py](Turns.md#edge_counts) or for [visualization in sumo-gui](../sumo-gui.md#visualizing_edge-related_data)) Example: ``` -/tools/detector/edgeDataFromFlow.py -d input_detectors.det.xml -f input_flows.txt -o edgedata.xml +/tools/detector/edgeDataFromFlow.py -d input_detectors.det.xml -f input_flows.txt -o edgedata.xml ``` # filterFlows.py Filters a flow file by detector ids and time range ``` -/tools/detector/edgeDataFromFlow.py -d det1,det2 -f input_flows.txt -b 3600 -e 7200 -o output_flows.txt +/tools/detector/edgeDataFromFlow.py -d det1,det2 -f input_flows.txt -b 3600 -e 7200 -o output_flows.txt ``` # mapDetectors.py diff --git a/docs/web/docs/Tools/District.md b/docs/web/docs/Tools/District.md index 4dd155d249d7..de93828fa1b1 100644 --- a/docs/web/docs/Tools/District.md +++ b/docs/web/docs/Tools/District.md @@ -11,7 +11,7 @@ Using the options **--hue, --saturation, --brightness** the colors can be contro supports values from \[0, 1\] as well as the special value *random*. ``` -python tools/districts2poly.py   +python tools/districts2poly.py ``` !!! caution @@ -24,7 +24,7 @@ The taz-shape-files must be in the format generated by [polyconvert](../polyconvert.md). ``` -python tools/edgesInDistricts.py -n  -t  +python tools/edgesInDistricts.py -n -t ``` @@ -40,7 +40,7 @@ that only edges which allow the given vehicle class are included in the taz definitions. ``` -python tools/district/filterDistricts.py -n  -t  -o  --vclass passenger +python tools/district/filterDistricts.py -n -t -o --vclass passenger ``` Call option **--help** for additional details. @@ -53,7 +53,7 @@ district (TAZ). This can be used to improve routing in conjunction with toTaz](../Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md#traffic_assignment_zones_taz). ``` -python tools/generateBidiDistricts.py  +python tools/generateBidiDistricts.py ``` Call option **--help** for additional details. @@ -74,7 +74,7 @@ instead use the attributes *fromTaz* and *toTaz*: ```xml - + ``` The second definition would allow departure from either edge *123*' or @@ -88,7 +88,7 @@ thus simplifies trips created from mapping of geo-coordinates. Generates a grid of districts (TAZ) with a given width (in m) for a given network file. ``` -python tools/district/gridDistricts.py -n -o -w 300 +python tools/district/gridDistricts.py -n -o -w 300 ``` @@ -112,5 +112,5 @@ If there are multiple stops with different names (stations) on the same edge, th Example call: ``` -python tools/district/stationDistricts.py -n -s -o +python tools/district/stationDistricts.py -n -s -o ``` diff --git a/docs/web/docs/Tools/Import/OSM.md b/docs/web/docs/Tools/Import/OSM.md index 559b4a64d4e3..62d5c9dbe390 100644 --- a/docs/web/docs/Tools/Import/OSM.md +++ b/docs/web/docs/Tools/Import/OSM.md @@ -21,7 +21,7 @@ script *build.bat* to rebuild the random demand. Call: ``` -python tools/osmWebWizard.py +python tools/osmWebWizard.py ``` The script will keep running so you can build multiple scenarios in your @@ -42,7 +42,7 @@ can be defined with one of the following options: Example: ``` -python tools/osmGet.py --bbox  --tiles  +python tools/osmGet.py --bbox --tiles ``` The additional option **--tiles** allows to split larger areas into multiple tiles and download requests. @@ -53,13 +53,13 @@ The script creates a sumo network from the given osm file (i.e. from the output Example: ``` -python tools/osmBuild.py --osm-file  +python tools/osmBuild.py --osm-file ``` More additional options can be defined to manage the import. Example: ``` -python tools/osmBuild.py --osm-file  [--vehicle-classes (all|road|publicTransport|passenger)] [--type-file ] [--netconvert-options ] [--polyconvert-options ] +python tools/osmBuild.py --osm-file [--vehicle-classes (all|road|publicTransport|passenger)] [--type-file ] [--netconvert-options ] [--polyconvert-options ] ``` The option **--vehicle-classes** allows to filter the roads to import by vehicles classes. @@ -82,7 +82,7 @@ and **-polyconvert-options**. This script import taxi stands from OSM data. Using the option **--type** you can choose which type of element to add in the SUMO network. For example: ``` -python tools/import/osm/osmTaxiStop.py --osm-file -n --type parkingArea +python tools/import/osm/osmTaxiStop.py --osm-file -n --type parkingArea ``` Will add the taxi stands as parkingAreas. diff --git a/docs/web/docs/Tools/Import/VISSIM.md b/docs/web/docs/Tools/Import/VISSIM.md index 15b1b4c97ab1..9373767c4974 100644 --- a/docs/web/docs/Tools/Import/VISSIM.md +++ b/docs/web/docs/Tools/Import/VISSIM.md @@ -39,7 +39,7 @@ ermöglichen. Der Aufruf von `netconvert` für VISSIM-Netze erfolgt über: ``` -netconvert --vissim-file= -      -         -         -         -         -      -   + + + + + + + + ``` Routenentscheidungen werden in VISSIM durch ihre Startpunkte @@ -161,13 +161,13 @@ Routen muss immer 1 ergeben und die Referenzierung auf eine Routen-Verteilung erfolgt über deren eindeutige ID: ```xml -   -      -      -      -      -      -   + + + + + + + ``` Des weiteren gehören zur Routendefinition auch Fahzeugtyp-Verteilungen . @@ -178,8 +178,8 @@ eindeutige ID: ```xml -    -    + + ``` @@ -418,10 +418,10 @@ per Hand oder durch das Kindelement `` zu einem angegebenen Zeitpunkt verändert werden: ```xml -   -      -      -   + + + + ``` Nähere Beschreibungen zur Definition von Lichtsignalanlagen befinden @@ -465,7 +465,7 @@ auszulesen und in das zuvor durch `netconvert` konvertierte SUMO-Netz zu Simulation hinzugefügt werden muss. Der Aufruf erfolgt über: ``` -convert_detectors2SUMO.py -V  -S  -o  +convert_detectors2SUMO.py -V -S -o ``` ## Detektor-Definition VISSIM @@ -485,10 +485,10 @@ streckenbezogen. Hierfür wird die Strecke und der Laufmeter für den Start- und Endpunkt festgelegt: ```xml -   -      -      -   + + + + ``` ## Detektor-Definition SUMO @@ -499,8 +499,8 @@ Fahrstreifen und Laufmeter angegeben. Es ist jedoch zusätzlich möglich das Zeitintervall zu definieren, in dem die Daten aggregiert werden. ```xml -   -   + + ``` Wie bei den Induktionsschleifen sind auch die Reisezeitmessungen durch @@ -510,12 +510,12 @@ die ganze Strecke beziehen, da definiert wird, welche Fahrstreifen berücksichtigt werden sollen. ```xml -   -      -      -      -      -   + + + + + + ``` ## Umsetzung diff --git a/docs/web/docs/Tools/Misc.md b/docs/web/docs/Tools/Misc.md index b67ac08af782..9d53e27e7c51 100644 --- a/docs/web/docs/Tools/Misc.md +++ b/docs/web/docs/Tools/Misc.md @@ -8,19 +8,19 @@ Creates a vehicle type distribution by sampling from configurable value distributions for the [desired `vType`-parameters](../Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md#vehicle_types). Example: ``` -python tools/createVehTypeDistribution.py config.txt +python tools/createVehTypeDistribution.py config.txt ``` The only required parameter is the configuration file in the format shown below (*example config.txt*): ``` -tau; normal(0.8,0.1) -sigma; normal(0.5,0.2) -length; normal(4.9,0.2); [3.5,5.5] -param; myCustomParameter; normal(5, 2); [0, 12] -vClass; passenger -carFollowModel; Krauss +tau; normal(0.8,0.1) +sigma; normal(0.5,0.2) +length; normal(4.9,0.2); [3.5,5.5] +param; myCustomParameter; normal(5, 2); [0, 12] +vClass; passenger +carFollowModel; Krauss ``` In the config file, one line is used per vehicle type attribute. The @@ -70,7 +70,7 @@ external screen capture software or using the internal screenshot feature. The s Example: ``` -python tools/createScreenshotSequence.py --sumocfg test.sumocfg -o outDir --begin 600 --end 900 -p filePrefix --zoom 600:500;900:1000 --translate 800:100,100;900:150,100 --include-time +python tools/createScreenshotSequence.py --sumocfg test.sumocfg -o outDir --begin 600 --end 900 -p filePrefix --zoom 600:500;900:1000 --translate 800:100,100;900:150,100 --include-time ``` This will run the configuration file named by **--sumocfg** in sumo-gui and register a TraCI step listener for the screenshot process. The time interval when to take a screenshot of each time step can be limited to start only at **--begin** (s) or to end at **--end** (s). If the end time is not defined explicitly, the script runs the simulation either up to the end value from the configuration (if defined) @@ -165,15 +165,15 @@ Additional options: This script generates parking lots. Example: ``` -python tools/generateParkingLots.py -b  -c  - [-i  -n  -l  -a  ...] +python tools/generateParkingLots.py -b -c + [-i -n -l -a ...] ``` or ``` -python tools/generateParkingLots.py -x  -y  -c  - [-i  -n  -l  -a  ...] +python tools/generateParkingLots.py -x -y -c + [-i -n -l -a ...] ``` The required parameter are the shape (--bounding-box) or the position @@ -208,8 +208,8 @@ for extending rail-only networks with the bare minimum of pedestrian infrastructure for departing, changing trains and arriving. Example: ``` -python tools/generateStationEdges.py rail.net.xml stops.xml - netconvert -s rail.net.xml -e stops.access.edg.xml -n stops.access.nod.xml --ptstop-files stops.xml -o railForPersons.net.xml --ptstop-output stopsWithAccess.xml +python tools/generateStationEdges.py rail.net.xml stops.xml + netconvert -s rail.net.xml -e stops.access.edg.xml -n stops.access.nod.xml --ptstop-files stops.xml -o railForPersons.net.xml --ptstop-output stopsWithAccess.xml ``` # generateRerouters.py @@ -217,7 +217,7 @@ python tools/generateStationEdges.py rail.net.xml stops.xml This script generates rerouter for closing a given list of roads. It will automatically identify where to place the notification signs to facilitate rerouting. ``` -python tools/generateRerouters.py -n -o -x CLOSED_EDGE1,CLOSED_EDGE2 +python tools/generateRerouters.py -n -o -x CLOSED_EDGE1,CLOSED_EDGE2 ``` # generateContinuousRerouters.py @@ -225,7 +225,7 @@ python tools/generateRerouters.py -n -o -x CLOSED_EDG This script generates rerouter definitions for a continuously running simulation. Rerouters are placed ahead of each intersection with routes leading up to the next intersection and configurable turning ratios. Vehicles that enter the simulation will circulate continuously (unless hitting a dead-end). Example: ``` -python tools/generateContinuousRerouters.py -n -o +python tools/generateContinuousRerouters.py -n -o ``` # generateParkingAreaRerouters.py @@ -233,7 +233,7 @@ python tools/generateContinuousRerouters.py -n -o This script generates parking area rerouters from a parking area definition. Example: ``` -python tools/generateParkingAreaRerouters.py -n -a -o +python tools/generateParkingAreaRerouters.py -n -a -o ``` # averageTripStatistics.py @@ -244,7 +244,7 @@ different random seeds and averages the trip statistics output (see [trip statis Example: ``` -python tools/averageTripStatistics.py  +python tools/averageTripStatistics.py ``` As default, the simulation will be run 10 times with an initial seed for @@ -258,7 +258,7 @@ transport schedule (regular interval timetable) for all lines. The stop-to-stop travel times are determined by running a background simulation on an empty network using either a given route or shortest paths between stops. Example: ``` -python tools/ptlines2flows.py -n  -s  -l  -o  +python tools/ptlines2flows.py -n -s -l -o ``` As output, the public transport lines are written as [flows](../Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md). @@ -352,13 +352,13 @@ can be loaded with sumo-gui or netedit. The most useful options are -t for the - Retrieving data from the public ArcGIS online instance: ``` -python tools/tileGet.py -n test.net.xml -t 10 +python tools/tileGet.py -n test.net.xml -t 10 ``` - Retrieving satellite data from Google or MapQuest (Requires obtaining an API-key first): ``` -python tools/tileGet.py -n test.net.xml -t 10 --url maps.googleapis.com/maps/api/staticmap --key YOURKEY -python tools/tileGet.py -n test.net.xml -t 10 --url www.mapquestapi.com/staticmap/v5/map --key YOURKEY +python tools/tileGet.py -n test.net.xml -t 10 --url maps.googleapis.com/maps/api/staticmap --key YOURKEY +python tools/tileGet.py -n test.net.xml -t 10 --url www.mapquestapi.com/staticmap/v5/map --key YOURKEY ``` The generated setting file can be loaded in sumo-gui with: @@ -400,7 +400,7 @@ Run a (sumo) configuration multiple times with different seeds. Example: ``` -python tools/runSeeds.py -k test.sumocfg --seeds 7,11,13 +python tools/runSeeds.py -k test.sumocfg --seeds 7,11,13 ``` - option **--seeds** can either be given as a list or as a range (`0:100`). diff --git a/docs/web/docs/Tools/Net.md b/docs/web/docs/Tools/Net.md index 2dfce08d4420..7c5956196fc7 100644 --- a/docs/web/docs/Tools/Net.md +++ b/docs/web/docs/Tools/Net.md @@ -7,7 +7,7 @@ title: Net This script compares two *.net.xml* files. The call ``` -python tools/net/netdiff.py A.net.xml B.net.xml diff +python tools/net/netdiff.py A.net.xml B.net.xml diff ``` will produce 4 [plain-XML network](../Networks/PlainXML.md) files: @@ -23,7 +23,7 @@ between the two networks ***A*** and ***B***. Furthermore, these files can be us maintain change-sets for making repeatable modifications: ``` -netconvert --sumo-net-file A.net.xml -n diff.nod.xml -e diff.edg.xml -x diff.con.xml -i diff.tll.xml -o B.net.xml +netconvert --sumo-net-file A.net.xml -n diff.nod.xml -e diff.edg.xml -x diff.con.xml -i diff.tll.xml -o B.net.xml ``` The above call can be used to recreate network ***B*** based on ***A*** and the @@ -87,7 +87,7 @@ given network. The following connections are added: Usage: ``` -python tools/net/createRoundaboutConnections.py  +python tools/net/createRoundaboutConnections.py ``` This creates the output file ```roundabout-connection.con.xml```, where the input network is ******. @@ -104,7 +104,7 @@ Additionally, you may run this script to discover which edges are reachable from a particular edge. ``` -python tools/net/netcheck.py  --source  --selection-output selection.txt +python tools/net/netcheck.py --source --selection-output selection.txt ``` This will create a file called ```selection.txt``` which can be loaded in @@ -139,8 +139,8 @@ edges or nodes given in the input file. The results are written into .mod.xml or .mod.xml, respectively. ``` -python tools/net/xmledges_applyOffset.py    -python tools/net/xmlnodes_applyOffset.py    +python tools/net/xmledges_applyOffset.py +python tools/net/xmlnodes_applyOffset.py ``` - /: The edges/nodes file whose content shall be @@ -161,7 +161,7 @@ Reads the given connections file and replaces old edge names by the new ones. The result is written to .mod.xml ``` -python tools/net/xmlconnections_mapEdges.py  +python tools/net/xmlconnections_mapEdges.py ``` - : Id of an edge as used within @@ -173,7 +173,7 @@ python tools/net/xmlconnections_mapEdges.py  converts '.net.xml' road geometries to [KML](https://en.wikipedia.org/wiki/Keyhole_Markup_Language) format. ``` -python tools/net/net2kml.py -n  -o output.kml +python tools/net/net2kml.py -n -o output.kml ``` By default, normal edge geometries will be exported. This can be changed with options @@ -186,7 +186,7 @@ By default, normal edge geometries will be exported. This can be changed with op converts '.net.xml' road geometries to [GeoJSON](https://en.wikipedia.org/wiki/GeoJSON) format. ``` -python tools/net/net2geojson.py -n  -o output.geojson +python tools/net/net2geojson.py -n -o output.geojson ``` By default, normal edge geometries will be exported. This can be changed with options @@ -201,7 +201,7 @@ Generates an .edg.xml patch file with `split` definitions to ensure that each pu Example call: ``` -python tools/net/split_at_stops.py  -n  -r -o --stop-output --route-output --stop-type busStop +python tools/net/split_at_stops.py -n -r -o --stop-output --route-output --stop-type busStop ``` !!! note diff --git a/docs/web/docs/Tools/Output.md b/docs/web/docs/Tools/Output.md index 41c390790916..4cce50c120db 100644 --- a/docs/web/docs/Tools/Output.md +++ b/docs/web/docs/Tools/Output.md @@ -12,7 +12,7 @@ document. (eg. attribute *timeLoss* for element *tripinfo* in results to standard output. When the attribute contains time data in HH:MM:SS format, the values will automatically be converted to seconds. ``` -python tools/output/attributeStats --element tripinfo --attribute timeLoss input.xml +python tools/output/attributeStats --element tripinfo --attribute timeLoss input.xml ``` - If option **--element** (**-e**) is set to a comma-separated list of elements, only these elements will be read. Otherwise all elements will be parsed @@ -32,7 +32,7 @@ Computes difference between numerical attributes in two xml files with the same results to standard output. When the attribute contains time data in HH:MM:SS format, the values will automatically be converted to seconds. ``` -python tools/output/attributeDiff file1.xml file2.xml --xml-output differences.xml +python tools/output/attributeDiff file1.xml file2.xml --xml-output differences.xml ``` - If option **--element** (**-e**) is set to a comma-separated list of elements, only these elements will be read. Otherwise all elements will be parsed @@ -46,7 +46,7 @@ python tools/output/attributeDiff file1.xml file2.xml --xml-output differences. If is often useful to compare files where the same elements occur multiple times but are distinguishable by some further attribute (i.e. vehicle id in [tripinfo-output](../Simulation/Output/TripInfo.md)). To compare elements with similar ids, the option **--id-attribute** can be used to set a list of attributes. The following example calls computes the differences of all tripinfo attributes for each individual vehicle that occurred in both files (i.e. from two simulation runs with different seeds): ``` -python tools/output/attributeDiff tripinfos1.xml tripinfos2.xml --xml-output differences.xml -i id +python tools/output/attributeDiff tripinfos1.xml tripinfos2.xml --xml-output differences.xml -i id ``` !!! note @@ -55,7 +55,7 @@ python tools/output/attributeDiff tripinfos1.xml tripinfos2.xml --xml-output di If a list of id attributes is set, those attributes may occur at different levels of the xml element hierarchy and parent values will be applied for the child element comparison. The following example makes use of this to compare edges with the same id and in the same time interval for [edgedata-output](../Simulation/Output/Lane-_or_Edge-based_Traffic_Measures.md): ``` -python tools/output/attributeDiff edgedata1.xml edgedata2.xml --xml-output differences.xml -i begin,id +python tools/output/attributeDiff edgedata1.xml edgedata2.xml --xml-output differences.xml -i begin,id ``` !!! note @@ -67,7 +67,7 @@ Computes statistics on numerical attributes in multiple xml files with the same results to standard output. The tool works very similar to [attributeDiff.py](#attributediffpy) but uses multiple files and computes a wide range of statistics instead of the difference between values. ``` -python tools/output/attributeCompare.py file1.xml file2.xml file3.xml --xml-output compared.xml +python tools/output/attributeCompare.py file1.xml file2.xml file3.xml --xml-output compared.xml ``` - If option **--element** (**-e**) is set to a comma-separated list of elements, only these elements will be read. Otherwise all elements will be parsed @@ -119,7 +119,7 @@ for each junction in the supplied network file. Example usage: ``` -python tools\output\generateTLSE1Detectors.py -n .net.net.xml -o detectors.add.xml +python tools\output\generateTLSE1Detectors.py -n .net.net.xml -o detectors.add.xml ``` Execute the *generateTLSE1Detectors.py*script with *--help* option to @@ -132,7 +132,7 @@ each junction in the supplied network file. Example usage: ``` -python tools\output\generateTLSE2Detectors.py -n .net.net.xml -o detectors.add.xml +python tools\output\generateTLSE2Detectors.py -n .net.net.xml -o detectors.add.xml ``` Execute the *generateTLSE2Detectors.py* script with *--help* option to @@ -151,7 +151,7 @@ included as well. Example usage: ``` -python tools\output\generateTLSE3Detectors.py -n .net.net.xml -o detectors.add.xml +python tools\output\generateTLSE3Detectors.py -n .net.net.xml -o detectors.add.xml ``` Execute the *generateTLSE3Detectors.py* script with *--help* option to @@ -195,7 +195,7 @@ for each vehicle. usage: ``` -python vehLanes.py   +python vehLanes.py ``` ## edgeDataDiff.py @@ -209,7 +209,7 @@ input files must contain the same edges and intervals. usage: ``` -python edgeDataDiff.py    +python edgeDataDiff.py ``` ## vehrouteDiff.py @@ -222,7 +222,7 @@ for the script to work. usage: ``` -python vehrouteDiff.py routes1.rou.xml routes2.rou.xml result.xml +python vehrouteDiff.py routes1.rou.xml routes2.rou.xml result.xml ``` ## vehrouteCountValidation.py @@ -234,7 +234,7 @@ Since typically, the total count of vehicles provided in the simulation **--rout usage (with turn counts): ``` -python vehrouteCountValidation.py -r routes.rou.xml -t input_turns.xml +python vehrouteCountValidation.py -r routes.rou.xml -t input_turns.xml ``` ## tripinfoDiff.py @@ -246,7 +246,7 @@ should contain the same vehicles. usage: ``` -python tripinfoDiff.py tripinfos1.xml tripinfos2.xml result.xml +python tripinfoDiff.py tripinfos1.xml tripinfos2.xml result.xml ``` By default only `` elements are considered. By setting option **--persons**, the @@ -259,8 +259,8 @@ either by taken from the original input file (if it contains 'fromTaz' and 'toTaz' attributes) or from a TAZ file. ``` -python tripinfoByTAZ.py -t tripinfos.xml -r trips.xml -python tripinfoByTAZ.py -t tripinfos.xml -z taz.axml +python tripinfoByTAZ.py -t tripinfos.xml -r trips.xml +python tripinfoByTAZ.py -t tripinfos.xml -z taz.axml ``` By default traveltime (tripinfo attribute 'duration') is aggregated. @@ -273,7 +273,7 @@ option **--output** is set. Aggregates tripinfo data by vType and person stage type for the given attribute ``` -python tripinfoByType.py -t tripinfos.xml -a timeLoss +python tripinfoByType.py -t tripinfos.xml -a timeLoss ``` @@ -285,7 +285,7 @@ This tool reads fcd-output and a corridor definition. It computes the fraction o Example: ``` -python tools/output/computeCoordination.py --fcd-file fcd.xml --filter-route B,C,D,E --entry C --min-speed 5 +python tools/output/computeCoordination.py --fcd-file fcd.xml --filter-route B,C,D,E --entry C --min-speed 5 ``` This computes the fraction of vehicles that passed the edges *B,C,D,E* in order (possibly with gaps) and were delayed after passing edge *C* to less then 5m/s. @@ -322,12 +322,12 @@ the tables.py. An exemplary command is shown below. ``` -python tools/output/tripStatistics.py -t  -o -e +python tools/output/tripStatistics.py -t -o -e -where -t: name of output files containing vehicle information, generated by SUMO -      -o: define the output file name -      -e: set true for applying the t test (default: false) -      -k: set true for applying the Kruskal-Wallis test (default: false) +where -t: name of output files containing vehicle information, generated by SUMO + -o: define the output file name + -e: set true for applying the t test (default: false) + -k: set true for applying the Kruskal-Wallis test (default: false) ``` ## computeStoppingPlaceUsage.py @@ -337,7 +337,7 @@ If option **--only-changes** is set, only time steps in which the number of stop Example: ``` -python tools/output/computeStoppingPlaceUsage.py -s stopinfos.xml +python tools/output/computeStoppingPlaceUsage.py -s stopinfos.xml ``` ## computePassengerCounts.py @@ -346,7 +346,7 @@ A distinct output file will be created for each vehicle. Example: ``` -python tools/output/computePassengerCounts.py -s stopinfos.xml +python tools/output/computePassengerCounts.py -s stopinfos.xml ``` ## parkingSearchTraffic.py @@ -357,7 +357,7 @@ It currently outputs only basic statistics (mean, avg, quartiles etc.). Example: ``` -python tools/output/parkingSearchTraffic.py net.net.xml vehroutes.xml +python tools/output/parkingSearchTraffic.py net.net.xml vehroutes.xml ``` @@ -367,7 +367,7 @@ Script for aggregate battery outputs in intervals. Example usage: ``` -python tools\output\aggregateBatteryOutput.py -i battery.xml -o batteryAggregatedx.xml -t 60 -v veh0 +python tools\output\aggregateBatteryOutput.py -i battery.xml -o batteryAggregatedx.xml -t 60 -v veh0 ``` ## fcdDiff.py @@ -378,7 +378,7 @@ Data points in the files are matched by time and by id (no time shifting is done Statistical outputs are printed on the console. It is also possible to write all error values to an xml file. ``` -python tools/output/fcdDiff fcd.xml fcd2.xml +python tools/output/fcdDiff fcd.xml fcd2.xml ``` - If option **--grouped** is set, separate statistics for each vehicle will be printed diff --git a/docs/web/docs/Tools/Routes.md b/docs/web/docs/Tools/Routes.md index c575c8d7c38f..909e1e7ef6aa 100644 --- a/docs/web/docs/Tools/Routes.md +++ b/docs/web/docs/Tools/Routes.md @@ -10,11 +10,11 @@ Allows to verify whether routes within the given route-file(s) are valid for the given network. Call(s): ``` -python tools\route\routecheck.py   [-f|--fix] + +python tools\route\routecheck.py [-f|--fix] + ``` ``` -python tools\route\routecheck.py   +python tools\route\routecheck.py ``` If a route is broken (or disconnected), the tool gives a warning, e.g.: "Warning: @@ -38,13 +38,13 @@ vehicle. The tool determines all possible routes between the given source and target edges. Example: ``` -python tools/findAllRoutes.py -n -o -s -t +python tools/findAllRoutes.py -n -o -s -t ``` # analyzePersonPlans.py Count the different types of person plans according to the sequence of used modes. Private rides are distinguished from public transport rides using the assumption that the name of the private vehicle will start with the name of the person (as happens for [duarouter](../duarouter.md)-generated person plans). ``` -python tools\route\analyzePersonPlans.py -r routes.xml +python tools\route\analyzePersonPlans.py -r routes.xml ``` example output: ``` @@ -71,7 +71,7 @@ route from the list of previously discarded ones which start at the corresponding edge. ``` -python tools\route\routes_Join.py      +python tools\route\routes_Join.py ``` - : The prefix to use for vehicles from the first routes @@ -91,7 +91,7 @@ time. If the option **--big** is supplied, a slow but memory efficient algorithm is used. ``` -python tools/route/sort_routes.py input.rou.xml -o output.rou.xml +python tools/route/sort_routes.py input.rou.xml -o output.rou.xml ``` # cutRoutes.py @@ -108,8 +108,8 @@ If the option **--big** is supplied, a slow but memory efficient algorithm is us for sorting the output by departure time. Example usage ``` -python tools/route/cutRoutes.py reduced.net.xml orig.rou.xml  - --routes-output output.rou.xml --orig-net orig.net.xml +python tools/route/cutRoutes.py reduced.net.xml orig.rou.xml + --routes-output output.rou.xml --orig-net orig.net.xml ``` Filtering stopping places is also supported by setting the options **--additional-input** and **--stops-output**. @@ -121,7 +121,7 @@ by start time. If a detector file is given, the routes will be also split by the edges with detectors. Example: ``` -python tools/route/splitRouteFiles.py  +python tools/route/splitRouteFiles.py ``` As default, the routes will be split in steps of 900 seconds. This can be changed @@ -129,7 +129,7 @@ with the option **-s**. The detector file can be loaded with the option **-f**. Example: ``` -python tools/route/splitRouteFiles.py  -f +python tools/route/splitRouteFiles.py -f ``` # routeStats.py @@ -140,7 +140,7 @@ with the same vehicles. Routes must be child elements of ``-elements. Output for plotting may also be generated (see **--help**). ``` -python tools/route/routeStats.py   +python tools/route/routeStats.py ``` When setting option **--attribute depart** a histogram on departure times (or departure time @@ -156,7 +156,7 @@ Optionally a district file may be given, then only routes with the same origin and destination district are matched. ``` -python tools/route/routecompare.py routes.rou.xml routes2.rou.xml +python tools/route/routecompare.py routes.rou.xml routes2.rou.xml ``` # route2poly.py @@ -167,7 +167,7 @@ controlled. Each of these options supports values from \[0, 1\] as well as the special value *random*. ``` -python tools/route/route2poly.py   +python tools/route/route2poly.py ``` # route2sel.py @@ -178,11 +178,11 @@ for visualization in [sumo-gui](../sumo-gui.md) or pruning a network via [netconvert](../netconvert.md). ``` -python tools/route/route2sel.py  -o usedEdges.txt +python tools/route/route2sel.py -o usedEdges.txt ``` ``` -netconvert --net-file  --keep-edges.input-file usedEdges.txt --output reduced.net.xml +netconvert --net-file --keep-edges.input-file usedEdges.txt --output reduced.net.xml ``` # route_departOffset @@ -192,21 +192,21 @@ When setting the option **--depart-edges Edge1,Edge2,...**, only vehicles that d edges are affected. ``` -python tools/route/route_departOffset.py --input-file  --output-file shifted.rou.xml --depart-offset 900 +python tools/route/route_departOffset.py --input-file --output-file shifted.rou.xml --depart-offset 900 ``` The option **--depart-interval a,b,c,d** shifts all departures within the interval \[a,b\[ to the interval \[c,d\[. ``` -python tools/route/route_departOffset.py --input-file  --output-file shifted.rou.xml --depart-interval 3600,7200,0,500 +python tools/route/route_departOffset.py --input-file --output-file shifted.rou.xml --depart-interval 3600,7200,0,500 ``` # route_1htoDay Uses "route_departOffset.py" for building 24 route files which describe a whole day assuming the given route files describes an hour. ``` -python tools/route/route_1htoDay.py  +python tools/route/route_1htoDay.py ``` # route2alts.py @@ -216,7 +216,7 @@ Builds route alternatives assigning the so determined probabilities to use a rou Please note that the cost of the route is not computed! ``` -python tools/route/route2alts.py  +python tools/route/route2alts.py ``` # countEdgeUsage.py @@ -225,7 +225,7 @@ Generates a [visualization](../sumo-gui.md#visualizing_edge-related_data) file f route file. ``` -python tools/countEdgeUsage.py  --output-file  +python tools/countEdgeUsage.py --output-file ``` The option **--intermediate** may be used to include the total number of passing vehicles @@ -239,7 +239,7 @@ When investigating routes that pass a particular edge or intersection, the input routes may be filtered using the option **--subpart** {{DT_STR}}: ``` -python tools/countEdgeUsage.py  --output-file  --subpart edge3,edge4,edge5 +python tools/countEdgeUsage.py --output-file --subpart edge3,edge4,edge5 ``` This will only generate results for routes that contain the edge @@ -250,7 +250,7 @@ sequence *edge3 edge4 edge5*. Declares a vehicle to stop in one or more parking areas (separated by comma). ``` -python tools/addParkingAreaStops2Routes.py -r  -p  -d  [-o ] +python tools/addParkingAreaStops2Routes.py -r -p -d [-o ] ``` The stop will be added to the vehicles route, if the id of the given parking area is part of the vehicle id. Example: @@ -267,7 +267,7 @@ The stop will be added to the vehicles route, if the id of the given parking are ``` ``` -python tools/route/addParkingAreaStops2Routes.py -r  -p ParkingAreaA -d 3600 [-o ] +python tools/route/addParkingAreaStops2Routes.py -r -p ParkingAreaA -d 3600 [-o ] ``` ```xml @@ -291,7 +291,7 @@ Note, that the lane of that parking area must belong to one of the edges Add a stop over parking in all trips given in input file ``` -python tools/route/addParkingAreaStops2Trips.py -r  -p  -d  [-o ] +python tools/route/addParkingAreaStops2Trips.py -r -p -d [-o ] ``` The stop will be added to the trip route. @@ -303,7 +303,7 @@ The stop will be added to the trip route. ``` ``` -python tools/route/addParkingAreaStops2Routes.py -r  -p  -d 1800 [-o ] +python tools/route/addParkingAreaStops2Routes.py -r -p -d 1800 [-o ] ``` ```xml @@ -323,7 +323,7 @@ Note, that the lane of that parking area must belong to one of the edges Declares vehicles to stop at the end of their route (or at some other defined / random location). ``` -python tools/route/addStops2Routes.py -n  -r  -t  -o  -d  -u +python tools/route/addStops2Routes.py -n -r -t -o -d -u ``` Either the "duration" or "until" for stop must be given. Using the option **-p**, the vehicle stops besides the road without blocking other vehicles. Example: @@ -337,7 +337,7 @@ Either the "duration" or "until" for stop must be given. Using the option **-p** ``` ``` -python tools/route/addStops2Routes.py -n  -r  -t  -o  -p --duration 1800 --until 12:0:0 +python tools/route/addStops2Routes.py -n -r -t -o -p --duration 1800 --until 12:0:0 ``` ```xml @@ -385,7 +385,7 @@ python tools/route/vehicles2flow.py -o -e  -r  -o  +python tools/route/tracegenerator.py -n -r -o ``` # tracemapper.py @@ -394,7 +394,7 @@ This script maps a list of (geo) coordinates to a consecutive list of edges in a given network (a route) ``` -python tools/route/tracemapper.py -n  -t  -o  +python tools/route/tracemapper.py -n -t -o ``` The input contains the coordinates for every vehicle in a single line. @@ -435,7 +435,7 @@ The output will be saved in a xml-file and can be directly used as additional file in SUMO. The call is ``` -python tools/tlsCycleAdaptation.py -n  -r  -b  +python tools/tlsCycleAdaptation.py -n -r -b ``` The signalization parameters, such as minimal green time, lost time, @@ -449,7 +449,7 @@ splits will be adapted. This tool analyzes a give route file and computes a implausibility score for each route. ``` -python tools/route/implausibleRoutes.py  +python tools/route/implausibleRoutes.py ``` The implausibility score is a weighted sum of individual measures of implausibility (with configurable weights): @@ -471,7 +471,7 @@ It can also be used to generated restrictions for [flowrouter](Detector.md#flowr This tool adds a random delay to some or all stops that have a 'duration' value by increasing the duration ``` -python tools/route/addStopDelay.py -r -o +python tools/route/addStopDelay.py -r -o ``` The delays are sampled from a [truncated Normal distribution](https://en.wikipedia.org/wiki/Truncated_normal_distribution) with parameters set via options @@ -482,7 +482,7 @@ By setting option **--probability FLOAT**, stops only receive a delay with the g This tool reads a [public transport schedule for vehicles or trips](../Simulation/Public_Transport.md#single_vehicles_and_trips) and checks whether the time spent at the same stop by different vehicles is overlapping. This occurrence may be expected for bus lines but typically indicates a data error for a railway schedule (unless [portion working](../Simulation/Railways.md#portion_working) takes place). ``` -python tools/route/checkStopOrder.py -r +python tools/route/checkStopOrder.py -r ``` When setting option **--stop-table STOP_ID** a time table for all vehicles that service the given ``-id is written to standard output. @@ -517,21 +517,21 @@ arrival until veh tripId started ended flags busStop This tool splits a route file in two different route files ``` -python tools/route/splitRandom.py -r -a -b -n +python tools/route/splitRandom.py -r -a -b -n ``` # addTAZ.py This tool adds 'fromTaz' and 'toTaz' information to vehicles in a route file. ``` -python tools/route/addTAZ.py -r -a -o +python tools/route/addTAZ.py -r -a -o ``` # route2OD.py This tool generates a [tazRelation-file (OD-Matrix)](../Demand/Importing_O/D_Matrices.md#tazrelation_format) from a taz-file and route-file. ``` -python tools/route/route2OD.py -r -a -o +python tools/route/route2OD.py -r -a -o ``` Not only route file but also trip file can be used as input. The tool will firstly try to find the start edge and the end edge of each trip or flows and match them to the respective origin and destination TAZ according to the input taz-file. The counts of the TAZ-relations will be calculated and saved. If only TAZ-information in the given trip or route file is available, this tool will directly calculate TAZ-based OD relation counts without using the information in the given taz-file, which connection edges locate in each TAZ. If the option **--edge-relations** is set, edge-based relation counts will be calculated and saved, only when start/end edge information is available. diff --git a/docs/web/docs/Tools/Shapes.md b/docs/web/docs/Tools/Shapes.md index cfa84bf4a522..4cc950daf373 100644 --- a/docs/web/docs/Tools/Shapes.md +++ b/docs/web/docs/Tools/Shapes.md @@ -7,7 +7,7 @@ title: Shapes Generate circular polygons with custom radius, and number of vertices. ``` -/tools/shape/circlePolygon.py X,Y,RADIUS,NUMVERTICES [x2,y2,radius2,points2] .... +/tools/shape/circlePolygon.py X,Y,RADIUS,NUMVERTICES [x2,y2,radius2,points2] .... ``` - : Polygon center X @@ -53,7 +53,7 @@ chains of connected edges are not allowed -\> this needs two different runs of this script. Output is written in file 'pois.add.xml' ``` -poi_alongRoads.py [,]*  +poi_alongRoads.py [,]* ``` - : The net to use for retrieving the geometry diff --git a/docs/web/docs/Tools/Sumolib.md b/docs/web/docs/Tools/Sumolib.md index ca8a161178fc..36c1adbd2309 100644 --- a/docs/web/docs/Tools/Sumolib.md +++ b/docs/web/docs/Tools/Sumolib.md @@ -14,19 +14,19 @@ To use the library, the {{SUMO}}/tools directory must be on the python load path. This is typically done with a stanza like this: ```python -import os +import os import sys -if 'SUMO_HOME' in os.environ: -    sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools')) +if 'SUMO_HOME' in os.environ: + sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools')) ``` # loading a network file ```python -# import the library -import sumolib -# parse the net -net = sumolib.net.readNet('myNet.net.xml') +# import the library +import sumolib +# parse the net +net = sumolib.net.readNet('myNet.net.xml') ``` The following named arguments may be given to the `readNet` function (i.e. `readNet('myNet.net.xml', withInternal=True)`): @@ -43,81 +43,81 @@ The following named arguments may be given to the `readNet` function (i.e. `read ## import a network and retrieve nodes and edges ```python -# import the library -import sumolib -# parse the net -net = sumolib.net.readNet('myNet.net.xml') +# import the library +import sumolib +# parse the net +net = sumolib.net.readNet('myNet.net.xml') -# retrieve the coordinate of a node based on its ID +# retrieve the coordinate of a node based on its ID print(net.getNode('myNodeID').getCoord()) -# retrieve the successor node ID of an edge -nextNodeID = net.getEdge('myEdgeID').getToNode().getID() +# retrieve the successor node ID of an edge +nextNodeID = net.getEdge('myEdgeID').getToNode().getID() ``` ## compute the average edge speed in a *plain xml* edge file ```python -speedSum = 0.0 -edgeCount = 0 -for edge in sumolib.xml.parse('myNet.edg.xml', ['edge']): -    speedSum += float(edge.speed) -    edgeCount += 1 -avgSpeed = speedSum / edgeCount +speedSum = 0.0 +edgeCount = 0 +for edge in sumolib.xml.parse('myNet.edg.xml', ['edge']): + speedSum += float(edge.speed) + edgeCount += 1 +avgSpeed = speedSum / edgeCount ``` !!! note This is just a processing example. To compute average travel speeds in a network, process [edgeData](../Simulation/Output/Lane-_or_Edge-based_Traffic_Measures.md), [tripinfos](../Simulation/Output/TripInfo.md) or [summary-output](../Simulation/Output/Summary.md) instead. -## compute the length of the selected edges +## compute the length of the selected edges ```python net.loadSelection('selection.txt') cumulLength = 0. -for edge in net.getEdges(): -    if edge.isSelected(): -        cumulLength += edge.getLength() +for edge in net.getEdges(): + if edge.isSelected(): + cumulLength += edge.getLength() ``` -## compute the median speed using the [Statistics](https://sumo.dlr.de/pydoc/sumolib.miscutils.html#Statistics) module +## compute the median speed using the [Statistics](https://sumo.dlr.de/pydoc/sumolib.miscutils.html#Statistics) module ```python -edgeStats = sumolib.miscutils.Statistics("edge speeds") -for edge in sumolib.xml.parse('myNet.edg.xml', ['edge']): -    edgeStats.add(float(edge.speed)) -avgSpeed = edgeStats.median() +edgeStats = sumolib.miscutils.Statistics("edge speeds") +for edge in sumolib.xml.parse('myNet.edg.xml', ['edge']): + edgeStats.add(float(edge.speed)) +avgSpeed = edgeStats.median() ``` !!! note Attribute *speed* is optional in user-generated *.edg.xml* files but will always be included if that file was written by [netconvert](../netconvert.md) or [netedit](../Netedit/index.md). ## locate nearby edges based on the geo-coordinate -This requires the module [pyproj](https://github.com/pyproj4/pyproj) to be installed. -For larger networks [rtree](https://pypi.org/project/Rtree/) is also strongly recommended. +This requires the module [pyproj](https://github.com/pyproj4/pyproj) to be installed. +For larger networks [rtree](https://pypi.org/project/Rtree/) is also strongly recommended. ```python -net = sumolib.net.readNet('myNet.net.xml') -radius = 0.1 -x, y = net.convertLonLat2XY(lon, lat) -edges = net.getNeighboringEdges(x, y, radius) -# pick the closest edge -if len(edges) > 0: -   distancesAndEdges = sorted([(dist, edge) for edge, dist in edges], key=lambda x:x[0]) -    dist, closestEdge = distancesAndEdges[0] +net = sumolib.net.readNet('myNet.net.xml') +radius = 0.1 +x, y = net.convertLonLat2XY(lon, lat) +edges = net.getNeighboringEdges(x, y, radius) +# pick the closest edge +if len(edges) > 0: + distancesAndEdges = sorted([(dist, edge) for edge, dist in edges], key=lambda x:x[0]) + dist, closestEdge = distancesAndEdges[0] ``` ## parse all edges in a route file ```python -for route in sumolib.xml.parse_fast("myRoutes.rou.xml", 'route', ['edges']): -    edge_ids = route.edges.split() -    # do something with the vector of edge ids +for route in sumolib.xml.parse_fast("myRoutes.rou.xml", 'route', ['edges']): + edge_ids = route.edges.split() + # do something with the vector of edge ids ``` ## parse vehicles and their route edges in a route file ```python -for vehicle in sumolib.xml.parse("myRoutes.rou.xml", "vehicle"): +for vehicle in sumolib.xml.parse("myRoutes.rou.xml", "vehicle"): route = vehicle.route[0] # access the first (and only) child element with name 'route' edges = route.edges.split() ``` @@ -126,7 +126,7 @@ with automatic data conversions (including depart time as "HH:MM:SS"): ```python from sumolib.miscutils import parseTime -for vehicle in sumolib.xml.parse("myRoutes.rou.xml", "vehicle", attr_conversions={ +for vehicle in sumolib.xml.parse("myRoutes.rou.xml", "vehicle", attr_conversions={ 'depart' : parseTime, 'edges' : (lambda x : x.split())}): edges = vehicle.route[0].edges @@ -138,30 +138,30 @@ for vehicle in sumolib.xml.parse("myRoutes.rou.xml", "vehicle", attr_convers ## parse all edges in a edge data (meanData) file ```python -for interval in sumolib.xml.parse("edgedata.xml", "interval"): +for interval in sumolib.xml.parse("edgedata.xml", "interval"): for edge in interval.edge: -     # do something with the edge attributes i.e. edge.entered + # do something with the edge attributes i.e. edge.entered ``` ## coordinate transformations ```python -net = sumolib.net.readNet('myNet.net.xml') - -# network coordinates (lower left network corner is at x=0, y=0) -x, y = net.convertLonLat2XY(lon, lat) -lon, lat = net.convertXY2LonLat(x, y) - -# raw UTM coordinates -x, y = net.convertLonLat2XY(lon, lat, True) -lon, lat = net.convertXY2LonLat(x, y, True) - -# lane/offset coordinates -# from lane position to network coordinates -x,y = sumolib.geomhelper.positionAtShapeOffset(net.getLane(laneID).getShape(), lanePos) -# from network coordinates to lane position -lane, d = net.getNeighboringLanes(x, y, radius)[0] (see "locate nearby edges based on the geo-coordinate" above) -lanePos, dist = sumolib.geomhelper.polygonOffsetAndDistanceToPoint((x,y), lane.getShape()) +net = sumolib.net.readNet('myNet.net.xml') + +# network coordinates (lower left network corner is at x=0, y=0) +x, y = net.convertLonLat2XY(lon, lat) +lon, lat = net.convertXY2LonLat(x, y) + +# raw UTM coordinates +x, y = net.convertLonLat2XY(lon, lat, True) +lon, lat = net.convertXY2LonLat(x, y, True) + +# lane/offset coordinates +# from lane position to network coordinates +x,y = sumolib.geomhelper.positionAtShapeOffset(net.getLane(laneID).getShape(), lanePos) +# from network coordinates to lane position +lane, d = net.getNeighboringLanes(x, y, radius)[0] (see "locate nearby edges based on the geo-coordinate" above) +lanePos, dist = sumolib.geomhelper.polygonOffsetAndDistanceToPoint((x,y), lane.getShape()) ``` see also diff --git a/docs/web/docs/Tools/TraceExporter.md b/docs/web/docs/Tools/TraceExporter.md index 8ef55448e24a..63b96be44529 100644 --- a/docs/web/docs/Tools/TraceExporter.md +++ b/docs/web/docs/Tools/TraceExporter.md @@ -51,7 +51,7 @@ You convert a given [fcd output](../Simulation/Output/FCDOutput.md) into a format using a command like this: ``` -traceExporter.py --fcd-input myFCDoutput.xml --omnet-output myOMNETfile.xml +traceExporter.py --fcd-input myFCDoutput.xml --omnet-output myOMNETfile.xml ``` In the case given above, a file for [OMNET](https://www.omnetpp.org/) diff --git a/docs/web/docs/Tools/Trip.md b/docs/web/docs/Tools/Trip.md index 3545bff01bc9..88f53c7f0875 100644 --- a/docs/web/docs/Tools/Trip.md +++ b/docs/web/docs/Tools/Trip.md @@ -17,7 +17,7 @@ defined by begin (option **-b**, default 0) and end time (option **-e**, default prefix (option **--prefix**, default "") and a running number. Example call: ``` -python tools/randomTrips.py -n  -e 50 +python tools/randomTrips.py -n -e 50 ``` The script does not check whether the chosen destination may be reached @@ -56,7 +56,7 @@ The probabilities for selecting an edge may also be weighted by For additional ways to influence edge probabilities call ``` -python tools/randomTrips.py --help +python tools/randomTrips.py --help ``` ## Traffic Volume / Arrival rate @@ -120,8 +120,8 @@ With the option **--trip-attributes** {{DT_STR}}, additional parameters can be g vehicles (note, usage of the quoting characters). ``` -python tools/randomTrips.py -n   - --trip-attributes="departLane=\"best\" departSpeed=\"max\" departPos=\"random\"" +python tools/randomTrips.py -n + --trip-attributes="departLane=\"best\" departSpeed=\"max\" departPos=\"random\"" ``` This would make the random vehicles be distributed randomly on their @@ -137,7 +137,7 @@ to be prepared: ```xml -   + ``` @@ -145,8 +145,8 @@ Then load this file (assume it was saved as *type.add.xml*) with the option --additional-file ``` -python tools/randomTrips.py -n  --trip-attributes="type=\"myType\"" --additional-file  -   --edge-permission passenger +python tools/randomTrips.py -n --trip-attributes="type=\"myType\"" --additional-file + --edge-permission passenger ``` Note the use of the option **--edge-permission** (deprecated alias: **--vclass**) which ensures that @@ -168,7 +168,7 @@ By setting the option **--vehicle-class** a vehicle type definition that specifi class will be added to the output files. I.e. ``` -python tools/randomTrips.py --vehicle-class bus ... +python tools/randomTrips.py --vehicle-class bus ... ``` will add @@ -181,7 +181,7 @@ Any **--trip-attributes** that are applicable to a vehicle type rather than a ve placed in the generated `vType` definition automatically: ``` -python tools/randomTrips.py --vehicle-class bus --trip-attributes="maxSpeed=\"27.8\"" +python tools/randomTrips.py --vehicle-class bus --trip-attributes="maxSpeed=\"27.8\"" ``` will add @@ -263,17 +263,17 @@ To obtain trips from two specific locations (edges *a*, and *b*) to random destinations, use ``` -python tools/randomTrips.py --weights-prefix example  ...... +python tools/randomTrips.py --weights-prefix example ...... ``` and define only the file *example.src.xml* as follows: ```xml -   -     -     -   + + + + ``` diff --git a/docs/web/docs/Tools/Turns.md b/docs/web/docs/Tools/Turns.md index 1d35278a88ca..e167f6b84671 100644 --- a/docs/web/docs/Tools/Turns.md +++ b/docs/web/docs/Tools/Turns.md @@ -11,7 +11,7 @@ The data, most frequently available takes the form of traffic counts on roads (e file](../Simulation/Output/Lane-_or_Edge-based_Traffic_Measures.md) using option **--edgedata-files**. ``` -python tools/routeSampler.py -r  --edgedata-files -o +python tools/routeSampler.py -r --edgedata-files -o ``` Only the edge attribute 'id' and another attribute for the traffic count are needed: @@ -65,7 +65,7 @@ The turn-count data must be provided in the format: Example call: ``` -python tools/routeSampler.py -r  --turn-files -o +python tools/routeSampler.py -r --turn-files -o ``` The attributes for reading the counts from the turn-data file can be set with option **--turn-attribute** (default 'count') @@ -91,7 +91,7 @@ Traffic data related to turning traffic can also be provided as ratios in the fo Example call: ``` -python tools/routeSampler.py -r  --turn-ratio-files -o +python tools/routeSampler.py -r --turn-ratio-files -o ``` The attributes for reading the ratios from the turn-data file can be set with option **--turn-ratio-attribute** (default *probability*) @@ -109,8 +109,8 @@ Routes generated by randomTrips.py (**--route-output**) can be a good input sour Example: ``` -python tools/randomTrips.py -n  -r sampleRoutes.rou.xml -python tools/routeSampler.py -r sampleRoutes.rou.xml --edgedata-files -o +python tools/randomTrips.py -n -r sampleRoutes.rou.xml +python tools/routeSampler.py -r sampleRoutes.rou.xml --edgedata-files -o ``` !!! note @@ -202,8 +202,8 @@ With the option **--attributes** {{DT_STR}}, additional parameters can be given vehicles (note, usage of the quoting characters). ``` -python tools/routeSampler.py -n input_net.net.xml -r candidate.rou.xml -o out.rou.xml -d data.xml - --attributes="departLane=\"best\" departSpeed=\"max\" departPos=\"random\"" +python tools/routeSampler.py -n input_net.net.xml -r candidate.rou.xml -o out.rou.xml -d data.xml + --attributes="departLane=\"best\" departSpeed=\"max\" departPos=\"random\"" ``` The above attributes would make the vehicles be distributed randomly on their @@ -217,15 +217,15 @@ starting edges and inserted with high speed on a reasonable lane. To distinguish vehicles of different types, routeSampler may be run multiple times with different attributes. Note, that it is also necessary to set the option **--prefix** to prevent duplicate ids. The example below creates traffic consisting of cars and trucks using two edgedata files with distinct count values (stored in the default attribute 'entered'). ``` -python tools/routeSampler.py --attributes="type=\"car\"" --edgedata-files carcounts.xml --prefix c -o cars.rou.xml -r candidate.rou.xml -python tools/routeSampler.py --attributes="type=\"heavy\"" --edgedata-files truckcounts.xml --prefix t -o trucks.rou.xml -r candidate.rou.xml +python tools/routeSampler.py --attributes="type=\"car\"" --edgedata-files carcounts.xml --prefix c -o cars.rou.xml -r candidate.rou.xml +python tools/routeSampler.py --attributes="type=\"heavy\"" --edgedata-files truckcounts.xml --prefix t -o trucks.rou.xml -r candidate.rou.xml ``` Alternatively, the count values might also be stored in different attributes of the same file (i.e. 'count1', 'count2'): ``` python tools/routeSampler.py --attributes="type=\"car\"" --edgedata-files counts.xml --edgedata-attribute count1 --prefix c -o cars.rou.xml -r candidate.rou.xml -python tools/routeSampler.py --attributes="type=\"heavy\"" --edgedata-files counts.xml --edgedata-attribute count2 --prefix t -o trucks.rou.xml -r candidate.rou.xml +python tools/routeSampler.py --attributes="type=\"heavy\"" --edgedata-files counts.xml --edgedata-attribute count2 --prefix t -o trucks.rou.xml -r candidate.rou.xml ``` When running the simulation, the types 'car' and 'heavy' (previously set as vehicle attributes), must be defined in an additional file which could look like the following example (types.add.xml): @@ -334,7 +334,7 @@ an edge to its downstream edge with a given route file. The output file can be directly used as input with [routeSampler.py](#routesamplerpy) and [jtrrouter](../jtrrouter.md). The time interval will span the minimum and maximum departure times of the route file but it can also be configured with options **--begin**, **--end** and **--interval**. ``` -python tools/turn-defs/generateTurnRatios.py -r  +python tools/turn-defs/generateTurnRatios.py -r ``` The standard output is the traffic volumes (which jtrrouter normalizes automatically). With the option **-p**, turning ratios will be written as values from [0,1]. @@ -356,7 +356,7 @@ distributes the traffic uniformly, that is: Example use ``` -python tools/turn-defs/generateTurnDefs.py --connections-file connections.con.xml --turn-definitions-file output.turndefs.xml +python tools/turn-defs/generateTurnDefs.py --connections-file connections.con.xml --turn-definitions-file output.turndefs.xml ``` The script allows to be extended with new traffic distribution policies @@ -375,7 +375,7 @@ file. For usage details, execute the *generateTurnDefs.py* script with This script converts turn-count data into [edgeData](../Simulation/Output/Lane-_or_Edge-based_Traffic_Measures.md). ``` -python tools/turn-defs/turnCount2EdgeCount.py -t  -o +python tools/turn-defs/turnCount2EdgeCount.py -t -o ``` # turnFile2EdgeRelations.py @@ -383,7 +383,7 @@ python tools/turn-defs/turnCount2EdgeCount.py -t  -o This script converts the deprecated turn-file format into edgeRelation format ``` -python tools/turn-defs/turnFile2EdgeRelations.py -t  -o +python tools/turn-defs/turnFile2EdgeRelations.py -t -o ``` # jtcrouter.py @@ -394,7 +394,7 @@ Then it calls jtrrouter in the background. Example call: ``` -python tools/jtcrouter.py -n -t  -o +python tools/jtcrouter.py -n -t -o ``` There are three basic styles of converting turn-counts to routes: diff --git a/docs/web/docs/Tools/Visualization.md b/docs/web/docs/Tools/Visualization.md index bbba49341039..0b1e143050d4 100644 --- a/docs/web/docs/Tools/Visualization.md +++ b/docs/web/docs/Tools/Visualization.md @@ -312,7 +312,7 @@ Create plot of all trajectories obtained from a file generated through [--fcd-ou Example use: ``` -python tools/plot_trajectories.py fcd.xml -t td -o plot.png -s +python tools/plot_trajectories.py fcd.xml -t td -o plot.png -s ``` The option **-t (--trajectory-type)** supports different attributes that can be plotted against each other. The argument is a two-letter code with each letter encoding an attribute that is derived from the fcd input. @@ -416,30 +416,30 @@ noise](../Simulation/Output/Lane-_or_Edge-based_Noise_Measures.md).
-

python plot_net_dump.py -v -n bs.net.xml \
- --xticks 7000,14001,2000,16 --yticks 9000,16001,1000,16 \
- --measures entered,entered --xlabel [m] --ylabel [m] \
- --default-width 1 -i base-jr.xml,base-jr.xml \
- --xlim 7000,14000 --ylim 9000,16000 -\
- --default-width .5 --default-color #606060 \
- --min-color-value -1000 --max-color-value 1000 \
- --max-width-value 1000 --min-width-value -1000  \
- --max-width 3 --min-width .5 \
- --colormap "#0:#0000c0,.25:#404080,.5:#808080,.75:#804040,1:#c00000"

+

python plot_net_dump.py -v -n bs.net.xml \
+ --xticks 7000,14001,2000,16 --yticks 9000,16001,1000,16 \
+ --measures entered,entered --xlabel [m] --ylabel [m] \
+ --default-width 1 -i base-jr.xml,base-jr.xml \
+ --xlim 7000,14000 --ylim 9000,16000 -\
+ --default-width .5 --default-color #606060 \
+ --min-color-value -1000 --max-color-value 1000 \
+ --max-width-value 1000 --min-width-value -1000 \
+ --max-width 3 --min-width .5 \
+ --colormap "#0:#0000c0,.25:#404080,.5:#808080,.75:#804040,1:#c00000"

It shows the shift in traffic in the city of Brunswick, Tuesday-Thursday week type after establishing an environmental zone.

-

python plot_net_dump.py -v -n bs.net.xml \
- --xticks 7000,14001,2000,16 --yticks 9000,16001,1000,16 \
- --measures NOx_normed,NOx_normed --xlabel [m] --ylabel [m] \
- --default-width 1 -i HBEFA_base-jr.xml,HBEFA_base-jr.xml \
- --xlim 7000,14000 --ylim 9000,16000 \
- --default-width .5 --default-color #606060 \
- --min-color-value -.1 --max-color-value .1 \
- --max-width-value .1  --max-width 3 --min-width .5 \
- --colormap "#0:#00c000,.25:#408040,.5:#808080,.75:#804040,1:#c00000"

+

python plot_net_dump.py -v -n bs.net.xml \
+ --xticks 7000,14001,2000,16 --yticks 9000,16001,1000,16 \
+ --measures NOx_normed,NOx_normed --xlabel [m] --ylabel [m] \
+ --default-width 1 -i HBEFA_base-jr.xml,HBEFA_base-jr.xml \
+ --xlim 7000,14000 --ylim 9000,16000 \
+ --default-width .5 --default-color #606060 \
+ --min-color-value -.1 --max-color-value .1 \
+ --max-width-value .1 --max-width 3 --min-width .5 \
+ --colormap "#0:#00c000,.25:#408040,.5:#808080,.75:#804040,1:#c00000"

Showing the according changes in NOx emissions.

@@ -487,13 +487,13 @@ selection (all edge with at least one lane in the selection).
-

python plot_net_selection.py -n bs.net.xml \
- --xlim 7000,14000 --ylim 9000,16000 \
- -i selection_environmental_zone.txt \
- --xlabel [m] --ylabel [m] \
- --xticks 7000,14001,2000,16 --yticks 9000,16001,1000,16 \
- --selected-width 1 --edge-width .5 -o selected_ez.png \
- --edge-color #606060 --selected-color #800000 

+

python plot_net_selection.py -n bs.net.xml \
+ --xlim 7000,14000 --ylim 9000,16000 \
+ -i selection_environmental_zone.txt \
+ --xlabel [m] --ylabel [m] \
+ --xticks 7000,14001,2000,16 --yticks 9000,16001,1000,16 \
+ --selected-width 1 --edge-width .5 -o selected_ez.png \
+ --edge-color #606060 --selected-color #800000

The example shows the selection of an "environmental zone".

@@ -522,11 +522,11 @@ read from the network file.
-

python plot_speeds.py -n bs.net.xml --xlim 1000,25000 \
- --ylim 2000,26000 --edge-width .5 -o speeds2.png \
- --minV 0 --maxV 60 --xticks 16 --yticks 16 \
- --xlabel [m] --ylabel [m] --xlabelsize 16 --ylabelsize 16 \
- --colormap jet

+

python plot_speeds.py -n bs.net.xml --xlim 1000,25000 \
+ --ylim 2000,26000 --edge-width .5 -o speeds2.png \
+ --minV 0 --maxV 60 --xticks 16 --yticks 16 \
+ --xlabel [m] --ylabel [m] --xlabelsize 16 --ylabelsize 16 \
+ --colormap jet

The example colors the streets in Brunswick, Germany by their maximum allowed speed.

@@ -554,11 +554,11 @@ are part of the net.
-

python plot_trafficLights.py -n bs.net.xml \
- --xlim 1000,25000 --ylim 2000,26000 --edge-width .5 \
- --xticks 16 --yticks 16 --xlabel [m] --ylabel [m] \ 
- --xlabelsize 16 --ylabelsize 16 --width 5 \
- --edge-color #606060

+

python plot_trafficLights.py -n bs.net.xml \
+ --xlim 1000,25000 --ylim 2000,26000 --edge-width .5 \
+ --xticks 16 --yticks 16 --xlabel [m] --ylabel [m] \
+ --xlabelsize 16 --ylabelsize 16 --width 5 \
+ --edge-color #606060

The example shows the traffic lights in Brunswick.

@@ -588,13 +588,13 @@ visualised as a time line along the simulation time.
-

python plot_summary.py 
- -i mo.xml,dido.xml,fr.xml,sa.xml,so.xml \
- -l Mo,Di-Do,Fr,Sa,So --xlim 0,86400 --ylim 0,10000 
- -o sumodocs/summary_running.png --yticks 0,10001,2000,14 \
- --xticks 0,86401,14400,14 --xtime1 --ygrid \
- --ylabel "running vehicles [#]" --xlabel "time" \
- --title "running vehicles over time" --adjust .14,.1 

+

python plot_summary.py
+ -i mo.xml,dido.xml,fr.xml,sa.xml,so.xml \
+ -l Mo,Di-Do,Fr,Sa,So --xlim 0,86400 --ylim 0,10000
+ -o sumodocs/summary_running.png --yticks 0,10001,2000,14 \
+ --xticks 0,86401,14400,14 --xtime1 --ygrid \
+ --ylabel "running vehicles [#]" --xlabel "time" \
+ --title "running vehicles over time" --adjust .14,.1

The example shows the numbers of vehicles running in a large-scale scenario of the city of Brunswick over the day for the standard week day classes. "mo.xml", "dido.xml", "fr.xml", "sa.xml", and "so.xml" are summary-files resulting from simulations of the weekday-types Monday, Tuesday-Thursday, Friday, Saturday, and Sunday, respectively.

@@ -624,14 +624,14 @@ the measure (vehicles) that fall into a bin.
-

python plot_tripinfo_distributions.py \
- -i mo.xml,dido.xml,fr.xml,sa.xml,so.xml \
- -o tripinfo_distribution_duration.png -v -m duration \
- --minV 0 --maxV 3600 --bins 10 --xticks 0,3601,360,14 \
- --xlabel "duration [s]" --ylabel "number [#]" \
- --title "duration distribution" \
- --yticks 14 --xlabelsize 14 --ylabelsize 14 --titlesize 16 \
- -l mon,tue-thu,fri,sat,sun --adjust .14,.1 --xlim 0,3600

+

python plot_tripinfo_distributions.py \
+ -i mo.xml,dido.xml,fr.xml,sa.xml,so.xml \
+ -o tripinfo_distribution_duration.png -v -m duration \
+ --minV 0 --maxV 3600 --bins 10 --xticks 0,3601,360,14 \
+ --xlabel "duration [s]" --ylabel "number [#]" \
+ --title "duration distribution" \
+ --yticks 14 --xlabelsize 14 --ylabelsize 14 --titlesize 16 \
+ -l mon,tue-thu,fri,sat,sun --adjust .14,.1 --xlim 0,3600

The example shows the travel time distribution for the vehicles of different week day classes (Braunschweig scenario). "mo.xml", "dido.xml", "fr.xml", "sa.xml", and "so.xml" are tripinfo-files resulting from simulations of the weekday-types Monday, Tuesday-Thursday, Friday, Saturday, and Sunday, respectively.

@@ -670,12 +670,12 @@ using the **--columns** {{DT_INT}}\[,{{DT_INT}}\]\* option. The values are visua
-

plot_csv_timeline.py \
- -i nefz.csv -c 1 --no-legend --xlabel "time [s]" \
- --ylabel "velocity [km/h]" --xlabelsize 14 --ylabelsize 14 \
- --xticks 14 --yticks 14 --colors k --ylim 0,125 \
- --output nefz.png \
- --title "New European Driving Cycle (NEDC)" --titlesize 16

+

plot_csv_timeline.py \
+ -i nefz.csv -c 1 --no-legend --xlabel "time [s]" \
+ --ylabel "velocity [km/h]" --xlabelsize 14 --ylabelsize 14 \
+ --xticks 14 --yticks 14 --colors k --ylim 0,125 \
+ --output nefz.png \
+ --title "New European Driving Cycle (NEDC)" --titlesize 16

The example shows the New European Driving Cycle (NEDC).

@@ -701,8 +701,8 @@ name/value-pairs are visualised as a pie chart.
-

plot_csv_pie.py \
- -i paradigm.csv -b --colormap Accent --no-legend -s 6,6 



Note: Please note that you should set the width and the height to the same value using the --size <FLOAT>,<FLOAT> option, see #common options. Otherwise you'll get an oval. +

plot_csv_pie.py \
+ -i paradigm.csv -b --colormap Accent --no-legend -s 6,6



Note: Please note that you should set the width and the height to the same value using the --size <FLOAT>,<FLOAT> option, see #common options. Otherwise you'll get an oval. @@ -731,10 +731,10 @@ name/value-pairs are visualised as a bar chart.
-

plot_csv_bars.py \
- -i nox_effects.txt --colormap RdYlGn --no-legend --width .4 \
- -s 8,4 --revert --xlim 0,50 --xticks 0,51,10,16 --yticks 16 \
- --adjust .28,.1,.95,.9 --show-values 

+

plot_csv_bars.py \
+ -i nox_effects.txt --colormap RdYlGn --no-legend --width .4 \
+ -s 8,4 --revert --xlim 0,50 --xticks 0,51,10,16 --yticks 16 \
+ --adjust .28,.1,.95,.9 --show-values

@@ -842,7 +842,7 @@ When stepping through the simulation, different time intervals contained in the weight file can be shown. It can be useful to adapt the simulation step length to the data period for easier stepping: ``` -sumo-gui -n NET --edgedata-files FILE --step-length 3600 --end 24:0:0 +sumo-gui -n NET --edgedata-files FILE --step-length 3600 --end 24:0:0 ``` ## Intersection Flow Diagram diff --git a/docs/web/docs/Tools/Xml.md b/docs/web/docs/Tools/Xml.md index 75afbea96e59..b6bddf772dc1 100644 --- a/docs/web/docs/Tools/Xml.md +++ b/docs/web/docs/Tools/Xml.md @@ -10,7 +10,7 @@ opened in [LibreOffice](https://www.libreoffice.org/) or Microsoft Excel. Usage: ``` -python tools/xml/xml2csv.py input.xml +python tools/xml/xml2csv.py input.xml ``` With the option **--separator** {{DT_STR}} you can customize the field separator (default is @@ -44,7 +44,7 @@ limited to only one type of child elements. This is the inverse tool to xml2csv.py. Usage: ``` -python tools/xml/csv2xml.py -x schema.xsd input.csv +python tools/xml/csv2xml.py -x schema.xsd input.csv ``` The options have the same meaning as above. For some file types as @@ -62,7 +62,7 @@ require the protoc compiler as well as the protobuf packages for python and your target language to be installed. Usage: ``` -python tools/xml/xml2protobuf.py -x schema.xsd input.xml +python tools/xml/xml2protobuf.py -x schema.xsd input.xml ``` The xsd schema file needs to be given the using **--xsd** {{DT_FILE}} and the **--validation** option will @@ -77,7 +77,7 @@ protomsg file containing the binary stream. This is the inverse tool to xml2protobuf.py. Usage: ``` -python tools/xml/protobuf2xml.py -x schema.xsd input.protomsg +python tools/xml/protobuf2xml.py -x schema.xsd input.protomsg ``` The options have the same meaning as above. @@ -95,7 +95,7 @@ This sets/removes the specified attribute on all tags (elements) in the input fi If option **--value** (**-v**) is not given, the attribute is removed. Otherwise it is added/modified to the given value. ``` -python tools/xml/tools/xml/changeAttribute.py -f INPUT_FILE -o OUTPUT_FILE -t TAG -a ATTRIBUTE [-v VALUE] +python tools/xml/tools/xml/changeAttribute.py -f INPUT_FILE -o OUTPUT_FILE -t TAG -a ATTRIBUTE [-v VALUE] ``` ## filterElements.py @@ -108,5 +108,5 @@ This removes the specified element from the input file subject to the following Example call: ``` -python tools/xml/tools/xml/filterElements.py -f stopoutput.xml -o filtered.xml -t stopinfo -a delay --remove-values 0 +python tools/xml/tools/xml/filterElements.py -f stopoutput.xml -o filtered.xml -t stopinfo -a delay --remove-values 0 ``` diff --git a/docs/web/docs/Tools/devel.md b/docs/web/docs/Tools/devel.md index 81913c4d3f08..9991e8280bf7 100644 --- a/docs/web/docs/Tools/devel.md +++ b/docs/web/docs/Tools/devel.md @@ -7,7 +7,7 @@ title: Devel Build polygon/poi file from cmdline geometry input as generated by sumo debug output. ``` -/tools/shape/debug2shapes.py  +/tools/shape/debug2shapes.py ``` - : The debug file to use for generating shapes diff --git a/docs/web/docs/Tools/tls.md b/docs/web/docs/Tools/tls.md index 295f753ec2db..da890ea4f5c6 100644 --- a/docs/web/docs/Tools/tls.md +++ b/docs/web/docs/Tools/tls.md @@ -8,14 +8,14 @@ This script modifies the traffic-light offsets to coordinate them for a given traffic demand. Example call: ``` -python tools/tlsCoordinator.py -n net.net.xml -r routes.rou.xml -o tlsOffsets.add.xml +python tools/tlsCoordinator.py -n net.net.xml -r routes.rou.xml -o tlsOffsets.add.xml ``` This would generate the file *tlsOffsets.add.xml* which can be loaded into [sumo](../sumo.md): ``` -sumo -n net.net.xml -r routes.rou.xml -a tlsOffsets.add.xml +sumo -n net.net.xml -r routes.rou.xml -a tlsOffsets.add.xml ``` !!! note @@ -30,14 +30,14 @@ This script modifies the cycle lenth and the duration of green phases according formula to best accommodate a given traffic demand. Example call: ``` -python tools/tlsCycleAdaptation.py -n net.net.xml -r routes.rou.xml -o newTLS.add.xml -b begin_time +python tools/tlsCycleAdaptation.py -n net.net.xml -r routes.rou.xml -o newTLS.add.xml -b begin_time ``` This would generate the file *newTLS.add.xml* which can be loaded into [sumo](../sumo.md): ``` -sumo -n net.net.xml -r routes.rou.xml -a newTLS.add.xml +sumo -n net.net.xml -r routes.rou.xml -a newTLS.add.xml ``` !!! caution @@ -71,7 +71,7 @@ This tool requires the program definition and the SUMO-network it shall be converted to: ``` -python tools/tls/tls_csv2SUMO.py   +python tools/tls/tls_csv2SUMO.py ``` It prints the generated TLS definition on stdout (you can pipe it to a @@ -236,7 +236,7 @@ time;31;16;6;16;31;16;6;16 We convert those program definitions using ``` -python tools/tls/tls_csv2SUMO.py lsa_def.csv,lsa_def2.csv input_net.net.xml +python tools/tls/tls_csv2SUMO.py lsa_def.csv,lsa_def2.csv input_net.net.xml ``` And obtain the following programs after loading them into @@ -257,7 +257,7 @@ creates the [sumo](../sumo.md) tls representation out of it. Example call to con additional file *tls.add.xml*: ``` -python tools/tls/tls_csvSignalgroups.py -n net.net.xml -i tl1.csv,tl2.csv -o tls.add.xml +python tools/tls/tls_csvSignalgroups.py -n net.net.xml -i tl1.csv,tl2.csv -o tls.add.xml ``` In the opposite direction, templates for csv-tls-descriptions of all tls @@ -265,14 +265,14 @@ in a [sumo](../sumo.md) network can be written to a given directory and completed by hand: ``` -python tools/tls/tls_csvSignalgroups.py -n net.net.xml -m . +python tools/tls/tls_csvSignalgroups.py -n net.net.xml -m . ``` It also provides a mechanism to convert an additional file *tls.add.xml* or the TL logic contained in a net file *net.net.xml* directly into a csv-tls-representation. Example call to convert an additional file *tls.add.xml* into csv-tls-representation(s): ``` -python tools/tls/tls_csvSignalgroups.py -n net.net.xml -i tls.add.xml -r --group +python tools/tls/tls_csvSignalgroups.py -n net.net.xml -i tls.add.xml -r --group ``` The csv output files (one per found TL logic) are written to the current working directory and named *tlID_programID.csv*. An additional file prefix can be prepended using the **--output** parameter. When adding the parameter **--group**, signal groups with identical signal states across all @@ -312,7 +312,7 @@ optional, so are the keywords. ``` [general] -cycle time;60 +cycle time;60 key;1 subkey;SZP_LeftTurn offset;0 @@ -325,7 +325,7 @@ FZ21;-472_0; FZ31;-468_0; FZ32;-468_1; FZ41;-470_0; -[signal groups] +[signal groups] id;on1;off1;transOn;transOff FZ11;0;25;1;3 FZ12;0;35;1;3 @@ -339,7 +339,7 @@ FZ41;40;55;1;3 ``` [general] -cycle time;60 +cycle time;60 key;1 subkey;SZP_2Green offset;0 @@ -350,7 +350,7 @@ FZ21;-472_0; FZ31;-468_0; FZ32;-468_1; FZ41;-470_0; -[signal groups] +[signal groups] id;on1;off1;transOn;transOff;on2;off2 FZ11;0;15;1;3;; FZ12;0;15;1;3;40;55 @@ -395,5 +395,5 @@ The corresponding yellow and red phases will be build and the 'next' attribute will be set to the appropriate transition phase. ``` -python tools/tls/buildTransitions.py -d -o +python tools/tls/buildTransitions.py -d -o ``` diff --git a/docs/web/docs/TraCI.md b/docs/web/docs/TraCI.md index e94a9746a8d5..158799ea7c66 100644 --- a/docs/web/docs/TraCI.md +++ b/docs/web/docs/TraCI.md @@ -302,10 +302,10 @@ As an example use-case consider retrieving the x,y position of each vehicle during every simulation step (using the python client): ```py -while traci.simulation.getMinExpectedNumber() > 0: -    for veh_id in traci.vehicle.getIDList(): -         position = traci.vehicle.getPosition(veh_id) -    traci.simulationStep() +while traci.simulation.getMinExpectedNumber() > 0: + for veh_id in traci.vehicle.getIDList(): + position = traci.vehicle.getPosition(veh_id) + traci.simulationStep() ``` - This script is able to process about 25000 vehicles per second. @@ -314,11 +314,11 @@ while traci.simulation.getMinExpectedNumber() > 0: [subscriptions](TraCI/Object_Variable_Subscription.md): ```py -while traci.simulation.getMinExpectedNumber() > 0: -    for veh_id in traci.simulation.getDepartedIDList(): -        traci.vehicle.subscribe(veh_id, [traci.constants.VAR_POSITION]) -    positions = traci.vehicle.getAllSubscriptionResults() -    traci.simulationStep() +while traci.simulation.getMinExpectedNumber() > 0: + for veh_id in traci.simulation.getDepartedIDList(): + traci.vehicle.subscribe(veh_id, [traci.constants.VAR_POSITION]) + positions = traci.vehicle.getAllSubscriptionResults() + traci.simulationStep() ``` When using this script on the [Bologna diff --git a/docs/web/docs/TraCI/C++TraCIAPI.md b/docs/web/docs/TraCI/C++TraCIAPI.md index e173bfe1cb28..25453515594f 100644 --- a/docs/web/docs/TraCI/C++TraCIAPI.md +++ b/docs/web/docs/TraCI/C++TraCIAPI.md @@ -57,9 +57,9 @@ In this operating mode, the full TraCI-API is supported. Example input files typically look like: ``` -repeat 50 simstep2 0 -setvalue 0xc4 0x31 veh0  e_vo0 -simstep2 200 +repeat 50 simstep2 0 +setvalue 0xc4 0x31 veh0 e_vo0 +simstep2 200 ``` This mode is meant for testing the server side and is unsuitable for @@ -70,8 +70,8 @@ building a control program that mixes TraCI calls with custom code. In this mode the client library itself is used. Example code looks like: ```cpp -SUMOTime t = simulation.getCurrentTime(); -std::vector = edge.getIDList(); +SUMOTime t = simulation.getCurrentTime(); +std::vector = edge.getIDList(); ``` ## Example Code @@ -100,12 +100,12 @@ int main(int argc, char* argv[]) { ### compiling (make sure SUMO_HOME is set) ``` -g++ -o test -I$SUMO_HOME/src TraCIAPITest.cpp $SUMO_HOME/src/utils/traci/TraCIAPI.cpp $SUMO_HOME/src/foreign/tcpip/socket.cpp $SUMO_HOME/src/foreign/tcpip/storage.cpp +g++ -o test -I$SUMO_HOME/src TraCIAPITest.cpp $SUMO_HOME/src/utils/traci/TraCIAPI.cpp $SUMO_HOME/src/foreign/tcpip/socket.cpp $SUMO_HOME/src/foreign/tcpip/storage.cpp ``` ### running ``` -sumo -c test.sumocfg --remote-port 1337 & +sumo -c test.sumocfg --remote-port 1337 & ./test ``` diff --git a/docs/web/docs/TraCI/Protocol.md b/docs/web/docs/TraCI/Protocol.md index 96f3b395fd35..96a3f34e29d9 100644 --- a/docs/web/docs/TraCI/Protocol.md +++ b/docs/web/docs/TraCI/Protocol.md @@ -70,22 +70,22 @@ length and identifier of each command is placed in front of the command. A scheme of this container is depicted below: ``` - 0                 7 8               15 + 0 7 8 15 +--------------------------------------+ -| Message Length including this header | +| Message Length including this header | +--------------------------------------+ -|      (Message Length, continued)     | -+--------------------------------------+  \ -|     Length        |    Identifier    |  | -+--------------------------------------+   > Command_0 -|           Command_0 content          |  | -+--------------------------------------+  / -                   ... -+--------------------------------------+  \ -|     Length        |    Identifier    |  | -+--------------------------------------+   > Command_n-1 -|          Command_n-1 content         |  | -+--------------------------------------+  / +| (Message Length, continued) | ++--------------------------------------+ \ +| Length | Identifier | | ++--------------------------------------+ > Command_0 +| Command_0 content | | ++--------------------------------------+ / + ... ++--------------------------------------+ \ +| Length | Identifier | | ++--------------------------------------+ > Command_n-1 +| Command_n-1 content | | ++--------------------------------------+ / ``` In some cases the length of a single command may not suffice, since the @@ -95,16 +95,16 @@ and adding an integer length field. This extended scheme for a command looks as follows: ``` - 0                 7 8               15 -+--------------------------------------+  \ -|   Length = 0      |                  |  | -+-------------------+                  |  | -|        32 bit Integer Length         |  | -|                   +------------------+   > Command -|                   |   Identifier     |  | -+--------------------------------------+  | -|            Command content           |  | -+--------------------------------------+  / + 0 7 8 15 ++--------------------------------------+ \ +| Length = 0 | | | ++-------------------+ | | +| 32 bit Integer Length | | +| +------------------+ > Command +| | Identifier | | ++--------------------------------------+ | +| Command content | | ++--------------------------------------+ / ``` To simplify the usage of TraCI, we provide a class for handling the diff --git a/docs/web/docs/TraCI/TraaS.md b/docs/web/docs/TraCI/TraaS.md index 29bf6d66e4a1..2c33b5930c76 100644 --- a/docs/web/docs/TraCI/TraaS.md +++ b/docs/web/docs/TraCI/TraaS.md @@ -34,7 +34,7 @@ major difference is, that the method return values must be casted in the calling code: ``` -double timeSeconds = (double)conn.do_job_get(Simulation.getTime()); +double timeSeconds = (double)conn.do_job_get(Simulation.getTime()); ``` ## Examples diff --git a/docs/web/docs/Tutorials/Autobahn.md b/docs/web/docs/Tutorials/Autobahn.md index 82f6751b92fe..80e84329bed4 100644 --- a/docs/web/docs/Tutorials/Autobahn.md +++ b/docs/web/docs/Tutorials/Autobahn.md @@ -51,14 +51,14 @@ Create a routes-file `autobahn.rou.xml` with the following content: ```xml -     -     -     -     -     -     -     -     + + + + + + + + ``` @@ -68,10 +68,10 @@ Create a config-file `autobahn.sumocfg`: ```xml -    -        -        -    + + + + ``` @@ -98,11 +98,11 @@ settings by adding a ``-element: ```xml -    -        -        -        -    + + + + + ``` diff --git a/docs/web/docs/Tutorials/Calibration/San_Pablo_Dam.md b/docs/web/docs/Tutorials/Calibration/San_Pablo_Dam.md index a659c0f713a8..0646d515408d 100644 --- a/docs/web/docs/Tutorials/Calibration/San_Pablo_Dam.md +++ b/docs/web/docs/Tutorials/Calibration/San_Pablo_Dam.md @@ -140,7 +140,7 @@ complicated: In order to perform the calibration, you need to call only: ``` -python runner.py +python runner.py ``` This is what it is doing: @@ -162,9 +162,9 @@ This is what it is doing: For each calibration step, the following output should appear: ``` -# simulation with: vMax:22.000 aMax:2.000 bMax:2.000 lCar:5.000 sigA:0.500 tTau:1.500 -Loading configuration... done. -#### yields rmse: 212.6411 +# simulation with: vMax:22.000 aMax:2.000 bMax:2.000 lCar:5.000 sigA:0.500 tTau:1.500 +Loading configuration... done. +#### yields rmse: 212.6411 ``` Of course, the values differ between the steps. 80 iterations need about diff --git a/docs/web/docs/Tutorials/CityMobil.md b/docs/web/docs/Tutorials/CityMobil.md index d4fadad05dfb..2078364c008f 100644 --- a/docs/web/docs/Tutorials/CityMobil.md +++ b/docs/web/docs/Tutorials/CityMobil.md @@ -26,7 +26,7 @@ import os import sys from constants import PREFIX, DOUBLE_ROWS, ROW_DIST, SLOTS_PER_ROW, SLOT_WIDTH ... # more constants -if 'SUMO_HOME' in os.environ: +if 'SUMO_HOME' in os.environ: sys.path.append(os.path.join(os.environ['SUMO_HOME'], 'tools')) import sumolib ``` diff --git a/docs/web/docs/Tutorials/CityMobil_old.md b/docs/web/docs/Tutorials/CityMobil_old.md index af26fd4cb457..f1c099465b17 100644 --- a/docs/web/docs/Tutorials/CityMobil_old.md +++ b/docs/web/docs/Tutorials/CityMobil_old.md @@ -24,7 +24,7 @@ managers agentManager.py or simpleManager.py. If you want a visual display you have to provide the -g option, e.g. ``` -./simpleManager -g +./simpleManager -g ``` Further options are described by starting the scripts with -h. diff --git a/docs/web/docs/Tutorials/Driving_in_Circles.md b/docs/web/docs/Tutorials/Driving_in_Circles.md index 9f6b07cb19f5..f48d6e084e6e 100644 --- a/docs/web/docs/Tutorials/Driving_in_Circles.md +++ b/docs/web/docs/Tutorials/Driving_in_Circles.md @@ -40,8 +40,8 @@ standard passenger cars. The file contents should look like this: ```xml -    -    + + ``` @@ -57,10 +57,10 @@ and net definitions: ```xml -     -        -        -     + + + + ``` @@ -104,9 +104,9 @@ Now we add the from-edge and the to-edge to the flow in `circles.rou.xml`: ```xml - ... -     - ... + ... + + ... ``` Let's try to run SUMO again. The window should now show the network you @@ -144,16 +144,16 @@ for details): ```xml -     -         -            -         -     -     -         -            -         -     + + + + + + + + + + ``` diff --git a/docs/web/docs/Tutorials/FundamentalDiagram.md b/docs/web/docs/Tutorials/FundamentalDiagram.md index 2ed330422719..454932a92e58 100644 --- a/docs/web/docs/Tutorials/FundamentalDiagram.md +++ b/docs/web/docs/Tutorials/FundamentalDiagram.md @@ -58,30 +58,30 @@ with the following definition (to be placed in an {{AdditionalFile}}) ```xml -     -     -     -     -     -     -     -     -     -     -     -     -     -     -     -     -     -     -     -     -     -     -     -     + + + + + + + + + + + + + + + + + + + + + + + + ``` @@ -92,7 +92,7 @@ And a flow that continuously tries to add vehicles: ```xml -   + ``` diff --git a/docs/web/docs/Tutorials/Hello_SUMO.md b/docs/web/docs/Tutorials/Hello_SUMO.md index 1e860213f493..bac612f8fab2 100644 --- a/docs/web/docs/Tutorials/Hello_SUMO.md +++ b/docs/web/docs/Tutorials/Hello_SUMO.md @@ -58,7 +58,7 @@ Make sure [netconvert](../netconvert.md) is somewhere in your `PATH` and call ``` -netconvert --node-files=hello.nod.xml --edge-files=hello.edg.xml --output-file=hello.net.xml +netconvert --node-files=hello.nod.xml --edge-files=hello.edg.xml --output-file=hello.net.xml ``` This will generate our network called `hello.net.xml`. @@ -109,13 +109,13 @@ Now we glue everything together into a configuration file Saving this to `hello.sumocfg` we can start the simulation by either ``` -sumo -c hello.sumocfg +sumo -c hello.sumocfg ``` or with GUI by ``` -sumo-gui -c hello.sumocfg +sumo-gui -c hello.sumocfg ``` When simulating with GUI it's useful to add a gui-settings file, so you diff --git a/docs/web/docs/Tutorials/HighwayDetector.md b/docs/web/docs/Tutorials/HighwayDetector.md index 12f2f430ecd1..205ead2a4e88 100644 --- a/docs/web/docs/Tutorials/HighwayDetector.md +++ b/docs/web/docs/Tutorials/HighwayDetector.md @@ -42,7 +42,7 @@ network. A starting point can be to use the python sumolib to match the positions to the network: ```python -if 'SUMO_HOME' in os.environ: +if 'SUMO_HOME' in os.environ: sys.path.append(os.path.join(os.environ["SUMO_HOME"], 'tools')) import sumolib @@ -113,7 +113,7 @@ must be given, while speed data is optional. All data is saved in csv format. ``` -Detector_id;Time(minutes);Number_of_passenger_cars;Number_of_trucks;Average_speed_of passenger_cars;Average_speed_of_trucks +Detector_id;Time(minutes);Number_of_passenger_cars;Number_of_trucks;Average_speed_of passenger_cars;Average_speed_of_trucks ``` ## Determining the routes @@ -128,7 +128,7 @@ specify detectors and flows respectively. The type of the detectors given detector file. As an example the script can be executed as ``` -tools/detector/flowrouter.py -n net.net.xml -d detector.det.xml -f flow.csv` +tools/detector/flowrouter.py -n net.net.xml -d detector.det.xml -f flow.csv` ``` Moreover, there are options, which are not available in @@ -144,7 +144,7 @@ options and the respective definitions can be found at [dfrouter](../dfrouter.md). As an example the execution call is ``` -dfrouter -n net.net.xml -d detectors.det.xml -f flows.csv -o routes.rou.xml` +dfrouter -n net.net.xml -d detectors.det.xml -f flows.csv -o routes.rou.xml` ``` Moreover, it is also possible to set up a configuration file with use of @@ -166,7 +166,7 @@ latter one is based on SUMO's aggregated outputs. The script can be executed as following: ``` -tools/detector/flowFromEdgeData.py -d detectors.det.xml -e edgeData.xml -f detector_flows.xml -c flow_column` +tools/detector/flowFromEdgeData.py -d detectors.det.xml -e edgeData.xml -f detector_flows.xml -c flow_column` ``` , where `detectors.det.xml` mainly defines the relationship between @@ -185,7 +185,7 @@ according to the pre-defined emitted flows and routes. The basic execution call is as following: ``` -tools/detector/flowFromRoutes.py -d detectors.det.xml -e emitters.flows.xml -f detector_flows.txt -r routes.rou.xml` +tools/detector/flowFromRoutes.py -d detectors.det.xml -e emitters.flows.xml -f detector_flows.txt -r routes.rou.xml` ``` , where `emitters.flows.xml` defines the route flows; `detector_flows.txt` diff --git a/docs/web/docs/Tutorials/Manhattan.md b/docs/web/docs/Tutorials/Manhattan.md index b2c5cc902331..de06a508bbf3 100644 --- a/docs/web/docs/Tutorials/Manhattan.md +++ b/docs/web/docs/Tutorials/Manhattan.md @@ -21,7 +21,7 @@ for this tutorial are written in a configuration file. The network is created by calling ``` -netgenerate -c manhattan/data/manhattan.netgcfg +netgenerate -c manhattan/data/manhattan.netgcfg ``` # Generating vehicles @@ -39,9 +39,9 @@ used to generated suitable randomFlows with the following options. If the **--tr is not recognized correctly, try using double quotes around the option value and escape double quotes inside. ``` - /tools/randomTrips.py -n net.net.xml -o flows.xml --begin 0 --end 1 \ -       --flows 100 --jtrrouter \ -       --trip-attributes 'departPos="random" departSpeed="max"' + /tools/randomTrips.py -n net.net.xml -o flows.xml --begin 0 --end 1 \ + --flows 100 --jtrrouter \ + --trip-attributes 'departPos="random" departSpeed="max"' ``` The option **--flows 100** defines the number of vehicles that shall drive in the @@ -69,7 +69,7 @@ All options for this tutorial are written in a configuration file. The vehicles are created by calling ``` -jtrrouter -c manhattan/data/manhattan.jtrrcfg +jtrrouter -c manhattan/data/manhattan.jtrrcfg ``` ## Remarks on Vehicle number diff --git a/docs/web/docs/Tutorials/OSMWebWizard.md b/docs/web/docs/Tutorials/OSMWebWizard.md index 93e37febc327..ecf093b984da 100644 --- a/docs/web/docs/Tutorials/OSMWebWizard.md +++ b/docs/web/docs/Tutorials/OSMWebWizard.md @@ -25,7 +25,7 @@ the OSM Web wizard by invoking the following command in the *tools* directory: ``` -python osmWebWizard.py +python osmWebWizard.py ``` Windows users may also invoke the command by clicking *All Programs -\> @@ -135,17 +135,17 @@ directory *\~/SUMO/yyyy-mm-dd-hh-mm-ss* will be created to host the data. The contents of the directory look like this: ``` -   ➜  2016-10-17-14-54-30 ls -   build.bat                  osm.net.xml                osm.rail.rou.alt.xml       osm.tram.rou.alt.xml -   osm.bicycle.rou.alt.xml    osm.netccfg                osm.rail.rou.xml           osm.tram.rou.xml -   osm.bicycle.rou.xml        osm.passenger.rou.alt.xml  osm.rail.trips.xml         osm.tram.trips.xml -   osm.bicycle.trips.xml      osm.passenger.rou.xml      osm.rail_urban.rou.alt.xml osm.truck.rou.alt.xml -   osm.bus.rou.alt.xml        osm.passenger.trips.xml    osm.rail_urban.rou.xml     osm.truck.rou.xml -   osm.bus.rou.xml            osm.pedestrian.rou.alt.xml osm.rail_urban.trips.xml   osm.truck.trips.xml -   osm.bus.trips.xml          osm.pedestrian.rou.xml     osm.ship.rou.alt.xml       osm.view.xml -   osm.motorcycle.rou.alt.xml osm.pedestrian.trips.xml   osm.ship.rou.xml           osm_bbox.osm.xml -   osm.motorcycle.rou.xml     osm.poly.xml               osm.ship.trips.xml         run.bat -   osm.motorcycle.trips.xml   osm.polycfg                osm.sumocfg + ➜ 2016-10-17-14-54-30 ls + build.bat osm.net.xml osm.rail.rou.alt.xml osm.tram.rou.alt.xml + osm.bicycle.rou.alt.xml osm.netccfg osm.rail.rou.xml osm.tram.rou.xml + osm.bicycle.rou.xml osm.passenger.rou.alt.xml osm.rail.trips.xml osm.tram.trips.xml + osm.bicycle.trips.xml osm.passenger.rou.xml osm.rail_urban.rou.alt.xml osm.truck.rou.alt.xml + osm.bus.rou.alt.xml osm.passenger.trips.xml osm.rail_urban.rou.xml osm.truck.rou.xml + osm.bus.rou.xml osm.pedestrian.rou.alt.xml osm.rail_urban.trips.xml osm.truck.trips.xml + osm.bus.trips.xml osm.pedestrian.rou.xml osm.ship.rou.alt.xml osm.view.xml + osm.motorcycle.rou.alt.xml osm.pedestrian.trips.xml osm.ship.rou.xml osm_bbox.osm.xml + osm.motorcycle.rou.xml osm.poly.xml osm.ship.trips.xml run.bat + osm.motorcycle.trips.xml osm.polycfg osm.sumocfg ``` You may now edit those files and re-run the simulation. To learn more diff --git a/docs/web/docs/Tutorials/Output_Parsing.md b/docs/web/docs/Tutorials/Output_Parsing.md index e72c83eb7a71..ada3d9a9f246 100644 --- a/docs/web/docs/Tutorials/Output_Parsing.md +++ b/docs/web/docs/Tutorials/Output_Parsing.md @@ -27,10 +27,10 @@ circles so we set up four nodes at the corners as follows -     -     -     -     + + + + ``` @@ -42,7 +42,7 @@ type in a separate file (`circular.typ.xml`): -     + ``` @@ -52,17 +52,17 @@ Finally we define the edges connecting the nodes (`circular.edg.xml`): -     -     -     -     + + + + ``` The netconvert call is very straightforward ``` -netconvert -n circular.nod.xml -t circular.typ.xml -e circular.edg.xml -o circular.net.xml +netconvert -n circular.nod.xml -t circular.typ.xml -e circular.edg.xml -o circular.net.xml ``` In order to simplify the resulting net (and get the highest speed out of @@ -76,20 +76,20 @@ netconvert configuration file is as follows (`circular.netccfg`): -    -        -        -        -    + + + + + -        + -    -        -        -    + + + + ``` @@ -97,13 +97,13 @@ netconvert configuration file is as follows (`circular.netccfg`): Call netconvert again using this configuration file: ``` -netconvert -c circular.netcfg +netconvert -c circular.netcfg ``` Try ``` -sumo-gui -n circular.net.xml +sumo-gui -n circular.net.xml ``` for a look at the final network. @@ -117,8 +117,8 @@ Next, we define routes and traffic flows. Open a new file called `circular.rou.x -     -     + + ``` @@ -126,24 +126,24 @@ For further details, see the [vehicle type attributes description](../Definition Since our network's edges are uni-directional, we want to define corresponding circular routes, i.e., counter-clockwise, as follows: ```xml -     -     -     -     + + + + ``` Add these lines just before the closing `` element. More information on defining your own routes can be found [here](../Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md#routes). Finally, we define traffic flows on these routes. For each route, we want a flow for cars as well as for trucks: ```xml -     -     -     -     -     -     -     -     + + + + + + + + ``` These lines can be inserted just after the route definitions. More on the attributes of the `flow` element can be found [here](../Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md#repeated_vehicles_flows). @@ -158,16 +158,16 @@ Thus, we create a file called `circular.add.xml` which defines a [rerouter](../S -     -         -             -         -     -     -         -             -         -     + + + + + + + + + + ``` @@ -179,19 +179,19 @@ With all input files (network, routes, rerouters) completed, we can create a SUM -     -         + + -     + -         + -     + ``` diff --git a/docs/web/docs/Tutorials/PT_from_OpenStreetMap.md b/docs/web/docs/Tutorials/PT_from_OpenStreetMap.md index 2adcc4fa88e6..882a458309da 100644 --- a/docs/web/docs/Tutorials/PT_from_OpenStreetMap.md +++ b/docs/web/docs/Tutorials/PT_from_OpenStreetMap.md @@ -24,8 +24,8 @@ In the first step PT stops and line information will be extracted. The step is performed by invoking netconvert as follows ``` -netconvert --osm-files osm.xml -o net.net.xml --osm.stop-output.length 20  - --ptstop-output additional.xml --ptline-output ptlines.xml +netconvert --osm-files osm.xml -o net.net.xml --osm.stop-output.length 20 + --ptstop-output additional.xml --ptline-output ptlines.xml ``` , where @@ -56,8 +56,8 @@ beyond the scope of this tutorial. The steps are performed by invoking the *ptlines2flows.py* script as follows ``` -python tools/ptlines2flows.py -n net.net.xml -s additional.xml -l ptlines.xml  - -o flows.rou.xml -p 600 --use-osm-routes +python tools/ptlines2flows.py -n net.net.xml -s additional.xml -l ptlines.xml + -o flows.rou.xml -p 600 --use-osm-routes ``` , where diff --git a/docs/web/docs/Tutorials/Plotting_Cookbook.md b/docs/web/docs/Tutorials/Plotting_Cookbook.md index a2c2fdc7f4ca..f0d6659f624c 100644 --- a/docs/web/docs/Tutorials/Plotting_Cookbook.md +++ b/docs/web/docs/Tutorials/Plotting_Cookbook.md @@ -16,7 +16,7 @@ If Your [summary-output](../Simulation/Output/Summary.md) is named "summary.xml", You may show the number of running vehicles using ``` -python plot_summary.py -i summary.xml +python plot_summary.py -i summary.xml ``` as `running`, the measurement You want to @@ -36,8 +36,8 @@ using **--xlim 0,86400** and we also save the figure into the file the file names in the legend by the week day types using **-l Mo,Di-Do,Fr,Sa,So**. ``` -python plot_summary.py -i mo\summary.xml,dido\summary.xml,fr\summary.xml,sa\summary.xml,so\summary.xml \ - -l Mo,Di-Do,Fr,Sa,So -o summary_running_all.png --xlim 0,86400 +python plot_summary.py -i mo\summary.xml,dido\summary.xml,fr\summary.xml,sa\summary.xml,so\summary.xml \ + -l Mo,Di-Do,Fr,Sa,So -o summary_running_all.png --xlim 0,86400 ``` ![summary_running_all.png](../images/Summary_running_all.png @@ -48,10 +48,10 @@ ticks, using a different format for the simulation time than seconds, etc. ``` -python plot_summary.py -i mo\summary.xml,dido\summary.xml,fr\summary.xml,sa\summary.xml,so\summary.xml \ - -l Mo,Di-Do,Fr,Sa,So --xlim 0,86400 --ylim 0,10000 -o sumodocs/summary_running.png --yticks 0,10001,2000,14 \ - --xticks 0,86401,14400,14 --xtime1 --ygrid --ylabel "running vehicles [#]" --xlabel "time" \ - --title "running vehicles over time" --adjust .14,.1 +python plot_summary.py -i mo\summary.xml,dido\summary.xml,fr\summary.xml,sa\summary.xml,so\summary.xml \ + -l Mo,Di-Do,Fr,Sa,So --xlim 0,86400 --ylim 0,10000 -o sumodocs/summary_running.png --yticks 0,10001,2000,14 \ + --xticks 0,86401,14400,14 --xtime1 --ygrid --ylabel "running vehicles [#]" --xlabel "time" \ + --title "running vehicles over time" --adjust .14,.1 ``` ![summary_running.png](../images/Summary_running.png "summary_running.png") diff --git a/docs/web/docs/Tutorials/Quick_Start_old_style.md b/docs/web/docs/Tutorials/Quick_Start_old_style.md index 0e21d464411e..59262fd767a6 100644 --- a/docs/web/docs/Tutorials/Quick_Start_old_style.md +++ b/docs/web/docs/Tutorials/Quick_Start_old_style.md @@ -342,7 +342,7 @@ In our example, the network file *quickstart.net.xml* will be generated by executing the following command in the command line ``` -netconvert –c quickstart.netccfg +netconvert –c quickstart.netccfg ``` The generated network file can be viewed with the use of @@ -490,7 +490,7 @@ example network the respective configuration file is shown in Listing the following command. ``` -sumo –c quickstart.sumocfg +sumo –c quickstart.sumocfg ``` **Listing 1.7 Configuration file for the traffic simulation of the diff --git a/docs/web/docs/Tutorials/SUMOlympics.md b/docs/web/docs/Tutorials/SUMOlympics.md index a687be2e1afd..2ec4ac0a215a 100644 --- a/docs/web/docs/Tutorials/SUMOlympics.md +++ b/docs/web/docs/Tutorials/SUMOlympics.md @@ -89,8 +89,8 @@ For each vehicle type, we schedule and position vehicle flows by adding the foll vType definitions (within the `` element!): ```xml -        ... -     + ... + @@ -98,7 +98,7 @@ vType definitions (within the `` element!): -        ... + ... ``` Notice that the pedestrian flow (represented by the `personFlow` element above) has a slightly different syntax, the reason for this is that pedestrians can walk or take a ride (use public transport for instance), and these different activities need to be communicated to [sumo](../sumo.md). For details on the meaning of the attributes of the flows, see the @@ -123,13 +123,13 @@ Finally, to prepare the simulation, create a SUMO configuration file (name it ```xml -    -        -        -    -    -     -    + + + + + + + ``` diff --git a/docs/web/docs/Tutorials/ScenarioGuide.md b/docs/web/docs/Tutorials/ScenarioGuide.md index 13ea2aa616cf..3507481c4a75 100644 --- a/docs/web/docs/Tutorials/ScenarioGuide.md +++ b/docs/web/docs/Tutorials/ScenarioGuide.md @@ -90,13 +90,13 @@ patch.nod.xml : and patch the network like this: ``` -netconvert --sumo-net-file your.net.xml --node-files patch.nod.xml -o yourpatched.net.xml +netconvert --sumo-net-file your.net.xml --node-files patch.nod.xml -o yourpatched.net.xml ``` or perform the patch during the initial import: ``` -netconvert --osm-file yourOSMfile.xml --node-files patch.nod.xml ... +netconvert --osm-file yourOSMfile.xml --node-files patch.nod.xml ... ``` ### Modifying an imported network via plain.xml @@ -106,13 +106,13 @@ network to plain.xml, modify the plain file and then re-assemble the network like this: ``` -netconvert --sumo-net-file your.net.xml --plain-output-prefix yourplain +netconvert --sumo-net-file your.net.xml --plain-output-prefix yourplain ``` or during import: ``` -netconvert --osm-files yourOSMinput.xml --plain-output-prefix yourplain ...  +netconvert --osm-files yourOSMinput.xml --plain-output-prefix yourplain ... ``` This will give you the files: @@ -128,13 +128,13 @@ You can edit these files and then reassemble the network by loading some or all of them: ``` -netconvert --edge-files yourplain.edg.xml --node-files yourplain.nod.xml -o new.net.xml +netconvert --edge-files yourplain.edg.xml --node-files yourplain.nod.xml -o new.net.xml ``` or ``` -netconvert --edge-files yourplain.edg.xml --node-files yourplain.nod.xml --connection-files yourplain.con.xml -o new.net.xml +netconvert --edge-files yourplain.edg.xml --node-files yourplain.nod.xml --connection-files yourplain.con.xml -o new.net.xml ``` !!! note diff --git a/docs/web/docs/Tutorials/TraCI4Traffic_Lights.md b/docs/web/docs/Tutorials/TraCI4Traffic_Lights.md index fcd6e17d64de..c771307fc2ef 100644 --- a/docs/web/docs/Tutorials/TraCI4Traffic_Lights.md +++ b/docs/web/docs/Tutorials/TraCI4Traffic_Lights.md @@ -39,7 +39,7 @@ To run the example you need to execute the script *runner.py* with python ``` -python runner.py +python runner.py ``` !!! caution diff --git a/docs/web/docs/Tutorials/TraCIPedCrossing.md b/docs/web/docs/Tutorials/TraCIPedCrossing.md index bf5c007db626..5bd549589422 100644 --- a/docs/web/docs/Tutorials/TraCIPedCrossing.md +++ b/docs/web/docs/Tutorials/TraCIPedCrossing.md @@ -30,7 +30,7 @@ To run the example you need to execute the script *runner.py* with python ``` -python runner.py +python runner.py ``` !!! caution @@ -57,10 +57,10 @@ The definition below is taken from ```xml -   -   -   -   + + + + ``` @@ -90,8 +90,8 @@ specific to pedestrian simulation. In the script *runner.py* these are defined as ``` -WALKINGAREAS = [':C_w0', ':C_w1'] -CROSSINGS = [':C_c0'] +WALKINGAREAS = [':C_w0', ':C_w1'] +CROSSINGS = [':C_c0'] ``` For a description of pedestrian network elements see diff --git a/docs/web/docs/Tutorials/Trace_File_Generation.md b/docs/web/docs/Tutorials/Trace_File_Generation.md index 5379eaffb442..d7589241bb75 100644 --- a/docs/web/docs/Tutorials/Trace_File_Generation.md +++ b/docs/web/docs/Tutorials/Trace_File_Generation.md @@ -26,7 +26,7 @@ We assume that you have the scenario and a configuration file named be able to start SUMO using your configuration like this: ``` -sumo -c myConfig.sumocfg +sumo -c myConfig.sumocfg ``` Now, we use the simulation to get an [fcd @@ -37,7 +37,7 @@ of the applications supported by [fcd output](../Simulation/Output/FCDOutput.md) as follows: ``` -sumo -c myConfig.sumocfg --fcd-output sumoTrace.xml +sumo -c myConfig.sumocfg --fcd-output sumoTrace.xml ``` Through this method, we obtain the file "sumoTrace.xml". @@ -50,7 +50,7 @@ file. We can generate one from the obtained [fcd output](../Simulation/Output/FCDOutput.md) using: ``` -traceExporter.py --fcd-input sumoTrace.xml --ns2mobility-output ns2mobility.tcl +traceExporter.py --fcd-input sumoTrace.xml --ns2mobility-output ns2mobility.tcl ``` We obtain the file "ns2mobility.tcl", which we can give ns2 as input. @@ -73,8 +73,8 @@ of vehicles that are exported, where 1 is equal to 100 %. This means, if You want to have 10 % of vehicles to show up in Your ns2-trace, use: ``` -traceExporter.py --penetration 0.1 \ - --fcd-input sumoTrace.xml --ns2-mobilityoutput ns2mobility.tcl +traceExporter.py --penetration 0.1 \ + --fcd-input sumoTrace.xml --ns2-mobilityoutput ns2mobility.tcl ``` The **--seed** {{DT_FLOAT}} allows you to give different random number initialisations for diff --git a/docs/web/docs/Tutorials/quick_start.md b/docs/web/docs/Tutorials/quick_start.md index 1422ad4bbab5..f08cdfa96a28 100644 --- a/docs/web/docs/Tutorials/quick_start.md +++ b/docs/web/docs/Tutorials/quick_start.md @@ -351,7 +351,7 @@ Listing 1.7 and the traffic simulation can then be carried out with the use of the following command: ``` -sumo –c quickstart.sumocfg +sumo –c quickstart.sumocfg ``` ### sumo-gui diff --git a/docs/web/docs/netconvert.md b/docs/web/docs/netconvert.md index 3e2a2c11cf85..4671a16a80fd 100644 --- a/docs/web/docs/netconvert.md +++ b/docs/web/docs/netconvert.md @@ -24,13 +24,13 @@ parameter value. So, for importing a network from OpenStreetMap one could simply write: ``` -netconvert --osm my_osm_net.xml +netconvert --osm my_osm_net.xml ``` and for importing a VISUM-network: ``` -netconvert --visum my_visum_net.net +netconvert --visum my_visum_net.net ``` In both cases, as no output name is given, the SUMO network generated @@ -40,7 +40,7 @@ the imported VISUM-network into a file named "my_sumo_net.net.xml", write: ``` -netconvert --visum my_visum_net.net -o my_sumo_net.net.xml +netconvert --visum my_visum_net.net -o my_sumo_net.net.xml ``` Many further parameter steer how the network is imported and how the diff --git a/docs/web/docs/polyconvert.md b/docs/web/docs/polyconvert.md index 5f0e3c0ef577..f4f3c1a14ea6 100644 --- a/docs/web/docs/polyconvert.md +++ b/docs/web/docs/polyconvert.md @@ -31,7 +31,7 @@ the type name is used as option name and the value indicates the position of the file. So ``` -polyconvert --visum mynet.net -o converted.poi.xml +polyconvert --visum mynet.net -o converted.poi.xml ``` imports from a VISUM-net file. diff --git a/docs/web/docs/sumo.md b/docs/web/docs/sumo.md index 6af1cb19d788..9e069c0048c4 100644 --- a/docs/web/docs/sumo.md +++ b/docs/web/docs/sumo.md @@ -643,12 +643,12 @@ The additional file always needs a top level tag with arbitrary name ```xml -     -     + + -     + -     + ``` From 294fd8e8dc21cda9ef36954e14a447b62a3a20aa Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Tue, 10 Sep 2024 15:54:03 +0200 Subject: [PATCH 41/41] Updated writeDemandElement() functions. Refs #15368 --- src/netedit/elements/demand/GNERide.cpp | 4 ++++ src/netedit/elements/demand/GNETranship.cpp | 1 + 2 files changed, 5 insertions(+) diff --git a/src/netedit/elements/demand/GNERide.cpp b/src/netedit/elements/demand/GNERide.cpp index fbc8eddc7108..e806cfe58769 100644 --- a/src/netedit/elements/demand/GNERide.cpp +++ b/src/netedit/elements/demand/GNERide.cpp @@ -78,6 +78,10 @@ GNERide::writeDemandElement(OutputDevice& device) const { if (myLines.size() > 0) { device.writeAttr(SUMO_ATTR_LINES, myLines); } + // group + if (myGroup.size() > 0) { + device.writeAttr(SUMO_ATTR_GROUP, myGroup); + } device.closeTag(); } diff --git a/src/netedit/elements/demand/GNETranship.cpp b/src/netedit/elements/demand/GNETranship.cpp index b69a7725fdb8..cab7f8112e2a 100644 --- a/src/netedit/elements/demand/GNETranship.cpp +++ b/src/netedit/elements/demand/GNETranship.cpp @@ -75,6 +75,7 @@ GNETranship::writeDemandElement(OutputDevice& device) const { writeOriginStop(device); // write rest of attributes device.openTag(SUMO_TAG_TRANSHIP); + writeLocationAttributes(device); // speed if (toString(mySpeed) != myTagProperty.getDefaultValue(SUMO_ATTR_SPEED)) { device.writeAttr(SUMO_ATTR_SPEED, mySpeed);