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

Abstract world #133

Closed

Commits on Nov 29, 2023

  1. [RemovingPybulletFromObjectClass] removed all usages of pybullet from…

    … the object class; needs tests to verify functionality.
    AbdelrhmanBassiouny committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    4c950bc View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. Configuration menu
    Copy the full SHA
    1953249 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    40d2d47 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3af92d4 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Configuration menu
    Copy the full SHA
    bbb1800 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. [WorldAbstractClass] InProgress , currently in _set_attached_objects …

    …method, and defining the Attachment class and making the necessary changes for that, also add_constraint is still in progress.
    AbdelrhmanBassiouny committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    a5ae78b View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. Configuration menu
    Copy the full SHA
    5188eed View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. [WorldAbstractClass] Updated local transformer class to not depend on…

    … Object Class (still need to remove world dependency if needed), The attachment refactoring still needs to be completed.
    AbdelrhmanBassiouny committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    3b365a8 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2023

  1. [RefactoringAttachments] Improved attachment class to handle bidirect…

    …ional and unidirectional attachments.
    AbdelrhmanBassiouny committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    bac3a4b View commit details
    Browse the repository at this point in the history
  2. [RefactoringAttachments] Improved attachment class, needs to better i…

    …mplement the inverse attachment (changes are not synced)
    AbdelrhmanBassiouny committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    5b61daa View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2023

  1. [AbstractWorld] Added a WorldState dataclass, Implemented saving and …

    …resotring of state, Implemented exiting the world and other methods.
    AbdelrhmanBassiouny committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    7fb3524 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. [AbstractWorld] Finished defining AbstractWorld, and correcting all c…

    …lasses defined in the world.py file.
    AbdelrhmanBassiouny committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    0f1133b View commit details
    Browse the repository at this point in the history
  2. [AbstractWorld] Completed world.py refactoring, tests are passing exc…

    …ept test_attachment_exclusion in test_costmap.py.
    AbdelrhmanBassiouny committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    2d834a4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    534390d View commit details
    Browse the repository at this point in the history
  4. [AbstractWorld] Moved BulletWorld and GUI classes to bullet_world.py,…

    … removed pybullet dependency from world.py, tests are running except test_attachment_exclusion in test_costmaps.py
    AbdelrhmanBassiouny committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    e2e2f12 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. Configuration menu
    Copy the full SHA
    f05ef64 View commit details
    Browse the repository at this point in the history
  2. [WorldAbstractClass] Added Color and AxisAlignedBoundingBox datalcass…

    …es and used them instead of Lists (changed function signatures to use them).
    AbdelrhmanBassiouny committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    a81c489 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. Configuration menu
    Copy the full SHA
    278a7fe View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. Configuration menu
    Copy the full SHA
    205c9f2 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2023

  1. [WorldAbstractClass] Created links dictionary inside Object class to …

    …point to link objects.
    
     Removed _current_link_poses and _current_link_transforms
    AbdelrhmanBassiouny committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    17ed78f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0e70fe2 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2023

  1. [AbstractWorld]

    Refactoring of link related methods.
    Removal of redundant methods and/or properties
    AbdelrhmanBassiouny committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    417c176 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2023

  1. [AbstractWorld]

    Objects are responsible for attachments not World.
    Links are responsible for constraints.
    AbdelrhmanBassiouny committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    fae2d8f View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2023

  1. [AbstractWorld]

    _set_attached_objects_poses implementation moved to the Object class instead of World.
    
    Cleaned World init method.
    
    Added optional argument in set_pose method of the Object class to exclude moving attached objects.
    AbdelrhmanBassiouny committed Dec 28, 2023
    Configuration menu
    Copy the full SHA
    2099bd7 View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2024

  1. [AbstractWorld]

    Implemented a CollisionsCallbacks dataclass and used it to define the self.coll_callbacks attribute.
    AbdelrhmanBassiouny committed Jan 1, 2024
    Configuration menu
    Copy the full SHA
    38516ff View commit details
    Browse the repository at this point in the history
  2. [AbstractWorld]

    Object Class does not manage constraints, they are managed by the Link Class instead.
    AbdelrhmanBassiouny committed Jan 1, 2024
    Configuration menu
    Copy the full SHA
    9a9d1a6 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. [AbstractWorld]

    Implemented save and restore state for World, Object, and Link classes.
    Added tests for Object, Attachment, and Link Classes.
    AbdelrhmanBassiouny committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    34fd070 View commit details
    Browse the repository at this point in the history
  2. [WorldAbstractClass] Reseting the world now also has the option to re…

    …move all saved sates.
    
    world saved states is a list of int state ids
    
    WorldState data class moved to world_dataclasses.py
    
    added the method to remove physics simulator state
    
    add reset object method in the Object class.
    AbdelrhmanBassiouny committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    e296537 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. [WorldAbstractClass] World reasoning is refactored to depend on abstr…

    …act class. Not passing tests yet.
    AbdelrhmanBassiouny committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    62c5309 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2024

  1. [AbstractWorld]

    WorldReasoning is now abstracted from pybullet
    tests are passing
    created two methods _try_to_reach, try_to_reach_with_grasp in the ik.py
    AbdelrhmanBassiouny committed Jan 21, 2024
    Configuration menu
    Copy the full SHA
    371d72c View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. Configuration menu
    Copy the full SHA
    624bb8c View commit details
    Browse the repository at this point in the history
  2. [WorldAbstractClass] (in progress) implementing abstract shape creati…

    …on and visualization for usage in costmap for example.
    AbdelrhmanBassiouny committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    8583fd1 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. Merge branch 'dev' of https://github.com/cram2/pycram into abstract_w…

    …orld
    
    # Conflicts:
    #	src/pycram/bullet_world.py
    #	src/pycram/bullet_world_reasoning.py
    #	src/pycram/designators/action_designator.py
    #	src/pycram/enums.py
    #	src/pycram/external_interfaces/giskard.py
    #	src/pycram/helper.py
    #	src/pycram/process_modules/boxy_process_modules.py
    #	src/pycram/process_modules/donbot_process_modules.py
    #	src/pycram/resolver/location/database_location.py
    #	src/pycram/ros/tf_broadcaster.py
    #	src/pycram/task.py
    #	test/test_bullet_world.py
    #	test/test_bullet_world_reasoning.py
    #	test/test_database_resolver.py
    #	test/test_local_transformer.py
    AbdelrhmanBassiouny committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    8c32506 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ed33735 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'dev' of github.com:cram2/pycram into abstract_world (fi…

    …xed missing import and use of World instead of BulletWorld in test_database_resolver.py)
    AbdelrhmanBassiouny committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    49a7026 View commit details
    Browse the repository at this point in the history
  4. [Abstract World] (check TODOs) Costmaps now is independent of pybulle…

    …t, HSR module is improved but still dependent on pybullet, designators are independent of pybullet.
    AbdelrhmanBassiouny committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    3916ded View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. Configuration menu
    Copy the full SHA
    6c4e42c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    11fbdc4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f139b2a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c267c68 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

  1. Configuration menu
    Copy the full SHA
    1aaa11e View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. Configuration menu
    Copy the full SHA
    eace428 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. Configuration menu
    Copy the full SHA
    2a8d4fa View commit details
    Browse the repository at this point in the history
  2. [Abstract World] Removed all mentions and dependencies of bullet worl…

    …d and pybullet from all places except bullet_world.py
    
    Applied some cleaning and removed duplications.
    
    Added extra functionallity to World class like force torque sensor.
    AbdelrhmanBassiouny committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    efdf22a View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2024

  1. [Abstract World] all change requests completed

    Update positions of objects when simulating
    Increasing code coverage by tests (reached 55% for bullet_world.py) (77% world.py)
    AbdelrhmanBassiouny committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    50adda9 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2024

  1. [AbstractWorld]

    Added joint class to handle joint related things.
    Object, Link, and Joint all have cached poses.
    Cached poses update when World.simulate() is called.
    Or when the poses are set manually.
    AbdelrhmanBassiouny committed Feb 3, 2024
    Configuration menu
    Copy the full SHA
    99c675f View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2024

  1. [AbstractWorld]

    Abstracting URDF dependency to be any type of description.
    Cleaning.
    In progress, tests are not passing.
    AbdelrhmanBassiouny committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    a8405b2 View commit details
    Browse the repository at this point in the history
  2. [Abstract World] Abstracted URDF dependency.

    Added a SateEntity for abstract state preserving classes.
    Cleaned code.
    Still needs to run tests.
    AbdelrhmanBassiouny committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    85a6cb3 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2024

  1. [AbstractWorld]

    Fixing tests for Description Abstraction
    AbdelrhmanBassiouny committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    d2b9f97 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0d80945 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    17018f9 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. Configuration menu
    Copy the full SHA
    3fa6880 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8433035 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Configuration menu
    Copy the full SHA
    bfc5134 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b9f5d86 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1458e03 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. [Abstract World] Added more tests for bullet world, Tests are running.

    Made 'WorldSync' sync objects by equating their current state/
    AbdelrhmanBassiouny committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    c49ccc0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bba4c4f View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. Configuration menu
    Copy the full SHA
    9e39552 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. Configuration menu
    Copy the full SHA
    8462338 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7b8afe6 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2024

  1. [AbstractWorld]

    refactored joint position getting and setting to use joint class.
    AbdelrhmanBassiouny committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    c85cb91 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. [AbstractWorld]

    allowing not object description for initializing objects. still in development.
    AbdelrhmanBassiouny committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    8b81353 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b4a384f View commit details
    Browse the repository at this point in the history
  3. [Abstract World] Defualted description type to URDF as it as it is cu…

    …rrently the only used/implement description.
    AbdelrhmanBassiouny committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    953f312 View commit details
    Browse the repository at this point in the history
  4. [AbstractWorld]

    Restructured files.
    AbdelrhmanBassiouny committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    b6a512e View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Configuration menu
    Copy the full SHA
    44b7d71 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. Configuration menu
    Copy the full SHA
    4155d6a View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. Configuration menu
    Copy the full SHA
    5a91845 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0f54c8b View commit details
    Browse the repository at this point in the history