Skip to content

Commit f1f15c0

Browse files
authored
Merge pull request #53 from Simple-Robotics/topic/fix-state-constraints-aligator0.13
Fix box constraints for aligator 0.13
2 parents 0f5bf81 + d5c975d commit f1f15c0

File tree

6 files changed

+2601
-3814
lines changed

6 files changed

+2601
-3814
lines changed

cmake

Submodule cmake updated 375 files

dependencies.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ find_package(example-robot-data 4.0.9 REQUIRED)
22
ADD_PROJECT_DEPENDENCY(OpenMP REQUIRED)
33
ADD_PROJECT_DEPENDENCY(proxsuite REQUIRED)
44
ADD_PROJECT_DEPENDENCY(pinocchio REQUIRED)
5-
ADD_PROJECT_DEPENDENCY(aligator REQUIRED)
5+
ADD_PROJECT_DEPENDENCY(aligator 0.13.0 REQUIRED)
66

77
function(get_ndcurves)
88
find_package(ndcurves QUIET)

pixi.lock

Lines changed: 2594 additions & 3807 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pkg-config = ">=0.29.2"
1919
libboost-python-devel = ">=1.80.0"
2020
python = "3.11"
2121
eigenpy = ">=3.10.1"
22-
aligator = ">=0.10"
22+
aligator = ">=0.13"
2323
benchmark = ">=1.8.0"
2424
pytest = ">=8.3.0"
2525
matplotlib = ">=3.9"
@@ -44,9 +44,9 @@ configure = { cmd = [
4444
"-DBUILD_TESTING=ON",
4545
"-DGENERATE_PYTHON_STUBS=ON",
4646
] }
47-
build = { cmd = "cmake --build build --target all", depends_on = ["configure"] }
47+
build = { cmd = "cmake --build build --target all", depends-on = ["configure"] }
4848
clean = { cmd = "rm -rf build" }
49-
test = { cmd = "ctest --test-dir build --output-on-failure", depends_on = [
49+
test = { cmd = "ctest --test-dir build --output-on-failure", depends-on = [
5050
"build",
5151
] }
5252

src/fulldynamics.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ namespace simple_mpc
156156
state_id.push_back(i);
157157
}
158158
FunctionSliceXpr state_slice = FunctionSliceXpr(state_fn, state_id);
159-
stm.addConstraint(state_slice, BoxConstraint(-settings_.qmax, -settings_.qmin));
159+
stm.addConstraint(state_slice, BoxConstraint(settings_.qmin, settings_.qmax));
160160
}
161161

162162
for (auto const & name : model_handler_.getFeetNames())

src/kinodynamics.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ namespace simple_mpc
9696
state_id.push_back(i);
9797
}
9898
FunctionSliceXpr state_slice = FunctionSliceXpr(state_fn, state_id);
99-
stm.addConstraint(state_slice, BoxConstraint(-settings_.qmax, -settings_.qmin));
99+
stm.addConstraint(state_slice, BoxConstraint(settings_.qmin, settings_.qmax));
100100
}
101101

102102
Motion v_ref = Motion::Zero();

0 commit comments

Comments
 (0)