Skip to content

Added new initil assumptions with boostings #1359

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.

Sign up for GitHub

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

Merged
dmitryglhf merged 11 commits into from
Feb 18, 2025
Merged

Added new initil assumptions with boostings #1359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d55865f
Added new initil assumptions with boostings
dmitryglhf Jan 23, 2025
5f24a70
Automated autopep8 fixes
github-actions[bot] Jan 23, 2025
a89c92e
Update default catboost params
dmitryglhf Jan 23, 2025
5f066a3
Merge branch 'new-initial-assumptions' of https://github.com/aimclub/…
dmitryglhf Jan 23, 2025
5cfae85
Added early_stopping_rounds parameter for CatBoost
dmitryglhf Jan 23, 2025
a554e8b
od_wait instead of early_stopping_rounds
dmitryglhf Jan 23, 2025
326d485
Selected only gbm_linear asuumption
dmitryglhf Jan 23, 2025
3daf188
Merge branch 'master' of https://github.com/aimclub/FEDOT into new-in…
dmitryglhf Feb 1, 2025
80ce88d
updated target assign for multi output
dmitryglhf Feb 1, 2025
14f9ac3
updated regression assumptions
dmitryglhf Feb 18, 2025
80d8f48
Merge branch 'master' of https://github.com/aimclub/FEDOT into new-in…
dmitryglhf Feb 18, 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
7 changes: 6 additions & 1 deletion fedot/api/api_utils/assumptions/task_assumptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ def builders(self):
return {
'rfr': PipelineBuilder().add_node('rfr'),
'ridge': PipelineBuilder().add_node('ridge'),
'lgbmreg': PipelineBuilder().add_node('lgbmreg'),
}

def ensemble_operation(self) -> str:
Expand All @@ -112,9 +113,13 @@ class ClassificationAssumptions(TaskAssumptions):
@property
def builders(self):
return {
'gbm_linear': PipelineBuilder().
add_branch('catboost', 'xgboost', 'lgbm').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
3 changes: 2 additions & 1 deletion .../core/operations/evaluation/operation_implementations/models/boostings_implementations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,11 +398,12 @@ def convert_to_dataframe(data: Optional[InputData], identify_cats: bool):
Converts InputData data class to DataFrame.
"""
features = pd.DataFrame(data=data.features)
target = None

if data.target is not None and data.target.size > 0:
if not is_multi_output_task(data):
target = np.ravel(data.target[:features.shape[0]])
else:
target = data.target
else:
# TODO: temp workaround in case data.target is set to None intentionally
# for test.integration.models.test_model.check_predict_correct
Expand Down
46 changes: 36 additions & 10 deletions fedot/core/repository/data/default_operation_params.json
View file
Open in desktop
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