From 43056e76a857d5a5f76780fdeedca1b3cbb59527 Mon Sep 17 00:00:00 2001 From: Lorenzo Volpi Date: Fri, 5 Apr 2024 15:56:37 +0200 Subject: [PATCH] legacy imports fixed --- quacc/legacy/evaluation/evaluate.py | 2 +- quacc/legacy/evaluation/method.py | 10 +++++----- quacc/legacy/method/base.py | 2 +- quacc/legacy/method/model_selection.py | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/quacc/legacy/evaluation/evaluate.py b/quacc/legacy/evaluation/evaluate.py index 2fe6842..c4dd444 100644 --- a/quacc/legacy/evaluation/evaluate.py +++ b/quacc/legacy/evaluation/evaluate.py @@ -3,7 +3,7 @@ from typing import Callable, Union from quapy.protocol import AbstractProtocol, OnLabelledCollectionProtocol import quacc as qc -from quacc.deprecated.method.base import BaseAccuracyEstimator +from quacc.legacy.method.base import BaseAccuracyEstimator def evaluate( diff --git a/quacc/legacy/evaluation/method.py b/quacc/legacy/evaluation/method.py index 0984617..b911fd5 100644 --- a/quacc/legacy/evaluation/method.py +++ b/quacc/legacy/evaluation/method.py @@ -5,19 +5,19 @@ from typing import Callable, List, Union import numpy as np from matplotlib.pylab import rand from quapy.method.aggregative import CC, PACC, SLD, BaseQuantifier +from quapy.method.aggregative import KDEyML as KDEy from quapy.protocol import UPP, AbstractProtocol, OnLabelledCollectionProtocol from sklearn.linear_model import LogisticRegression from sklearn.svm import SVC, LinearSVC import quacc as qc -from quacc.deprecated.method.base import BQAE, MCAE, BaseAccuracyEstimator -from quacc.deprecated.method.model_selection import ( +from quacc.legacy.environment import env +from quacc.legacy.evaluation.report import EvaluationReport +from quacc.legacy.method.base import BQAE, MCAE, BaseAccuracyEstimator +from quacc.legacy.method.model_selection import ( GridSearchAE, SpiderSearchAE, ) -from quacc.legacy.environment import env -from quacc.legacy.evaluation.report import EvaluationReport -from quacc.quantification import KDEy def _param_grid(method, X_fit: np.ndarray): diff --git a/quacc/legacy/method/base.py b/quacc/legacy/method/base.py index 55df29d..e701a63 100644 --- a/quacc/legacy/method/base.py +++ b/quacc/legacy/method/base.py @@ -8,7 +8,7 @@ from quapy.data import LabelledCollection from quapy.method.aggregative import BaseQuantifier from sklearn.base import BaseEstimator -import quacc.deprecated.method.confidence as conf +import quacc.legacy.method.confidence as conf from quacc.legacy.data import ( ExtBinPrev, ExtendedCollection, diff --git a/quacc/legacy/method/model_selection.py b/quacc/legacy/method/model_selection.py index 0ab7e98..37100af 100644 --- a/quacc/legacy/method/model_selection.py +++ b/quacc/legacy/method/model_selection.py @@ -15,11 +15,11 @@ from quapy.protocol import ( import quacc as qc import quacc.error -from quacc.deprecated.method.base import ( - BaseAccuracyEstimator, -) from quacc.legacy.data import ExtendedCollection from quacc.legacy.evaluation.evaluate import evaluate +from quacc.legacy.method.base import ( + BaseAccuracyEstimator, +) from quacc.logger import logger