Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
791 commits
Select commit Hold shift + click to select a range
14c6fb1
a
mrzkp May 19, 2023
d0e7d9c
Revert
mrzkp May 19, 2023
4fdeaf1
Revert Tests
mrzkp May 19, 2023
86ec6f9
Merge pull request #533 from nasa/feature/inplace_noise
teubert May 22, 2023
041f410
Improvements on controller functions: removed a for loop in lqr_fn by…
matteocorbetta May 22, 2023
27f09e2
Added a new class that is supposed to replace UAVGen (if accepted) an…
matteocorbetta May 22, 2023
01832d1
Auto stash before merge of "feature/traj_generation_modular" and "ori…
kjjarvis May 22, 2023
e638c90
Update test_estimate_params.py
mrzkp May 23, 2023
027c03e
Updated Calc_Error, question regarding Runs remain
mrzkp May 23, 2023
4ad29cd
Merge branch 'dev' into feature/next_state_integrator
teubert May 23, 2023
2dd4ff8
Merge pull request #529 from nasa/feature/next_state_integrator
teubert May 23, 2023
31411ee
Update test_estimate_params.py
mrzkp May 23, 2023
cccc1c0
Update test_estimate_params.py
mrzkp May 23, 2023
e9806d4
removed tol = 0 test. diff behavior depending on version
mrzkp May 23, 2023
a4a18b8
debugging new code
kjjarvis May 24, 2023
ed06535
Debugging
kjjarvis May 24, 2023
0f8d9f7
cleaned up SmallRotorcraft class and removed AircraftModels, which is…
matteocorbetta May 24, 2023
9a00e66
Merge remote-tracking branch 'origin/feature/traj_generation_modular'…
kjjarvis May 24, 2023
e2ef386
Final adjustments for deleting AircraftModels and class
kjjarvis May 24, 2023
790bc77
First changes for mission_complete in inputs/ctrl
kjjarvis May 24, 2023
5b993c6
Added mission_complete works
kjjarvis May 24, 2023
120519a
PR changes
mrzkp May 26, 2023
f9ddb6d
Cleanup formatting
teubert May 26, 2023
9a0d893
Further Changes for calc_error
mrzkp May 26, 2023
98210a0
Cleanup from linter
teubert May 26, 2023
e854cfb
Merge pull request #535 from nasa/cleanup_formatting
teubert May 26, 2023
643161c
Update test_calc_error.py
mrzkp May 26, 2023
9966277
Update test_calc_error.py
mrzkp May 26, 2023
8306b63
improving coverage and removed cProfile
mrzkp May 26, 2023
fb1ba4d
Update test_estimate_params.py
mrzkp May 26, 2023
3c8a7a5
Merge branch 'dev' into tests/tolerance
teubert May 26, 2023
2ae3e38
Merge pull request #518 from nasa/tests/tolerance
teubert May 26, 2023
95a6633
Update test_calc_error.py
mrzkp May 26, 2023
cd0d12e
need to fix _loc
mrzkp May 26, 2023
249b265
Update test_calc_error.py
mrzkp May 26, 2023
ea5b03b
Merge branch 'dev' into features/DTW-alg
mrzkp May 26, 2023
e30003d
I think it's good?
mrzkp May 26, 2023
e63c82b
need to add few gt's
mrzkp May 26, 2023
c30cfce
Change coarse waypoints format to DataFrames
kjjarvis May 27, 2023
1ec678e
Merge remote-tracking branch 'origin/dev' into feature/traj_generatio…
kjjarvis May 27, 2023
776c476
Add back in uav_model test to __main__
kjjarvis May 27, 2023
59be861
First draft integrator
teubert May 27, 2023
3a9272e
Integrate into next_state
teubert May 27, 2023
42f52e7
Small clean-up changes
kjjarvis May 29, 2023
4d9002b
Add tests
teubert May 30, 2023
f25d5cb
function comments
mrzkp May 30, 2023
0755987
Small clean-up edits
kjjarvis May 30, 2023
3f7e9c1
FIxed data location and added more comprehensive tests
mrzkp May 30, 2023
b25b86d
Merge branch 'dev' into tests/calc_error
mrzkp May 30, 2023
59959d8
documenting acceptable types in calc_error
mrzkp May 30, 2023
3a5edcd
clean up
mrzkp May 30, 2023
ea6d7a1
Wrote function defintion for check_iterable
mrzkp May 30, 2023
bd33b27
Delete output_calls.txt
mrzkp May 30, 2023
58b798c
Delete output_time.txt
mrzkp May 30, 2023
3db5847
Update calc_error.py
mrzkp May 30, 2023
7673c02
Delete output_calls.txt
mrzkp May 30, 2023
29460bc
Delete output_time.txt
mrzkp May 30, 2023
f64f3cd
testing
mrzkp May 30, 2023
c55d8e4
Delete params_est_edge.py
mrzkp May 30, 2023
30f36de
added documentation for a bunch of functions, although this pass is n…
matteocorbetta May 30, 2023
79da7cc
Rename loading_fcns to loading and documentation edits/typos
kjjarvis May 31, 2023
ffd496b
First pass at PR comments
kjjarvis May 31, 2023
ff66096
Adding test_uav_model to coverage assessment
kjjarvis May 31, 2023
e260827
Fixing copyright issue
kjjarvis May 31, 2023
fdb19f2
Merge branch 'dev' into prog_models_feature/containers_simresult_test…
mstraut May 31, 2023
9c76d35
final edits(?) awaiting another check from Chris Teubert, pt 4
mstraut May 31, 2023
2fdadf0
Update src/prog_models/sim_result.py
mstraut May 31, 2023
580fbd4
Merge pull request #536 from nasa/feature/scipy_integrator
teubert May 31, 2023
b194001
final edits(?) awaiting another check from Chris Teubert, pt 5
mstraut May 31, 2023
24cf0e0
Merge remote-tracking branch 'origin/prog_models_feature/containers_s…
mstraut May 31, 2023
651cfdd
final edits(?) awaiting another check from Chris Teubert, pt 5
mstraut May 31, 2023
49f7729
Merge branch 'dev' into prog_models_feature/containers_simresult_test…
teubert Jun 1, 2023
cd8f3bb
Piecewise loading
teubert Jun 1, 2023
5a89a4e
Stop points
teubert Jun 1, 2023
232fd10
Update example
teubert Jun 1, 2023
b9acb00
Update test
teubert Jun 1, 2023
d4c38bd
Update example
teubert Jun 1, 2023
936e635
Apply suggestions from code review
teubert Jun 1, 2023
b68374a
Reversing changes in sim
teubert Jun 1, 2023
d5e98cd
save_pt -> eval_pt
teubert Jun 1, 2023
10096d8
Piecewise in events example
teubert Jun 1, 2023
9fdddd5
Merge pull request #536 from nasa/feature/scipy_integrator
teubert May 31, 2023
ca33624
Add test
teubert Jun 1, 2023
66c8e53
Merge branch 'dev' into 487-composite-pm-connections
teubert Jun 1, 2023
33d056a
Update src/prog_models/sim_result.py
mstraut Jun 2, 2023
dece451
Update src/prog_models/sim_result.py
mstraut Jun 2, 2023
8364c28
Update src/prog_models/sim_result.py
mstraut Jun 2, 2023
718eb3b
Merge branch 'dev' into prog_models_feature/containers_simresult_test…
mstraut Jun 2, 2023
4d9d834
Small improvements and more testing
kjjarvis Jun 2, 2023
43a574b
first changes to cleanup route and trajectory
matteocorbetta Jun 2, 2023
6b59be9
commiting local changes before merge
matteocorbetta Jun 2, 2023
7a0c44d
Add test of actual simulation
kjjarvis Jun 2, 2023
b9cc10e
created tests for sim_result:iloc and frame in test_sim_result.py
mstraut Jun 2, 2023
3cb15d9
Merge branch 'prog_models_feature/containers_simresult_tests_updates'…
mstraut Jun 2, 2023
3571105
Update prognostics_model.py
mrzkp Jun 5, 2023
1436221
str concat and isinstance()
mrzkp Jun 5, 2023
b61dbdd
Apply suggestions from code review
mrzkp Jun 5, 2023
b8d169f
PR changes
mrzkp Jun 5, 2023
bdfb3d7
Changed Documentation.
mrzkp Jun 5, 2023
855d341
Apply suggestions from code review
mrzkp Jun 5, 2023
971e7fd
Apply suggestions from code review
mrzkp Jun 5, 2023
281d022
Update calc_error.py
mrzkp Jun 5, 2023
9d4b322
Merge branch 'features/DTW-alg' of https://github.com/nasa/prog_model…
mrzkp Jun 5, 2023
47c41f6
Update python-package.yml
mrzkp Jun 5, 2023
bd53456
Update calc_error.py
mrzkp Jun 5, 2023
6debc7d
Fix typos
teubert Jun 5, 2023
2af246d
Fix example
teubert Jun 5, 2023
8febff5
Merge pull request #543 from nasa/487-composite-pm-connections
teubert Jun 5, 2023
58c3f1a
Merge branch 'dev' into feature/314-auto-step-for-piecewise-loading-prof
teubert Jun 5, 2023
b5edcc3
Merge pull request #542 from nasa/feature/314-auto-step-for-piecewise…
teubert Jun 6, 2023
b1fedfb
Moved exceptions
teubert Jun 6, 2023
b94dd5d
major refactoring of trajectory generation files; cleaned up interfac…
matteocorbetta Jun 6, 2023
085b4f3
Merge branch 'feature/traj_generation_modular' of https://github.com/…
matteocorbetta Jun 6, 2023
a9e4526
fix error type
teubert Jun 6, 2023
a6fca27
Fix surrogate test
teubert Jun 6, 2023
8c61a5f
fix test issue for some devices
teubert Jun 6, 2023
0b7b06e
Merge pull request #545 from nasa/update_exceptions
teubert Jun 6, 2023
5897cb7
Cleanup documentation and Tests
teubert Jun 6, 2023
2c77258
Fix tests
teubert Jun 6, 2023
c3deb0e
lazy import
teubert Jun 6, 2023
4b07ee0
Merge pull request #546 from nasa/feature/lazy_import_tf
mstraut Jun 6, 2023
2dcde68
Adding loading folder and moving current loading methods
kjjarvis Jun 6, 2023
d392ed6
Adding explicit import of mock.patch as bugfix
kjjarvis Jun 6, 2023
33eb151
Merge pull request #549 from nasa/bug/fix_import_mock_patch
teubert Jun 6, 2023
0fff403
Merge remote-tracking branch 'origin/dev' into feature/loading_folder
kjjarvis Jun 6, 2023
bf0b93e
Fix typo
kjjarvis Jun 6, 2023
d77ac95
Some changes required still.
mrzkp Jun 7, 2023
ebc3805
Adding times to each data point during tranformation
mrzkp Jun 7, 2023
8162b0b
Update calc_error.py
mrzkp Jun 7, 2023
133a9d6
?
mrzkp Jun 7, 2023
faa4ed0
Merge branch 'features/DTW-alg' of https://github.com/nasa/prog_model…
mrzkp Jun 7, 2023
27590c2
Revert Tests
mrzkp Jun 7, 2023
948d05f
overwrite changes
mrzkp Jun 7, 2023
a2dcba9
Merge branch 'dev' into features/DTW-alg
mrzkp Jun 7, 2023
f354247
Delete output.dat
mrzkp Jun 7, 2023
34523a2
Merge pull request #550 from nasa/feature/loading_folder
teubert Jun 7, 2023
86e1250
Update linear_model.py
mrzkp Jun 7, 2023
b2f5e43
Apply suggestions from code review
mrzkp Jun 7, 2023
62afa5f
changes according to Chris' review. Removed traj_gen.py, renamed traj…
matteocorbetta Jun 7, 2023
bf11c87
Switch from Typing to collections.abc
teubert Jun 6, 2023
be3bd54
Merge pull request #547 from nasa/switch_typing
teubert Jun 7, 2023
0207291
removed old sanity tests
mrzkp Jun 8, 2023
ecefc5a
removed unneeded tests and added 2 complicated tests
mrzkp Jun 8, 2023
e16b772
Update prognostics_model.py
mrzkp Jun 8, 2023
784a46d
Reformatted Error message
mrzkp Jun 8, 2023
8b8408b
updated functions for frame cache
mstraut Jun 8, 2023
9e4c7f0
Merge branch 'dev' into features/DTW-alg
teubert Jun 9, 2023
5c6f378
Merge branch 'dev' into prog_models_feature/containers_simresult_test…
teubert Jun 9, 2023
801f219
Added warnings/exceptions for new structure; fixed tests
kjjarvis Jun 10, 2023
f18bb07
Cleaning up code; fixing copyright issue
kjjarvis Jun 12, 2023
dd4e90d
fix typo
teubert Jun 12, 2023
503c33e
Merge pull request #538 from nasa/features/DTW-alg
teubert Jun 12, 2023
32e5806
Small fixes from review
kjjarvis Jun 12, 2023
4dfe9cc
Merge branch 'dev' into feature/traj_generation_modular
kjjarvis Jun 12, 2023
f929851
Merge branch 'dev' into tests/calc_error
mrzkp Jun 12, 2023
6724ea8
Cleanup spacing and documentation
teubert Jun 12, 2023
0975b1f
Increasing timeout for test
kjjarvis Jun 12, 2023
3595483
Merge remote-tracking branch 'origin/feature/traj_generation_modular'…
kjjarvis Jun 12, 2023
2be93fc
Clean up
mrzkp Jun 12, 2023
63f4c23
Controller kwargs description
kjjarvis Jun 12, 2023
92a454a
Debugging failed test
kjjarvis Jun 12, 2023
aa16797
push changes =(
mrzkp Jun 12, 2023
51b7605
Auto stash before checking out "origin/dev"
teubert Jun 12, 2023
45ff8d5
update dispatch
teubert Jun 12, 2023
d35557c
Update to use stash
teubert Jun 12, 2023
69545fb
split tests
teubert Jun 12, 2023
9f95a9c
updating cache name
teubert Jun 12, 2023
162f823
Debugging PR test by skipping uav_test
kjjarvis Jun 12, 2023
3aa35f9
Add more tests
teubert Jun 12, 2023
348a454
Add all tests
teubert Jun 12, 2023
10c05f5
Apply suggestions from code review
mrzkp Jun 12, 2023
151cb15
Fix tests
teubert Jun 12, 2023
ddfae86
.
mrzkp Jun 12, 2023
5dc8334
Apply suggestions from code review
mrzkp Jun 13, 2023
074b3e4
Reword comment
mrzkp Jun 13, 2023
33997d5
Debugging test
kjjarvis Jun 13, 2023
4d9a434
Merge remote-tracking branch 'origin/run_all_tests' into feature/traj…
kjjarvis Jun 13, 2023
b12fc7b
Testing without examples
kjjarvis Jun 13, 2023
55c5a26
Adding some tests
kjjarvis Jun 13, 2023
0e77e76
Only include uav test
kjjarvis Jun 13, 2023
a8b8efe
Just testing test_uav, no example
kjjarvis Jun 13, 2023
eb8b409
Testing commented out code in uav example
kjjarvis Jun 13, 2023
211c30a
Testing example again
kjjarvis Jun 13, 2023
f14b7a3
Testing example again
kjjarvis Jun 13, 2023
38cc4a4
Testing example again
kjjarvis Jun 13, 2023
307d531
Merge branch 'run_all_tests' into dev
teubert Jun 13, 2023
a64d4ed
Test example again, with ex #2
kjjarvis Jun 13, 2023
eb077c1
Test example again, add ex #3 no plot
kjjarvis Jun 13, 2023
83589e2
Testing complete example
kjjarvis Jun 13, 2023
3a5e870
Rename and clean
teubert Jun 13, 2023
81351e0
Testing example start
kjjarvis Jun 13, 2023
f3fd7a0
Adding more example
kjjarvis Jun 13, 2023
d35f0d1
Adding more of test
kjjarvis Jun 13, 2023
d276af7
Remove comment
teubert Jun 13, 2023
72a32b5
Adding less to test
kjjarvis Jun 13, 2023
ea73617
add warning message
teubert Jun 13, 2023
8a6688f
fix typo
teubert Jun 13, 2023
4d4aa74
print all state
teubert Jun 13, 2023
43ddd58
Print controller config
teubert Jun 13, 2023
d5c4663
Add controller printing
teubert Jun 13, 2023
d8f4779
logging in example
teubert Jun 13, 2023
f43187a
updated frame for check on cached data.
mstraut Jun 13, 2023
a98d666
additional warnings
teubert Jun 13, 2023
4216396
additional logs
teubert Jun 13, 2023
1e797ff
Using absolute datetimes
teubert Jun 13, 2023
45675fc
before/after eta call
teubert Jun 13, 2023
be7e1e6
Merge branch 'dev' into tests/calc_error
teubert Jun 13, 2023
d4f2286
before/after other fcn
teubert Jun 13, 2023
d9fab24
Merge pull request #539 from nasa/tests/calc_error
teubert Jun 13, 2023
3cde702
updated comments
mstraut Jun 13, 2023
b3ad9b0
Merge branch 'dev' into prog_models_feature/containers_simresult_test…
teubert Jun 13, 2023
e7b1116
small fixes
teubert Jun 13, 2023
78ee671
before/after other fcn
teubert Jun 13, 2023
c31180c
clean warnings
teubert Jun 13, 2023
53e1c2a
trying float time
teubert Jun 13, 2023
33e0fc5
propogate change
teubert Jun 13, 2023
15c5cbe
Merge branch 'feature/traj_generation_modular' into float_time
teubert Jun 14, 2023
fe29189
Uncomment example
teubert Jun 14, 2023
6e7ba07
Remove exception
teubert Jun 14, 2023
e0ab157
Merge branch 'feature/traj_generation_modular' into float_time
teubert Jun 14, 2023
91f7724
Remove waypoints in eg
teubert Jun 14, 2023
53a7511
Fix lat/lon typo
teubert Jun 14, 2023
3b50f84
Remove comments and merge functions
teubert Jun 14, 2023
a9e9688
Remove logging messages
teubert Jun 14, 2023
99b50a7
Fix typo
teubert Jun 14, 2023
4ff5c0b
More cleanup
teubert Jun 14, 2023
b899e23
Fix issue with pop
teubert Jun 14, 2023
94a096d
Remove duplicate warn
teubert Jun 14, 2023
67d184e
Switch to abc.callable
teubert Jun 14, 2023
ba8852f
Fix __delitem__
teubert Jun 14, 2023
07cd465
remove recalc in extend
teubert Jun 14, 2023
2c30b9a
Merge pull request #554 from nasa/simresult_suggestions
mstraut Jun 14, 2023
07855ea
Merge branch 'feature/traj_generation_modular' into float_time
teubert Jun 14, 2023
945d09e
fixed pandas index
mstraut Jun 14, 2023
68a865f
warn_once
teubert Jun 14, 2023
cb59116
Merge pull request #553 from nasa/float_time
teubert Jun 15, 2023
ec7d17d
Fix tests for new time configuration
kjjarvis Jun 16, 2023
728c8d0
Add uav model to cov
teubert Jun 16, 2023
569b6d1
Merge pull request #555 from nasa/feature/warn_once
teubert Jun 16, 2023
60c1456
Adding more tests for coverage
kjjarvis Jun 16, 2023
e5fda4f
Merge remote-tracking branch 'origin/feature/traj_generation_modular'…
kjjarvis Jun 16, 2023
b412e72
update to index and pop
mstraut Jun 16, 2023
9f5064a
Fix typo
kjjarvis Jun 16, 2023
f0f8cff
Merge branch 'dev' into prog_models_feature/containers_simresult_test…
teubert Jun 16, 2023
2e8c658
Warn_once
teubert Jun 16, 2023
f80a8df
Merge branch 'dev' into feature/traj_generation_modular
teubert Jun 16, 2023
bc0162f
Merge pull request #527 from nasa/prog_models_feature/containers_simr…
teubert Jun 16, 2023
19fd78e
Merge branch 'dev' into feature/traj_generation_modular
teubert Jun 16, 2023
9a783c2
Merge pull request #537 from nasa/feature/traj_generation_modular
teubert Jun 16, 2023
db91bfd
Merge branch 'master' into dev
teubert Jun 16, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: [ "master", dev, release/* ]
branches: [ "master", "dev", "release/*" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "master", dev, release/* ]
branches: [ "master", "dev", "release/*" ]

jobs:
analyze:
Expand Down
53 changes: 53 additions & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Coverage

on:
push:
pull_request:
paths:
- prog_models

jobs:
coverage:
timeout-minutes: 30
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.10']
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies cache
uses: actions/cache@v2
with:
path: ~/.cache/pip
key: pip-cache
- name: Install additional dependencies
run: |
pip install coverage
pip install importlib_metadata
- name: Update
run: pip install --upgrade --upgrade-strategy eager -e .
- name: Run coverage
run: |
coverage run -m tests.test_base_models
coverage run -a -m tests.test_battery
coverage run -a -m tests.test_calc_error
coverage run -a -m tests.test_centrifugal_pump
coverage run -a -m tests.test_composite
coverage run -a -m tests.test_datasets
coverage run -a -m tests.test_dict_like_matrix_wrapper
coverage run -a -m tests.test_direct
coverage run -a -m tests.test_estimate_params
coverage run -a -m tests.test_ensemble
coverage run -a -m tests.test_linear_model
coverage run -a -m tests.test_pneumatic_valve
coverage run -a -m tests.test_powertrain
coverage run -a -m tests.test_serialization
coverage run -a -m tests.test_sim_result
coverage run -a -m tests.test_uav_model
coverage xml -i
- name: "Upload coverage to Codecov"
uses: codecov/codecov-action@v3
7 changes: 3 additions & 4 deletions .github/workflows/pr-messages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ on:
types: [opened]

jobs:
benchmark_branch:
pr_msg:
timeout-minutes: 5
runs-on: ubuntu-latest
steps:
- name: Auto Comment
Expand All @@ -17,12 +18,10 @@ jobs:
pullRequestOpened: >
Thank you for opening this PR. Each PR into dev requires a code review. For the code review, look at the following:

- [ ] Reviewer should look for bugs, efficiency, readability, testing, and coverage in examples (if relevant).
- [ ] Reviewer (someone other than author) should look for bugs, efficiency, readability, testing, and coverage in examples (if relevant).

- [ ] Ensure that each PR adding a new feature should include a test verifying that feature.

- [ ] All tests must be passing.

- [ ] All errors from static analysis must be resolved.

- [ ] Review the test coverage reports (if there is a change) - will be added as comment on PR if there is a change
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/print-benchmarking.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on: pull_request

jobs:
benchmark_branch:
timeout-minutes: 20
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -17,7 +18,6 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install -r requirements.txt
python -m pip install -e .
- name: benchmark
id: bench
Expand Down
Loading