generated from NOAA-OWP/owp-open-source-project-template
-
Notifications
You must be signed in to change notification settings - Fork 8
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
Ss test mapie #41
Open
ssorou1
wants to merge
79
commits into
NOAA-OWP:dev
Choose a base branch
from
ssorou1:ss_test_mapie
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+264
−72
Open
Ss test mapie #41
Changes from all commits
Commits
Show all changes
79 commits
Select commit
Hold shift + click to select a range
31791cb
bring in the ci for rf in fs_algo_train_eval.py
dcc6c5a
bring in ci to fs_proc_algo.py
1805ec0
bring in ci to fs_pred_algo.py
93ede73
apply only one n_estimators (grid selection bug)
2d3dbfa
fix a syntax error in fs_algo_train_eval
1154eef
clean fs_algo_train_eval.py
50e790c
added unit test for std_Xtrain_path function
ffbbc62
Revert "Merge remote-tracking branch 'upstream/dev' into ss_test_fci_…
bdb7d32
added unit test for fci function
cb0efe1
Update fs_pred_algo.py
glitt13 5eb00e4
brought back list of values in n_estimators in xssa_algo_config.yaml
c310236
Merge branch 'ss_test_fci_dev3' of https://github.com/ssorou1/formula…
737c36a
Incorporate Bagging into mlp in fs_algo_train_eval
88661ad
rf n_estimators=400
ea914f4
Incorporate Bagging into rf in fs_algo_train_eval
ad24727
incorporated mapie for rf model
983a662
update the MAPIE to use the same fit as rf
710038a
incorporated mapie for mlp model
d24e19f
deleted unsed pred_rf variable inside tran_algos function
08deb3c
add number of bootstrap runs as a parameter to the yaml file
6476710
Implemented multiple confidence intervals (90, 95 & 99%) for rf Baggi…
e94b32d
Implemented multiple confidence intervals (90, 95 & 99%) for mlp Bagg…
746b172
Update rf_Bagging_ci function to dynamically read the number of boots…
6fdb8d6
Update mlp_Bagging_ci function to dynamically read the number of boot…
52f088f
develop a separate function for MAPIE and update fs_algo_train_eval a…
048ca30
Rename ci for rf model for clarification
5c9e14b
Update fs_pred to consider forestci only for rf model. Update saving …
275564f
added pkg/proc.attr.hydfab/.RData to the gitignore
75a5140
add confidence level to the yaml file
3bc23ea
update Bagging_ci files to calculate the confidence interval from use…
ba8858d
delete .RData
3e65cd6
add MAPIE alpha to the yaml file
cfc0c24
boolean variable for MAPIE
39174fc
implement MAPIE dynamically into fs_proc and fs_train_eval from infor…
91cb971
clean up fs_algo_train_eval from regarding MAPIE
afaa087
add forestci boolean to yaml file
aecf707
change forestci as an independent function outside of train_algos. Ad…
bf34bbf
added flag for Bagging enable/disable in yaml file
7077843
fixed a bug in calculate_Bagging_ci
7e4ee03
merged Bagging_ci functions into one and bring it out of train_algos(…
6aaa3ee
clean up fs_algo_train_eval from individual Bagging_ci(), and forestc…
4de7e19
replace model_name with algo_str in Bagging_ci
15bbc04
replace model_cfg with algo_cfg for consistency
5046c84
replace n_models with n_algos
1d8bba6
relace model with algo
adf4746
delete Bagging_ci flag from yaml and build the logic around n_algos f…
3df0553
delete MAPIE flag from yaml and build the logic around MAPIE_alpha fo…
7e5ce60
create a separate section in yaml for Bagging
9edb092
update fs_proc and fs_algo_train_eval to treat uncertainty as a separ…
7b616a3
delete unused mapie boolean arg
ddab11a
added some information about OPTIONAL/REQUIRED to yaml file
9ab4ccf
replace Bagging with bagging (lower case)
8404b69
fixed a bug in the range of mapie_alpha
52e73ce
temporarily change the the COMID retrieval till update for pynhd package
373986c
temporarily change the the COMID retrieval till update for pynhd pack…
685023e
Apply the changes in fs_prog_algo.py into fs_proc_algo_viz.py
99d8784
implement random sampling and recycle hyper-parameters into uncertain…
9825210
revert back the COMID retrieval section as pynhd is updated to >=0.19
8129667
add additional comment for MAPIE_alpha
9263a49
resolve merge conflicts and apply fixes by Guy
2390b90
simplify the calculate_bagging_ci function
4ac5ce7
update calculate_mapie() to write mapie to self.algs_dict
ef57c39
clean up calculate_bagging_ci()
b3cbc62
update train_algos_grid_search to calculate forestci with grid search
3336544
Merge remote-tracking branch 'upstream/dev' into ss_test_mapie
e263848
add save_Xtrain_to_csv function to the model and update the code and …
36d6a62
update the save_algos() to output the X_train shape to the joblib file
2563199
Write forestci parameters in terms of numpy arrays instead of dataframe
d3c6624
updated fs_pred to read the X_train dimension from joblib file rather…
1b3def2
clean up unnecessary Xtrain related functions in fs_algo_train_eval a…
3142576
clean up save_algos function
5913aed
fix the forestci with grid search while keeping the forestci calculat…
982ec5b
implement calculate_bagging_ci to work with grid search
6fee686
update the keys and indices of tuples inside Bagging ci
80620a0
update the output format for mapie
6b3c5b8
bring confidence_levels out of Bagging_uncertainty in the config file…
c6f4554
implement forestci with user-defined confidence intervals
b17010b
update the code to save uncertainty dictionary
5b35735
Generate n_algos unique random states using self.rs as the seed, ensu…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -99,6 +99,7 @@ coverage.xml | |
####### | ||
*.Rproj | ||
*.Rhistory | ||
pkg/proc.attr.hydfab/.RData | ||
|
||
# Front-End # | ||
############# | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After the code is in good order, the next task will be adding/adapting unit tests for all the new functions that have undergone changes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Heads up that this branch needs an update to the unit test
test_calculate_rf_uncertainty
with your latest changes.