Skip to content

Commit

Permalink
rebase fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
valer1435 committed Sep 12, 2023
1 parent 621f976 commit 15cdd80
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion fedot_ind/core/models/signal/SignalExtractor.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from fedot_ind.core.metrics.metrics_implementation import *
from fedot_ind.core.models.WindowedFeaturesExtractor import WindowedFeatureExtractor
from fedot_ind.core.models.quantile.quantile_extractor import QuantileExtractor
from fedot_ind.core.operation.transformation.basis.wavelet import WaveletBasisImplementation
from fedot_ind.core.operation.implementation.basis.wavelet import WaveletBasisImplementation


class SignalExtractor(WindowedFeatureExtractor):
Expand Down
5 changes: 1 addition & 4 deletions fedot_ind/core/operation/transformation/basis/data_driven.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,18 @@

import numpy as np
import pandas as pd
import tensorly as tl
from fedot.core.data.data import InputData
from fedot.core.operations.operation_parameters import OperationParameters
from joblib import Parallel, delayed
from pymonad.either import Either
from pymonad.list import ListMonad
from scipy import stats
from scipy.spatial.distance import cdist
from tensorly.decomposition import parafac
from tqdm import tqdm

from fedot_ind.core.operation.decomposition.SpectrumDecomposition import SpectrumDecomposer
from fedot_ind.core.operation.implementation.basis.abstract_basis import BasisDecompositionImplementation
from fedot_ind.core.operation.transformation.data.hankel import HankelMatrix
from fedot_ind.core.operation.transformation.regularization.spectrum import reconstruct_basis

class_type = TypeVar("T", bound="DataDrivenBasis")

Expand Down Expand Up @@ -112,7 +109,7 @@ def get_threshold(self, data, selector: str):
svd_numbers.append(self._transform_one_sample(signal, svd_flag=True))
pbar.update(1)

return selectors[selector](svd_numbers).astype(int)
return selectors[selector](svd_numbers).mode[0]

def estimate_singular_values(self, data):
basis = Either.insert(data).then(self.decomposer.svd).value[0]
Expand Down

0 comments on commit 15cdd80

Please sign in to comment.