Merge pull request #629 from IN-CORE/release-1.20.1

Release 1.20.1
IN-CORE · Nov 4, 2024 · 86c639a · 86c639a
2 parents 6a1845e + 47a41fc
commit 86c639a
Show file tree

Hide file tree

Showing 9 changed files with 117 additions and 118 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/).
 
+## [1.20.1] - 2024-11-01
+
+### 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/docs/source/conf.py b/docs/source/conf.py
@@ -35,7 +35,7 @@
 # The short X.Y version
 version = "1.20"
 # The full version, including alpha/beta/rc tags
-release = "1.20.0"
+release = "1.20.1"
 
 # -- General configuration ---------------------------------------------------
 

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

diff --git a/pyincore/analyses/mlenabledcgejoplin/DFFD_coefficients.csv b/pyincore/analyses/mlenabledcgejoplin/DFFD_coefficients.csv
diff --git a/pyincore/analyses/mlenabledcgejoplin/DS_base_val.csv b/pyincore/analyses/mlenabledcgejoplin/DS_base_val.csv
@@ -1,19 +1,19 @@
 ,sector,value
-0,AG_MIN,1.598027339066979
-1,UTIL_CONS,67.83798452867518
-2,MANU,399.1735922481955
-3,WHOLE,124.48196455965623
-4,RETAIL,422.29292165870265
-5,TRANS,197.26277382798176
-6,INFO,35.59158407713193
-7,FINANCE,44.28241127691359
-8,REALE,26.224762492350692
-9,PROF_MAN,106.58918808985136
-10,ADMIN_EDU,193.8495390757108
-11,HEALTH,546.8729601561311
-12,ART,20.572497674487664
-13,ACCO,102.42295840687507
-14,OTHER,67.5312469807354
+0,AG_MIN,2.2338513413999994
+1,UTIL_CONS,90.2904755290001
+2,MANU,403.07955221000003
+3,WHOLE,109.81030951599996
+4,RETAIL,415.5543353970001
+5,TRANS,195.15013653100002
+6,INFO,35.005621056999956
+7,FINANCE,52.85019249929991
+8,REALE,30.407020309000018
+9,PROF_MAN,112.20005307899999
+10,ADMIN_EDU,197.97671472700003
+11,HEALTH,534.1355093950003
+12,ART,20.804700404000002
+13,ACCO,91.63897788500009
+14,OTHER,68.20265451800003
 15,HS1,82.9637664
 16,HS2,280.149233194
 17,HS3,289.624294422

diff --git a/pyincore/analyses/mlenabledcgejoplin/GI_base_val.csv b/pyincore/analyses/mlenabledcgejoplin/GI_base_val.csv
@@ -1,6 +1,6 @@
 ,household,value
-0,HH1,12.124737965497282
-1,HH2,55.32517905721738
-2,HH3,259.9930146301393
-3,HH4,312.6160129368168
-4,HH5,230.22826881816738
+0,HH1,12.128132620497281
+1,HH2,55.340668867217374
+2,HH3,260.0658068501393
+3,HH4,312.7035384168168
+4,HH5,230.29272756816738
diff --git a/pyincore/analyses/mlenabledcgejoplin/baseKAP.csv b/pyincore/analyses/mlenabledcgejoplin/baseKAP.csv
@@ -1,20 +1,20 @@
 ,sector,baseKAP
-0,AG_MIN,7.530259164
-1,UTIL_CONS,114.5791946
-2,MANU,640.8047102
-3,WHOLE,580.117871
-4,RETAIL,1113.884815
-5,TRANS,247.6179499
-6,INFO,168.2107127
-7,FINANCE,166.1392265
-8,REALE,111.3663128
-9,PROF_MAN,110.4881089
-10,ADMIN_EDU,369.9734177
-11,HEALTH,596.4218767
-12,ART,63.20249818
-13,ACCO,372.402468
-14,OTHER,417.7524372
-15,HS1,968.5177702
-16,HS2,530.2815926
-17,HS3,890.5163487
-18,HS4,1718.109817
+0,AG_MIN,13.71604
+1,UTIL_CONS,334.2707
+2,MANU,679.328
+3,WHOLE,435.7134
+4,RETAIL,1047.724
+5,TRANS,226.8709
+6,INFO,162.6365
+7,FINANCE,248.7325
+8,REALE,152.5482
+9,PROF_MAN,165.6483
+10,ADMIN_EDU,410.688
+11,HEALTH,470.7956
+12,ART,65.48041
+13,ACCO,266.3136
+14,OTHER,424.3918
+15,HS1,564.678
+16,HS2,901.6777
+17,HS3,799.9431
+18,HS4,1811.061
diff --git a/pyincore/globals.py b/pyincore/globals.py
@@ -10,7 +10,7 @@
 import os
 import shutil
 
-PACKAGE_VERSION = "1.20.0"
+PACKAGE_VERSION = "1.20.1"
 
 INCORE_API_PROD_URL = "https://incore.ncsa.illinois.edu"
 INCORE_API_DEV_URL = "https://incore-dev.ncsa.illinois.edu"

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 from setuptools import setup, find_packages
 
 # version number of pyincore
-version = "1.20.0"
+version = "1.20.1"
 
 with open("README.rst", encoding="utf-8") as f:
     readme = f.read()