scgraph 2.1.1__tar.gz → 2.2.0__tar.gz

{scgraph-2.1.1/scgraph.egg-info → scgraph-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scgraph
-Version: 2.1.1
+Version: 2.2.0
 Summary: Determine an approximate route between two points on earth.
 Author-email: Connor Makowski <conmak@mit.edu>
 Project-URL: Homepage, https://github.com/connor-makowski/scgraph
@@ -165,6 +165,8 @@ output = marnet_geograph.get_shortest_path(
 get_line_path(output, filename='output.geojson')
 ```
 
+Modify an existing geograph: See the notebook [here](https://colab.research.google.com/github/connor-makowski/scgraph/blob/main/example_making_modifications.ipynb)
+
 
 You can specify your own custom graphs for direct access to the solving algorithms. This requires the use of the low level `Graph` class
 

{scgraph-2.1.1 → scgraph-2.2.0}/README.md

@@ -150,6 +150,8 @@ output = marnet_geograph.get_shortest_path(
 get_line_path(output, filename='output.geojson')
 ```
 
+Modify an existing geograph: See the notebook [here](https://colab.research.google.com/github/connor-makowski/scgraph/blob/main/example_making_modifications.ipynb)
+
 
 You can specify your own custom graphs for direct access to the solving algorithms. This requires the use of the low level `Graph` class
 

{scgraph-2.1.1 → scgraph-2.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.black]
 line-length = 80
-target-version = ['py39']
+target-version = ['py312']
 exclude = '/.*(migrations|__pycache__|geographs).*/'
 
 [tool.setuptools]
@@ -12,7 +12,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "scgraph"
-version = "2.1.1"
+version = "2.2.0"
 description = "Determine an approximate route between two points on earth."
 authors = [
     {name="Connor Makowski", email="conmak@mit.edu"}

{scgraph-2.1.1 → scgraph-2.2.0}/scgraph/core.py

@@ -315,9 +315,6 @@ class GeoGraph:
             - Type: list of lists
             - What: A list of lists where the values are coordinates (latitude then longitude)
             - Note: The length of the nodes list must be the same as that of the graph list
-
-        Optional Arguments:
-
         """
         self.graph = graph
         self.nodes = nodes
@@ -727,7 +724,7 @@ class GeoGraph:
         if len(nodes) == 0:
             # Default to all if the lat_lon_bound fails to find any nodes
             return self.get_node_distances(
-                node=nodes,
+                node=node,
                 circuity=circuity,
                 lat_lon_bound=180,
                 node_addition_type=node_addition_type,
@@ -843,7 +840,6 @@ class GeoGraph:
             lat_lon_bound, (int, float)
         ), "Lat_lon_bound must be a number"
         assert lat_lon_bound > 0, "Lat_lon_bound must be greater than 0"
-
         node = [node["latitude"], node["longitude"]]
         # Get the distances to all other nodes
         distances = self.get_node_distances(
@@ -878,13 +874,13 @@ class GeoGraph:
 
         """
         features = []
-        for origin_idx, destinations in self.graph.items():
+        for origin_idx, destinations in enumerate(self.graph):
             for destination_idx, distance in destinations.items():
                 # Create an undirected graph for geojson purposes
                 if origin_idx > destination_idx:
                     continue
-                origin = self.nodes.get(origin_idx)
-                destination = self.nodes.get(destination_idx)
+                origin = self.nodes[origin_idx]
+                destination = self.nodes[destination_idx]
                 features.append(
                     {
                         "type": "Feature",
@@ -896,10 +892,10 @@ class GeoGraph:
                         "geometry": {
                             "type": "LineString",
                             "coordinates": [
-                                [origin["longitude"], origin["latitude"]],
+                                [origin[1], origin[0]],
                                 [
-                                    destination["longitude"],
-                                    destination["latitude"],
+                                    destination[1],
+                                    destination[0],
                                 ],
                             ],
                         },
@@ -909,3 +905,214 @@ class GeoGraph:
         out_dict = {"type": "FeatureCollection", "features": features}
         with open(filename, "w") as f:
             json.dump(out_dict, f)
+
+    def save_as_geograph(self, name: str) -> None:
+        """
+        Function:
+
+        - Save the current geograph as an importable python file
+
+        Required Arguments:
+
+        - `name`
+            - Type: str
+            - What: The name of the geograph and file
+            - EG: 'custom'
+                - Stored as: 'custom.py'
+                    - In your current directory
+                - Import as: 'from .custom import custom_geograph'
+        """
+        self.validate_nodes()
+        self.validate_graph(
+            check_symmetry=True, check_connected=False
+        )
+        out_string = f"""from scgraph.core import GeoGraph\ngraph={str(self.graph)}\nnodes={str(self.nodes)}\n{name}_geograph = GeoGraph(graph=graph, nodes=nodes)"""
+        with open(name+".py", "w") as f:
+            f.write(out_string)
+    
+    def mod_remove_arc(self, origin_idx: int, destination_idx: int, undirected: bool = True) -> None:
+        """
+        Function:
+
+        - Remove an arc from the graph
+
+        Required Arguments:
+
+        - `origin_idx`
+            - Type: int
+            - What: The index of the origin node
+        - `destination_idx`
+            - Type: int
+            - What: The index of the destination node
+
+        Optional Arguments:
+
+        - `undirected`
+            - Type: bool
+            - What: Whether to remove the arc in both directions
+            - Default: True
+        """
+        assert origin_idx < len(self.graph), "Origin node does not exist"
+        assert destination_idx < len(self.graph), "Destination node does not exist"
+        assert destination_idx in self.graph[origin_idx], "Arc does not exist"
+        del self.graph[origin_idx][destination_idx]
+        if undirected:
+            if origin_idx in self.graph[destination_idx]:
+                del self.graph[destination_idx][origin_idx]
+
+    def mod_add_node(self, latitude: [float, int], longitude: [float, int]) -> int:
+        """
+        Function:
+
+        - Add a node to the graph
+
+        Required Arguments:
+
+        - `latitude`
+            - Type: int | float
+            - What: The latitude of the node
+        - `longitude`
+            - Type: int | float
+            - What: The longitude of the node
+
+        Returns:
+
+        - The index of the new node
+        """
+        self.nodes.append([latitude, longitude])
+        self.graph.append({})
+        return len(self.graph) - 1
+    
+    def mod_add_arc(self, origin_idx: int, destination_idx: int, distance: [int, float]=0, use_haversine_distance=True, undirected: bool = True) -> None:
+        """
+        Function:
+
+        - Add an arc to the graph
+
+        Required Arguments:
+
+        - `origin_idx`
+            - Type: int
+            - What: The index of the origin node
+        - `destination_idx`
+            - Type: int
+            - What: The index of the destination node
+
+        Optional Arguments:
+
+        - `distance`
+            - Type: int | float
+            - What: The distance between the origin and destination nodes in terms of the graph distance (normally km)
+            - Default: 0
+        - `use_haversine_distance`
+            - Type: bool
+            - What: Whether to calculate the haversine distance (km) between the nodes when calculating the distance
+            - Default: True
+            - Note: If true, overrides the `distance` argument
+        - `undirected`
+            - Type: bool
+            - What: Whether to add the arc in both directions
+            - Default: True
+        """
+        assert origin_idx < len(self.graph), "Origin node does not exist"
+        assert destination_idx < len(self.graph), "Destination node does not exist"
+        if use_haversine_distance:
+            distance = haversine(self.nodes[origin_idx], self.nodes[destination_idx])
+        self.graph[origin_idx][destination_idx] = distance
+        if undirected:
+            self.graph[destination_idx][origin_idx] = distance
+
+def load_geojson_as_geograph(geojson_filename: str) -> GeoGraph:
+    """
+    Function:
+
+    - Create a CustomGeoGraph object loaded from a geojson file
+
+    Required Arguments:
+
+    - `geojson_filename`
+        - Type: str
+        - What: The filename of the geojson file to load
+        - Note: All arcs read in will be undirected
+        - Note: This geojson file must be formatted in a specific way
+            - The geojson file must be a FeatureCollection
+            - Each feature must be a LineString with two coordinate pairs
+                - The first coordinate pair must be the origin node
+                - The second coordinate pair must be the destination node
+                - The properties of the feature must include the distance between the origin and destination nodes
+                - The properties of the feature must include the origin and destination node idxs
+                - Origin and destination node idxs must be integers between 0 and n-1 where n is the number of nodes in the graph
+            - EG:
+            ```
+            {
+                "type": "FeatureCollection",
+                "features": [
+                    {
+                        "type": "Feature",
+                        "properties": {
+                            "origin_idx": 0,
+                            "destination_idx": 1,
+                            "distance": 10
+                        },
+                        "geometry": {
+                            "type": "LineString",
+                            "coordinates": [
+                                [121.47, 31.23],
+                                [121.48, 31.24]
+                            ]
+                        }
+                    }
+                ]
+            }
+            ```
+    """
+    with open (geojson_filename, "r") as f:
+        geojson_features = json.load(f).get("features", [])
+    
+    nodes_dict = {}
+    graph_dict = {}
+    for feature in geojson_features:
+        properties = feature.get("properties", {})
+        origin_idx = properties.get("origin_idx")
+        destination_idx = properties.get("destination_idx")
+        distance = properties.get("distance")
+        geometry = feature.get("geometry", {})
+        coordinates = geometry.get("coordinates", [])
+
+        # Validations
+        assert feature.get("type") == "Feature", "All features must be of type 'Feature'"
+        assert geometry.get("type") == "LineString", "All geometries must be of type 'LineString'"
+        assert len(coordinates) == 2, "All LineStrings must have exactly 2 coordinates"
+        assert isinstance(origin_idx, int), "All features must have an 'origin_idx' property that is an integer"
+        assert isinstance(destination_idx, int), "All features must have a 'destination_idx' property that is an integer"
+        assert isinstance(distance, (int, float)), "All features must have a 'distance' property that is a number"
+        assert origin_idx >= 0, "All origin_idxs must be greater than or equal to 0"
+        assert destination_idx >= 0, "All destination_idxs must be greater than or equal to 0"
+        assert distance >= 0, "All distances must be greater than or equal to 0"
+        origin = coordinates[0]
+        destination = coordinates[1]
+        assert isinstance(origin, list), "All coordinates must be lists"
+        assert isinstance(destination, list), "All coordinates must be lists"
+        assert len(origin) == 2, "All coordinates must have a length of 2"
+        assert len(destination) == 2, "All coordinates must have a length of 2"
+        assert all([isinstance(i, (int, float)) for i in origin]), "All coordinates must be numeric"
+        assert all([isinstance(i, (int, float)) for i in destination]), "All coordinates must be numeric"
+        # assert all([origin[0] >= -90, origin[0] <= 90, origin[1] >= -180, origin[1] <= 180]), "All coordinates must be valid latitudes and longitudes"
+        # assert all([destination[0] >= -90, destination[0] <= 90, destination[1] >= -180, destination[1] <= 180]), "All coordinates must be valid latitudes and longitudes"
+        
+        # Update the data
+        nodes_dict[origin_idx] = origin
+        nodes_dict[destination_idx] = destination
+        graph_dict[origin_idx] = {**graph_dict.get(origin_idx, {}), destination_idx: distance}
+        graph_dict[destination_idx] = {**graph_dict.get(destination_idx, {}), origin_idx: distance}
+    assert len(nodes_dict) == len(graph_dict), "All nodes must be included as origins in the graph dictionary"
+    nodes = [[i[1][1],i[1][0]] for i in sorted(nodes_dict.items(), key=lambda x: x[0])]
+    ordered_graph_tuple = sorted(graph_dict.items(), key=lambda x: x[0])
+    graph_map = {i[0]: idx for idx, i in enumerate(ordered_graph_tuple)}
+    graph = [
+        {graph_map[k]: v for k, v in i[1].items()} for i in ordered_graph_tuple
+    ]
+    return GeoGraph(
+        graph=graph,
+        nodes=nodes
+    )

{scgraph-2.1.1 → scgraph-2.2.0}/scgraph/utils.py

@@ -16,10 +16,10 @@ def haversine(
 
     - `origin`:
         - Type: list of two floats | ints
-        - What: The origin point as a list of "longitude" and "latitude"
+        - What: The origin point as a list of "latitude" and "longitude"
     - `destination`:
         - Type: list of two floats | ints
-        - What: The destination point as a list of "longitude" and "latitude"
+        - What: The destination point as a list of "latitude" and "longitude"
 
     Optional Arguments:
 

{scgraph-2.1.1 → scgraph-2.2.0/scgraph.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scgraph
-Version: 2.1.1
+Version: 2.2.0
 Summary: Determine an approximate route between two points on earth.
 Author-email: Connor Makowski <conmak@mit.edu>
 Project-URL: Homepage, https://github.com/connor-makowski/scgraph
@@ -165,6 +165,8 @@ output = marnet_geograph.get_shortest_path(
 get_line_path(output, filename='output.geojson')
 ```
 
+Modify an existing geograph: See the notebook [here](https://colab.research.google.com/github/connor-makowski/scgraph/blob/main/example_making_modifications.ipynb)
+
 
 You can specify your own custom graphs for direct access to the solving algorithms. This requires the use of the low level `Graph` class
 

{scgraph-2.1.1 → scgraph-2.2.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = scgraph
-version = 2.1.1
+version = 2.2.0
 description_file = README.md
 
 [options]