From a23648320c52abca27f1d32d6d7a1045bf769ab9 Mon Sep 17 00:00:00 2001 From: Doresic <85789271+Doresic@users.noreply.github.com> Date: Tue, 12 Nov 2024 14:20:06 +0100 Subject: [PATCH] Hierarchical: remove inner datas from relative calculator (#1505) * Remove inner rdatas from relative calculator * Remove inner_rdatas from C.py --- pypesto/C.py | 1 - pypesto/hierarchical/relative/calculator.py | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pypesto/C.py b/pypesto/C.py index 5a0e7438a..e79c90717 100644 --- a/pypesto/C.py +++ b/pypesto/C.py @@ -93,7 +93,6 @@ class EnsembleType(Enum): # HIERARCHICAL SCALING + OFFSET INNER_PARAMETERS = "inner_parameters" -INNER_RDATAS = "inner_rdatas" PARAMETER_TYPE = "parameterType" RELATIVE = "relative" diff --git a/pypesto/hierarchical/relative/calculator.py b/pypesto/hierarchical/relative/calculator.py index cfd74a42f..ceec8ef76 100644 --- a/pypesto/hierarchical/relative/calculator.py +++ b/pypesto/hierarchical/relative/calculator.py @@ -21,7 +21,6 @@ GRAD, HESS, INNER_PARAMETERS, - INNER_RDATAS, RDATAS, RES, SRES, @@ -365,6 +364,6 @@ def calculate_directly( rdatas=rdatas, inner_parameters=inner_parameters, ) - inner_result[INNER_RDATAS] = rdatas + inner_result[RDATAS] = rdatas return inner_result, inner_parameters