implement destroy_congested_link to ALNS

Author: toruseo

.gitignore

@@ -144,6 +144,7 @@ p*_*.py
 *.prof
 demos_and_examples/uxsim/*
 /*.pkl
+_bench*
 
 # pre-commit
 .pre-commit-config.yaml

uxsim/DTAsolvers/ALNS.py

@@ -451,22 +451,26 @@ def destroy_congested_link(state: ALNSState, base: Sequence[Any]) -> Tuple[List[
         部分解の削除位置はNoneに設定される
     """
     n = len(base)
-    
+
+    removed = []
+
     #混雑リンクを選択
     W = state.additional_info.get("W")
-    df_l = W.analyzer.links_to_pandas()
-    delay_threath = 1.5
-    delay_ranking_ratio = 0.1
-    link_selected_name = np.random.choice(list(df_l[df_l["delay"]>delay_threath].sort_values(by='delay', ascending=False)[:max([int(len(df_l)*delay_ranking_ratio),5])]["link"]))
-    link_selected = W.get_link(link_selected_name)
-
-    #TODO:つづく
+    df_l = W.analyzer.link_to_pandas()
+    
+    delay_ranking_ratio = 0.05
+    delay_ranking_min_n = 3
 
-    w = np.maximum(1/100000, w-0.3)
+    most_delayed_links = list(df_l.sort_values(by='delay_ratio', ascending=False)[:max([int(len(df_l)*delay_ranking_ratio),delay_ranking_min_n])]["link"])
 
     k = state.rng.randint(state.k_min, min(state.k_max, n))
-    probs = (w / w.sum())
-    removed = list(np.random.choice(np.arange(n), size=k, replace=False, p=probs))
+    for _ in range(k):
+        link_selected_name = np.random.choice(most_delayed_links)
+        link_selected = W.get_link(link_selected_name)
+
+        veh_selected = np.random.choice(list(link_selected.vehicles_enter_log.values()))
+        removed.append(veh_selected.id)
+
     xx = _copy_vec(base)
     for i in removed:
         xx[i] = None
@@ -479,6 +483,7 @@ def destroy_congested_link(state: ALNSState, base: Sequence[Any]) -> Tuple[List[
     "segment": destroy_segment,
     "early_departure": destroy_early_departure,
     "late_departure": destroy_late_departure,
+    "congested_link": destroy_congested_link,
 }
 
 # 破壊オペレータの初期重み（選択確率に比例）
@@ -487,6 +492,7 @@ def destroy_congested_link(state: ALNSState, base: Sequence[Any]) -> Tuple[List[
     "segment": 1.0,
     "early_departure": 2.0,
     "late_departure": 0.5,
+    "congested_link": 1.0,
 }
 
 # -------------------------
@@ -768,7 +774,7 @@ def _eval(xx: Sequence[Any]) -> float:
         if not deltas:
             deltas = [1.0]
         med = sorted(deltas)[len(deltas)//2]
-        p0 = 0.3                  # 初期に悪化を割合p0前後で受理したい：かなりずれる．．．
+        p0 = 0.2                  # 初期に悪化を割合p0前後で受理したい：かなりずれる．．．
         T0 = max(1e-6, med / max(1e-12, math.log(1.0/p0)))
 
     # 適応初期値（初期重みは定数から取得、定義されていなければ1.0）

uxsim/uxsim.py

@@ -225,6 +225,7 @@ def generate(s):
                             assert veh.leader.lane == veh.lane
 
                         outlink.vehicles.append(veh)
+                        outlink.vehicles_enter_log[s.W.T*s.W.DELTAT] = veh
 
                         outlink.cum_arrival[-1] += s.W.DELTAN
                         veh.link_arrival_time = s.W.T*s.W.DELTAT
@@ -295,6 +296,7 @@ def transfer(s):
 
                 #リンク間遷移実行
                 inlink.vehicles.popleft()
+                outlink.vehicles_enter_log[s.W.T*s.W.DELTAT] = veh
                 veh.link = outlink
                 veh.x = 0
 
@@ -534,6 +536,9 @@ def __init__(s, W, name, start_node, end_node, length, free_flow_speed=20, jam_d
         #リンク内車両一覧
         s.vehicles = deque()
 
+        #流入した車両一覧．t: Vehicle
+        s.vehicles_enter_log = {}
+
         #旅行時間
         s.traveltime_instant = []
 
@@ -2305,7 +2310,7 @@ def get_node(W, node):
             else:
                 if node.name in W.NODES_NAME_DICT:
                     return W.NODES_NAME_DICT[node.name]
-        elif type(node) is str:
+        elif type(node) is str or type(node) is np.str_:
             if node in W.NODES_NAME_DICT:
                 return W.NODES_NAME_DICT[node]
         raise Exception(f"'{node}' is not Node in this World")
@@ -2333,7 +2338,7 @@ def get_link(W, link):
             else:
                 if link.name in W.LINKS_NAME_DICT:
                     return W.LINKS_NAME_DICT[link.name]
-        elif type(link) is str:
+        elif type(link) is str or type(link) is np.str_:
             if link in W.LINKS_NAME_DICT:
                 return W.LINKS_NAME_DICT[link]
         raise Exception(f"'{link}' is not Link in this World")