Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/industrial_release_0.5' into ind…
Browse files Browse the repository at this point in the history
…ustrial_release_0.5
  • Loading branch information
v1docq committed Jan 17, 2025
2 parents 3e290ab + 49f3eb8 commit b4f978f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from fedot_ind.core.repository.config_repository import DEFAULT_COMPUTE_CONFIG

DATASET_NAME = 'Lightning7'
COMPARISON_DICT = dict(pairwise_approach=['quantile_extractor', 'pdl_clf'],
baseline=['quantile_extractor', 'rf'])
COMPARISON_DICT = dict(pairwise_approach={0: ['quantile_extractor', 'pdl_clf']},
baseline={0: ['quantile_extractor', 'rf']})
METRIC_NAMES = ('f1', 'accuracy', 'precision', 'roc_auc')

COMPUTE_CONFIG = DEFAULT_COMPUTE_CONFIG
Expand Down Expand Up @@ -32,5 +32,5 @@
result_dict = ApiTemplate(api_config=API_CONFIG,
metric_list=METRIC_NAMES).eval(dataset=DATASET_NAME,
initial_assumption=node_list,
finetune=True)
finetune=False)
print(f'Approach: {approach}. Metrics: {result_dict["metrics"]}')
7 changes: 3 additions & 4 deletions fedot_ind/api/utils/checkers_collections.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,9 @@ def _check_fedot_context(self):
left_function=lambda x: x.features,
right_function=lambda strategy: self.convert_ts_method[strategy]
(self.input_data, self.strategy_params.get('sampling_strategy', None)))
if is_big_data:
self.input_data.features, self.input_data.target = output_data.predict, output_data.target
else:
self.input_data.features = output_data.predict
self.input_data.features = output_data.predict if hasattr(output_data, 'predict') else output_data
if is_big_data and hasattr(output_data, 'target'):
self.input_data.target = output_data.target

def _convert_ts2tabular(self, input_data, sampling_strategy):
if sampling_strategy is not None:
Expand Down

0 comments on commit b4f978f

Please sign in to comment.