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

BoxedLcpConstraintSolver: API compatible with 6.7 #1291

Merged
merged 2 commits into from
Apr 24, 2019
Merged

BoxedLcpConstraintSolver: API compatible with 6.7 #1291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf63f68
BoxedLcpConstraintSolver: API compatible with 6.7
scpeters Apr 24, 2019
eade86c
Update changelog
jslee02 Apr 24, 2019
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
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

#### Changes

* XXX
* Dynamics

* XXX: [#XXXX](https://github.com/dartsim/dart/pull/XXXX)
* Fixed BoxedLcpConstraintSolver is not API compatible with 6.7: [#1291](https://github.com/dartsim/dart/pull/1291)

#### Compilers Tested

Expand Down
4 changes: 2 additions & 2 deletions dart/constraint/BoxedLcpConstraintSolver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ class BoxedLcpConstraintSolver : public ConstraintSolver
DART_DEPRECATED(6.8)
BoxedLcpConstraintSolver(
double timeStep,
BoxedLcpSolverPtr boxedLcpSolver,
BoxedLcpSolverPtr secondaryBoxedLcpSolver);
BoxedLcpSolverPtr boxedLcpSolver = nullptr,
BoxedLcpSolverPtr secondaryBoxedLcpSolver = nullptr);

/// Constructos with default primary and secondary LCP solvers, which are
/// Dantzig and PGS, respectively.
Expand Down