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

Merge upstream changes #224

Merged
merged 71 commits into from
Apr 16, 2024
Merged

Merge upstream changes #224

merged 71 commits into from
Apr 16, 2024

Conversation

patkenneally
Copy link
Collaborator

  • Tickets addressed: NA
  • Review: By commit
  • Merge strategy: Merge (no squash)

Description

Merged upstream changes.

Verification

Ci to run.

Documentation

NA

Future work

NA

@patkenneally patkenneally self-assigned this Apr 15, 2024
leahkiner and others added 29 commits April 15, 2024 16:57
tr, ts, tc, and tf are renamed to
t_r, t_s, t_c and t_f
This commit moves the module methods and variables
into more logical groups so that when smoothing
is introduced, the associated methods and variables
will have clear groups they belong to.
This method is added in order to reduce the
content and complexity of the UpdateState() method.
This method is added in order to reduce the
content and complexity of the UpdateState() method.
The changes in this commit include small tweaks to
method and parameter descriptions, rewording of
other comments, changing indentation, and shifting/
swapping some lines of code to more logical
locations.
Both of these variables represent the end of a
bang segment; therefore they can be merged and
renamed as a single variable. When smoothing
is added to the module, these additional profilers
will be able to re-use this variable.
transPos_tr and transVel_tr variables are renamed
to transPos_tb1 and trannsVel_tb1, respectively.

These variables are renamed so that when smoothing
is added to the module, the additional profilers
will be able to re-use these variables.
The methods ending in NoCoast() are removed because
the other existing methods can be rewritten and used
by either profiler.
This method is added in order to reduce the
content and complexity of the UpdateState() method.
This commit adds both a smoothed bang-bang and a
smoothed bang-coast-bang profiler option to the
module.
For the smoothed profiler options, the numerical
derivative of the profiled displacements and
velocities is determined across the entire
simulation and then checked with the module's
profiled acceleration and velocity to ensure the
profiled acceleration is correctly integrated in
the module to obtain the displacements and
velocities.
leahkiner and others added 27 commits April 15, 2024 16:58
The methods ending in NoCoast() are removed because
the other existing methods can be rewritten and used
by either profiler.
This method is added in order to reduce the
content and complexity of the UpdateState() method.
This commit adds both a smoothed bang-bang and a
smoothed bang-coast-bang profiler option to the
module.
Remove section discussing how to use the depreciated way of writing python modules.
@patkenneally patkenneally force-pushed the feature/merge-upstream-changes branch from d73fb70 to 1ce39c6 Compare April 15, 2024 22:58
@patkenneally patkenneally merged commit fa2eb00 into develop Apr 16, 2024
2 checks passed
@patkenneally patkenneally deleted the feature/merge-upstream-changes branch April 16, 2024 01:32
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.

6 participants