Merge pull request #165 from Tigul/problems-and-fixes

Problems and fixes
cram2 · Jun 7, 2024 · c4408c3 · c4408c3
2 parents c25295d + 77d555c
commit c4408c3
Show file tree

Hide file tree

Showing 19 changed files with 758 additions and 732 deletions.
diff --git a/.github/workflows/new-pycram-ci.yml b/.github/workflows/new-pycram-ci.yml
@@ -61,7 +61,6 @@ jobs:
           cd /opt/ros/overlay_ws/src/pycram
           pip3 install -r requirements.txt
           pip3 install -r requirements-resolver.txt
-          pip3 install -r requirements-ontology.txt
 
       - name: Install pytest & pyjpt
         run: |

diff --git a/requirements-ontology.txt b/requirements-ontology.txt
diff --git a/requirements-resolver.txt b/requirements-resolver.txt
@@ -1,3 +1,3 @@
 -r requirements.txt
 probabilistic_model>=4.0.8
-random_events>=2.0.9
+random_events==2.0.10
diff --git a/requirements.txt b/requirements.txt
@@ -16,3 +16,4 @@ tqdm==4.66.3
 psutil==5.9.7
 lxml==4.9.1
 typing_extensions==4.9.0
+owlready2>=0.45
diff --git a/src/pycram/datastructures/world.py b/src/pycram/datastructures/world.py
@@ -778,6 +778,7 @@ def get_prospection_object_for_object(self, obj: Object) -> Object:
         :param obj: The object for which the corresponding object in the prospection World should be found.
         :return: The corresponding object in the prospection world.
         """
+        self.world_sync.add_obj_queue.join()
         try:
             return self.world_sync.object_mapping[obj]
         except KeyError:

diff --git a/src/pycram/designators/action_designator.py b/src/pycram/designators/action_designator.py
diff --git a/src/pycram/designators/performables/__init__.py b/src/pycram/designators/performables/__init__.py