Fix Regression in FNSG (#248)

There was a regression when removing extra nodes in EMME 2024 and 2025.  This patch
fixes the results to match TMG_Toolbox 1.13.

Author: JamesVaughan

TMGToolbox.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26430.13
+# Visual Studio Version 17
+VisualStudioVersion = 17.13.35919.96 d17.13
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NewFolder1", "NewFolder1", "{BB827711-D5DA-4966-B23C-F9CF1B385FC8}"
 	ProjectSection(SolutionItems) = preProject
@@ -22,4 +22,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {F01023F6-7353-4BBF-8BDC-968881298B6B}
+	EndGlobalSection
 EndGlobal

TMGToolbox/src/network_editing/remove_extra_nodes.py

@@ -440,47 +440,38 @@ def _ParseSegmentAggregators(self):
                 self._segmentAggregators[attName] = funcName
                 self._nodeAggregators[attName] = funcName
 
-        def fix_key_end(dictionary, end_sequency):
-            to_change = []
-            for key in six.iterkeys(dictionary):
-                if key.endswith(end_sequency):
-                    to_change.append(key)
-            for key in to_change:
-                newKey = key.replace(end_sequency, "")
-                val = dictionary.pop(key)
-                dictionary[newKey] = val
+        for key in list(six.iterkeys(self._linkAggregators)):
+            if key.endswith("_l"):
+                newKey = key.replace("_l", "")
+                val = self._linkAggregators.pop(key)
+                self._linkAggregators[newKey] = val
+        
+        for key in list(six.iterkeys(self._segmentAggregators)):
+            if key.endswith("_s"):
+                newKey = key.replace("_s", "")
+                val = self._segmentAggregators.pop(key)
+                self._segmentAggregators[newKey] = val
+        
+        for key in list(six.iterkeys(self._nodeAggregators)):
+            if key.endswith("_n"):
+                newKey = key.replace("_n", "")
+                val = self._nodeAggregators.pop(key)
+                self._nodeAggregators[newKey] = val
+        
+        for att, funcName in list(six.iteritems(self._linkAggregators)):
+            if funcName == 'avg_by_length':
+                self._linkAggregators[att] = self.AVERAGE_BY_LENGTH_LINKS
+            else:
+                self._linkAggregators[att] = _editing.NAMED_AGGREGATORS[funcName]
 
-        fix_key_end(self._linkAggregators, "_l")
-        fix_key_end(self._segmentAggregators, "_s")
-        fix_key_end(self._nodeAggregators, "_n")
+        for att, funcName in list(six.iteritems(self._segmentAggregators)):
+            if funcName == 'avg_by_length':
+                self._segmentAggregators[att] = self.AVERAGE_BY_LENGTH_SEGMENTS
+            else:
+                self._segmentAggregators[att] = _editing.NAMED_AGGREGATORS[funcName]
 
-        def assign_function(dictionary, func_name, func_type):
-            to_change = []
-            for att, funcName in six.iteritems(dictionary):
-                if funcName == func_name:
-                    to_change.append((att, func_type))
-                else:
-                    try:
-                        to_change.append((att, _editing.NAMED_AGGREGATORS[funcName]))
-                    except KeyError as ke:
-                        print("Error assigning function: %s from _editing" %funcName)
-                        print(dictionary)
-                        raise
-            
-
-            for key, to_assign in to_change:
-                try:
-                    dictionary[key] = to_assign
-                except KeyError as ke:
-                    print("Error assigning function: %s" %key)
-                    print(dictionary)
-                    raise
-            
-
-        assign_function(self._linkAggregators, 'avg_by_length', self.AVERAGE_BY_LENGTH_LINKS)
-        assign_function(self._segmentAggregators, 'avg_by_length', self.AVERAGE_BY_LENGTH_LINKS)
-        # This one should only set the func type to the _editing.NAMED_AGGREGATORS.
-        assign_function(self._nodeAggregators, None, None)
+        for att, funcName in list(six.iteritems(self._nodeAggregators)):
+            self._nodeAggregators[att] = _editing.NAMED_AGGREGATORS[funcName]
 
     def _GetCandidateNodes(self, network):