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

Accumulate contact points to prevent objects sinking when using ODE - Waiting for comments #1832

Draft
wants to merge 45 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
39a78a8
Add potential fix draft and test case
henriquealrs Jul 6, 2024
f7e4a12
Fix Collision test
henriquealrs Jul 9, 2024
d3aacc4
Remove archlinux support
jslee02 Jun 23, 2024
5976fe6
Remove building archlinux images
jslee02 Jun 23, 2024
a020c50
Upgrade pybind11 to v2.12.0
jslee02 Jun 23, 2024
e8ed6e4
Update changelog for 6.14.0
jslee02 Jun 25, 2024
3a27135
Bump version to 6.15
jslee02 Jun 26, 2024
b4c6db3
Include CTest for BUILD_TESTING option (#1819)
scpeters Jun 26, 2024
bc57e9b
Fix doxygen folder path
jslee02 Jun 26, 2024
9d9d1bc
Replace pagmo with pagmo-devel
jslee02 Jun 27, 2024
b95ff83
[pixi] Fix finding pagmo and ipopt
jslee02 Jun 27, 2024
b631135
[py] Remove binding of deprecated BoxedLcpConstraintSolver constructor
jslee02 Jun 27, 2024
ff610d3
[vcpkg] Update to 2024.06.15
jslee02 Jun 27, 2024
e11c65f
config.hpp.in: remove whitespace from version macros (#1820)
scpeters Jun 28, 2024
69a445c
[vcpkg] Update version to 2024.06.15 for dartpy build
jslee02 Jun 29, 2024
8cf5fa8
[pixi] Exclude hidden folders from formatting
jslee02 Jun 29, 2024
b6a39c4
[clang-format] Set language standard to C++17
jslee02 Jun 29, 2024
eb6fa74
[build] Remove DART_IN_CI
jslee02 Jun 30, 2024
cf86865
[pixi] Use system installed imgui
jslee02 Jun 30, 2024
0a70b7f
[build] Fix Findimgui.cmake -- still not working since libimgui.so do…
jslee02 Jun 30, 2024
6ffb2e4
[vcpkg] Update packages
jslee02 Jun 30, 2024
a55b701
[vcpkg] Use system installed imgui
jslee02 Jun 30, 2024
634d15d
[build] Use Ninja on Unix
jslee02 Jun 30, 2024
a0a1784
[pixi] Rename example- to ex-
jslee02 Jun 30, 2024
34f62f6
[pixi] Run lock update CI job on every Sat
jslee02 Jun 30, 2024
42ad24d
[pixi] Add tutorial tasks
jslee02 Jun 30, 2024
938cd1a
[docker] Update dep versions for dartpy build
jslee02 Jul 1, 2024
433de99
Update pixi lockfile (#1828)
github-actions[bot] Jul 6, 2024
23b52dd
Set DART_ENABLE_SIMD=OFF by default (#1825)
jslee02 Jul 4, 2024
814628a
[docker] Update DART version to 6.15
jslee02 Jul 6, 2024
50adcf2
[ci] Use noble as default
jslee02 Jul 6, 2024
58a8aea
[ci] Add oracular job
jslee02 Jul 6, 2024
654a883
[ci] Use jammy for codecov
jslee02 Jul 7, 2024
094010e
Set DART_BUILD_DARTPY=OFF by default
jslee02 Jul 7, 2024
5a849d1
[py] Remove OpenCL settings in setup.py
jslee02 Jul 8, 2024
2d4dcb5
Merge branch 'main' into Investigate_Issue_1654
henriquealrs Jul 13, 2024
ff26983
Merge branch 'main' into Investigate_Issue_1654
henriquealrs Jul 13, 2024
4651fb6
Fix in solution
henriquealrs Jul 13, 2024
44bc4db
Remove couts
henriquealrs Jul 13, 2024
1026f54
I think I fixed it
henriquealrs Jul 13, 2024
2312d16
Another fix in solution
henriquealrs Jul 14, 2024
9b7a9fe
Merge branch 'main' into Investigate_Issue_1654
henriquealrs Jul 23, 2024
a221386
Clang-format
henriquealrs Jul 23, 2024
aee3429
Fix test
henriquealrs Jul 23, 2024
7ce709a
Merge branch 'main' into Investigate_Issue_1654
jslee02 Dec 21, 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
[py] Remove binding of deprecated BoxedLcpConstraintSolver constructor
(cherry picked from commit ad9a8a1)
jslee02 authored and henriquealrs committed Jul 13, 2024
commit b631135d06e5fef47f470d3c66c107820abe3c5c
2 changes: 1 addition & 1 deletion dart/constraint/BoxedLcpConstraintSolver.hpp
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ class BoxedLcpConstraintSolver : public ConstraintSolver
BoxedLcpSolverPtr boxedLcpSolver = nullptr,
BoxedLcpSolverPtr secondaryBoxedLcpSolver = nullptr);

/// Constructos with default primary and secondary LCP solvers, which are
/// Constructs with default primary and secondary LCP solvers, which are
/// Dantzig and PGS, respectively.
BoxedLcpConstraintSolver();

25 changes: 15 additions & 10 deletions python/dartpy/constraint/BoxedLcpConstraintSolver.cpp
Original file line number Diff line number Diff line change
@@ -42,26 +42,31 @@ namespace python {
void BoxedLcpConstraintSolver(py::module& m)
{
::py::class_<
dart::constraint::BoxedLcpConstraintSolver,
dart::constraint::ConstraintSolver,
std::shared_ptr<dart::constraint::BoxedLcpConstraintSolver>>(
constraint::BoxedLcpConstraintSolver,
constraint::ConstraintSolver,
std::shared_ptr<constraint::BoxedLcpConstraintSolver>>(
m, "BoxedLcpConstraintSolver")
.def(::py::init<double>(), ::py::arg("timeStep"))
.def(::py::init<>())
.def(
::py::init<double, dart::constraint::BoxedLcpSolverPtr>(),
::py::arg("timeStep"),
::py::init<constraint::BoxedLcpSolverPtr>(),
::py::arg("boxedLcpSolver"))
.def(
::py::init<
constraint::BoxedLcpSolverPtr,
constraint::BoxedLcpSolverPtr>(),
::py::arg("boxedLcpSolver"),
::py::arg("secondaryBoxedLcpSolver"))
.def(
"setBoxedLcpSolver",
+[](dart::constraint::BoxedLcpConstraintSolver* self,
dart::constraint::BoxedLcpSolverPtr lcpSolver) {
+[](constraint::BoxedLcpConstraintSolver* self,
constraint::BoxedLcpSolverPtr lcpSolver) {
self->setBoxedLcpSolver(lcpSolver);
},
::py::arg("lcpSolver"))
.def(
"getBoxedLcpSolver",
+[](const dart::constraint::BoxedLcpConstraintSolver* self)
-> dart::constraint::ConstBoxedLcpSolverPtr {
+[](const constraint::BoxedLcpConstraintSolver* self)
-> constraint::ConstBoxedLcpSolverPtr {
return self->getBoxedLcpSolver();
});
}