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

{pd_code_connected_sum-0.0.1 → 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.1
+Version: 0.0.3
 Summary: make connected sum for link pd_code
 License: MIT
 License-File: LICENSE
@@ -14,6 +14,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Requires-Dist: pd-code-pre-nxt
 Requires-Dist: pd-code-sanity
 Description-Content-Type: text/markdown
 
@@ -40,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.1 → 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.1 → pd_code_connected_sum-0.0.3}/pd_code_connected_sum/main.py

@@ -1,4 +1,5 @@
 import pd_code_sanity
+import pd_code_pre_nxt
 import json
 
 # 为编码增加前缀
@@ -9,66 +10,6 @@ def add_prefix(pd_code:list[list], prefix:str) -> list[list]:
             pd_code[i][j] = prefix + str(pd_code[i][j])
     return json.loads(json.dumps(pd_code))
 
-# 提取原始数值
-def get_raw_val(val_in_crs:int|str) -> int:
-    if isinstance(val_in_crs, str):
-        return int(val_in_crs.split("_")[-1])
-    return int(val_in_crs)
-
-def add_edge(pre:dict, nxt:dict, val1, val2):
-    raw_val1 = get_raw_val(val1)
-    raw_val2 = get_raw_val(val2)
-
-    # 记录前后关系
-    pre_val = -1
-    nxt_val = -1
-
-    # 确定前后关系
-    if abs(raw_val1 - raw_val2) == 1:
-        if raw_val1 < raw_val2:
-            pre_val = val1
-            nxt_val = val2
-        else:
-            pre_val = val2
-            nxt_val = val1
-    else:
-        if raw_val1 < raw_val2:
-            pre_val = val2
-            nxt_val = val1
-        else:
-            pre_val = val1
-            nxt_val = val2
-
-    # 设置 dict 值 
-    pre[nxt_val] = pre_val
-    nxt[pre_val] = nxt_val
-
-# 计算 pre 和 nxt
-# 没有 r1 crossing 就不会出现混乱
-def get_pre_nxt(pd_code:list[list]) -> tuple[dict, dict]:
-    pre = dict()
-    nxt = dict()
-    for crossing in pd_code:
-        if len(set(crossing)) > 2: # 至少有三个不同的数
-            add_edge(pre, nxt, crossing[0], crossing[2])
-            add_edge(pre, nxt, crossing[1], crossing[3])
-        else:
-            two_values = list(set(crossing)) # 只有两个不同的数
-            if len(two_values) != 2:
-                raise AssertionError()
-            for i in range(2):
-                pre[two_values[i]] = two_values[1-i] # 互为前驱后继
-                nxt[two_values[i]] = two_values[1-i]
-    
-    # 获取数值合集
-    num_set = get_num_set(pd_code)
-    for num in num_set:
-        if pre.get(num) is None:
-            pre[num] = nxt[num]
-        if nxt.get(num) is None:
-            nxt[num] = pre[num]
-    return pre, nxt
-
 # 替换一个值恰好一次
 def replace_val(crossing:list, val_now:str, val_new:str):
     cnt = 0
@@ -92,13 +33,7 @@ def check_has2(crossing:list, val1:str, val2:str) -> bool:
         check_has(crossing, val1) and 
         check_has(crossing, val2))
 
-def get_num_set(pd_code:list[list]):
-    val_set = set()
-    for crossing in pd_code:
-        for term in crossing:
-            if term not in val_set:
-                val_set.add(term)
-    return sorted(list(val_set))
+get_num_set = pd_code_pre_nxt.get_num_set
 
 # 按照顺序对循环进行遍历
 def dfs(val, nxt:dict[str, str], vis: set[int], idx:dict[str, int]):
@@ -149,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):
@@ -169,8 +104,8 @@ def del_component_and_merge(pd_code1, pd_code2, val_1, val_2) -> list[list]:
     pd_code2 = add_prefix(pd_code2, "b_")
 
     # 计算前驱后继
-    _, nxt1 = get_pre_nxt(pd_code1)
-    _, nxt2 = get_pre_nxt(pd_code2)
+    _, nxt1 = pd_code_pre_nxt.get_pre_nxt(pd_code1)
+    _, nxt2 = pd_code_pre_nxt.get_pre_nxt(pd_code2)
     nxt = nxt1 | nxt2
 
     # 合并得到新的 pd_code
@@ -183,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 == []:
@@ -261,8 +196,8 @@ def connected_sum(
 
     # 由于不存在 nugatory crossing 和 r1 crossing
     # 所以两侧各有两个相关 crossing
-    _, nxt1 = get_pre_nxt(pd_code1)
-    _, nxt2 = get_pre_nxt(pd_code2)
+    _, nxt1 = pd_code_pre_nxt.get_pre_nxt(pd_code1)
+    _, nxt2 = pd_code_pre_nxt.get_pre_nxt(pd_code2)
     nxt = nxt1 | nxt2
 
     # 带有字母前缀的成分
@@ -300,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.1 → pd_code_connected_sum-0.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pd-code-connected-sum"
-version = "0.0.1"
+version = "0.0.3"
 description = "make connected sum for link pd_code"
 authors = [
     {name = "GGN_2015",email = "neko@jlulug.org"}
@@ -9,7 +9,8 @@ license = {text = "MIT"}
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "pd-code-sanity"
+    "pd-code-sanity",
+    "pd-code-pre-nxt"
 ]