diff --git a/data/po/it_sumo.po b/data/po/it_sumo.po index bfa03b14762f..9b81ed3b1a31 100644 --- a/data/po/it_sumo.po +++ b/data/po/it_sumo.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: sumo\n" "Report-Msgid-Bugs-To: sumo-dev@eclipse.org\n" "POT-Creation-Date: 2024-11-04 13:13+0100\n" -"PO-Revision-Date: 2024-11-12 08:57+0000\n" +"PO-Revision-Date: 2024-11-28 08:55+0000\n" "Last-Translator: Mirko Barthauer \n" "Language-Team: Italian \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 5.8.2\n" +"X-Generator: Weblate 5.9-dev\n" #: src/activitygen/AGActivityGen.cpp:46 msgid "Reading input" @@ -675,68 +675,80 @@ msgstr "" #: src/duarouter/RODUAFrame.cpp:142 src/marouter/ROMAFrame.cpp:202 msgid "Choose a route choice method: gawron, logit, or lohse" -msgstr "" +msgstr "Scegli un metodo di scelta di itinerari: gawron, logit o lohse" #: src/duarouter/RODUAFrame.cpp:145 msgid "Use c-logit model (deprecated in favor of --route-choice-method logit)" msgstr "" +"Usa il modello c-logit (diventato obsoleto con --route-choice-method logit)" #: src/duarouter/RODUAFrame.cpp:149 msgid "Use FLOAT as logit's beta" -msgstr "" +msgstr "Usa FLOAT come beta di logit" #: src/duarouter/RODUAFrame.cpp:153 msgid "Use FLOAT as logit's gamma" -msgstr "" +msgstr "Usa FLOAT come gamma di logit" #: src/duarouter/RODUAFrame.cpp:157 msgid "Use FLOAT as logit's theta (negative values mean auto-estimation)" msgstr "" +"Usa FLOAT come theta di logit (valori negativi provocano una estimazione " +"automatica)" #: src/duarouter/RODUAFrame.cpp:160 src/microsim/MSFrame.cpp:647 msgid "" "Use FLOAT as a factor on pedestrian maximum speed during intermodal routing" msgstr "" +"Usa FLOAT come fattore della velocità pedonale massima durante " +"l'instradamento intermodale" #: src/duarouter/RODUAFrame.cpp:163 src/microsim/MSFrame.cpp:650 msgid "" "Use FLOAT as a factor on walking speed against vehicle traffic direction" msgstr "" +"Usa FLOAT come fattore della velocità pedonale camminando contro la " +"direzione del traffico veicolare" #: src/duarouter/RODUAFrame.cpp:170 src/microsim/MSFrame.cpp:657 msgid "Where taxis can drop off customers ('allJunctions, 'ptStops')" msgstr "" +"Dove i taxi possono far scendere i passeggeri ('allJunctions', 'ptStops')" #: src/duarouter/RODUAFrame.cpp:173 src/microsim/MSFrame.cpp:660 msgid "Where taxis can pick up customers ('allJunctions, 'ptStops')" -msgstr "" +msgstr "Dove i taxi possono far salire passeggeri ('allJunctions, 'ptStops')" #: src/duarouter/RODUAFrame.cpp:176 src/microsim/MSFrame.cpp:666 msgid "Estimated time for taxi pickup" -msgstr "" +msgstr "Durata estimata per la salita dei passeggeri sul taxi" #: src/duarouter/RODUAFrame.cpp:179 src/microsim/MSFrame.cpp:669 msgid "" "Use FLOAT as a maximum train length when initializing the railway router" msgstr "" +"Usa FLOAT come lunghezza massima dei treni nell'avvio dell'instradamento " +"ferrioviario" #: src/duarouter/RODUAFrame.cpp:216 msgid "Routing algorithm '%' does not support weight-attribute '%'." msgstr "" +"L'algoritmo di instradamento '%' non permette l'uso dell'attributo di peso " +"'%'." #: src/duarouter/RODUAFrame.cpp:220 #, c-format msgid "Routing algorithm '%' does not support bulk routing." -msgstr "" +msgstr "L'algoritmo di instradamento '%' non permette instradamento massivo." #: src/duarouter/RODUAFrame.cpp:228 src/marouter/ROMAFrame.cpp:243 msgid "Invalid route choice method '%'." -msgstr "" +msgstr "Metodo di scelta di itinerario invalido '%'." #: src/duarouter/RODUAFrame.cpp:232 msgid "" "The --logit option is deprecated, please use --route-choice-method logit." -msgstr "" +msgstr "L'opzione --logit è obsoleta, va usato --route-choice-method logit." #: src/duarouter/RODUAFrame.cpp:244 msgid "Cannot derive file name for alternatives output, skipping it." @@ -755,11 +767,11 @@ msgstr "" #: src/duarouter/duarouter_main.cpp:152 src/marouter/marouter_main.cpp:180 msgid "Unknown routing Algorithm '%'!" -msgstr "" +msgstr "Algoritmo di instradamento sconosciuto '%'!" #: src/duarouter/duarouter_main.cpp:179 src/marouter/marouter_main.cpp:210 msgid "No weight data was loaded for attribute '%'." -msgstr "" +msgstr "I dati di peso non sono stati caricati per l'attributo '%'." #: src/duarouter/duarouter_main.cpp:216 msgid "" @@ -770,35 +782,35 @@ msgstr "" #: src/jtrrouter/ROJTREdge.cpp:64 #, c-format msgid "The edges '%' and '%' are not connected." -msgstr "" +msgstr "Gli archi '%' e '%' non sono connessi." #: src/jtrrouter/ROJTRFrame.cpp:59 msgid "Read turning ratios from FILE(s)" -msgstr "" +msgstr "Leggi quote di svolta da uno o più FILE" #: src/jtrrouter/ROJTRFrame.cpp:69 msgid "Use STR[] as default turn definition" -msgstr "" +msgstr "Usa STR[] come definizione di svolta standard" #: src/jtrrouter/ROJTRFrame.cpp:73 msgid "Use STR[] as list of sink edges" -msgstr "" +msgstr "Usa STR[] come elenco di archi di scarico" #: src/jtrrouter/ROJTRFrame.cpp:76 msgid "Whether all edges are allowed as sink edges" -msgstr "" +msgstr "Se tutti gli archi possono essere usati come scarico" #: src/jtrrouter/ROJTRFrame.cpp:79 msgid "Ignore road restrictions based on vehicle class" -msgstr "" +msgstr "Ignora restrizioni basate su la classe di veicolo" #: src/jtrrouter/ROJTRFrame.cpp:82 msgid "Allow to re-use a road" -msgstr "" +msgstr "Permetti di riutilizzare una via" #: src/jtrrouter/ROJTRFrame.cpp:85 msgid "Use all source edges as sink edges." -msgstr "" +msgstr "Utilizza tutti gli archi di sorgente anche come archi di scarico." #: src/jtrrouter/ROJTRFrame.cpp:88 msgid "" @@ -5522,19 +5534,21 @@ msgstr "" #: src/netbuild/NBAlgorithms_Railway.cpp:381 msgid "Found % bidirectional rail edges" -msgstr "" +msgstr "Trovati % archi ferroviari bidirezionali" #: src/netbuild/NBAlgorithms_Railway.cpp:407 msgid "Found % railway edges and % railway nodes (% signals)." -msgstr "" +msgstr "Trovati % archi ferroviari e % nodi ferrovioari (% segnali)." #: src/netbuild/NBAlgorithms_Railway.cpp:524 msgid "Added % bidi-edges as extension of existing bidi edges." msgstr "" +"% archi bidirezionali sono stati aggiunti come estensione di archi " +"bidirezionali preesistenti." #: src/netbuild/NBAlgorithms_Railway.cpp:535 msgid "Could not find bidi-edge for edge '%'" -msgstr "" +msgstr "Non ho potuto trovare l'arco bidirezionale per l'arco '%'" #: src/netbuild/NBAlgorithms_Railway.cpp:640 msgid "Found % reversible edge sequences between broken rail nodes" @@ -5603,7 +5617,7 @@ msgstr "% segnali ferroviari sono stati aggiunti a % fermate." #: src/netbuild/NBAlgorithms_Railway.cpp:1496 msgid "Could not straighten corridor %." -msgstr "" +msgstr "Non ho potuto appianare il corridoio %." #: src/netbuild/NBAlgorithms_Railway.cpp:1501 msgid "Moved % rail junctions for straightening % corridors." @@ -11478,20 +11492,21 @@ msgstr "Inizia il generatore di numeri casuali con il valore dato" #: src/utils/common/SUMOVehicleClass.cpp:199 msgid "Simultaneous specification of vClasses and exceptions is not allowed" msgstr "" +"Non si possono specificare classi di veicoli e eccezioni allo stesso tempo" #: src/utils/common/SUMOVehicleClass.cpp:203 msgid "StopOffset requires an offset value" -msgstr "" +msgstr "StopOffset richiede un valore di spostamento" #: src/utils/common/SUMOVehicleClass.cpp:354 #, c-format msgid "Unknown vehicle class '%' ignored." -msgstr "" +msgstr "Ignorata classe di veicoli sconosciuta '%'." #: src/utils/common/SUMOVehicleClass.cpp:356 #, c-format msgid "Unknown vehicle class '%' encountered." -msgstr "" +msgstr "Incontrata classe di veicoli sconosciuta '%'." #: src/utils/common/SUMOVehicleClass.cpp:398 msgid "" @@ -11502,15 +11517,15 @@ msgstr "" #: src/utils/common/SUMOVehicleClass.cpp:438 #, c-format msgid "The vehicle class '%' is deprecated, use '%' instead." -msgstr "" +msgstr "La classe di veicoli '%' non si usa più - invece scegli '%'." #: src/utils/common/SystemFrame.cpp:43 msgid "Loads the named config on startup" -msgstr "" +msgstr "Carica la configurazione indicata all'inizio" #: src/utils/common/SystemFrame.cpp:48 msgid "Saves current configuration into FILE" -msgstr "" +msgstr "Salva la configurazione attuale in FILE" #: src/utils/common/SystemFrame.cpp:52 msgid "Enforce relative paths when saving the configuration" @@ -12585,18 +12600,20 @@ msgstr "" #: src/utils/xml/GenericHandler.cpp:83 src/utils/xml/GenericSAXHandler.cpp:105 msgid "Found root element '%' in file '%' (expected '%')." msgstr "" +"L'elemento radice '%' è stato trovato nel file '%' (invece di quello " +"aspettato '%')." #: src/utils/xml/GenericSAXHandler.cpp:209 msgid " In file '" -msgstr "" +msgstr " In file '" #: src/utils/xml/GenericSAXHandler.cpp:210 msgid " At line/column " -msgstr "" +msgstr " In linea/colonna " #: src/utils/xml/SAXWeightsHandler.cpp:145 msgid "Missing value '%' in edge '%'." -msgstr "" +msgstr "Valore mancante '%' nell'arco '%'." #: src/utils/xml/SUMOSAXReader.cpp:110 src/utils/xml/SUMOSAXReader.cpp:136 msgid "Cannot read file '%'!" @@ -12605,7 +12622,7 @@ msgstr "" #: src/utils/xml/SUMOSAXReader.cpp:113 src/utils/xml/SUMOSAXReader.cpp:139 #, c-format msgid "File '%' is a directory!" -msgstr "" +msgstr "File '%' è una cartella!" #: src/utils/xml/SUMOSAXReader.cpp:156 src/utils/xml/SUMOSAXReader.cpp:165 msgid "The XML-parser was not initialized." diff --git a/docs/web/docs/Developer/HowToRelease.md b/docs/web/docs/Developer/HowToRelease.md index 7ff36e8261eb..ad1a87a9e6ae 100644 --- a/docs/web/docs/Developer/HowToRelease.md +++ b/docs/web/docs/Developer/HowToRelease.md @@ -130,8 +130,7 @@ If everything is fine: - make new sumo.dlr.de-release - copy the folder from S:\Releases to the releases dir `scp -r /media/S/Releases/x.y.z delphi@ts-sim-front-ba.intra.dlr.de:docs/releases` - update the eclipse.dev/sumo website - - modify the version number (Version) and the DOI number (DOI) [in config.yaml](https://github.com/eclipse-sumo/sumo.website/blob/main/src/config/_default/config.yaml) in the **Default Parameters** section - - generate the static files `cd src && hugo -d ../` and commit them + - modify the version number (Version) and the DOI number (DOI) [in config.yaml](https://github.com/eclipse-sumo/sumo.website/blob/source/config/_default/config.yaml) in the **Default Parameters** section - make new sourceforge-release - make a new release within the sumo package (named "version x.y.z") - add files to the release diff --git a/docs/web/docs/Simulation/Output/TripInfo.md b/docs/web/docs/Simulation/Output/TripInfo.md index 22526b2e98fc..1c10aa0839e9 100644 --- a/docs/web/docs/Simulation/Output/TripInfo.md +++ b/docs/web/docs/Simulation/Output/TripInfo.md @@ -111,7 +111,7 @@ This adds the following line: ```xml - + ... information about further vehicles ... @@ -120,9 +120,12 @@ This adds the following line: with the attributes as following -| Name | Type | Description | -| ------------ | ---- | ---------------------------------------------------------------------------------- | -| `depleted` | - | The times the vehicle wanted to consume more energy than the battery could provide | +| Name | Type | Description | +| ------------------------- | ---- | ----------------------------------------------------------------------------------- | +| `depleted` | - | The times the vehicle wanted to consume more energy than the battery could provide | +| `actualBatteryCapacity` | Wh | Battery capacity of the vehicle after completing its route | +| `totalEnergyConsumed` | Wh | Cumulative sum of energy consumption after completing the route | +| `totalEnergyRegenerated` | Wh | Cumulative sum of regenerated energy after completing the route | ## Output for vehicles that have not arrived at simulation end diff --git a/src/guisim/GUIVehicle.cpp b/src/guisim/GUIVehicle.cpp index d5b73691e157..9cc3f9be997f 100644 --- a/src/guisim/GUIVehicle.cpp +++ b/src/guisim/GUIVehicle.cpp @@ -964,7 +964,7 @@ GUIVehicle::getDriveWays() const { result.push_back(dw->getID()); } } - return joinToStringSorting(result, " "); + return StringUtils::wrapText(joinToStringSorting(result, " "), 60); } double diff --git a/src/microsim/MSLink.cpp b/src/microsim/MSLink.cpp index 2e05ea2d79c9..f8346915fd93 100644 --- a/src/microsim/MSLink.cpp +++ b/src/microsim/MSLink.cpp @@ -939,6 +939,14 @@ MSLink::blockedAtTime(SUMOTime arrivalTime, SUMOTime leaveTime, double arrivalSp || ego->getVehicleType().getParameter().getJMParam(SUMO_ATTR_JM_IGNORE_FOE_PROB, 0) < RandHelper::rand(ego->getRNG())) && !ignoreFoe(ego, it.first) && !((arrivalTime > it.second.leavingTime) || (leaveTime < it.second.arrivalTime))) { + if (ego == nullptr) { + // during insertion + if (myJunction->getType() == SumoXMLNodeType::RAIL_CROSSING) { + continue; + } else { + return true; + } + } // check whether braking is feasible (ego might have started to accelerate already) const auto& cfm = ego->getVehicleType().getCarFollowModel(); #ifdef MSLink_DEBUG_OPENED diff --git a/src/microsim/devices/MSDevice_Battery.cpp b/src/microsim/devices/MSDevice_Battery.cpp index 9a0005415a16..4c5f4cfa6e62 100644 --- a/src/microsim/devices/MSDevice_Battery.cpp +++ b/src/microsim/devices/MSDevice_Battery.cpp @@ -584,6 +584,9 @@ MSDevice_Battery::generateOutput(OutputDevice* tripinfoOut) const { if (tripinfoOut != nullptr) { tripinfoOut->openTag("battery"); tripinfoOut->writeAttr("depleted", toString(myDepletedCount)); + tripinfoOut->writeAttr("actualBatteryCapacity", toString(myActualBatteryCapacity)); + tripinfoOut->writeAttr("totalEnergyConsumed", toString(myTotalConsumption)); + tripinfoOut->writeAttr("totalEnergyRegenerated", toString(myTotalRegenerated)); tripinfoOut->closeTag(); } } diff --git a/src/microsim/traffic_lights/MSDriveWay.cpp b/src/microsim/traffic_lights/MSDriveWay.cpp index ef3f1b2c95bf..44876d825b8c 100644 --- a/src/microsim/traffic_lights/MSDriveWay.cpp +++ b/src/microsim/traffic_lights/MSDriveWay.cpp @@ -1144,7 +1144,7 @@ MSDriveWay::findFlankProtection(MSLink* link, MSLink* origLink, std::vectorgetCorrespondingEntryLink()->getTLLogic() != nullptr) { + if (link->getCorrespondingEntryLink()->getTLLogic() != nullptr && link->getJunction()->getType() == SumoXMLNodeType::RAIL_SIGNAL) { MSLink* entry = const_cast(link->getCorrespondingEntryLink()); // guarded by signal #ifdef DEBUG_CHECK_FLANKS @@ -1178,6 +1178,21 @@ MSDriveWay::findFlankProtection(MSLink* link, MSLink* origLink, std::vectorgetEdge()) != 0) { + for (MSDriveWay* foe : myDepartureDriveways[&lane->getEdge()]) { + if (flankConflict(*foe)) { +#ifdef DEBUG_ADD_FOES + std::cout << " foe " << foe->getID() << " departs on flank=" << lane->getID() << "\n"; +#endif + myFoes.push_back(foe); + } else { +#ifdef DEBUG_ADD_FOES + std::cout << " cand foe " << foe->getID() << " departs on flank=" << lane->getID() << " rejected\n"; +#endif + } + } + } } } diff --git a/src/netbuild/NBLoadedSUMOTLDef.cpp b/src/netbuild/NBLoadedSUMOTLDef.cpp index c2f8fd2b089c..098b06a2aa2e 100644 --- a/src/netbuild/NBLoadedSUMOTLDef.cpp +++ b/src/netbuild/NBLoadedSUMOTLDef.cpp @@ -171,6 +171,9 @@ NBLoadedSUMOTLDef::remapRemoved(NBEdge*, const EdgeVector&, const EdgeVector&) { void NBLoadedSUMOTLDef::replaceRemoved(NBEdge* removed, int removedLane, NBEdge* by, int byLane, bool incoming) { + if (by == nullptr) { + myReconstructRemovedConnections = true; + } for (NBConnectionVector::iterator it = myControlledLinks.begin(); it != myControlledLinks.end(); ++it) { if (incoming) { (*it).replaceFrom(removed, removedLane, by, byLane); @@ -197,6 +200,16 @@ NBLoadedSUMOTLDef::amInvalid() const { if (myIncomingEdges.size() == 0) { return true; } + if (myReconstructRemovedConnections) { + // check whether at least one connection is valid + for (const NBConnection& con : myControlledLinks) { + if (isValid(con)) { + return false; + } + } + // all invalid + return true; + } return false; } @@ -451,6 +464,16 @@ NBLoadedSUMOTLDef::registerModifications(bool addedConnections, bool removedConn myReconstructRemovedConnections |= removedConnections; } +bool +NBLoadedSUMOTLDef::isValid(const NBConnection& con) const { + return (// edge still exists + std::find(myIncomingEdges.begin(), myIncomingEdges.end(), con.getFrom()) != myIncomingEdges.end() + // connection still exists + && con.getFrom()->hasConnectionTo(con.getTo(), con.getToLane(), con.getFromLane()) + // connection is still set to be controlled + && con.getFrom()->mayBeTLSControlled(con.getFromLane(), con.getTo(), con.getToLane())); +} + void NBLoadedSUMOTLDef::reconstructLogic() { const bool netedit = NBNetBuilder::runningNetedit(); @@ -505,12 +528,7 @@ NBLoadedSUMOTLDef::reconstructLogic() { // for each connection, check whether it is still valid for (NBConnectionVector::iterator it = myControlledLinks.begin(); it != myControlledLinks.end();) { const NBConnection con = (*it); - if (// edge still exists - std::find(myIncomingEdges.begin(), myIncomingEdges.end(), con.getFrom()) != myIncomingEdges.end() - // connection still exists - && con.getFrom()->hasConnectionTo(con.getTo(), con.getToLane(), con.getFromLane()) - // connection is still set to be controlled - && con.getFrom()->mayBeTLSControlled(con.getFromLane(), con.getTo(), con.getToLane())) { + if (isValid(con)) { it++; } else { // remove connection diff --git a/src/netbuild/NBLoadedSUMOTLDef.h b/src/netbuild/NBLoadedSUMOTLDef.h index 5fa6586999aa..a6ded42a0067 100644 --- a/src/netbuild/NBLoadedSUMOTLDef.h +++ b/src/netbuild/NBLoadedSUMOTLDef.h @@ -240,6 +240,9 @@ class NBLoadedSUMOTLDef : public NBTrafficLightDefinition { /// @brief return whether all tls link indices are valid bool hasValidIndices() const; + /// @brief return whether the given connection is still valid + bool isValid(const NBConnection& con) const; + private: /// @brief class for identifying connections class connection_equal { diff --git a/tests/complex/traci/vehicle/vehicle/tripinfo.complex b/tests/complex/traci/vehicle/vehicle/tripinfo.complex index 21ceea3b909a..31d01cbbe9a0 100644 --- a/tests/complex/traci/vehicle/vehicle/tripinfo.complex +++ b/tests/complex/traci/vehicle/vehicle/tripinfo.complex @@ -1,6 +1,6 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netconvert/bugs/15xxx/ticket15798/net.netconvert b/tests/netconvert/bugs/15xxx/ticket15798/net.netconvert new file mode 100644 index 000000000000..d9681991a439 --- /dev/null +++ b/tests/netconvert/bugs/15xxx/ticket15798/net.netconvert @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netconvert/bugs/15xxx/ticket15798/options.netconvert b/tests/netconvert/bugs/15xxx/ticket15798/options.netconvert new file mode 100644 index 000000000000..ebbc7b2bd021 --- /dev/null +++ b/tests/netconvert/bugs/15xxx/ticket15798/options.netconvert @@ -0,0 +1,2 @@ +-s input_net.net.xml +--keep-edges.by-vclass rail diff --git a/tests/netconvert/bugs/ticket854/output.netconvert b/tests/netconvert/bugs/15xxx/ticket15798/output.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket854/output.netconvert rename to tests/netconvert/bugs/15xxx/ticket15798/output.netconvert diff --git a/tests/netconvert/bugs/5xxx/testsuite.netconvert b/tests/netconvert/bugs/5xxx/testsuite.netconvert new file mode 100644 index 000000000000..95b39bbdf0d2 --- /dev/null +++ b/tests/netconvert/bugs/5xxx/testsuite.netconvert @@ -0,0 +1,41 @@ +ticket5159 + +# consider edge permissions when computing link direction +ticket5512 + +# mutual conflict at junction cluster_2351978965_3491058798_606104206_606104215 +# between links 5 and 6 (right-turning car and left-turning bike) +ticket5609 + +# extreme lane widths +ticket5817 + +# scurve-stretch with changed default radius +ticket5881 + +# invalid network with option geometry.remove.min-length +ticket6333 + +# override right-turn-conflict +ticket6497 + +# rail turn-arounds should always have linkdir 't' +ticket6924 + +# split edge within joined tls +ticket7016 + +# wrong internal junction position +ticket7761 + +# traffic light corruption when using option --geometry.remove +ticket8413 + +# turnaround in input ignored +ticket8796 + +# connectivity on bike lane start +ticket8899 + +# duplicated roundabout +ticket9810 diff --git a/tests/netconvert/bugs/ticket5159/errors.netconvert b/tests/netconvert/bugs/5xxx/ticket5159/errors.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket5159/errors.netconvert rename to tests/netconvert/bugs/5xxx/ticket5159/errors.netconvert diff --git a/tests/netconvert/bugs/ticket5159/input_plain.edg.xml b/tests/netconvert/bugs/5xxx/ticket5159/input_plain.edg.xml similarity index 100% rename from tests/netconvert/bugs/ticket5159/input_plain.edg.xml rename to tests/netconvert/bugs/5xxx/ticket5159/input_plain.edg.xml diff --git a/tests/netconvert/bugs/ticket5159/input_plain.nod.xml b/tests/netconvert/bugs/5xxx/ticket5159/input_plain.nod.xml similarity index 100% rename from tests/netconvert/bugs/ticket5159/input_plain.nod.xml rename to tests/netconvert/bugs/5xxx/ticket5159/input_plain.nod.xml diff --git a/tests/netconvert/bugs/ticket5159/input_plain.typ.xml b/tests/netconvert/bugs/5xxx/ticket5159/input_plain.typ.xml similarity index 100% rename from tests/netconvert/bugs/ticket5159/input_plain.typ.xml rename to tests/netconvert/bugs/5xxx/ticket5159/input_plain.typ.xml diff --git a/tests/netconvert/bugs/ticket5159/net.netconvert b/tests/netconvert/bugs/5xxx/ticket5159/net.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket5159/net.netconvert rename to tests/netconvert/bugs/5xxx/ticket5159/net.netconvert diff --git a/tests/netconvert/bugs/ticket5159/options.netconvert b/tests/netconvert/bugs/5xxx/ticket5159/options.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket5159/options.netconvert rename to tests/netconvert/bugs/5xxx/ticket5159/options.netconvert diff --git a/tests/netconvert/bugs/ticket866/output.netconvert b/tests/netconvert/bugs/5xxx/ticket5159/output.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket866/output.netconvert rename to tests/netconvert/bugs/5xxx/ticket5159/output.netconvert diff --git a/tests/netconvert/bugs/ticket8413/errors.netconvert b/tests/netconvert/bugs/5xxx/ticket5512/errors.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket8413/errors.netconvert rename to tests/netconvert/bugs/5xxx/ticket5512/errors.netconvert diff --git a/tests/netconvert/bugs/ticket5512/input_plain.con.xml b/tests/netconvert/bugs/5xxx/ticket5512/input_plain.con.xml similarity index 100% rename from tests/netconvert/bugs/ticket5512/input_plain.con.xml rename to tests/netconvert/bugs/5xxx/ticket5512/input_plain.con.xml diff --git a/tests/netconvert/bugs/ticket5512/input_plain.edg.xml b/tests/netconvert/bugs/5xxx/ticket5512/input_plain.edg.xml similarity index 100% rename from tests/netconvert/bugs/ticket5512/input_plain.edg.xml rename to tests/netconvert/bugs/5xxx/ticket5512/input_plain.edg.xml diff --git a/tests/netconvert/bugs/ticket5512/input_plain.nod.xml b/tests/netconvert/bugs/5xxx/ticket5512/input_plain.nod.xml similarity index 100% rename from tests/netconvert/bugs/ticket5512/input_plain.nod.xml rename to tests/netconvert/bugs/5xxx/ticket5512/input_plain.nod.xml diff --git a/tests/netconvert/bugs/ticket5512/net.netconvert b/tests/netconvert/bugs/5xxx/ticket5512/net.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket5512/net.netconvert rename to tests/netconvert/bugs/5xxx/ticket5512/net.netconvert diff --git a/tests/netconvert/bugs/ticket5512/options.netconvert b/tests/netconvert/bugs/5xxx/ticket5512/options.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket5512/options.netconvert rename to tests/netconvert/bugs/5xxx/ticket5512/options.netconvert diff --git a/tests/netconvert/bugs/ticket867/output.netconvert b/tests/netconvert/bugs/5xxx/ticket5512/output.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket867/output.netconvert rename to tests/netconvert/bugs/5xxx/ticket5512/output.netconvert diff --git a/tests/netconvert/bugs/ticket850/errors.netconvert b/tests/netconvert/bugs/5xxx/ticket5609/errors.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket850/errors.netconvert rename to tests/netconvert/bugs/5xxx/ticket5609/errors.netconvert diff --git a/tests/netconvert/bugs/ticket5609/input_plain.con.xml b/tests/netconvert/bugs/5xxx/ticket5609/input_plain.con.xml similarity index 100% rename from tests/netconvert/bugs/ticket5609/input_plain.con.xml rename to tests/netconvert/bugs/5xxx/ticket5609/input_plain.con.xml diff --git a/tests/netconvert/bugs/ticket5609/input_plain.edg.xml b/tests/netconvert/bugs/5xxx/ticket5609/input_plain.edg.xml similarity index 100% rename from tests/netconvert/bugs/ticket5609/input_plain.edg.xml rename to tests/netconvert/bugs/5xxx/ticket5609/input_plain.edg.xml diff --git a/tests/netconvert/bugs/ticket5609/input_plain.nod.xml b/tests/netconvert/bugs/5xxx/ticket5609/input_plain.nod.xml similarity index 100% rename from tests/netconvert/bugs/ticket5609/input_plain.nod.xml rename to tests/netconvert/bugs/5xxx/ticket5609/input_plain.nod.xml diff --git a/tests/netconvert/bugs/ticket5609/net.netconvert b/tests/netconvert/bugs/5xxx/ticket5609/net.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket5609/net.netconvert rename to tests/netconvert/bugs/5xxx/ticket5609/net.netconvert diff --git a/tests/netconvert/bugs/ticket5609/options.netconvert b/tests/netconvert/bugs/5xxx/ticket5609/options.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket5609/options.netconvert rename to tests/netconvert/bugs/5xxx/ticket5609/options.netconvert diff --git a/tests/netconvert/bugs/ticket8796/output.netconvert b/tests/netconvert/bugs/5xxx/ticket5609/output.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket8796/output.netconvert rename to tests/netconvert/bugs/5xxx/ticket5609/output.netconvert diff --git a/tests/netconvert/bugs/ticket5817/errors.netconvert b/tests/netconvert/bugs/5xxx/ticket5817/errors.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket5817/errors.netconvert rename to tests/netconvert/bugs/5xxx/ticket5817/errors.netconvert diff --git a/tests/netconvert/bugs/ticket5817/input_plain.edg.xml b/tests/netconvert/bugs/5xxx/ticket5817/input_plain.edg.xml similarity index 100% rename from tests/netconvert/bugs/ticket5817/input_plain.edg.xml rename to tests/netconvert/bugs/5xxx/ticket5817/input_plain.edg.xml diff --git a/tests/netconvert/bugs/ticket5817/input_plain.nod.xml b/tests/netconvert/bugs/5xxx/ticket5817/input_plain.nod.xml similarity index 100% rename from tests/netconvert/bugs/ticket5817/input_plain.nod.xml rename to tests/netconvert/bugs/5xxx/ticket5817/input_plain.nod.xml diff --git a/tests/netconvert/bugs/ticket5817/net.netconvert b/tests/netconvert/bugs/5xxx/ticket5817/net.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket5817/net.netconvert rename to tests/netconvert/bugs/5xxx/ticket5817/net.netconvert diff --git a/tests/netconvert/bugs/ticket5817/options.netconvert b/tests/netconvert/bugs/5xxx/ticket5817/options.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket5817/options.netconvert rename to tests/netconvert/bugs/5xxx/ticket5817/options.netconvert diff --git a/tests/netconvert/bugs/ticket8899/output.netconvert b/tests/netconvert/bugs/5xxx/ticket5817/output.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket8899/output.netconvert rename to tests/netconvert/bugs/5xxx/ticket5817/output.netconvert diff --git a/tests/netconvert/bugs/ticket854/errors.netconvert b/tests/netconvert/bugs/5xxx/ticket5881/errors.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket854/errors.netconvert rename to tests/netconvert/bugs/5xxx/ticket5881/errors.netconvert diff --git a/tests/netconvert/bugs/ticket5881/input_plain.edg.xml b/tests/netconvert/bugs/5xxx/ticket5881/input_plain.edg.xml similarity index 100% rename from tests/netconvert/bugs/ticket5881/input_plain.edg.xml rename to tests/netconvert/bugs/5xxx/ticket5881/input_plain.edg.xml diff --git a/tests/netconvert/bugs/ticket5881/input_plain.nod.xml b/tests/netconvert/bugs/5xxx/ticket5881/input_plain.nod.xml similarity index 100% rename from tests/netconvert/bugs/ticket5881/input_plain.nod.xml rename to tests/netconvert/bugs/5xxx/ticket5881/input_plain.nod.xml diff --git a/tests/netconvert/bugs/ticket5881/net.netconvert b/tests/netconvert/bugs/5xxx/ticket5881/net.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket5881/net.netconvert rename to tests/netconvert/bugs/5xxx/ticket5881/net.netconvert diff --git a/tests/netconvert/bugs/ticket5881/options.netconvert b/tests/netconvert/bugs/5xxx/ticket5881/options.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket5881/options.netconvert rename to tests/netconvert/bugs/5xxx/ticket5881/options.netconvert diff --git a/tests/netconvert/bugs/ticket916/output.netconvert b/tests/netconvert/bugs/5xxx/ticket5881/output.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket916/output.netconvert rename to tests/netconvert/bugs/5xxx/ticket5881/output.netconvert diff --git a/tests/netconvert/bugs/ticket866/errors.netconvert b/tests/netconvert/bugs/5xxx/ticket6333/errors.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket866/errors.netconvert rename to tests/netconvert/bugs/5xxx/ticket6333/errors.netconvert diff --git a/tests/netconvert/bugs/ticket6333/input_net.net.xml b/tests/netconvert/bugs/5xxx/ticket6333/input_net.net.xml similarity index 100% rename from tests/netconvert/bugs/ticket6333/input_net.net.xml rename to tests/netconvert/bugs/5xxx/ticket6333/input_net.net.xml diff --git a/tests/netconvert/bugs/ticket6333/net.netconvert b/tests/netconvert/bugs/5xxx/ticket6333/net.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket6333/net.netconvert rename to tests/netconvert/bugs/5xxx/ticket6333/net.netconvert diff --git a/tests/netconvert/bugs/ticket6333/options.netconvert b/tests/netconvert/bugs/5xxx/ticket6333/options.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket6333/options.netconvert rename to tests/netconvert/bugs/5xxx/ticket6333/options.netconvert diff --git a/tests/netconvert/bugs/ticket921/output.netconvert b/tests/netconvert/bugs/5xxx/ticket6333/output.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket921/output.netconvert rename to tests/netconvert/bugs/5xxx/ticket6333/output.netconvert diff --git a/tests/netconvert/bugs/ticket8796/errors.netconvert b/tests/netconvert/bugs/5xxx/ticket6497/errors.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket8796/errors.netconvert rename to tests/netconvert/bugs/5xxx/ticket6497/errors.netconvert diff --git a/tests/netconvert/bugs/ticket6497/input_net.net.xml b/tests/netconvert/bugs/5xxx/ticket6497/input_net.net.xml similarity index 100% rename from tests/netconvert/bugs/ticket6497/input_net.net.xml rename to tests/netconvert/bugs/5xxx/ticket6497/input_net.net.xml diff --git a/tests/netconvert/bugs/ticket6497/input_plain.con.xml b/tests/netconvert/bugs/5xxx/ticket6497/input_plain.con.xml similarity index 100% rename from tests/netconvert/bugs/ticket6497/input_plain.con.xml rename to tests/netconvert/bugs/5xxx/ticket6497/input_plain.con.xml diff --git a/tests/netconvert/bugs/ticket6497/net.netconvert b/tests/netconvert/bugs/5xxx/ticket6497/net.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket6497/net.netconvert rename to tests/netconvert/bugs/5xxx/ticket6497/net.netconvert diff --git a/tests/netconvert/bugs/ticket6497/options.netconvert b/tests/netconvert/bugs/5xxx/ticket6497/options.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket6497/options.netconvert rename to tests/netconvert/bugs/5xxx/ticket6497/options.netconvert diff --git a/tests/netconvert/bugs/ticket936/output.netconvert b/tests/netconvert/bugs/5xxx/ticket6497/output.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket936/output.netconvert rename to tests/netconvert/bugs/5xxx/ticket6497/output.netconvert diff --git a/tests/netconvert/bugs/ticket6924/errors.netconvert b/tests/netconvert/bugs/5xxx/ticket6924/errors.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket6924/errors.netconvert rename to tests/netconvert/bugs/5xxx/ticket6924/errors.netconvert diff --git a/tests/netconvert/bugs/ticket6924/input_plain.edg.xml b/tests/netconvert/bugs/5xxx/ticket6924/input_plain.edg.xml similarity index 100% rename from tests/netconvert/bugs/ticket6924/input_plain.edg.xml rename to tests/netconvert/bugs/5xxx/ticket6924/input_plain.edg.xml diff --git a/tests/netconvert/bugs/ticket6924/input_plain.nod.xml b/tests/netconvert/bugs/5xxx/ticket6924/input_plain.nod.xml similarity index 100% rename from tests/netconvert/bugs/ticket6924/input_plain.nod.xml rename to tests/netconvert/bugs/5xxx/ticket6924/input_plain.nod.xml diff --git a/tests/netconvert/bugs/ticket6924/net.netconvert b/tests/netconvert/bugs/5xxx/ticket6924/net.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket6924/net.netconvert rename to tests/netconvert/bugs/5xxx/ticket6924/net.netconvert diff --git a/tests/netconvert/bugs/ticket6924/options.netconvert b/tests/netconvert/bugs/5xxx/ticket6924/options.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket6924/options.netconvert rename to tests/netconvert/bugs/5xxx/ticket6924/options.netconvert diff --git a/tests/netconvert/bugs/ticket936b/output.netconvert b/tests/netconvert/bugs/5xxx/ticket6924/output.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket936b/output.netconvert rename to tests/netconvert/bugs/5xxx/ticket6924/output.netconvert diff --git a/tests/netconvert/bugs/ticket8899/errors.netconvert b/tests/netconvert/bugs/5xxx/ticket7016/errors.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket8899/errors.netconvert rename to tests/netconvert/bugs/5xxx/ticket7016/errors.netconvert diff --git a/tests/netconvert/bugs/ticket7016/input_net.net.xml b/tests/netconvert/bugs/5xxx/ticket7016/input_net.net.xml similarity index 100% rename from tests/netconvert/bugs/ticket7016/input_net.net.xml rename to tests/netconvert/bugs/5xxx/ticket7016/input_net.net.xml diff --git a/tests/netconvert/bugs/ticket7016/input_plain.edg.xml b/tests/netconvert/bugs/5xxx/ticket7016/input_plain.edg.xml similarity index 100% rename from tests/netconvert/bugs/ticket7016/input_plain.edg.xml rename to tests/netconvert/bugs/5xxx/ticket7016/input_plain.edg.xml diff --git a/tests/netconvert/bugs/ticket7016/net.netconvert b/tests/netconvert/bugs/5xxx/ticket7016/net.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket7016/net.netconvert rename to tests/netconvert/bugs/5xxx/ticket7016/net.netconvert diff --git a/tests/netconvert/bugs/ticket7016/options.netconvert b/tests/netconvert/bugs/5xxx/ticket7016/options.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket7016/options.netconvert rename to tests/netconvert/bugs/5xxx/ticket7016/options.netconvert diff --git a/tests/netconvert/bugs/ticket947/output.netconvert b/tests/netconvert/bugs/5xxx/ticket7016/output.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket947/output.netconvert rename to tests/netconvert/bugs/5xxx/ticket7016/output.netconvert diff --git a/tests/netconvert/bugs/ticket936/errors.netconvert b/tests/netconvert/bugs/5xxx/ticket7761/errors.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket936/errors.netconvert rename to tests/netconvert/bugs/5xxx/ticket7761/errors.netconvert diff --git a/tests/netconvert/bugs/ticket7761/input_plain.con.xml b/tests/netconvert/bugs/5xxx/ticket7761/input_plain.con.xml similarity index 100% rename from tests/netconvert/bugs/ticket7761/input_plain.con.xml rename to tests/netconvert/bugs/5xxx/ticket7761/input_plain.con.xml diff --git a/tests/netconvert/bugs/ticket7761/input_plain.edg.xml b/tests/netconvert/bugs/5xxx/ticket7761/input_plain.edg.xml similarity index 100% rename from tests/netconvert/bugs/ticket7761/input_plain.edg.xml rename to tests/netconvert/bugs/5xxx/ticket7761/input_plain.edg.xml diff --git a/tests/netconvert/bugs/ticket7761/input_plain.nod.xml b/tests/netconvert/bugs/5xxx/ticket7761/input_plain.nod.xml similarity index 100% rename from tests/netconvert/bugs/ticket7761/input_plain.nod.xml rename to tests/netconvert/bugs/5xxx/ticket7761/input_plain.nod.xml diff --git a/tests/netconvert/bugs/ticket7761/net.netconvert b/tests/netconvert/bugs/5xxx/ticket7761/net.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket7761/net.netconvert rename to tests/netconvert/bugs/5xxx/ticket7761/net.netconvert diff --git a/tests/netconvert/bugs/ticket7761/options.netconvert b/tests/netconvert/bugs/5xxx/ticket7761/options.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket7761/options.netconvert rename to tests/netconvert/bugs/5xxx/ticket7761/options.netconvert diff --git a/tests/netconvert/bugs/ticket947b/output.netconvert b/tests/netconvert/bugs/5xxx/ticket7761/output.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket947b/output.netconvert rename to tests/netconvert/bugs/5xxx/ticket7761/output.netconvert diff --git a/tests/netconvert/bugs/ticket936b/errors.netconvert b/tests/netconvert/bugs/5xxx/ticket8413/errors.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket936b/errors.netconvert rename to tests/netconvert/bugs/5xxx/ticket8413/errors.netconvert diff --git a/tests/netconvert/bugs/ticket8413/input_net.net.xml b/tests/netconvert/bugs/5xxx/ticket8413/input_net.net.xml similarity index 100% rename from tests/netconvert/bugs/ticket8413/input_net.net.xml rename to tests/netconvert/bugs/5xxx/ticket8413/input_net.net.xml diff --git a/tests/netconvert/bugs/ticket8413/net.netconvert b/tests/netconvert/bugs/5xxx/ticket8413/net.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket8413/net.netconvert rename to tests/netconvert/bugs/5xxx/ticket8413/net.netconvert diff --git a/tests/netconvert/bugs/ticket8413/options.netconvert b/tests/netconvert/bugs/5xxx/ticket8413/options.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket8413/options.netconvert rename to tests/netconvert/bugs/5xxx/ticket8413/options.netconvert diff --git a/tests/netconvert/bugs/ticket9810/output.netconvert b/tests/netconvert/bugs/5xxx/ticket8413/output.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket9810/output.netconvert rename to tests/netconvert/bugs/5xxx/ticket8413/output.netconvert diff --git a/tests/netconvert/bugs/ticket9874/errors.netconvert b/tests/netconvert/bugs/5xxx/ticket8796/errors.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket9874/errors.netconvert rename to tests/netconvert/bugs/5xxx/ticket8796/errors.netconvert diff --git a/tests/netconvert/bugs/ticket8796/input_plain.con.xml b/tests/netconvert/bugs/5xxx/ticket8796/input_plain.con.xml similarity index 100% rename from tests/netconvert/bugs/ticket8796/input_plain.con.xml rename to tests/netconvert/bugs/5xxx/ticket8796/input_plain.con.xml diff --git a/tests/netconvert/bugs/ticket8796/input_plain.edg.xml b/tests/netconvert/bugs/5xxx/ticket8796/input_plain.edg.xml similarity index 100% rename from tests/netconvert/bugs/ticket8796/input_plain.edg.xml rename to tests/netconvert/bugs/5xxx/ticket8796/input_plain.edg.xml diff --git a/tests/netconvert/bugs/ticket8796/input_plain.nod.xml b/tests/netconvert/bugs/5xxx/ticket8796/input_plain.nod.xml similarity index 100% rename from tests/netconvert/bugs/ticket8796/input_plain.nod.xml rename to tests/netconvert/bugs/5xxx/ticket8796/input_plain.nod.xml diff --git a/tests/netconvert/bugs/ticket8796/net.netconvert b/tests/netconvert/bugs/5xxx/ticket8796/net.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket8796/net.netconvert rename to tests/netconvert/bugs/5xxx/ticket8796/net.netconvert diff --git a/tests/netconvert/bugs/ticket8796/options.netconvert b/tests/netconvert/bugs/5xxx/ticket8796/options.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket8796/options.netconvert rename to tests/netconvert/bugs/5xxx/ticket8796/options.netconvert diff --git a/tests/netconvert/bugs/ticket9874/output.netconvert b/tests/netconvert/bugs/5xxx/ticket8796/output.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket9874/output.netconvert rename to tests/netconvert/bugs/5xxx/ticket8796/output.netconvert diff --git a/tests/netconvert/bugs/ticket9874b/errors.netconvert b/tests/netconvert/bugs/5xxx/ticket8899/errors.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket9874b/errors.netconvert rename to tests/netconvert/bugs/5xxx/ticket8899/errors.netconvert diff --git a/tests/netconvert/bugs/ticket8899/input_plain.edg.xml b/tests/netconvert/bugs/5xxx/ticket8899/input_plain.edg.xml similarity index 100% rename from tests/netconvert/bugs/ticket8899/input_plain.edg.xml rename to tests/netconvert/bugs/5xxx/ticket8899/input_plain.edg.xml diff --git a/tests/netconvert/bugs/ticket8899/input_plain.nod.xml b/tests/netconvert/bugs/5xxx/ticket8899/input_plain.nod.xml similarity index 100% rename from tests/netconvert/bugs/ticket8899/input_plain.nod.xml rename to tests/netconvert/bugs/5xxx/ticket8899/input_plain.nod.xml diff --git a/tests/netconvert/bugs/ticket8899/net.netconvert b/tests/netconvert/bugs/5xxx/ticket8899/net.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket8899/net.netconvert rename to tests/netconvert/bugs/5xxx/ticket8899/net.netconvert diff --git a/tests/netconvert/bugs/ticket8899/options.netconvert b/tests/netconvert/bugs/5xxx/ticket8899/options.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket8899/options.netconvert rename to tests/netconvert/bugs/5xxx/ticket8899/options.netconvert diff --git a/tests/netconvert/bugs/ticket9874b/output.netconvert b/tests/netconvert/bugs/5xxx/ticket8899/output.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket9874b/output.netconvert rename to tests/netconvert/bugs/5xxx/ticket8899/output.netconvert diff --git a/tests/netconvert/bugs/ticket9810/errors.netconvert b/tests/netconvert/bugs/5xxx/ticket9810/errors.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket9810/errors.netconvert rename to tests/netconvert/bugs/5xxx/ticket9810/errors.netconvert diff --git a/tests/netconvert/bugs/ticket9810/input_plain.edg.xml b/tests/netconvert/bugs/5xxx/ticket9810/input_plain.edg.xml similarity index 100% rename from tests/netconvert/bugs/ticket9810/input_plain.edg.xml rename to tests/netconvert/bugs/5xxx/ticket9810/input_plain.edg.xml diff --git a/tests/netconvert/bugs/ticket9810/input_plain.nod.xml b/tests/netconvert/bugs/5xxx/ticket9810/input_plain.nod.xml similarity index 100% rename from tests/netconvert/bugs/ticket9810/input_plain.nod.xml rename to tests/netconvert/bugs/5xxx/ticket9810/input_plain.nod.xml diff --git a/tests/netconvert/bugs/ticket9810/input_plain.typ.xml b/tests/netconvert/bugs/5xxx/ticket9810/input_plain.typ.xml similarity index 100% rename from tests/netconvert/bugs/ticket9810/input_plain.typ.xml rename to tests/netconvert/bugs/5xxx/ticket9810/input_plain.typ.xml diff --git a/tests/netconvert/bugs/ticket9810/net.netconvert b/tests/netconvert/bugs/5xxx/ticket9810/net.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket9810/net.netconvert rename to tests/netconvert/bugs/5xxx/ticket9810/net.netconvert diff --git a/tests/netconvert/bugs/ticket9810/options.netconvert b/tests/netconvert/bugs/5xxx/ticket9810/options.netconvert similarity index 100% rename from tests/netconvert/bugs/ticket9810/options.netconvert rename to tests/netconvert/bugs/5xxx/ticket9810/options.netconvert diff --git a/tests/netconvert/bugs/5xxx/ticket9810/output.netconvert b/tests/netconvert/bugs/5xxx/ticket9810/output.netconvert new file mode 100644 index 000000000000..a9d787cc55cb --- /dev/null +++ b/tests/netconvert/bugs/5xxx/ticket9810/output.netconvert @@ -0,0 +1 @@ +Success. diff --git a/tests/netconvert/bugs/testsuite.netconvert b/tests/netconvert/bugs/testsuite.netconvert index d3cb941fd644..3938f0bb8215 100644 --- a/tests/netconvert/bugs/testsuite.netconvert +++ b/tests/netconvert/bugs/testsuite.netconvert @@ -1,208 +1,13 @@ -# testing bug 1653266 (netconvert ignores second decimale) -1653266 +0xxx -# testing bug 1821617 (netconvert breaks with a segmentation fault) -1821617 +# tickets after 5000 +5xxx -# testing bug 1821668 (false link direction computation) -1821668 +# tickets after 10000 +10xxx -# testing bug 2392943 (netconvert fails when removing edges and guessing ramps) -2392943 - -# Test for [ 2468327 ] log files together with input errors let sumo crash (should not make problems, was a SUMO issue only) -2468327 - -# Test for [ 2171355 ] turnarounds even with --no-turnarounds -2171355 - -# Test for #38 speed instead of length while importing XML -ticket38 +# tickets after 15000 +15xxx # Test for #55 NETCONVERT breaks on cartesian networks and --use-projection # ticket55 - -# Test for #193 invalid traffic lights at dead ends -ticket193 - -# Test for #267 keep-edges (postload) breaks on connections given for a removed edge -ticket267 - -# Test for false foe determination (on inner-continuation-intersections) yielding in a teleport -ticket19_falseFoe -ticket606 - -# geometry-remove option -ticket637 -ticket727 - -# crossed connections at off-ramp -ticket731 -ticket731b -ticket731c -ticket749 -ticket810 -ticket850 -ticket854 -ticket866 -ticket867 -ticket916 -ticket921 -ticket936 - -# test the code path where a ramp is recognized -ticket936b -ticket947 - -# using another junction geometry to expose the issue -ticket947b -ticket1031 -ticket1037 -ticket1177 -ticket1437 -ticket1483 - -# remove edges from a sumo net which contains pedestrian crossings -ticket1557 -ticket1586 - -# a non-pedestrian network with allowAll which falls under the special cases of connection building -ticket1586b - -# all lanes allow pedestrians only -ticket1586c - -# no unregulated nodes -ticket1586d - -# computing node shape with corner detail failed -ticket1674 -ticket1678 -ticket1689 -ticket1855 -ticket1907 -ticket2015 -ticket2066 -ticket2086 -ticket2141 -ticket2094 -ticket2459 -ticket2631 -ticket3385 - -# For merging right turning lanes the right lane should have priority, i.e. 0>3 and 11>14 -ticket4188 -ticket5159 - -# consider edge permissions when computing link direction -ticket5512 - -# mutual conflict at junction cluster_2351978965_3491058798_606104206_606104215 -# between links 5 and 6 (right-turning car and left-turning bike) -ticket5609 - -# extreme lane widths -ticket5817 - -# scurve-stretch with changed default radius -ticket5881 - -# invalid network with option geometry.remove.min-length -ticket6333 - -# override right-turn-conflict -ticket6497 - -# rail turn-arounds should always have linkdir 't' -ticket6924 - -# split edge within joined tls -ticket7016 - -# wrong internal junction position -ticket7761 - -# traffic light corruption when using option --geometry.remove -ticket8413 - -# turnaround in input ignored -ticket8796 - -# connectivity on bike lane start -ticket8899 - -# duplicated roundabout -ticket9810 - -# regression on clipping curved shapes -ticket10727 - -# strange connections -ticket10771 - -# doubly linked edge with hybrid tram -ticket10978 - -# right of way rules at side road with custom internal junction -ticket11146 - -# invalid rail internal junction -ticket11558 - -# glitched walkingarea shape -ticket11590 - -# crash during roundabout processing -ticket11779 - -# missing foes at internal junction -ticket11988 - -# missing foes at internal junction -ticket11988b - -# invalid node shape (for uncommen edge shapes) -ticket11996 - -# invalid plain output -ticket12086 - -# prohibitions fail for edge id with '_' -ticket12419 - -# prohibitions fail for edge id with '_' -ticket12419b - -# handling abstract projection in input -ticket12761 - -# no connection to merged tram -ticket12767 - -# missing connection to merged tram -ticket12768 -ticket13542 -ticket13542b - -# crash -ticket13581 -ticket9874 -ticket12676 -ticket11737 -ticket55 -ticket9874b - -# crash involving roundabout deletion -ticket14930 - -# self overlapping outline -ticket15111 - -# custom node shape projected twice -ticket15137 - -# net has superfluous edge, bidi connections not found -ticket15514 - -# invalid memory access when deleting narrow lanes -ticket15718 diff --git a/tests/netconvert/function/keep_edges/by-vclass/net.netconvert b/tests/netconvert/function/keep_edges/by-vclass/net.netconvert index abaab7115e14..89def6748bcc 100644 --- a/tests/netconvert/function/keep_edges/by-vclass/net.netconvert +++ b/tests/netconvert/function/keep_edges/by-vclass/net.netconvert @@ -1,6 +1,6 @@ - @@ -74,10 +74,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - + + + + @@ -96,6 +96,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - + diff --git a/tests/netconvert/import/XML/diff/change_from_node_of_edge_incomplete/net.netconvert b/tests/netconvert/import/XML/diff/change_from_node_of_edge_incomplete/net.netconvert index c5d3590b9bb2..2f9d27545634 100644 --- a/tests/netconvert/import/XML/diff/change_from_node_of_edge_incomplete/net.netconvert +++ b/tests/netconvert/import/XML/diff/change_from_node_of_edge_incomplete/net.netconvert @@ -1,6 +1,6 @@ - @@ -125,12 +125,12 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - + + + + + + @@ -163,12 +163,12 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later - - - - - - + + + + + + diff --git a/tests/sumo/devices/battery/half_equipped/tripinfos.sumo b/tests/sumo/devices/battery/half_equipped/tripinfos.sumo index 35ff99d2ba96..de31f5ba24b6 100644 --- a/tests/sumo/devices/battery/half_equipped/tripinfos.sumo +++ b/tests/sumo/devices/battery/half_equipped/tripinfos.sumo @@ -1,6 +1,6 @@ - + + + + + + + diff --git a/tests/sumo/rail/bugs/ticket15797/net.net.xml b/tests/sumo/rail/bugs/ticket15797/net.net.xml new file mode 100644 index 000000000000..bde63f0a0789 --- /dev/null +++ b/tests/sumo/rail/bugs/ticket15797/net.net.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/sumo/rail/bugs/ticket15797/options.sumo b/tests/sumo/rail/bugs/ticket15797/options.sumo new file mode 100644 index 000000000000..a6643cdddf5d --- /dev/null +++ b/tests/sumo/rail/bugs/ticket15797/options.sumo @@ -0,0 +1,2 @@ +--no-step-log --no-duration-log --net-file=net.net.xml --routes=input_routes.rou.xml +--collision.action warn diff --git a/tests/sumo/rail/bugs/ticket15797/output.sumo b/tests/sumo/rail/bugs/ticket15797/output.sumo new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/sumo/rail/bugs/ticket15797/railsignalblocks.sumo b/tests/sumo/rail/bugs/ticket15797/railsignalblocks.sumo new file mode 100644 index 000000000000..7de67ebdfdda --- /dev/null +++ b/tests/sumo/rail/bugs/ticket15797/railsignalblocks.sumo @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/sumo/rail/bugs/ticket15797/railsignalblocks.sumo.meso b/tests/sumo/rail/bugs/ticket15797/railsignalblocks.sumo.meso new file mode 100644 index 000000000000..acda738ca06d --- /dev/null +++ b/tests/sumo/rail/bugs/ticket15797/railsignalblocks.sumo.meso @@ -0,0 +1,47 @@ + + + + + + diff --git a/tests/sumo/rail/bugs/ticket15797b/errors.sumo b/tests/sumo/rail/bugs/ticket15797b/errors.sumo new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/sumo/rail/bugs/ticket15797b/errors.sumo.meso b/tests/sumo/rail/bugs/ticket15797b/errors.sumo.meso new file mode 100644 index 000000000000..7c5032aa693c --- /dev/null +++ b/tests/sumo/rail/bugs/ticket15797b/errors.sumo.meso @@ -0,0 +1 @@ +Warning: Network contains internal links which are ignored. Vehicles will 'jump' across junctions and thus underestimate route lengths and travel times. diff --git a/tests/sumo/rail/bugs/ticket15797b/input_routes.rou.xml b/tests/sumo/rail/bugs/ticket15797b/input_routes.rou.xml new file mode 100644 index 000000000000..17fe04275fb2 --- /dev/null +++ b/tests/sumo/rail/bugs/ticket15797b/input_routes.rou.xml @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/tests/sumo/rail/bugs/ticket15797b/net.net.xml b/tests/sumo/rail/bugs/ticket15797b/net.net.xml new file mode 100644 index 000000000000..d88fc00665b5 --- /dev/null +++ b/tests/sumo/rail/bugs/ticket15797b/net.net.xml @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/sumo/rail/bugs/ticket15797b/options.sumo b/tests/sumo/rail/bugs/ticket15797b/options.sumo new file mode 100644 index 000000000000..a6643cdddf5d --- /dev/null +++ b/tests/sumo/rail/bugs/ticket15797b/options.sumo @@ -0,0 +1,2 @@ +--no-step-log --no-duration-log --net-file=net.net.xml --routes=input_routes.rou.xml +--collision.action warn diff --git a/tests/sumo/rail/bugs/ticket15797b/output.sumo b/tests/sumo/rail/bugs/ticket15797b/output.sumo new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/sumo/rail/bugs/ticket15797b/railsignalblocks.sumo b/tests/sumo/rail/bugs/ticket15797b/railsignalblocks.sumo new file mode 100644 index 000000000000..1a5e6b14a4ea --- /dev/null +++ b/tests/sumo/rail/bugs/ticket15797b/railsignalblocks.sumo @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/sumo/rail/bugs/ticket15797b/railsignalblocks.sumo.meso b/tests/sumo/rail/bugs/ticket15797b/railsignalblocks.sumo.meso new file mode 100644 index 000000000000..acda738ca06d --- /dev/null +++ b/tests/sumo/rail/bugs/ticket15797b/railsignalblocks.sumo.meso @@ -0,0 +1,47 @@ + + + + + + diff --git a/tests/sumo/rail/bugs/ticket15807/errors.sumo b/tests/sumo/rail/bugs/ticket15807/errors.sumo new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/sumo/rail/bugs/ticket15807/errors.sumo.meso b/tests/sumo/rail/bugs/ticket15807/errors.sumo.meso new file mode 100644 index 000000000000..7c5032aa693c --- /dev/null +++ b/tests/sumo/rail/bugs/ticket15807/errors.sumo.meso @@ -0,0 +1 @@ +Warning: Network contains internal links which are ignored. Vehicles will 'jump' across junctions and thus underestimate route lengths and travel times. diff --git a/tests/sumo/rail/bugs/ticket15807/input_routes.rou.xml b/tests/sumo/rail/bugs/ticket15807/input_routes.rou.xml new file mode 100644 index 000000000000..46281d02fc6e --- /dev/null +++ b/tests/sumo/rail/bugs/ticket15807/input_routes.rou.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/tests/sumo/rail/bugs/ticket15807/net.net.xml b/tests/sumo/rail/bugs/ticket15807/net.net.xml new file mode 100644 index 000000000000..16fd346712e6 --- /dev/null +++ b/tests/sumo/rail/bugs/ticket15807/net.net.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/sumo/rail/bugs/ticket15807/options.sumo b/tests/sumo/rail/bugs/ticket15807/options.sumo new file mode 100644 index 000000000000..a6643cdddf5d --- /dev/null +++ b/tests/sumo/rail/bugs/ticket15807/options.sumo @@ -0,0 +1,2 @@ +--no-step-log --no-duration-log --net-file=net.net.xml --routes=input_routes.rou.xml +--collision.action warn diff --git a/tests/sumo/rail/bugs/ticket15807/output.sumo b/tests/sumo/rail/bugs/ticket15807/output.sumo new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/sumo/rail/bugs/ticket15807/railsignalblocks.sumo b/tests/sumo/rail/bugs/ticket15807/railsignalblocks.sumo new file mode 100644 index 000000000000..9fe8c94dd087 --- /dev/null +++ b/tests/sumo/rail/bugs/ticket15807/railsignalblocks.sumo @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + diff --git a/tests/sumo/rail/bugs/ticket15807/railsignalblocks.sumo.meso b/tests/sumo/rail/bugs/ticket15807/railsignalblocks.sumo.meso new file mode 100644 index 000000000000..acda738ca06d --- /dev/null +++ b/tests/sumo/rail/bugs/ticket15807/railsignalblocks.sumo.meso @@ -0,0 +1,47 @@ + + + + + + diff --git a/tests/sumo/rail/portion_working/join_front_signal/railsignalblocks.sumo.meso b/tests/sumo/rail/portion_working/join_front_signal/railsignalblocks.sumo.meso index 4d83428f59bd..613d677357f8 100644 --- a/tests/sumo/rail/portion_working/join_front_signal/railsignalblocks.sumo.meso +++ b/tests/sumo/rail/portion_working/join_front_signal/railsignalblocks.sumo.meso @@ -1,6 +1,6 @@ -