pd-code-connected-sum 0.0.2__tar.gz → 0.0.3__tar.gz

{pd_code_connected_sum-0.0.2 → pd_code_connected_sum-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pd-code-connected-sum
-Version: 0.0.2
+Version: 0.0.3
 Summary: make connected sum for link pd_code
 License: MIT
 License-File: LICENSE
@@ -41,7 +41,10 @@ link_pd_code_2 = [[6, 1, 7, 2], [8, 3, 5, 4], [2, 5, 3, 6], [4, 7, 1, 8]]
 connect_pos_1 = 1
 connect_pos_2 = 1
 
-print(pd_code_connected_sum.connected_sum(
-    link_pd_code_1, link_pd_code_2, connect_pos_1, connect_pos_2))
+new_pd_code, num_map = pd_code_connected_sum.connected_sum(
+    link_pd_code_1, link_pd_code_2, connect_pos_1, connect_pos_2)
+
+print(new_pd_code)
+print(num_map)
 ```
 

{pd_code_connected_sum-0.0.2 → pd_code_connected_sum-0.0.3}/README.md

@@ -21,6 +21,9 @@ link_pd_code_2 = [[6, 1, 7, 2], [8, 3, 5, 4], [2, 5, 3, 6], [4, 7, 1, 8]]
 connect_pos_1 = 1
 connect_pos_2 = 1
 
-print(pd_code_connected_sum.connected_sum(
-    link_pd_code_1, link_pd_code_2, connect_pos_1, connect_pos_2))
+new_pd_code, num_map = pd_code_connected_sum.connected_sum(
+    link_pd_code_1, link_pd_code_2, connect_pos_1, connect_pos_2)
+
+print(new_pd_code)
+print(num_map)
 ```

{pd_code_connected_sum-0.0.2 → pd_code_connected_sum-0.0.3}/pd_code_connected_sum/main.py

@@ -84,7 +84,7 @@ def find_avaible_pos(pd_code:list[list], val_now):
 # 删除 pd_code1 中 val_1 所在的 crossing
 # 然后把两个扭结直接合并
 # 然后重新编号
-def del_component_and_merge(pd_code1, pd_code2, val_1, val_2) -> list[list]:
+def del_component_and_merge(pd_code1, pd_code2, val_1, val_2) -> tuple[list[list], dict]:
     suc = False
     for i in range(len(pd_code1)):
         if check_has(pd_code1[i], val_1):
@@ -118,11 +118,11 @@ def del_component_and_merge(pd_code1, pd_code2, val_1, val_2) -> list[list]:
             if num_map.get(crossing[i]) is None:
                 assert AssertionError()
             crossing[i] = num_map[crossing[i]]
-    return sorted(new_pd_code)
+    return sorted(new_pd_code), num_map
 
 # 将 pd_code1 里面的 val_1 和 pd_code2 里面的 val_2 连接起来
 def connected_sum(
-    pd_code1:list[list], pd_code2:list[list], val_1, val_2) -> list[list]:
+    pd_code1:list[list], pd_code2:list[list], val_1, val_2) -> tuple[list[list], dict]:
     
     # 如果有一个扭结平凡，则不需要连接
     if pd_code1 == [] or pd_code2 == []:
@@ -235,7 +235,11 @@ def connected_sum(
     ans_pd_code = sorted(new_pd_code)
     if not pd_code_sanity.sanity(ans_pd_code):
         raise AssertionError()
-    return ans_pd_code
+    
+    return ans_pd_code, num_map
 
 if __name__ == "__main__":
-    print(connected_sum([[1, 2, 2, 1]], [[1, 2, 2, 1]], 1, 1))
+    pd_code, num_map = connected_sum(
+        [[1, 5, 2, 4], [3, 1, 4, 6], [5, 3, 6, 2]], 
+        [[1, 5, 2, 4], [3, 1, 4, 6], [5, 3, 6, 2]], 1, 1)
+    print(num_map)

{pd_code_connected_sum-0.0.2 → pd_code_connected_sum-0.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pd-code-connected-sum"
-version = "0.0.2"
+version = "0.0.3"
 description = "make connected sum for link pd_code"
 authors = [
     {name = "GGN_2015",email = "neko@jlulug.org"}