Merge pull request #161 from jGaboardi/update_api

Update api
pysal · Nov 25, 2018 · bbca867 · bbca867
2 parents bdc6449 + 812aae7
commit bbca867
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/spaghetti/__init__.py b/spaghetti/__init__.py
@@ -5,9 +5,4 @@
 
 """
 from .network import Network, PointPattern, SimulatedPointPattern, SortedEdges
-from .network import element_as_gdf
-from .analysis import NetworkBase, NetworkG, NetworkK, NetworkF
-from .analysis import gfunction, kfunction, ffunction
-from .util import compute_length, get_neighbor_distances, generatetree
-from .util import dijkstra, dijkstra_mp
-from .util import squared_distance_point_segment, snap_points_on_segments
+from .network import element_as_gdf
diff --git a/spaghetti/tests/test_network_api.py b/spaghetti/tests/test_network_api.py
@@ -313,14 +313,14 @@ def test_generate_tree(self):
         self.assertEqual(self.tree[3], self.known_path)
 
     def test_dijkstra(self):
-        self.distance, self.pred = spgh.dijkstra(self.ntw,
-                                                 self.ntw.edge_lengths, 0)
+        self.distance,\
+        self.pred = spgh.util.dijkstra(self.ntw, self.ntw.edge_lengths, 0)
         self.assertAlmostEqual(self.distance[196], 5505.668247, places=4)
         self.assertEqual(self.pred[196], 133)
 
     def test_dijkstra_mp(self):
-        self.distance, self.pred = spgh.dijkstra_mp((self.ntw,
-                                                     self.ntw.edge_lengths, 0))
+        self.distance,\
+        self.pred = spgh.util.dijkstra_mp((self.ntw, self.ntw.edge_lengths, 0))
         self.assertAlmostEqual(self.distance[196], 5505.668247, places=4)
         self.assertEqual(self.pred[196], 133)