Fix cge core and joplin basevals (#628)

* add mlenabledcgejoplin * add mlenabled cge joplin * finalize pr * update coefficients * fix basevals and core cge bug * add changelog entry
IN-CORE · Oct 31, 2024 · 77ed41b · 77ed41b
1 parent a51ce64
commit 77ed41b
Show file tree

Hide file tree

Showing 6 changed files with 114 additions and 115 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+
+### Fixed
+- CoreCGEML bug and updated base values [#627](https://github.com/IN-CORE/pyincore/issues/627)
+
 
 ## [1.20.0] - 2024-10-24
 

diff --git a/pyincore/analyses/core_cge_ml/corecgeml.py b/pyincore/analyses/core_cge_ml/corecgeml.py
@@ -103,11 +103,12 @@ def construct_output(self, predictions: dict) -> Dict[str, Dict[str, list]]:
 
             temp_prefd: Dict[str, Dict[str, float]] = defaultdict(dict)
             temp_postfd: Dict[str, Dict[str, float]] = defaultdict(dict)
+
             for i, fd_sector in enumerate(self.sectors["dffd"]):
                 splits = fd_sector.split("_")
-                if len(splits) > 2:
-                    sector = "_".join(splits[:-1])
-                    grp = splits[-1]
+
+                sector = "_".join(splits[:-1]) if len(splits) > 1 else splits[0]
+                grp = splits[-1]
 
                 temp_prefd[sector][grp] = predictions["dffd"]["before"][i]
                 temp_postfd[sector][grp] = predictions["dffd"]["after"][i]
@@ -116,15 +117,8 @@ def construct_output(self, predictions: dict) -> Dict[str, Dict[str, list]]:
                 prefd_l = []
                 postfd_l = []
                 for grp in self.labor_groups:
-                    if temp_prefd[sector].get(grp, None) is None:
-                        prefd_l.append(-1)
-                    else:
-                        prefd_l.append(temp_prefd[sector][grp])
-
-                    if temp_postfd[sector].get(grp, None) is None:
-                        postfd_l.append(-1)
-                    else:
-                        postfd_l.append(temp_postfd[sector][grp])
+                    prefd_l.append(temp_prefd[sector].get(grp, -1))
+                    postfd_l.append(temp_postfd[sector].get(grp, -1))
 
                 prefd[sector] = prefd_l
                 postfd[sector] = postfd_l