ir-sim 2.2.2__tar.gz → 2.2.3__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (76) hide show
  1. {ir_sim-2.2.2 → ir_sim-2.2.3}/PKG-INFO +1 -1
  2. {ir_sim-2.2.2 → ir_sim-2.2.3}/ir_sim.egg-info/PKG-INFO +1 -1
  3. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/world/object_base.py +2 -1
  4. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/world/robots/robot_acker.py +2 -2
  5. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/world/robots/robot_diff.py +2 -2
  6. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/world/robots/robot_omni.py +2 -2
  7. {ir_sim-2.2.2 → ir_sim-2.2.3}/pyproject.toml +1 -1
  8. {ir_sim-2.2.2 → ir_sim-2.2.3}/LICENSE +0 -0
  9. {ir_sim-2.2.2 → ir_sim-2.2.3}/README.md +0 -0
  10. {ir_sim-2.2.2 → ir_sim-2.2.3}/doc/animations/image/IR_SIM_logos/logo1.png +0 -0
  11. {ir_sim-2.2.2 → ir_sim-2.2.3}/doc/animations/image/IR_SIM_logos/logo1_nobg.png +0 -0
  12. {ir_sim-2.2.2 → ir_sim-2.2.3}/doc/source/conf.py +0 -0
  13. {ir_sim-2.2.2 → ir_sim-2.2.3}/ir_sim.egg-info/SOURCES.txt +0 -0
  14. {ir_sim-2.2.2 → ir_sim-2.2.3}/ir_sim.egg-info/dependency_links.txt +0 -0
  15. {ir_sim-2.2.2 → ir_sim-2.2.3}/ir_sim.egg-info/requires.txt +0 -0
  16. {ir_sim-2.2.2 → ir_sim-2.2.3}/ir_sim.egg-info/top_level.txt +0 -0
  17. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/__init__.py +0 -0
  18. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/env/__init__.py +0 -0
  19. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/env/env_base.py +0 -0
  20. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/env/env_config.py +0 -0
  21. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/env/env_logger.py +0 -0
  22. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/env/env_plot.py +0 -0
  23. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/global_param/env_param.py +0 -0
  24. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/global_param/path_param.py +0 -0
  25. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/global_param/world_param.py +0 -0
  26. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/lib/__init__.py +0 -0
  27. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/lib/algorithm/rvo.py +0 -0
  28. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/lib/behavior.py +0 -0
  29. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/lib/behaviorlib.py +0 -0
  30. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/lib/factory.py +0 -0
  31. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/lib/generation.py +0 -0
  32. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/lib/kinematics.py +0 -0
  33. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/01empty_world/empty_world.py +0 -0
  34. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/01empty_world/empty_world.yaml +0 -0
  35. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/02robot_world/car_world.yaml +0 -0
  36. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/02robot_world/robot_omni_world.yaml +0 -0
  37. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/02robot_world/robot_world.py +0 -0
  38. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/02robot_world/robot_world.yaml +0 -0
  39. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/03obstacle_world/obstacle_world.py +0 -0
  40. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/03obstacle_world/obstacle_world.yaml +0 -0
  41. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/04collision_world/collision_world.py +0 -0
  42. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/04collision_world/collision_world.yaml +0 -0
  43. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/05lidar_world/lidar_world.py +0 -0
  44. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/05lidar_world/lidar_world.yaml +0 -0
  45. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/06multi_objects_world/multi_objects_world.py +0 -0
  46. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/06multi_objects_world/multi_objects_world.yaml +0 -0
  47. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/07render_world/render.py +0 -0
  48. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/07render_world/render.yaml +0 -0
  49. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/08random_obstacle/random_obstacle.py +0 -0
  50. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/08random_obstacle/random_obstacle.yaml +0 -0
  51. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/09keyboard_control/keyboard_control.py +0 -0
  52. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/09keyboard_control/keyboard_control.yaml +0 -0
  53. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/10grid_map/cave.png +0 -0
  54. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/10grid_map/grid_map.py +0 -0
  55. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/10grid_map/grid_map.yaml +0 -0
  56. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/11collision_avoidance/collision_avoidance.py +0 -0
  57. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/usage/11collision_avoidance/collision_avoidance.yaml +0 -0
  58. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/util/util.py +0 -0
  59. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/version.py +0 -0
  60. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/world/__init__.py +0 -0
  61. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/world/description/car_blue.png +0 -0
  62. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/world/description/car_green.png +0 -0
  63. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/world/description/car_red.png +0 -0
  64. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/world/description/diff_robot0.png +0 -0
  65. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/world/description/diff_robot1.png +0 -0
  66. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/world/map/cave.png +0 -0
  67. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/world/map/obstacle_map.py +0 -0
  68. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/world/multi_object_base.py +0 -0
  69. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/world/object_factory.py +0 -0
  70. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/world/obstacles/obstacle_diff.py +0 -0
  71. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/world/obstacles/obstacle_omni.py +0 -0
  72. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/world/obstacles/obstacle_static.py +0 -0
  73. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/world/sensors/lidar2d.py +0 -0
  74. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/world/sensors/sensor_factory.py +0 -0
  75. {ir_sim-2.2.2 → ir_sim-2.2.3}/irsim/world/world.py +0 -0
  76. {ir_sim-2.2.2 → ir_sim-2.2.3}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ir-sim
