Code

Code format: control#191

Code

Merged

jslee02 merged 72 commits intomasterpersonalrobotics/aikido:masterfrom style/controlpersonalrobotics/aikido:style/controlCopy head branch name to clipboardMay 4, 2017

+626-537

Commits

Commits on Apr 12, 2017

• Renaming, adding an abstract BarretHandPositionCommandExecutor class

  gilwoolee

  committed
  8feb924

  Copy full SHA for 8feb924

• Adding -override

  gilwoolee

  committed
  811a63b

  Copy full SHA for 811a63b

• Merge branch 'master' into SimBarrettHandCommandExecutor

  gilwoolee

  authored
  dd96c10

  Copy full SHA for dd96c10

Commits on Apr 13, 2017

• Exposing step

  gilwoolee

  committed
  83f69dd

  Copy full SHA for 83f69dd

• Merge branch 'SimBarrettHandCommandExecutor' of https://github.com/personalrobotics/aikido into SimBarrettHandCommandExecutor

  gilwoolee

  committed
  cf8f104

  Copy full SHA for cf8f104

• Renaiming PositionCommandExecutor

  gilwoolee

  committed
  9d9fb3d

  Copy full SHA for 9d9fb3d

• Changing header files

  gilwoolee

  committed
  648c2bf

  Copy full SHA for 648c2bf

• Format statespace code

  jslee02

  committed
  90a7ab6

  Copy full SHA for 90a7ab6

Commits on Apr 14, 2017

• Changing names and step function.

  gilwoolee

  committed
  a38c65a

  Copy full SHA for a38c65a

• Merge branch 'master' into SimBarrettHandCommandExecutor

  gilwoolee

  authored
  06dad13

  Copy full SHA for 06dad13

• Merge branch 'master' into style/statespace

  jslee02

  authored
  012031d

  Copy full SHA for 012031d

• Update simulation speed constants and matrix->vector methods.

  brianhou

  committed
  c6462db

  Copy full SHA for c6462db

Commits on Apr 15, 2017

• Add collisionDetector argument. Make collideWith an optional argument.

  brianhou

  committed
  e16880e

  Copy full SHA for e16880e

• Don't reset mCollideWith every time.

  brianhou

  committed
  ce86f93

  Copy full SHA for ce86f93

• Simplify logic of optional collision detector and collision groups.

  Show description for c90cd8d
  brianhou

  committed
  c90cd8d

  Copy full SHA for c90cd8d

• Merge branch 'master' into style/statespace

  jslee02

  authored
  9347ffd

  Copy full SHA for 9347ffd

• Add ShapeFrames of original collision group to new collision group.

  brianhou

  committed
  2d3a5bc

  Copy full SHA for 2d3a5bc

• Make collisionDetector, collideWith optional.

  brianhou

  committed
  d9d36fc

  Copy full SHA for d9d36fc

• Instantiate FingerPositionCommandExecutors and FingerSpreadCommandExecutor in HandPositionCommandExecutor.

  Show description for 3af8671
  brianhou

  committed
  3af8671

  Copy full SHA for 3af8671

• Clean up some documentation.

  brianhou

  committed
  2174930

  Copy full SHA for 2174930

• Remove parameter from step.

  brianhou

  committed
  6ecb30e

  Copy full SHA for 6ecb30e

• Set mCollisionDetector when setting mCollideWith.

  brianhou

  committed
  c3eb6f3

  Copy full SHA for c3eb6f3

• Make FingerCommandExecutors implement PositionCommandExecutor.

  brianhou

  committed
  47a9852

  Copy full SHA for 47a9852

Commits on Apr 16, 2017

• Swap argument order in HandPositionExecutor.

  brianhou

  committed
  bebb761

  Copy full SHA for bebb761

• Partial test fixes.

  Show description for f1d805f
  brianhou

  committed
  f1d805f

  Copy full SHA for f1d805f

• Rename RnTraits to RJointTraits

  jslee02

  committed
  56f1644

  Copy full SHA for 56f1644

• Yaml parser

  gilwoolee

  committed
  0be9ae8

  Copy full SHA for 0be9ae8

• Adding time-reset when a new execute command is given.

  gilwoolee

  committed
  fc7cd1c

  Copy full SHA for fc7cd1c

• Merge branch 'SimBarrettHandCommandExecutor' of https://github.com/personalrobotics/aikido into util/yaml_helper

  gilwoolee

  committed
  57e404f

  Copy full SHA for 57e404f

Commits on Apr 18, 2017

• Move eigen_yaml to util renaming to yaml_eigen_extension

  jslee02

  committed
  7ec2fbd

  Copy full SHA for 7ec2fbd

• Address Mike's comments -- still need docstrings

  jslee02

  committed
  c6c12d9

  Copy full SHA for c6c12d9

• Merge remote-tracking branch 'origin/master' into util/yaml_helper

  Show description for 4804ff2
  jslee02

  committed
  4804ff2

  Copy full SHA for 4804ff2

• Merge branch 'master' into style/statespace

  jslee02

  authored
  e74d236

  Copy full SHA for e74d236

Commits on Apr 19, 2017

