From f5cc7521eb8358d18394e99a1fbd862834da53e4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Mon, 1 Sep 2025 14:27:04 +0200 Subject: [PATCH] chore(qav3): add a few shortcuts for power means MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- .../freqaimodels/QuickAdapterRegressorV3.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py index 229db3c..36aa6bf 100644 --- a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py +++ b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py @@ -746,8 +746,11 @@ class QuickAdapterRegressorV3(BaseRegressionModel): # "yule", "hellinger", "shellinger", - "geometric_mean", "harmonic_mean", + "geometric_mean", + "arithmetic_mean", + "quadratic_mean", + "cubic_mean", "power_mean", "weighted_sum", "kmeans", @@ -853,10 +856,20 @@ class QuickAdapterRegressorV3(BaseRegressionModel): axis=1, ) ) / np.sqrt(2.0) - elif metric in {"geometric_mean", "harmonic_mean", "power_mean"}: + elif metric in { + "harmonic_mean", + "geometric_mean", + "arithmetic_mean", + "quadratic_mean", + "cubic_mean", + "power_mean", + }: p = { - "geometric_mean": 0.0, "harmonic_mean": -1.0, + "geometric_mean": 0.0, + "arithmetic_mean": 1.0, + "quadratic_mean": 2.0, + "cubic_mean": 3.0, "power_mean": label_p_order, }[metric] return sp.stats.pmean( -- 2.43.0