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.

Sign up for GitHub

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

Jump to bottom

Code format: control #191

Merged
merged 72 commits into from
May 4, 2017
Merged

Code format: control #191

merged 72 commits into from
May 4, 2017

Conversation

jslee02
Copy link
Member

@jslee02 jslee02 commented Apr 23, 2017

Depends on #170 and #190.

gilwoolee and others added 30 commits April 12, 2017 15:24
@gilwoolee
Renaming, adding an abstract BarretHandPositionCommandExecutor class
8feb924
@gilwoolee
Adding -override
811a63b
@gilwoolee
Merge branch 'master' into SimBarrettHandCommandExecutor
dd96c10
@gilwoolee
Exposing step
83f69dd
@gilwoolee
Merge branch 'SimBarrettHandCommandExecutor' of https://github.com/pe…
cf8f104 
…rsonalrobotics/aikido into SimBarrettHandCommandExecutor
@gilwoolee
Renaiming PositionCommandExecutor
9d9fb3d
@gilwoolee
Changing header files
648c2bf
@jslee02
Format statespace code
90a7ab6
@gilwoolee
Changing names and step function.
a38c65a
@gilwoolee
Merge branch 'master' into SimBarrettHandCommandExecutor
06dad13
@jslee02
Merge branch 'master' into style/statespace
012031d
@brianhou
Update simulation speed constants and matrix->vector methods.
c6462db
@brianhou
Add collisionDetector argument. Make collideWith an optional argument.
e16880e
@brianhou
Don't reset mCollideWith every time.
ce86f93
@brianhou
Simplify logic of optional collision detector and collision groups.
c90cd8d 
Duplicate changes in BarrettHandKinematicSimulationPositionCommandExecutor.
@jslee02
Merge branch 'master' into style/statespace
9347ffd
@brianhou
Add ShapeFrames of original collision group to new collision group.
2d3a5bc
@brianhou
Make collisionDetector, collideWith optional.
d9d36fc
@brianhou
Instantiate FingerPositionCommandExecutors and FingerSpreadCommandExe…
3af8671 
…cutor in HandPositionCommandExecutor.

Adapted from https://github.com/personalrobotics/libherb/pull/20.
@brianhou
Clean up some documentation.
2174930
@brianhou
Remove parameter from step.
6ecb30e
@brianhou
Set mCollisionDetector when setting mCollideWith.
c3eb6f3
@brianhou
Make FingerCommandExecutors implement PositionCommandExecutor.
47a9852
@brianhou
Swap argument order in HandPositionExecutor.
bebb761
@brianhou
Partial test fixes.
f1d805f 
Make test_BarrettFinger* compile (although actual execution seems to fail).
Make part of test_BarrettHand compile, although introducing `robot` as a
parameter seems like it will make testing this difficult.
@jslee02
Rename RnTraits to RJointTraits
56f1644
@gilwoolee
Yaml parser
0be9ae8
@gilwoolee
Adding time-reset when a new execute command is given.
fc7cd1c
@gilwoolee
Merge branch 'SimBarrettHandCommandExecutor' of https://github.com/pe…
57e404f 
…rsonalrobotics/aikido into util/yaml_helper
@jslee02
Move eigen_yaml to util renaming to yaml_eigen_extension
7ec2fbd
gilwoolee and others added 15 commits April 22, 2017 14:38
@gilwoolee
Merge branch 'master' into util/yaml_helper
e39ef72
@jslee02
Merge branch 'master' into style/statespace
22e0ebb
@jslee02
Use detail namespace instead of anonymous namespace
5e4b783
@jslee02
Make function inline-ed that is defined in header
5b39cb7
@jslee02
Merge branch 'master' into style/statespace
0ce929c
@gilwoolee
Merge branch 'master' into util/yaml_helper
9b437a9
@jslee02
Add comment
151b7e6
@mkoval
Merge branch 'master' into util/yaml_helper
fe89b10
@gilwoolee @jslee02
Renaming spin to step and removing template (#189)
1f7aba6
@jslee02
Suppress warnings per gcc 5.4.0
4e5817b
@jslee02
Merge remote-tracking branch 'origin/util/yaml_helper' into style/con…
1ba78bf 
…trol

# Conflicts:
#	include/aikido/constraint/uniform/detail/RnBoxConstraint-impl.hpp
#	include/aikido/statespace/detail/Rn-impl.hpp
@jslee02
Update code style by clang-format-3.8
b4aadcc
@gilwoolee
Removing mspace from RosTrajectoryExecutor.
7a0e8c0
@jslee02
Update code style by hand
e4fc76f
@jslee02
Merge remote-tracking branch 'origin/rosTrajExecutor' into style/control
538877e 
# Conflicts:
#	include/aikido/constraint/uniform/detail/RnBoxConstraint-impl.hpp
#	include/aikido/control/ros/RosTrajectoryExecutor.hpp
#	include/aikido/statespace/detail/Rn-impl.hpp
#	src/control/ros/RosTrajectoryExecutor.cpp
@jslee02 jslee02 added this to the Aikido 0.1.0 milestone Apr 23, 2017
@coveralls
Copy link

Coverage Status

Coverage increased (+0.08%) to 78.984% when pulling 3125bf1 on style/control into dffdf28 on master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.08%) to 78.984% when pulling b35d8eb on style/control into dffdf28 on master.

@jslee02
Merge remote-tracking branch 'origin/master' into style/control
64516f4 
Conflicts:
	src/control/ros/RosTrajectoryExecutor.cpp
@coveralls
Copy link

Coverage Status

Coverage increased (+0.08%) to 79.342% when pulling 64516f4 on style/control into acd983c on master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.05%) to 79.319% when pulling b8e3916 on style/control into 36d3a30 on master.

@jslee02 jslee02 merged commit 427f7be into master May 4, 2017
@jslee02 jslee02 deleted the style/control branch May 4, 2017 16:05
dqyi11 pushed a commit that referenced this pull request May 9, 2017
@jslee02
Code format: control (#191)
4c2d515
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Aikido 0.1.0
Development

Successfully merging this pull request may close these issues.
5 participants
@jslee02 @coveralls @gilwoolee @brianhou @mkoval