Allow xml write/read of additional attributes

example_data/pt2matsim_network/road_pricing/osm_to_network_ids.json

@@ -1 +1 @@
-{"26997928": ["1", "2", "3", "4"], "546461337": ["998", "999"]}
+{"26997928.0": ["1", "2", "3", "4"], "546461337.0": ["998", "999"]}

example_data/pt2matsim_network/road_pricing/osm_toll_id_ref.csv

@@ -1,3 +1,3 @@
 osm_id,osm_ref,osm_name
-26997928,A400,Charing Cross Road
-546461337,A3211,Byward Street
+26997928.0,A400,Charing Cross Road
+546461337.0,A3211,Byward Street

example_data/pt2matsim_network/road_pricing/osm_tolls_with_network_ids.csv

@@ -1,3 +1,3 @@
 ,osm_id,osm_ref,osm_name,network_id,vehicle_type,toll_amount,start_time,end_time
-0,26997928,A400,Charing Cross Road,True,type2,2.9,00:00,23:59
-1,546461337,A3211,Byward Street,True,type2,2.9,00:00,23:59
+0,26997928.0,A400,Charing Cross Road,True,type2,2.9,00:00,23:59
+1,546461337.0,A3211,Byward Street,True,type2,2.9,00:00,23:59

example_data/pt2matsim_network/road_pricing/roadpricing-file.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE roadpricing SYSTEM "http://www.matsim.org/files/dtd/roadpricing_v1.dtd">
-<roadpricing type="cordon" name="cordon-toll">
-  <description>A simple cordon toll scheme</description>
+<roadpricing type="link" name="simple-toll">
+  <description>A simple toll scheme</description>
   <links>
     <!-- === A3211 === -->
     <link id="998">

genet/__init__.py

@@ -1,7 +1,7 @@
 from genet.core import Network  # noqa: F401
 from genet.schedule_elements import Schedule, Service, Route, Stop  # noqa: F401
 from genet.use.road_pricing import Toll  # noqa: F401
-from genet.inputs_handler.read import *  # noqa: F401,F403
+from genet.input.read import *  # noqa: F401,F403
 from genet.auxiliary_files import AuxiliaryFile  # noqa: F401
 from genet.max_stable_set import MaxStableSet  # noqa: F401
 from genet.exceptions import ScheduleElementGraphSchemaError, RouteInitialisationError, \

genet/configs/OSM/default_config.yml

@@ -111,7 +111,7 @@ MODES:
 
   DEFAULT_OSM_TAG_VALUE:
   # GeNet will first look at OSM tags to infer the matsim values the link should have. For the types and values head over to
-  # outputs_handler/matsim_xml_values.py.
+  # output/matsim_xml_values.py.
     car: secondary
     bus: secondary
     rail: railway

genet/configs/OSM/slim_config.yml

@@ -67,7 +67,7 @@ MODES:
 
   DEFAULT_OSM_TAG_VALUE:
   # GeNet will first look at OSM tags to infer the matsim values the link should have. For the types and values head over to
-  # outputs_handler/matsim_xml_values.py.
+  # output/matsim_xml_values.py.
     car: secondary
     bus: secondary
     rail: railway

genet/core.py

@@ -12,9 +12,9 @@
 import genet.modify.change_log as change_log
 import genet.modify.graph as modify_graph
 import genet.modify.schedule as modify_schedule
-import genet.outputs_handler.geojson as geojson
-import genet.outputs_handler.matsim_xml_writer as matsim_xml_writer
-import genet.outputs_handler.sanitiser as sanitiser
+import genet.output.geojson as geojson
+import genet.output.matsim_xml_writer as matsim_xml_writer
+import genet.output.sanitiser as sanitiser
 import genet.schedule_elements as schedule_elements
 import genet.utils.dict_support as dict_support
 import genet.utils.elevation as elevation
@@ -37,16 +37,19 @@
 
 
 class Network:
-    def __init__(self, epsg):
+    def __init__(self, epsg, **kwargs):
         self.epsg = epsg
         self.transformer = Transformer.from_crs(epsg, 'epsg:4326', always_xy=True)
-        self.graph = nx.MultiDiGraph(name='Network graph', crs=self.epsg, simplified=False)
+        self.graph = nx.MultiDiGraph(name='Network graph', crs=epsg)
+        self.attributes = {'crs': epsg}
         self.schedule = schedule_elements.Schedule(epsg)
         self.change_log = change_log.ChangeLog()
         self.auxiliary_files = {'node': {}, 'link': {}}
         # link_id_mapping maps between (usually string literal) index per edge to the from and to nodes that are
         # connected by the edge
         self.link_id_mapping = {}
+        if kwargs:
+            self.add_additional_attributes(kwargs)
 
     def __repr__(self):
         return f"<{self.__class__.__name__} instance at {id(self)}: with \ngraph: {nx.info(self.graph)} and " \
@@ -55,9 +58,26 @@ def __repr__(self):
     def __str__(self):
         return self.info()
 
+    def add_additional_attributes(self, attribs: dict):
+        """
+        adds attributes defined by keys of the attribs dictionary with values of the corresponding values
+        :param attribs: the additional attributes {attribute_name: attribute_value}
+        :return:
+        """
+        for k, v in attribs.items():
+            if k not in self.__dict__:
+                setattr(self, k, v)
+            else:
+                logging.warning(
+                    f"{self.__class__.__name__} already has an additional attribute: {k}. "
+                    "Consider overwritting it instead.")
+
+    def has_attrib(self, attrib_name):
+        return attrib_name in self.__dict__
+
     def add(self, other):
         """
-        This let's you add on `other` genet.Network to the network this method is called on.
+        This lets you add on `other` genet.Network to the network this method is called on.
         This is deliberately not a magic function to discourage `new_network = network_1 + network_2` (and memory
         goes out the window)
         :param other:
@@ -243,10 +263,16 @@ def simplify(self, no_processes=1, keep_loops=False):
                                                 v not in useless_self_loops}
 
         # mark graph as having been simplified
-        self.graph.graph["simplified"] = True
+        self._mark_as_simplified()
+
+    def _mark_as_simplified(self):
+        self.attributes['simplified'] = True
 
     def is_simplified(self):
-        return self.graph.graph["simplified"]
+        if 'simplified' in self.attributes:
+            # range of values for backwards compatibility
+            return self.attributes['simplified'] in {'true', 'True', True}
+        return False
 
     def node_attribute_summary(self, data=False):
         """

genet/exceptions.py

@@ -95,3 +95,10 @@ class PartialMaxStableSetProblem(Exception):
     Raised when the maximum stable set to snap PT to the network is partial - some stops found nothing to snap to
     """
     pass
+
+
+class MalformedAdditionalAttributeError(Exception):
+    """
+    Raised when additional attributes can not be saved to MATSim network
+    """
+    pass