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

Bump cvxpy from 1.5.3 to 1.6.0 in /requirements #1096

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Bump cvxpy from 1.5.3 to 1.6.0 in /requirements #1096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef25ebc
Bump cvxpy from 1.5.3 to 1.6.0 in /requirements
dependabot[bot] Dec 10, 2024
a370cbe
Merge branch 'master' into dependabot/pip/requirements/cvxpy-1.6.0
AtsushiSakai Dec 21, 2024
a0102ed
specify the order for cvxpy.reshape
AtsushiSakai Dec 22, 2024
3ab5b0d
using ECOS
AtsushiSakai Dec 22, 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
23 changes: 12 additions & 11 deletions AerialNavigation/rocket_powered_landing/rocket_powered_landing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,11 +462,11 @@ def __init__(self, m, K):
# x_t+1 = A_*x_t+B_*U_t+C_*U_T+1*S_*sigma+zbar+nu
constraints += [
self.var['X'][:, k + 1] ==
cvxpy.reshape(self.par['A_bar'][:, k], (m.n_x, m.n_x)) @
cvxpy.reshape(self.par['A_bar'][:, k], (m.n_x, m.n_x), order='F') @
self.var['X'][:, k] +
cvxpy.reshape(self.par['B_bar'][:, k], (m.n_x, m.n_u)) @
cvxpy.reshape(self.par['B_bar'][:, k], (m.n_x, m.n_u), order='F') @
self.var['U'][:, k] +
cvxpy.reshape(self.par['C_bar'][:, k], (m.n_x, m.n_u)) @
cvxpy.reshape(self.par['C_bar'][:, k], (m.n_x, m.n_u), order='F') @
self.var['U'][:, k + 1] +
self.par['S_bar'][:, k] * self.var['sigma'] +
self.par['z_bar'][:, k] +
Expand Down Expand Up @@ -536,20 +536,21 @@ def solve(self, **kwargs):
with warnings.catch_warnings(): # For User warning from solver
warnings.simplefilter('ignore')
self.prob.solve(verbose=verbose_solver,
solver=solver)
solver=cvxpy.ECOS)
except cvxpy.SolverError:
error = True

stats = self.prob.solver_stats

info = {
'setup_time': stats.setup_time,
'solver_time': stats.solve_time,
'iterations': stats.num_iters,
'solver_error': error
}
if stats is not None:
info = {
'setup_time': stats.setup_time,
'solver_time': stats.solve_time,
'iterations': stats.num_iters,
'solver_error': error
}

return info
return info


def axis3d_equal(X, Y, Z, ax):
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
numpy == 2.2.0
scipy == 1.14.1
matplotlib == 3.10.0
cvxpy == 1.5.3
cvxpy == 1.6.0
pytest == 8.3.4 # For unit test
pytest-xdist == 3.6.1 # For unit test
mypy == 1.13.0 # For unit test
Expand Down
Loading