Skip to content

Commit cd594b0

Browse files
authored
Merge pull request #71 from chenyangkang/beta
add ensemble_bootstrap; add backend argument passed to joblib; add base_model_method argument to predict method
2 parents 5f0c1cc + 6baf66a commit cd594b0

16 files changed

+415
-52
lines changed

docs/Examples/01.AdaSTEM_demo.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
{
2525
"cell_type": "code",
26-
"execution_count": 1,
26+
"execution_count": null,
2727
"metadata": {},
2828
"outputs": [],
2929
"source": [
@@ -38,7 +38,6 @@
3838
"import matplotlib\n",
3939
"import warnings\n",
4040
"import pickle\n",
41-
"import h3pandas\n",
4241
"\n",
4342
"pd.set_option('display.max_columns', None)\n",
4443
"# warnings.filterwarnings('ignore')\n"
@@ -731,7 +730,7 @@
731730
},
732731
{
733732
"cell_type": "code",
734-
"execution_count": 9,
733+
"execution_count": null,
735734
"metadata": {},
736735
"outputs": [],
737736
"source": [
@@ -741,6 +740,7 @@
741740
" classifier=XGBClassifier(tree_method='hist',random_state=42, verbosity = 0, n_jobs=1),\n",
742741
" regressor=XGBRegressor(tree_method='hist',random_state=42, verbosity = 0, n_jobs=1)\n",
743742
" ), # hurdel model for zero-inflated problem (e.g., count)\n",
743+
" task='hurdle',\n",
744744
" save_gridding_plot = True,\n",
745745
" ensemble_fold=10, # data are modeled 10 times, each time with jitter and rotation in Quadtree algo\n",
746746
" min_ensemble_required=7, # Only points covered by > 7 ensembles will be predicted\n",

docs/Examples/02.AdaSTEM_learning_curve_analysis.ipynb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
},
137137
{
138138
"cell_type": "code",
139-
"execution_count": 8,
139+
"execution_count": null,
140140
"metadata": {},
141141
"outputs": [
142142
{
@@ -195,6 +195,7 @@
195195
" classifier=XGBClassifier(tree_method='hist',random_state=42, verbosity = 0, n_jobs=1),\n",
196196
" regressor=XGBRegressor(tree_method='hist',random_state=42, verbosity = 0, n_jobs=1)\n",
197197
" ),\n",
198+
" task='hurdle',\n",
198199
" save_gridding_plot = True,\n",
199200
" ensemble_fold=10, \n",
200201
" min_ensemble_required=7,\n",

docs/Examples/04.SphereAdaSTEM_demo.ipynb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@
721721
},
722722
{
723723
"cell_type": "code",
724-
"execution_count": 9,
724+
"execution_count": null,
725725
"metadata": {},
726726
"outputs": [],
727727
"source": [
@@ -731,6 +731,7 @@
731731
" classifier=XGBClassifier(tree_method='hist',random_state=42, verbosity = 0, n_jobs=1),\n",
732732
" regressor=XGBRegressor(tree_method='hist',random_state=42, verbosity = 0, n_jobs=1)\n",
733733
" ), # hurdel model for zero-inflated problem (e.g., count)\n",
734+
" task='hurdle',\n",
734735
" save_gridding_plot = True,\n",
735736
" ensemble_fold=10, # data are modeled 10 times, each time with jitter and rotation in Quadtree algo\n",
736737
" min_ensemble_required=7, # Only points covered by > 7 stixels will be predicted\n",

docs/Examples/05.Hurdle_in_ada_or_ada_in_hurdle.ipynb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@
651651
},
652652
{
653653
"cell_type": "code",
654-
"execution_count": 8,
654+
"execution_count": null,
655655
"metadata": {},
656656
"outputs": [],
657657
"source": [
@@ -660,6 +660,7 @@
660660
" classifier=XGBClassifier(tree_method='hist',random_state=42, verbosity = 0, n_jobs=1),\n",
661661
" regressor=XGBRegressor(tree_method='hist',random_state=42, verbosity = 0, n_jobs=1)\n",
662662
" ),\n",
663+
" task='hurdle',\n",
663664
" save_gridding_plot = True,\n",
664665
" ensemble_fold=10, \n",
665666
" min_ensemble_required=7,\n",

docs/Examples/06.Base_model_choices.ipynb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,7 @@
710710
" classifier=base_model_dict[base_model_name]['classifier'],\n",
711711
" regressor=base_model_dict[base_model_name]['regressor']\n",
712712
" ),\n",
713+
" task='hurdle',\n",
713714
" save_gridding_plot = True,\n",
714715
" ensemble_fold=10, \n",
715716
" min_ensemble_required=7,\n",

docs/Examples/07.Optimizing_stixel_size.ipynb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@
581581
},
582582
{
583583
"cell_type": "code",
584-
"execution_count": 10,
584+
"execution_count": null,
585585
"metadata": {},
586586
"outputs": [
587587
{
@@ -1154,6 +1154,7 @@
11541154
" classifier=XGBClassifier(tree_method='hist',random_state=42, verbosity = 0, n_jobs=1),\n",
11551155
" regressor=XGBRegressor(tree_method='hist',random_state=42, verbosity = 0, n_jobs=1)\n",
11561156
" ),\n",
1157+
" task='hurdle',\n",
11571158
" save_gridding_plot = True,\n",
11581159
" ensemble_fold=10, \n",
11591160
" min_ensemble_required=7,\n",

docs/Examples/08.Lazy_loading.ipynb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@
678678
},
679679
{
680680
"cell_type": "code",
681-
"execution_count": 9,
681+
"execution_count": null,
682682
"metadata": {},
683683
"outputs": [],
684684
"source": [
@@ -691,6 +691,7 @@
691691
" classifier=XGBClassifier(tree_method='hist',random_state=42, verbosity = 0, n_jobs=1),\n",
692692
" regressor=XGBRegressor(tree_method='hist',random_state=42, verbosity = 0, n_jobs=1)\n",
693693
" ), # hurdel model for zero-inflated problem (e.g., count)\n",
694+
" task='hurdle',\n",
694695
" save_gridding_plot = True,\n",
695696
" ensemble_fold=ensemble_fold, # data are modeled 10 times, each time with jitter and rotation in Quadtree algo\n",
696697
" min_ensemble_required=ensemble_fold-2, # Only points covered by > 7 ensembles will be predicted\n",
@@ -720,6 +721,7 @@
720721
" classifier=XGBClassifier(tree_method='hist',random_state=42, verbosity = 0, n_jobs=1),\n",
721722
" regressor=XGBRegressor(tree_method='hist',random_state=42, verbosity = 0, n_jobs=1)\n",
722723
" ), # hurdel model for zero-inflated problem (e.g., count)\n",
724+
" task='hurdle',\n",
723725
" save_gridding_plot = True,\n",
724726
" ensemble_fold=ensemble_fold, # data are modeled 10 times, each time with jitter and rotation in Quadtree algo\n",
725727
" min_ensemble_required=ensemble_fold-2, # Only points covered by > 7 ensembles will be predicted\n",

0 commit comments

Comments
 (0)