pycityagent 1.1.6__tar.gz → 1.1.8__tar.gz

{pycityagent-1.1.6 → pycityagent-1.1.8}/PKG-INFO

@@ -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 → pycityagent-1.1.8}/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 → pycityagent-1.1.8}/pycityagent.egg-info/PKG-INFO

@@ -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