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

Add parameters, fix terminal cost, add bounds on x #12

Merged
merged 16 commits into from
Jan 5, 2023
Merged

Conversation

FreyJo
Copy link
Collaborator

@FreyJo FreyJo commented Jan 4, 2023

No description provided.

# either provide single parameter vector
p_val = np.concatenate((np.array([1.0, 0.1]), x_ref_val))
# or matrix (one parameter vector for each control stage)
p_val = np.tile(p_val, (opts.N_stages, 1))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need to copy the parameter values over all stages manually?
After some thinking, I would still prefer say p_global_val, p_time_var_val
and p_global and p_time_var over p
(and, of course, put them together and copy the values in the solver construction)

@nurkanovic
Copy link
Member

The comment above is my only concern. Otherwise, LGTM.

Copy link
Member

@apozharski apozharski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One thing that can definitely be handled later, otherwise LGTM. If Armin's comment is addressed probably good to merge.

nosnoc/nosnoc.py Show resolved Hide resolved
Copy link
Member

@nurkanovic nurkanovic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love it 🥇

@FreyJo FreyJo merged commit 16e3696 into main Jan 5, 2023
@FreyJo FreyJo deleted the add_parameters branch January 5, 2023 15:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants