fix ordering (#25)

* fix ordering

* ditch python 3.7 (not available on github actions macOS)

---------

Co-authored-by: TANG ZHIXIONG <[email protected]>

Author: district10

.github/workflows/pip.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         platform: [windows-latest, macos-latest, ubuntu-latest]
-        python-version: ["3.7", "3.12", "pypy-3.9"]
+        python-version: ["3.8", "3.12", "pypy-3.9"]
 
     steps:
     - uses: actions/checkout@v4

docs/conf.py

@@ -58,9 +58,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.2.1'
+version = '0.2.2'
 # The full version, including alpha/beta/rc tags.
-release = '0.2.1'
+release = '0.2.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "networkx_graph"
-version = "0.2.1"
+version = "0.2.2"
 url = "https://github.com/cubao/networkx-graph"
 description = "Some customized graph algorithms"
 readme = "README.md"

src/main.cpp

@@ -434,7 +434,11 @@ struct DiGraph
         for (auto &pair : bindings) {
             auto [itr, _] =
                 ret.node2bindings.emplace(indexer_.id(pair.first), pair.second);
-            std::sort(itr->second.begin(), itr->second.end());
+            std::sort(itr->second.begin(), itr->second.end(),
+                      [](const auto &a, const auto &b) {
+                          return std::tie(std::get<0>(a), std::get<1>(a)) <
+                                 std::tie(std::get<0>(b), std::get<1>(b));
+                      });
         }
         return ret;
     }

tests/test_basic.py

@@ -32,7 +32,7 @@ def calculate_md5(filename, block_size=4096):
 
 
 def test_version():
-    assert m.__version__ == "0.2.1"
+    assert m.__version__ == "0.2.2"
 
 
 def test_add():
@@ -624,6 +624,8 @@ def test_routing():
     decoded["w2"][-1][-1]["num"] = 42
     assert obj["num"] == 42
 
+    G.encode_bindings({"road": [(1, 2, 5), (1, 2, "val2")]})
+
     generator = G.shortest_paths_from("w1", cutoff=20.0)
     assert isinstance(generator, ShortestPathGenerator)
     dists = generator.destinations()