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

New initial assumption #1350

Open
wants to merge 43 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
6bc169d
Remove scaling as default, new single-node initial assumptions
dmitryglhf Nov 6, 2024
fbb4a01
Set parameters for assumptions
dmitryglhf Nov 6, 2024
15dab45
New gbm assumption
dmitryglhf Nov 7, 2024
000c7d6
Update assumptions
dmitryglhf Nov 12, 2024
c922da9
Merge branch 'master' into new-initial-assumption
dmitryglhf Nov 12, 2024
c3836cb
Return scaling as default
dmitryglhf Nov 26, 2024
7e5186b
Merge branch 'aimclub:master' into new-initial-assumption
dmitryglhf Nov 26, 2024
b0ab187
Fix XGBoost and LGBM convert_to_dataframe method
dmitryglhf Nov 26, 2024
652950d
Fork-gbm assumptions
dmitryglhf Dec 2, 2024
bcdf624
Linear assumptions
dmitryglhf Dec 2, 2024
5281d9e
Update rf, rfr
dmitryglhf Dec 2, 2024
4c67075
Add params
dmitryglhf Dec 2, 2024
63abea3
fix pep8
dmitryglhf Dec 2, 2024
c567ecd
test without xgb and lgbm
dmitryglhf Dec 9, 2024
09c5301
test rollback boostings_implementations.py
dmitryglhf Dec 9, 2024
00420d1
logit in gbm assumption
dmitryglhf Dec 9, 2024
d639407
test commit - main branch
dmitryglhf Dec 11, 2024
ed2d84f
new initial assumptions
dmitryglhf Dec 11, 2024
06e7894
Merge branch 'new-initial-assumption' of https://github.com/dmitryglh…
dmitryglhf Dec 11, 2024
cdbff29
Update task_assumptions.py
dmitryglhf Dec 11, 2024
decaa3b
with bugfix and old assumptions
dmitryglhf Dec 11, 2024
43913f0
with bugfix and new assumptions
dmitryglhf Dec 11, 2024
04b4431
Update task_assumptions.py
dmitryglhf Dec 11, 2024
f63bccb
without gbm
dmitryglhf Dec 11, 2024
1263da2
assumptions as dict return
dmitryglhf Dec 11, 2024
50064a3
rf, linear only
dmitryglhf Dec 11, 2024
236fc34
Update task_assumptions.py
dmitryglhf Dec 11, 2024
c15c013
only catboost, rf, linear
dmitryglhf Dec 11, 2024
5cc70c0
rf, linear, xgb
dmitryglhf Dec 11, 2024
d4562b2
rf, linear, lgbm
dmitryglhf Dec 11, 2024
c731a61
all assumptions
dmitryglhf Dec 12, 2024
a986b94
catboost for multitask
dmitryglhf Dec 12, 2024
9e21fd3
All asumptions, added 'rsm' param for catboost
dmitryglhf Dec 16, 2024
1e2ebad
new default params for catboost, all assumptions
dmitryglhf Dec 17, 2024
5ab8237
Update default_operation_params.json
dmitryglhf Dec 24, 2024
37b0fd5
Update default_operation_params.json
dmitryglhf Dec 27, 2024
fc1ef0c
lgbm multi-task test
dmitryglhf Dec 28, 2024
a8f9420
Multi-task for boostings, all assumptions
dmitryglhf Jan 7, 2025
c803e95
All assumptions
dmitryglhf Jan 7, 2025
1c4d630
All initial assumptions
dmitryglhf Dec 28, 2024
5ae4762
Multi-task for boostings, all assumptions
dmitryglhf Jan 7, 2025
09f289c
Merge branch 'new-initial-assumption' of https://github.com/dmitryglh…
dmitryglhf Jan 7, 2025
9214de1
All assumptions, rollback boostings
dmitryglhf Jan 7, 2025
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
19 changes: 18 additions & 1 deletion fedot/api/api_utils/assumptions/task_assumptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,15 @@ class RegressionAssumptions(TaskAssumptions):
@property
def builders(self):
return {
'gbm_linear': PipelineBuilder().
add_branch('catboostreg', 'xgboostreg', 'lgbmreg').join_branches('ridge'),
'xgb_lgbm_linear': PipelineBuilder().
add_branch('xgboostreg', 'lgbmreg').join_branches('ridge'),
'gbm_rf_linear': PipelineBuilder().
add_branch('catboostreg', 'xgboostreg', 'lgbmreg', 'rfr').join_branches('ridge'),
'catboostreg': PipelineBuilder().add_node('catboostreg'),
'xgboostreg': PipelineBuilder().add_node('xgboostreg'),
'lgbmreg': PipelineBuilder().add_node('lgbmreg'),
'rfr': PipelineBuilder().add_node('rfr'),
'ridge': PipelineBuilder().add_node('ridge'),
}
Expand All @@ -112,9 +121,17 @@ class ClassificationAssumptions(TaskAssumptions):
@property
def builders(self):
return {
'gbm_linear': PipelineBuilder().
add_branch('catboost', 'xgboost', 'lgbm').join_branches('logit'),
'xgb_lgbm_linear': PipelineBuilder().
add_branch('xgboost', 'lgbm').join_branches('logit'),
'gbm_rf_linear': PipelineBuilder().
add_branch('catboost', 'xgboost', 'lgbm', 'rf').join_branches('logit'),
'catboost': PipelineBuilder().add_node('catboost'),
'xgboost': PipelineBuilder().add_node('xgboost'),
'lgbm': PipelineBuilder().add_node('lgbm'),
'rf': PipelineBuilder().add_node('rf'),
'logit': PipelineBuilder().add_node('logit'),
'catboost': PipelineBuilder().add_node('catboost'),
}

def ensemble_operation(self) -> str:
Expand Down
46 changes: 36 additions & 10 deletions fedot/core/repository/data/default_operation_params.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,50 @@
"early_stopping_rounds": 30
},
"catboost": {
"allow_writing_files": false,
"n_jobs": -1,
"num_trees": 3000,
"learning_rate": 0.03,
"l2_leaf_reg": 1e-2,
"bootstrap_type": "Bernoulli",
"grow_policy": "SymmetricTree",
"max_depth": 5,
"min_data_in_leaf": 1,
"one_hot_max_size": 10,
"fold_permutation_block": 1,
"boosting_type": "Plain",
"od_type": "Iter",
"od_wait": 100,
"max_bin": 32,
"feature_border_type": "GreedyLogSum",
"nan_mode": "Min",
"verbose": false,
"iterations": 1000,
"enable_categorical": true,
"allow_writing_files": false,
"use_eval_set": true,
"use_best_model": true,
"early_stopping_rounds": 30,
"n_jobs": 1
"enable_categorical": true
},
"catboostreg": {
"allow_writing_files": false,
"n_jobs": -1,
"num_trees": 3000,
"learning_rate": 0.03,
"l2_leaf_reg": 1e-2,
"bootstrap_type": "Bernoulli",
"grow_policy": "SymmetricTree",
"max_depth": 5,
"min_data_in_leaf": 1,
"one_hot_max_size": 10,
"fold_permutation_block": 1,
"boosting_type": "Plain",
"od_type": "Iter",
"od_wait": 100,
"max_bin": 32,
"feature_border_type": "GreedyLogSum",
"nan_mode": "Min",
"verbose": false,
"iterations": 1000,
"enable_categorical": true,
"allow_writing_files": false,
"use_eval_set": true,
"use_best_model": true,
"early_stopping_rounds": 30,
"n_jobs": 1
"enable_categorical": true
},
"lgbm": {
"boosting_type": "gbdt",
Expand Down
Loading