3
- Version: 2.2.2
3
+ Version: 2.2.3
4
4
  Summary: A simple python based Intelligent Robot Simulator fpr robot navigation and Learning
5
5
  Author-email: Han Ruihua <hanrh@connect.hku.hk>
6
6
  Project-URL: Homepage, https://github.com/hanruihua/ir-sim
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ir-sim
3
- Version: 2.2.2
3
+ Version: 2.2.3
4
4
  Summary: A simple python based Intelligent Robot Simulator fpr robot navigation and Learning
5
5
  Author-email: Han Ruihua <hanrh@connect.hku.hk>
6
6
  Project-URL: Homepage, https://github.com/hanruihua/ir-sim
@@ -321,7 +321,8 @@ class ObjectBase:
321
321
  elif world_param.collision_mode == 'unobstructed_obstacles':
322
322
 
323
323
  if self.role == 'robot':
324
- self.stop_flag = self.collision_flag
324
+ # self.stop_flag = self.collision_flag
325
+ self.stop_flag = any([not obj.unobstructed for obj in self.collision_obj])
325
326
 
326
327
  elif self.role == 'obstacle':
327
328
  self.stop_flag = False
@@ -11,8 +11,8 @@ from irsim.global_param.path_param import path_manager
11
11
 
12
12
 
13
13
  class RobotAcker(ObjectBase):
14
- def __init__(self, shape='rectangle', shape_tuple=None, color='y', **kwargs):
15
- super(RobotAcker, self).__init__(shape=shape, shape_tuple=shape_tuple, kinematics='acker', role='robot', color=color, state_dim=4, **kwargs)
14
+ def __init__(self, shape='rectangle', shape_tuple=None, color='y', state_dim=4, **kwargs):
15
+ super(RobotAcker, self).__init__(shape=shape, shape_tuple=shape_tuple, kinematics='acker', role='robot', color=color, state_dim=state_dim, **kwargs)
16
16
 
17
17
  self.wheelbase = kwargs['wheelbase']
18
18
  self.info.add_property('wheelbase', self.wheelbase)
@@ -8,8 +8,8 @@ from matplotlib import image
8
8
  import matplotlib.transforms as mtransforms
9
9
 
10
10
  class RobotDiff(ObjectBase):
11
- def __init__(self, shape='circle', shape_tuple=None, color='g', **kwargs):
12
- super(RobotDiff, self).__init__(shape=shape, shape_tuple=shape_tuple, kinematics='diff', role='robot', color=color, state_dim=3, **kwargs)
11
+ def __init__(self, shape='circle', shape_tuple=None, color='g', state_dim=3, **kwargs):
12
+ super(RobotDiff, self).__init__(shape=shape, shape_tuple=shape_tuple, kinematics='diff', role='robot', color=color, state_dim=state_dim, **kwargs)
13
13
 
14
14
 
15
15
  def _kinematics(self, velocity, noise=False, alpha=[0.03, 0, 0, 0.03, 0, 0], **kwargs):
@@ -8,8 +8,8 @@ from matplotlib import image
8
8
  import matplotlib.transforms as mtransforms
9
9
 
10
10
  class RobotOmni(ObjectBase):
11
- def __init__(self, shape='circle', shape_tuple=None, color='g', **kwargs):
12
- super(RobotOmni, self).__init__(shape=shape, shape_tuple=shape_tuple, kinematics='omni', role='robot', color=color, state_dim=2, **kwargs)
11
+ def __init__(self, shape='circle', shape_tuple=None, color='g', state_dim=2, **kwargs):
12
+ super(RobotOmni, self).__init__(shape=shape, shape_tuple=shape_tuple, kinematics='omni', role='robot', color=color, state_dim=state_dim, **kwargs)
13
13
 
14
14
  def _kinematics(self, velocity, noise=False, alpha=[0.03, 0.03], **kwargs):
15
15
 
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
6
6
 
7
7
  [project]
8
8
  name = "ir-sim"
9
- version = "2.2.2"
9
+ version = "2.2.3"
10
10
  authors = [
11
11
  { name="Han Ruihua", email="hanrh@connect.hku.hk" },
12
12
  ]
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes