now 'postload' option affects more filters. refs #14528

eclipse-sumo · Mar 18, 2024 · 06cae88 · 06cae88
1 parent 64c4a14
commit 06cae88
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 28 deletions.
diff --git a/src/netbuild/NBEdgeCont.cpp b/src/netbuild/NBEdgeCont.cpp
@@ -78,7 +78,7 @@ void
 NBEdgeCont::applyOptions(OptionsCont& oc) {
     // set edges dismiss/accept options
     myEdgesMinSpeed = oc.getFloat("keep-edges.min-speed");
-    myRemoveEdgesAfterJoining = oc.exists("keep-edges.postload") && oc.getBool("keep-edges.postload");
+    myRemoveEdgesAfterLoading = oc.exists("keep-edges.postload") && oc.getBool("keep-edges.postload");
     // we possibly have to load the edges to keep/remove
     if (oc.isSet("keep-edges.input-file")) {
         NBHelpers::loadEdgesFromFile(oc.getString("keep-edges.input-file"), myEdges2Keep);
@@ -201,22 +201,32 @@ NBEdgeCont::insert(NBEdge* edge, bool ignorePrunning) {
 
 bool
 NBEdgeCont::ignoreFilterMatch(NBEdge* edge) {
-    // remove edges which allow a speed below a set one (set using "keep-edges.min-speed")
-    if (edge->getSpeed() < myEdgesMinSpeed) {
-        return true;
-    }
-    // check whether the edge is a named edge to keep
-    if (!myRemoveEdgesAfterJoining && myEdges2Keep.size() != 0) {
-        if (myEdges2Keep.count(edge->getID()) == 0) {
-            // explicit whitelisting may be combined additively with other filters
-            if (myVehicleClasses2Keep == 0 && myVehicleClasses2Remove == 0
-                    && myTypes2Keep.size() == 0 && myTypes2Remove.size() == 0
-                    && myPruningBoundary.size() == 0) {
-                return true;
+    if (!myRemoveEdgesAfterLoading) {
+        // check whether the edge is a named edge to keep
+        if (myEdges2Keep.size() != 0) {
+            if (myEdges2Keep.count(edge->getID()) == 0) {
+                // explicit whitelisting may be combined additively with other filters
+                if (myVehicleClasses2Keep == 0 && myVehicleClasses2Remove == 0
+                        && myTypes2Keep.size() == 0 && myTypes2Remove.size() == 0
+                        && myPruningBoundary.size() == 0) {
+                    return true;
+                }
+            } else {
+                // explicit whitelisting overrides other filters
+                return false;
             }
-        } else {
-            // explicit whitelisting overrides other filters
-            return false;
+        }
+        // remove edges which allow a speed below a set one (set using "keep-edges.min-speed")
+        if (edge->getSpeed() < myEdgesMinSpeed) {
+            return true;
+        }
+        // check whether the edge shall be removed because it does not allow any of the wished classes
+        if (myVehicleClasses2Keep != 0 && (myVehicleClasses2Keep & edge->getPermissions()) == 0) {
+            return true;
+        }
+        // check whether the edge shall be removed due to allowing unwished classes only
+        if (myVehicleClasses2Remove != 0 && (myVehicleClasses2Remove | edge->getPermissions()) == myVehicleClasses2Remove) {
+            return true;
         }
     }
     // check whether the edge is a named edge to remove
@@ -225,14 +235,6 @@ NBEdgeCont::ignoreFilterMatch(NBEdge* edge) {
             return true;
         }
     }
-    // check whether the edge shall be removed because it does not allow any of the wished classes
-    if (myVehicleClasses2Keep != 0 && (myVehicleClasses2Keep & edge->getPermissions()) == 0) {
-        return true;
-    }
-    // check whether the edge shall be removed due to allowing unwished classes only
-    if (myVehicleClasses2Remove != 0 && (myVehicleClasses2Remove | edge->getPermissions()) == myVehicleClasses2Remove) {
-        return true;
-    }
     // check whether the edge shall be removed because it does not have one of the requested types
     if (myTypes2Keep.size() != 0) {
         if (myTypes2Keep.count(edge->getTypeID()) == 0) {
@@ -710,7 +712,7 @@ NBEdgeCont::splitAt(NBDistrictCont& dc,
             throw ProcessError(TL("Could not set connection!"));
         }
     }
-    if (myRemoveEdgesAfterJoining) {
+    if (myRemoveEdgesAfterLoading) {
         if (myEdges2Keep.count(edge->getID()) != 0) {
             myEdges2Keep.insert(one->getID());
             myEdges2Keep.insert(two->getID());
@@ -2138,4 +2140,50 @@ NBEdgeCont::getUsedTypes() const {
     return result;
 }
 
+
+int
+NBEdgeCont::removeEdgesBySpeed(NBDistrictCont& dc) {
+    EdgeSet toRemove;
+    for (auto item : myEdges) {
+        NBEdge* edge = item.second;
+        // remove edges which allow a speed below a set one (set using "keep-edges.min-speed")
+        if (edge->getSpeed() < myEdgesMinSpeed) {
+            toRemove.insert(edge);
+        }
+    }
+    int numRemoved = 0;
+    for (NBEdge* edge : toRemove) {
+        // explicit whitelist overrides removal
+        if (myEdges2Keep.size() == 0 || myEdges2Keep.count(edge->getID()) == 0) {
+            erase(dc, edge);
+            numRemoved++;
+        }
+    }
+    return numRemoved;
+}
+
+int
+NBEdgeCont::removeEdgesByPermissions(NBDistrictCont& dc) {
+    EdgeSet toRemove;
+    for (auto item : myEdges) {
+        NBEdge* edge = item.second;
+        // check whether the edge shall be removed because it does not allow any of the wished classes
+        if (myVehicleClasses2Keep != 0 && (myVehicleClasses2Keep & edge->getPermissions()) == 0) {
+            toRemove.insert(edge);
+        }
+        // check whether the edge shall be removed due to allowing unwished classes only
+        if (myVehicleClasses2Remove != 0 && (myVehicleClasses2Remove | edge->getPermissions()) == myVehicleClasses2Remove) {
+            toRemove.insert(edge);
+        }
+    }
+    int numRemoved = 0;
+    for (NBEdge* edge : toRemove) {
+        // explicit whitelist overrides removal
+        if (myEdges2Keep.size() == 0 || myEdges2Keep.count(edge->getID()) == 0) {
+            erase(dc, edge);
+            numRemoved++;
+        }
+    }
+    return numRemoved;
+}
 /****************************************************************************/
diff --git a/src/netbuild/NBEdgeCont.h b/src/netbuild/NBEdgeCont.h
@@ -608,6 +608,10 @@ class NBEdgeCont {
     /// @brief return all edge types in used
     std::set<std::string> getUsedTypes() const;
 
+    /// @brief return number of edges removed
+    int removeEdgesBySpeed(NBDistrictCont& dc);
+    int removeEdgesByPermissions(NBDistrictCont& dc);
+
 private:
     /// @brief compute the form factor for a loop of edges
     static double formFactor(const EdgeVector& loopEdges);
@@ -748,8 +752,8 @@ class NBEdgeCont {
     /// @brief The minimum speed an edge may have in order to be kept (default: -1)
     double myEdgesMinSpeed;
 
-    /// @brief Whether edges shall be joined first, then removed
-    bool myRemoveEdgesAfterJoining;
+    /// @brief Whether edges shall be joined and patched first, then removed
+    bool myRemoveEdgesAfterLoading;
 
     /// @brief Set of ids of edges which shall explicitly be kept
     std::set<std::string> myEdges2Keep;

diff --git a/src/netbuild/NBFrame.cpp b/src/netbuild/NBFrame.cpp
@@ -640,7 +640,7 @@ NBFrame::fillOptions(OptionsCont& oc, bool forNetgen) {
 
     if (!forNetgen) {
         oc.doRegister("keep-edges.postload", new Option_Bool(false));
-        oc.addDescription("keep-edges.postload", "Edge Removal", TL("Remove edges after joining"));
+        oc.addDescription("keep-edges.postload", "Edge Removal", TL("Remove edges after loading, patching and joining"));
     }
 
     oc.doRegister("keep-edges.in-boundary", new Option_StringVector());

diff --git a/src/netbuild/NBNetBuilder.cpp b/src/netbuild/NBNetBuilder.cpp
@@ -111,6 +111,14 @@ NBNetBuilder::compute(OptionsCont& oc, const std::set<std::string>& explicitTurn
             myEdgeCont.removeUnwishedEdges(myDistrictCont);
             PROGRESS_TIME_MESSAGE(before);
         }
+        const int removed = myEdgeCont.removeEdgesBySpeed(myDistrictCont);
+        if (removed > 0) {
+            WRITE_MESSAGEF(TL(" Removed % edges because by minimum speed."), removed);
+        }
+        const int removed2 = myEdgeCont.removeEdgesByPermissions(myDistrictCont);
+        if (removed2 > 0) {
+            WRITE_MESSAGEF(TL(" Removed % edges based on vClass."), removed2);
+        }
     }
     // Processing pt stops and lines
     if (!myPTStopCont.getStops().empty()) {