pycityagent 1.1.6__py3-none-any.whl → 1.1.8__py3-none-any.whl

pycityagent/brain/sence.py

@@ -60,7 +60,7 @@ def get_xy_in_lane(nodes, distance, direction:str='front'):
         # 顺道路方向前进
         if distance == 0:
             return [nodes[0]['x'], nodes[0]['y']]
-        key_index = 0
+        key_index = 0  # first node
         for i in range(1, len(nodes)):
             x1, y1 = nodes[i-1]['x'], nodes[i-1]['y']
             x2, y2 = nodes[i]['x'], nodes[i]['y']
@@ -70,12 +70,14 @@ def get_xy_in_lane(nodes, distance, direction:str='front'):
                 break;
             key_index += 1
         if remain_s < 0.5:
-            return [nodes[-1]['x'], nodes[-1]['y']]
+            return [nodes[key_index]['x'], nodes[key_index]['y']]
         longlat = point_on_line_given_distance(nodes[key_index], nodes[key_index+1], remain_s)
         return longlat
     else:
         # 逆道路方向前进
-        key_index = len(nodes)
+        if distance == 0:
+            return [nodes[-1]['x'], nodes[-1]['y']]
+        key_index = len(nodes)-1  # last node
         for i in range(len(nodes)-1, 0, -1):
             x1, y1 = nodes[i]['x'], nodes[i]['y']
             x2, y2 = nodes[i-1]['x'], nodes[i-1]['y']
@@ -85,7 +87,7 @@ def get_xy_in_lane(nodes, distance, direction:str='front'):
                 break;
             key_index -= 1
         if remain_s < 0.5:
-            return [nodes[0]['x'], nodes[0]['y']]
+            return [nodes[key_index]['x'], nodes[key_index]['y']]
         longlat = point_on_line_given_distance(nodes[key_index], nodes[key_index-1], remain_s)
         return longlat
 
@@ -407,7 +409,7 @@ class Sence(BrainFunction):
                 x, y = get_xy_in_lane(nodes, neg_s, 'back')
                 longlat = self._agent._simulator.map.xy2lnglat(x=x, y=y)
                 type = self._lane_type_mapping.get(lane['type'], 'unspecified')
-                positions += [{'lans_id': lane_id, 
+                positions += [{'lane_id': lane_id, 
                                's': neg_s, 
                                'xy': (x, y),
                                'longlat': longlat, 
@@ -418,8 +420,8 @@ class Sence(BrainFunction):
                 x, y = get_xy_in_lane(nodes, pos_s)
                 longlat = self._agent._simulator.map.xy2lnglat(x=x, y=y)
                 type = self._lane_type_mapping.get(lane['type'], 'unspecified')
-                positions += [{'lans_id': lane_id, 
-                               's': neg_s, 
+                positions += [{'lane_id': lane_id, 
+                               's': pos_s, 
                                'xy': (x, y),
                                'longlat': longlat, 
                                'type': type}]

{pycityagent-1.1.6.dist-info → pycityagent-1.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycityagent
-Version: 1.1.6
+Version: 1.1.8
 Summary: LLM-based城市模拟器agent构建库
 Author-email: Yuwei Yan <pinkgranite86@gmail.com>
 License: MIT License

{pycityagent-1.1.6.dist-info → pycityagent-1.1.8.dist-info}/RECORD

@@ -19,7 +19,7 @@ pycityagent/brain/brain.py,sha256=G1Q98qZ6MH1SquC3BubgJqVvIBY-Vf7elgo7zzPEGwI,10
 pycityagent/brain/brainfc.py,sha256=E1N9Kdjjmo7S_kgvv8pr_gFDbQvRmXxEn1BVn85hd1s,280
 pycityagent/brain/memory.py,sha256=UBZFeUYBnQ_03_QYgJhgdWRy4n5MnISopw8-Brk-sag,22067
 pycityagent/brain/scheduler.py,sha256=b8MRikIJn1meTiIYi0gb6C607QnlpQkNc-Q_E0K2_Ks,18593
-pycityagent/brain/sence.py,sha256=uFau9iNZFat_E982P5eoH5WkTbqHJgjj2A9ofUTnq08,28724
+pycityagent/brain/sence.py,sha256=b6rwDjmKnfJQmdMtBmyVsLTVhWxEYuwHdMv4h7Zhlqc,28861
 pycityagent/brain/static.py,sha256=fdBjHKacNiDCKhvQkc9WgEYYSO0peMC5lb8CcXl9iNc,29101
 pycityagent/brain/persistence/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycityagent/brain/persistence/social.py,sha256=6hJi14sFm4LOU1JlnX8Vq_jFv7VII1uHDM9lrt7-JDA,27
@@ -46,8 +46,8 @@ pycityagent/st/__init__.py,sha256=LN9UMUUI_tZKAW-cUHszpRA8MjP4KL3RM0YQJY1ugVs,10
 pycityagent/st/st.py,sha256=PxNsy_BEZng2mOETKCK0ira98p4LjGluM17W3QZ_9Xw,5210
 pycityagent/urbanllm/__init__.py,sha256=ew7bS1-jaRf_MDTkDxvTup9a9-9FLqL0SLoloxrNDkU,85
 pycityagent/urbanllm/urbanllm.py,sha256=MbDxCFxlJ-FP1o51Ig-LW3eE6qsbXW52YWuY5_x-hgA,5221
-pycityagent-1.1.6.dist-info/LICENSE,sha256=Yo9QmwLDFU3VoOc0W8aYSCa5Yj5sJyqM3FEcbC2jMQQ,1063
-pycityagent-1.1.6.dist-info/METADATA,sha256=b4tQSzEszfAoy4PtVmZn_yzEPrVJ-mCDHhfDGekvvnE,7768
-pycityagent-1.1.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-pycityagent-1.1.6.dist-info/top_level.txt,sha256=mf70CsOn3eVJBwHQ_TjCesoc-elD0Bj2WLsi5APRjlU,12
-pycityagent-1.1.6.dist-info/RECORD,,
+pycityagent-1.1.8.dist-info/LICENSE,sha256=Yo9QmwLDFU3VoOc0W8aYSCa5Yj5sJyqM3FEcbC2jMQQ,1063
+pycityagent-1.1.8.dist-info/METADATA,sha256=K_RyISrFh88PULr1k_2Bk3wVAeSYR6qUt0JTJdYlvqM,7768
+pycityagent-1.1.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+pycityagent-1.1.8.dist-info/top_level.txt,sha256=mf70CsOn3eVJBwHQ_TjCesoc-elD0Bj2WLsi5APRjlU,12
+pycityagent-1.1.8.dist-info/RECORD,,