Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mergen dev into milestone-ease #201

Closed
wants to merge 360 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
360 commits
Select commit Hold shift + click to select a range
5469833
[MultiverseController] Merge with MultiverseGoalValidation
AbdelrhmanBassiouny Jul 31, 2024
31962cb
[MultiverseController] Fix issues after Merge with MultiverseGoalVali…
AbdelrhmanBassiouny Jul 31, 2024
d5e36cd
[MultiverseController] corrected datatype from float to datetime.
AbdelrhmanBassiouny Jul 31, 2024
ec08902
[MultiverseController] add sleep after remove in test
AbdelrhmanBassiouny Jul 31, 2024
8aaae44
[MultiverseController] made use of the config files.
AbdelrhmanBassiouny Aug 1, 2024
d16fa04
[MultiverseController] removed use of relative velocity and wait time…
AbdelrhmanBassiouny Aug 1, 2024
f621267
Merge remote-tracking branch 'origin/multiverse_interface_controller'…
AbdelrhmanBassiouny Aug 2, 2024
a2b95d5
[MultiverseAction] Tests are working after merge with MultiverseContr…
AbdelrhmanBassiouny Aug 2, 2024
b33a1ec
[MultiverseAction] Introduced bullet_mode where the multiverse behave…
AbdelrhmanBassiouny Aug 2, 2024
fa947b4
[MultiverseAction] Now relative velocity is always sent as zeros for …
AbdelrhmanBassiouny Aug 2, 2024
e430977
[MultiverseAction] Pr2 is now available and working!!!
AbdelrhmanBassiouny Aug 2, 2024
4600c00
[MultiverseAction] Fixed one issure related to confusion of prospecti…
AbdelrhmanBassiouny Aug 2, 2024
2b3b5a2
[Multiverse] transport action is now working with Pr2 in Multiverse.
AbdelrhmanBassiouny Aug 4, 2024
b431d07
[Multiverse] tests are running.
AbdelrhmanBassiouny Aug 4, 2024
4248cfb
[Multiverse] changed place location of transport demo.
AbdelrhmanBassiouny Aug 5, 2024
84eee01
[Multiverse] flexible name for robot description
AbdelrhmanBassiouny Aug 6, 2024
e97ac8d
[MultiverseAction] corrected robot description dictionary name confus…
AbdelrhmanBassiouny Aug 6, 2024
25eb18b
[MultiverseAction] Fixed detachment syncing problem.
AbdelrhmanBassiouny Aug 6, 2024
fcd8526
[MultiverseAction] Fixed failing test of attachment in real syncing t…
AbdelrhmanBassiouny Aug 6, 2024
8def0da
[MultiverseAction] made sure when setting attachments to obey the loo…
AbdelrhmanBassiouny Aug 6, 2024
a099097
[MultiverseAction] set all posses of all objects first before setting…
AbdelrhmanBassiouny Aug 6, 2024
079de32
[MultiverseAction] added is_inverse to indicate which was the origina…
AbdelrhmanBassiouny Aug 6, 2024
681000d
[MultiverseAction] corrected attachment frame names when syncing.
AbdelrhmanBassiouny Aug 6, 2024
8728810
[MultiverseAction] some cleaning.
AbdelrhmanBassiouny Aug 6, 2024
a9aa1e0
[MultiverseAction] renaming of methods.
AbdelrhmanBassiouny Aug 7, 2024
7b1afe8
[MultiverseAction] Implemented get_images_for_target for multiverse,
AbdelrhmanBassiouny Aug 7, 2024
44f9b61
[MultiverseAction] Fixed camera frmae issue, use camera_link instead.
AbdelrhmanBassiouny Aug 7, 2024
4736b31
[MultiverseAction] DetectionAction is now working in multiverse.
AbdelrhmanBassiouny Aug 7, 2024
8ad2986
[MultiverseAction] Added multiverse demo.
AbdelrhmanBassiouny Aug 7, 2024
ca28fd2
[MultiverseAction] Removed exceptions.py and put them in the plan_fai…
AbdelrhmanBassiouny Aug 13, 2024
8417955
[MultiverseAction] Created RayTestUtils class in the utils.py and use…
AbdelrhmanBassiouny Aug 14, 2024
4ee4910
[MultiverseAction] doc for multiverse.py.
AbdelrhmanBassiouny Aug 14, 2024
3d24a71
[MultiverseAction] moved client manager base port class variable valu…
AbdelrhmanBassiouny Aug 14, 2024
0472283
[MultiverseAction] doc of socket.py
AbdelrhmanBassiouny Aug 14, 2024
9d05b65
[MultiverseAction] Made remove_object_from_simulator return a boolean…
AbdelrhmanBassiouny Aug 14, 2024
023396b
[MultiverseAction] clients doc.
AbdelrhmanBassiouny Aug 14, 2024
d86aa24
[MultiverseAction] clean clients.py
AbdelrhmanBassiouny Aug 14, 2024
ce06f1c
[MultiverseAction] Moved set_mobile_robot_base_pose to world_object.p…
AbdelrhmanBassiouny Aug 14, 2024
082bffd
[MultiverseAction] removed extra line.
AbdelrhmanBassiouny Aug 14, 2024
51ad55a
[MultiverseAction] Added validate multi pose goals decorator.
AbdelrhmanBassiouny Aug 15, 2024
0308f4a
[MultiverseAction] test get and spawn of environment type objects.
AbdelrhmanBassiouny Aug 15, 2024
0753dd8
[MultiverseAction] Demo is working.
AbdelrhmanBassiouny Aug 15, 2024
b6c2372
[MultiverseAction] Demo is working.
AbdelrhmanBassiouny Aug 15, 2024
87ef6d2
[MultiverseAction] Added a step that removes all objects and resets t…
AbdelrhmanBassiouny Aug 16, 2024
2d3b75e
Merge remote-tracking branch 'origin/dev' into multiverse_interface
AbdelrhmanBassiouny Aug 16, 2024
5084d50
Merge pull request #169 from AbdelrhmanBassiouny/multiverse_interface
Tigul Aug 16, 2024
3f26492
[MultiverseAction] doc and cleaning
AbdelrhmanBassiouny Aug 16, 2024
dad905c
Merge remote-tracking branch 'origin/multiverse_interface' into multi…
AbdelrhmanBassiouny Aug 16, 2024
13e4136
Merge remote-tracking branch 'origin/multiverse_goal_validation' into…
AbdelrhmanBassiouny Aug 16, 2024
1996f50
[MultiverseControl] merged with goal validator to update the latest c…
AbdelrhmanBassiouny Aug 16, 2024
4aeb11e
Merge remote-tracking branch 'origin/multiverse_interface_controller'…
AbdelrhmanBassiouny Aug 16, 2024
284a1b8
[MultiverseAction] merged with multiverse_controller to update the la…
AbdelrhmanBassiouny Aug 16, 2024
5051b5a
[MultiverseMJCF] implemented link description for mjcf.
AbdelrhmanBassiouny Aug 16, 2024
93aaac0
[MultiverseMJCF] first implementation of mjcf and some tests for it.
AbdelrhmanBassiouny Aug 19, 2024
00f15b2
[MultiverseMJCF] Corrected attribute name error.
AbdelrhmanBassiouny Aug 20, 2024
22cadb2
[MultiverseMJCF] made the cache manager manage the data directories a…
AbdelrhmanBassiouny Aug 20, 2024
50cd312
Adds file// to the replaced key words
Leusmann Aug 20, 2024
868d84d
Merge pull request #187 from cram2/urdf_parsing_fix
Leusmann Aug 20, 2024
08d9cd3
[MultiverseMJCF] Implemented and tests creating mujoco xml files from…
AbdelrhmanBassiouny Aug 20, 2024
9759ab8
[MultiverseMJCF] currently generated xml descriptions from mesh files…
AbdelrhmanBassiouny Aug 20, 2024
70a166b
[MultiverseMJCF] Now the generated xml file from mesh has auto comput…
AbdelrhmanBassiouny Aug 21, 2024
03a08af
[MultiverseMJCF] Added an object description resolver such that, when…
AbdelrhmanBassiouny Aug 21, 2024
1bd1b52
[MultiverseMJCF] changed variable name.
AbdelrhmanBassiouny Aug 21, 2024
896fe34
Merge remote-tracking branch 'origin/dev' into multiverse_interface
AbdelrhmanBassiouny Aug 21, 2024
4016d93
[MultiverseInterface] merged dev.
AbdelrhmanBassiouny Aug 21, 2024
af59b0e
Merge remote-tracking branch 'origin/multiverse_interface' into multi…
AbdelrhmanBassiouny Aug 21, 2024
4bff422
Merge remote-tracking branch 'origin/multiverse_goal_validation' into…
AbdelrhmanBassiouny Aug 21, 2024
c5bd732
[MultiverseController] merged dev and fixed issues.
AbdelrhmanBassiouny Aug 21, 2024
8776b99
[MultiverseController] fixed incorrect enum value.
AbdelrhmanBassiouny Aug 21, 2024
097ecb7
Merge remote-tracking branch 'origin/multiverse_interface_controller'…
AbdelrhmanBassiouny Aug 21, 2024
1285227
[MultiverseActions] merged new dev changes and fixed issues.
AbdelrhmanBassiouny Aug 21, 2024
6477484
[MultiverseActions] fixed contact test.
AbdelrhmanBassiouny Aug 21, 2024
ab42e1d
Merge remote-tracking branch 'origin/multiverse_interface_actions' in…
AbdelrhmanBassiouny Aug 21, 2024
3ad9079
[MultiverseActions] fixed contact test.
AbdelrhmanBassiouny Aug 21, 2024
e540547
[MultiverseMJCF] Do not restore the state from the physics simultor, …
AbdelrhmanBassiouny Aug 22, 2024
4db70f0
[MultiverseMJCF] Handling the removing of the visualt object differen…
AbdelrhmanBassiouny Aug 23, 2024
bb95b6d
[MultiverseMJCF] Added load and save in multiverse.
AbdelrhmanBassiouny Aug 23, 2024
75f10fc
[MultiverseMJCF] Pycram can now handle .ply mesh files as well.
AbdelrhmanBassiouny Aug 23, 2024
056fddc
[MultiverseMJCF] Tested without having a multiverse installation.
AbdelrhmanBassiouny Aug 25, 2024
1c19d11
[MultiverseMJCF] Added get links contacts and check if two objects ar…
AbdelrhmanBassiouny Aug 27, 2024
c4b121d
[giskard] achieve_cart_goal
sunava Aug 27, 2024
3cbb2af
[MultiverseMJCF] Use .obj for meshes instead of .stl as .obj contains…
AbdelrhmanBassiouny Aug 27, 2024
2f488fb
Merge pull request #189 from AbdelrhmanBassiouny/multiverse_interface
Tigul Aug 27, 2024
193d5ff
Merge pull request #175 from AbdelrhmanBassiouny/multiverse_goal_vali…
Tigul Aug 28, 2024
58217ab
Merge pull request #176 from AbdelrhmanBassiouny/multiverse_interface…
Tigul Aug 28, 2024
597987e
Merge pull request #177 from AbdelrhmanBassiouny/multiverse_interface…
Tigul Aug 28, 2024
f491e39
Merge branch 'multiverse-dev' into multiverse_mjcf
Tigul Aug 28, 2024
c3d8761
Merge pull request #190 from AbdelrhmanBassiouny/multiverse_mjcf
Tigul Aug 28, 2024
e67dd2b
Merge pull request #192 from sunava/giskard-cartesian-goal
Tigul Sep 2, 2024
98bf3b6
[giskard] made threshold of cart_goal optional parameter
Tigul Sep 2, 2024
5b2c95c
started to fix probabilistic resolvers
tomsch420 Aug 14, 2024
744a446
[Probabilistic Costmap] First version of probabilistic semantic costmap
Tigul Aug 7, 2024
6f99014
[Probabilistic Costmap] Added margins for all methods.
tomsch420 Sep 3, 2024
afc9746
[Probabilistic Costmap] Added doc and updated requirements.txt
tomsch420 Sep 3, 2024
345892b
Update requirements.txt
Tigul Sep 3, 2024
262f661
[Probabilistic Costmap] Fixed deprecated import
tomsch420 Sep 3, 2024
0a5a648
[general] Changed pybullet requirement to pycram_bullet
Tigul Sep 4, 2024
50828da
[BulletWorld/Costmap] Changed pybullet import to pycram_bullet
Tigul Sep 4, 2024
4163c39
Fix missing import and error in tf_broadcaster
J-Schaefer Sep 4, 2024
7edce48
[general] Updated dependency to pycram_bullet==3.2.8
Tigul Sep 5, 2024
49d1099
[OntologyManager] add main_ontology_sql_backend
duc89 Sep 5, 2024
13cc83c
[Probabilistic Costmap] Fixed wrongly comitted demo
tomsch420 Sep 6, 2024
e1bff10
[giskard] Removed deprecated message import
Tigul Sep 6, 2024
19cd6b2
Merge pull request #196 from Tigul/pycram_bullet
Tigul Sep 9, 2024
94ba08a
Merge pull request #198 from duc89/onto_sqlite3_error_catch
Tigul Sep 9, 2024
15c1fd4
[workflow] added test ci for notebooks
Tigul Sep 9, 2024
6be5275
[examples] Refactored action designator example
Tigul Sep 9, 2024
76ce3c5
[process module] Fixed typo
Tigul Sep 9, 2024
6b9bbf2
[examples] Fixed examples
Tigul Sep 9, 2024
f0c8dfa
Merge pull request #197 from J-Schaefer/fix-tf-broadcaster
Tigul Sep 10, 2024
d895efd
[Process Module] Fixed Typo
Tigul Sep 10, 2024
92f2214
[Readme] Updated example plan
Tigul Sep 10, 2024
667da4c
[readme] position -> pose
Tigul Sep 10, 2024
5793cf8
[MultiverseMJCF] Add texture to xml generated from meshes.
AbdelrhmanBassiouny Sep 12, 2024
27c3201
Merge remote-tracking branch 'origin/multiverse_mjcf' into multiverse…
AbdelrhmanBassiouny Sep 12, 2024
2ec8aea
Merge branch 'dev' into dev
Tigul Sep 12, 2024
99636d0
[doc] Fixed syntax in example plan
Tigul Sep 12, 2024
f8f8955
[MultiverseMJCF] Added an optional config variable to indicate whethe…
AbdelrhmanBassiouny Sep 12, 2024
bbb7418
[MultiverseMJCF] cleaning
AbdelrhmanBassiouny Sep 12, 2024
f42a399
[MultiverseMJCF] cleaning, doc, and merged multiverse helpers, datacl…
AbdelrhmanBassiouny Sep 12, 2024
0eb328e
[MultiverseMJCF] unused import in test.
AbdelrhmanBassiouny Sep 13, 2024
45d2ef9
Merge remote-tracking branch 'origin/multiverse_mjcf' into multiverse…
AbdelrhmanBassiouny Sep 13, 2024
c4daacc
[MultiverseDev] moved config package to root of the pycram pacakge
AbdelrhmanBassiouny Sep 13, 2024
549eb2a
[designator][orm] fixed an issue where the PickUpAction was not prope…
davidprueser Sep 13, 2024
1b7c06e
[orm] fixed an issue where the BelieveObject could not be used in the…
davidprueser Sep 13, 2024
bb99647
[tasktree] updated tasktree implementation and ensured singleton beha…
davidprueser Sep 13, 2024
dbd71ac
[doc] updated documentation for orm, tasktree, probabilistic actions
davidprueser Sep 13, 2024
06a5bda
Merge remote-tracking branch 'origin/upd' into upd
davidprueser Sep 13, 2024
4a15ac7
Merge remote-tracking branch 'tomsch/dev' into upd
davidprueser Sep 13, 2024
b239b11
[tests] fixed issues where tests didnt run properly
davidprueser Sep 13, 2024
f85effa
[tests] fixed issues where tests didnt run properly II
davidprueser Sep 13, 2024
4ed74fe
[MultiverseDev] cleaning and renaming.
AbdelrhmanBassiouny Sep 13, 2024
2093793
[MultiverseDev] check_object_exists implementation is now up to the w…
AbdelrhmanBassiouny Sep 13, 2024
9234065
[MultiverseDev] In process of refactoring use of configuration files.
AbdelrhmanBassiouny Sep 13, 2024
3bb7ce9
[WorldObject] Fix issue related to repeated object ID when removing a…
AbdelrhmanBassiouny Sep 17, 2024
f73867a
Merge pull request #195 from tomsch420/dev
hawkina Sep 17, 2024
e8188ee
[MultiverseDev] config files moved to root of package and a symlink i…
AbdelrhmanBassiouny Sep 17, 2024
43c66ff
[MultiverseDev] cleaning, doc, and renaming of move base joints to mo…
AbdelrhmanBassiouny Sep 17, 2024
8443fc5
[MultiverseDev] added deprecated library for using deprecated decorat…
AbdelrhmanBassiouny Sep 17, 2024
05c8574
[MultiverseDev] cleaning, and doc.
AbdelrhmanBassiouny Sep 18, 2024
277688d
Merge remote-tracking branch 'origin/dev' into multiverse-dev
AbdelrhmanBassiouny Sep 18, 2024
066bd8b
[MultiverseDev] merge with dev.
AbdelrhmanBassiouny Sep 18, 2024
e6c0881
[MultiverseDev] added config symlink
AbdelrhmanBassiouny Sep 18, 2024
b4812f2
Fix issues in documentation
rhaschke Sep 18, 2024
a5f0468
Remove ROS packages from requirements.txt
rhaschke Sep 19, 2024
ef50689
Use pr2_arm_kinematics system package
rhaschke Sep 19, 2024
b58e776
Use pr2_common system package
rhaschke Sep 19, 2024
36d8709
Instructions to install python dependencies into catkin workspace
rhaschke Sep 19, 2024
15f3a17
Fix typos
rhaschke Sep 19, 2024
8bc8461
[MultiverseDev] Doc and Cleaning, fixing requested changes.
AbdelrhmanBassiouny Sep 20, 2024
afededa
[location desig/example] Fixed location designator example
Tigul Sep 23, 2024
c20a919
[language] Fixed return in repeat
Tigul Sep 23, 2024
2151b0d
[examples] Fixed imports
Tigul Sep 23, 2024
78f5180
[MultiverseDev] moved simulation_frequency to config file instead of …
AbdelrhmanBassiouny Sep 25, 2024
ac91b68
[doc][tasktree][tests] updated documentation, fixed orm test
davidprueser Sep 25, 2024
5b804e5
Merge pull request #199 from davidprueser/upd
tomsch420 Sep 25, 2024
901ed29
[MultiverseDev] added NamedBoxVisualShape for generic objects.
AbdelrhmanBassiouny Sep 26, 2024
2ed35e9
[MultiverseDev] object path can be None, for e.g. when using generic …
AbdelrhmanBassiouny Sep 26, 2024
36c1036
[MultiverseDev] fixed urdf box visual shape size.
AbdelrhmanBassiouny Sep 26, 2024
b153f45
Merge remote-tracking branch 'original_pycram_repo/dev' into multiver…
AbdelrhmanBassiouny Sep 26, 2024
f9b3ea4
Merge pull request #202 from rhaschke/fix-docs
Tigul Sep 27, 2024
334c938
Remove installation instructions for neem_interface_python
rhaschke Sep 27, 2024
ba473e8
Merge pull request #193 from cram2/multiverse-dev
Tigul Sep 27, 2024
4b5f262
Merge pull request #203 from rhaschke/install
Tigul Sep 27, 2024
dceed80
[ros] renamed ros module to ros_utils
Tigul Sep 30, 2024
f0fcbf7
[ros] moved rospkg, rosnode and actionlib into own module
Tigul Sep 30, 2024
0cf3e90
[ros] moved logging into ros module
Tigul Sep 30, 2024
da8c3b2
[genral] Removed rospy import and references everywhere
Tigul Oct 4, 2024
a7f3a5a
[ros] Improved logging with more info
Tigul Oct 4, 2024
6501b12
[ros] Added deprection warning to viz_marker_publisher
Tigul Oct 4, 2024
efe3b58
[MultiverseDev] changed how multiverse is searched for, and changed t…
AbdelrhmanBassiouny Oct 8, 2024
5fb5691
[WorldSyncCIBugFix] increased wait time between sync.
AbdelrhmanBassiouny Oct 9, 2024
77ad3fa
[WorldSyncCIBugFix] set wait time between sync to 0.
AbdelrhmanBassiouny Oct 9, 2024
322c3ea
[LoadXMLBugFix] fixes a bug related to loading xml files as object de…
AbdelrhmanBassiouny Oct 10, 2024
3ece41a
[Multiverse] Added a folder in resources for storing muv files (yaml …
AbdelrhmanBassiouny Oct 10, 2024
3e40c2f
Merge pull request #208 from AbdelrhmanBassiouny/dev
AbdelrhmanBassiouny Oct 10, 2024
f87a309
[Multiverse] fixed milk spawn in multiverse test.
AbdelrhmanBassiouny Oct 10, 2024
2c79898
Merge remote-tracking branch 'origin/dev' into dev
AbdelrhmanBassiouny Oct 10, 2024
69e1fca
Merge pull request #209 from AbdelrhmanBassiouny/dev
AbdelrhmanBassiouny Oct 10, 2024
4f46601
[genral] Fixed typo in file name and imports in orm/utils
Tigul Oct 11, 2024
17c7025
Merge pull request #205 from Tigul/ros-decoupling
Tigul Oct 11, 2024
1ec5681
[SaveWorldState] Corrected the save state functionality and added the…
mohammadkhoshnazarr Oct 10, 2024
e154ff7
[SaveState] Corrected arguments order in save simulator state.
AbdelrhmanBassiouny Oct 11, 2024
f229ac4
[world] Call world_sync from UseProspectionWorld explictly
Tigul Oct 11, 2024
2ef6f03
Merge pull request #207 from AbdelrhmanBassiouny/world_sync_ci_bug_fix
Tigul Oct 11, 2024
1b70ee4
[SaveState] prevented manual saving of object states when use_physics…
AbdelrhmanBassiouny Oct 11, 2024
f90dcc9
[SaveState] save and restore joint states manually when using physics…
AbdelrhmanBassiouny Oct 11, 2024
0b860cc
[MultiverseTest] added check for if apartment already exists before s…
AbdelrhmanBassiouny Oct 11, 2024
47853a6
Merge remote-tracking branch 'original_pycram_repo/dev' into save_wor…
AbdelrhmanBassiouny Oct 15, 2024
bc8f708
[SaveState] Fixed issue when removing all saved states.
AbdelrhmanBassiouny Oct 15, 2024
09b634d
Merge remote-tracking branch 'original_pycram_repo/dev' into original…
AbdelrhmanBassiouny Oct 15, 2024
c5eda48
Merge branch 'dev' of github.com:cram2/pycram into notebook-test-ci
Tigul Oct 18, 2024
0d0d53d
[examples] Added CI database to improving actions
Tigul Oct 18, 2024
d657cae
[ci] Changed name of notebook test ci
Tigul Oct 18, 2024
11f9a36
[ci] Added setuptool requirements
Tigul Oct 18, 2024
460e0fb
[ci] Update to 22.04
Tigul Oct 18, 2024
994a91c
[ci] Update dependency install
Tigul Oct 18, 2024
13977a8
[ci] Added install of jupytext and treon
Tigul Oct 18, 2024
11bf2d0
[ci] Final fix for ci
Tigul Oct 18, 2024
dfcd6aa
[exxamples] Some fixes
Tigul Oct 18, 2024
ee6740e
[examples] Fixed intro example
Tigul Oct 28, 2024
57ed827
[examples] Fixed more errors
Tigul Oct 28, 2024
7712d49
[ci] Added cleanup to delete leftover old dir before exec
Tigul Oct 29, 2024
79f5801
[ci] Added update of pycram source files
Tigul Oct 29, 2024
7fcbb3c
[bullet world] Check if Display is connected
Tigul Oct 29, 2024
1682856
[bullet world] Better check
Tigul Oct 29, 2024
cb8a1cf
[examples] Errors that appeard in ci
Tigul Oct 29, 2024
50e2983
[examples] more fixes
Tigul Oct 29, 2024
dde07d0
[ci] ADded libpq-dev because dependencies
Tigul Oct 29, 2024
9039fa5
[Probabilistic Reasoning] Upgraded to newest PM version
tomsch420 Oct 30, 2024
f35a511
[examples] Fixed from test branch
Tigul Oct 30, 2024
6c7f60e
[ci] Added libpq-dev for psycopg2 dependency
Tigul Oct 30, 2024
d09d097
[Probabilistic Reasoning] Started to work on move and place
tomsch420 Nov 1, 2024
e4d2669
Merge remote-tracking branch 'original_pycram_repo/dev' into save_wor…
AbdelrhmanBassiouny Nov 5, 2024
78d7269
[examples] Added robustness
Tigul Nov 5, 2024
aa27247
Merge pull request #211 from AbdelrhmanBassiouny/save_world_state
tomsch420 Nov 5, 2024
31a52fb
[example] New seed for cram plan tutorial
Tigul Nov 5, 2024
7e99e30
[Probabilistic Reasoning] Test for move and place performable
tomsch420 Nov 5, 2024
b085b81
[general] removed test code
Tigul Nov 5, 2024
385ea0d
[example] new troso val
Tigul Nov 5, 2024
7890161
Merge pull request #212 from Tigul/notebook-test-ci
Tigul Nov 6, 2024
7c09b6c
[Probabilistic Reasoning] Investigating iter with mode
tomsch420 Nov 6, 2024
296801b
[Probabilistic Reasoning] Iter with mode is now test case to reduce f…
tomsch420 Nov 6, 2024
e2efb4f
[Probabilistic Reasoning] First version of move and place
tomsch420 Nov 6, 2024
9eacd18
[Probabilistic Reasoning] First version of move and place
tomsch420 Nov 6, 2024
10fd891
Merge remote-tracking branch 'pycram/dev' into dev
tomsch420 Nov 6, 2024
c3b70c2
[Probabilistic Reasoning] Updated requirements
tomsch420 Nov 6, 2024
bf0604d
[Probabilistic Reasoning] Fixed bug in doc
tomsch420 Nov 6, 2024
410dd80
[Probabilistic Reasoning] Fixed bug in doc
tomsch420 Nov 6, 2024
cd9ac3c
[Probabilistic Reasoning] Fixed bug in example
tomsch420 Nov 7, 2024
ea93f4a
[examples] Fixed orm_examples header
Tigul Nov 8, 2024
626299b
Update cram_plan_tutorial.md
artnie Nov 11, 2024
3d11b91
Merge pull request #217 from cram2/rm-accidental-paste
Tigul Nov 11, 2024
93f5d80
Update probabilistic_action.py
tomsch420 Nov 14, 2024
c43f219
[doc] Added doc about costmaps
Tigul Nov 14, 2024
88e24a6
[doc] Doc for semantic costmaps
Tigul Nov 15, 2024
6887e2f
[doc] added doc for algebraic semantic costmaps
Tigul Nov 15, 2024
e34a8b6
Merge pull request #219 from Tigul/costmap-doc
Tigul Nov 15, 2024
191aecf
Merge pull request #214 from tomsch420/dev
Tigul Nov 15, 2024
157dc6e
[Costmap] First version of more general probabilistic costmap
tomsch420 Nov 19, 2024
bc6fdf9
[Costmap] Added occupancy and visability visualizations using rviz
tomsch420 Nov 19, 2024
9eac9b8
[Costmap] Updated requirements
tomsch420 Nov 20, 2024
52379a0
[process modules] Added process modules for the real Tiago
Tigul Nov 20, 2024
c17ac35
Merge pull request #221 from Tigul/tiago-pms
Tigul Nov 20, 2024
40c5e23
[Costmap] Probabilistic costmap parameters are now robot dependent.
tomsch420 Nov 21, 2024
f826231
Merge pull request #220 from tomsch420/dev
Tigul Nov 21, 2024
8081f94
[LocalTransformerBugFix] corrected used world in update transforms.
AbdelrhmanBassiouny Nov 24, 2024
b0a95db
Merge pull request #224 from AbdelrhmanBassiouny/local_transformer_bu…
AbdelrhmanBassiouny Nov 24, 2024
ee88841
[LoggingLevel] Adding setting log level.
AbdelrhmanBassiouny Nov 25, 2024
e75a355
Merge pull request #225 from AbdelrhmanBassiouny/log_level
Tigul Nov 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[Probabilistic Costmap] Fixed wrongly comitted demo
tomsch420 committed Sep 6, 2024
commit 13cc83c076d9ea62a3b99e5aeb0a9b9f77e636de
24 changes: 12 additions & 12 deletions demos/pycram_bullet_world_demo/demo.py
Original file line number Diff line number Diff line change
@@ -46,18 +46,18 @@ def move_and_detect(obj_type):
ParkArmsAction([Arms.BOTH]).resolve().perform()

MoveTorsoAction([0.25]).resolve().perform()
#
# milk_desig = move_and_detect(ObjectType.MILK)
#
# TransportAction(milk_desig, [Arms.LEFT], [Pose([4.8, 3.55, 0.8])]).resolve().perform()
#
# cereal_desig = move_and_detect(ObjectType.BREAKFAST_CEREAL)
#
# TransportAction(cereal_desig, [Arms.RIGHT], [Pose([5.2, 3.4, 0.8], [0, 0, 1, 1])]).resolve().perform()
#
# bowl_desig = move_and_detect(ObjectType.BOWL)
#
# TransportAction(bowl_desig, [Arms.LEFT], [Pose([5, 3.3, 0.8], [0, 0, 1, 1])]).resolve().perform()

milk_desig = move_and_detect(ObjectType.MILK)

TransportAction(milk_desig, [Arms.LEFT], [Pose([4.8, 3.55, 0.8])]).resolve().perform()

cereal_desig = move_and_detect(ObjectType.BREAKFAST_CEREAL)

TransportAction(cereal_desig, [Arms.RIGHT], [Pose([5.2, 3.4, 0.8], [0, 0, 1, 1])]).resolve().perform()

bowl_desig = move_and_detect(ObjectType.BOWL)

TransportAction(bowl_desig, [Arms.LEFT], [Pose([5, 3.3, 0.8], [0, 0, 1, 1])]).resolve().perform()

# Finding and navigating to the drawer holding the spoon
handle_desig = ObjectPart(names=["handle_cab10_t"], part_of=apartment_desig.resolve())
8 changes: 7 additions & 1 deletion test/test_costmaps.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import unittest

import numpy as np
from random_events.variable import Continuous
# import plotly.graph_objects as go
@@ -83,4 +85,8 @@ def test_iterate(self):
costmap.valid_area &= costmap.left() & costmap.top() & costmap.border(0.2)
for sample in iter(costmap):
self.assertIsInstance(sample, Pose)
self.assertTrue(costmap.valid_area.contains([sample.position.x, sample.position.y]))
self.assertTrue(costmap.valid_area.contains([sample.position.x, sample.position.y]))


class OntologySemanticLocationTestCase(unittest.TestCase):
...