• Merge remote-tracking branch 'origin/master' into util/yaml_helper

  jslee02

  committed
  0a05e5a

  Copy full SHA for 0a05e5a

• Use find module for yaml-cpp instead of pkgconfig

  jslee02

  committed
  5a5cec9

  Copy full SHA for 5a5cec9

• Remove meaningless test line

  jslee02

  committed
  9053361

  Copy full SHA for 9053361

• Fix style

  jslee02

  committed
  1bd0c27

  Copy full SHA for 1bd0c27

• Suppress warnings per GCC 6.3.0

  jslee02

  committed
  9ea12ef

  Copy full SHA for 9ea12ef

• Add yaml converter for std::unordered_map

  jslee02

  committed
  2fe83d4

  Copy full SHA for 2fe83d4

• Add comment

  jslee02

  committed
  4f0a428

  Copy full SHA for 4f0a428

• Rename deserialize to decode

  jslee02

  committed
  80d0be3

  Copy full SHA for 80d0be3

• Add comments

  jslee02

  committed
  9d02314

  Copy full SHA for 9d02314

• Add more comments

  jslee02

  committed
  1fe6f27

  Copy full SHA for 1fe6f27

• Rename yaml_eigen_extension to yaml_extension

  jslee02

  committed
  a7d0f77

  Copy full SHA for a7d0f77

• Fix header including

  jslee02

  committed
  e4a5f43

  Copy full SHA for e4a5f43

• Merge branch 'master' into style/statespace

  jslee02

  authored
  fcc093f

  Copy full SHA for fcc093f

• Rename test_yaml_eigen_extension to test_yaml_extension

  Show description for 3eb4b88
  jslee02

  committed
  3eb4b88

  Copy full SHA for 3eb4b88

Commits on Apr 21, 2017

• Fix typos in version.hpp.in

  jslee02

  committed
  7a8f2c6

  Copy full SHA for 7a8f2c6

• Use YAML::RepresentationException instead of std::exception

  jslee02

  committed
  e359fef

  Copy full SHA for e359fef

• Fix style

  jslee02

  committed
  c5ce755

  Copy full SHA for c5ce755

Commits on Apr 22, 2017

• Merge branch 'master' into util/yaml_helper

  gilwoolee

  authored
  e39ef72

  Copy full SHA for e39ef72

• Merge branch 'master' into style/statespace

  jslee02

  authored
  22e0ebb

  Copy full SHA for 22e0ebb

• Use detail namespace instead of anonymous namespace

  jslee02

  committed
  5e4b783

  Copy full SHA for 5e4b783

• Make function inline-ed that is defined in header

  jslee02

  committed
  5b39cb7

  Copy full SHA for 5b39cb7

• Merge branch 'master' into style/statespace

  jslee02

  authored
  0ce929c

  Copy full SHA for 0ce929c

• Merge branch 'master' into util/yaml_helper

  gilwoolee

  authored
  9b437a9

  Copy full SHA for 9b437a9

Commits on Apr 23, 2017

• Add comment

  jslee02

  committed
  151b7e6

  Copy full SHA for 151b7e6

• Merge branch 'master' into util/yaml_helper

  mkoval

  authored
  fe89b10

  Copy full SHA for fe89b10

• Renaming spin to step and removing template (#189)

  

  gilwoolee

  authored and

  jslee02

  committed
  1f7aba6

  Copy full SHA for 1f7aba6

• Suppress warnings per gcc 5.4.0

  jslee02

  committed
  4e5817b

  Copy full SHA for 4e5817b

• Merge remote-tracking branch 'origin/util/yaml_helper' into style/control

  Show description for 1ba78bf
  jslee02

  committed
  1ba78bf

  Copy full SHA for 1ba78bf

• Update code style by clang-format-3.8

  jslee02

  committed
  b4aadcc

  Copy full SHA for b4aadcc

• Removing mspace from RosTrajectoryExecutor.

  gilwoolee

  committed
  7a0e8c0

  Copy full SHA for 7a0e8c0

• Update code style by hand

  jslee02

  committed
  e4fc76f

  Copy full SHA for e4fc76f

• Merge remote-tracking branch 'origin/rosTrajExecutor' into style/control

  Show description for 538877e
  jslee02

  committed
  538877e

  Copy full SHA for 538877e

• Fix style

  jslee02

  committed
  206163e

  Copy full SHA for 206163e

• Merge branch 'master' into style/control

  jslee02

  authored
  3125bf1

  Copy full SHA for 3125bf1

• Fix style

  jslee02

  committed
  b35d8eb

  Copy full SHA for b35d8eb

Commits on Apr 27, 2017

• Merge remote-tracking branch 'origin/master' into style/control

  Show description for 64516f4
  jslee02

  committed
  64516f4

  Copy full SHA for 64516f4

Commits on May 2, 2017

• Merge branch 'master' into style/control

  jslee02

  authored
  b8e3916

  Copy full SHA for b8e3916

Commits on May 4, 2017

• Merge branch 'master' into style/control

  jslee02

  authored
  c25d192

  Copy full SHA for c25d192

• Merge branch 'master' into style/control

  jslee02

  authored
  be3f0bc

  Copy full SHA for be3f0bc