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

Jump to bottom

Fixes #150 #152

Merged
merged 1 commit into from
Aug 11, 2023
Merged

Fixes #150 #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 1 addition & 10 deletions optas/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,22 +202,13 @@ def __init__(
):
"""! Task model initializer.

<<<<<<< HEAD
@param name The name of the model.
@param dim Model dimension.
@param time_derivs Time derivatives required for model, 0 means not time derivative, 1 means first derivative wrt to time is required, etc.
@param symbol A short symbol to represent the model.
@param dlim Limits on each time derivative, index should correspond to a time derivative (i.e. 0, 1, ...) and the value should be a tuple of two lists containing the lower and upper bounds.
@param T Optionally use this to override the number of time-steps given in the OptimizationBuilder constructor.
=======
@param name The name of the model.
@param dim Model dimension.
@param time_derivs Time derivatives required for model, 0 means not time derivative, 1 means first derivative wrt to time is required, etc.
@param symbol A short symbol to represent the model.
@param dlim Limits on each time derivative, index should correspond to a time derivative (i.e. 0, 1, ...) and the value should be a tuple of two lists containing the lower and upper bounds.
@param T Optionally use this to override the number of time-steps given in the OptimizationBuilder constructor.
@param is_discrete When True, the variables are treated as discrete variables.
>>>>>>> Add is_discrete attribute for task model
@param is_discrete When True, the variables are treated as discrete variables.
"""

super().__init__(name, dim, time_derivs, symbol, dlim, T)
Expand Down
Loading