From 2bcd28e98600517bd894505fdaade2f2688a2d70 Mon Sep 17 00:00:00 2001 From: trevorb1 Date: Sat, 26 Oct 2024 14:47:21 -0700 Subject: [PATCH] update template config --- CHANGELOG.rst | 4 ++++ src/otoole/preprocess/config.yaml | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c155b9d6..b77d7dd4 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,10 @@ Changelog ========= +Version 1.1.4 +============= +- Add result calculations for ``DiscountedCapitalInvestment``, ``DiscountedCostByTechnology``, and ``DiscountedOperationalCost`` + Version 1.1.3 =========================== - Lock pandas to 2.1.4 or later diff --git a/src/otoole/preprocess/config.yaml b/src/otoole/preprocess/config.yaml index a915644d..dc309cde 100644 --- a/src/otoole/preprocess/config.yaml +++ b/src/otoole/preprocess/config.yaml @@ -342,6 +342,21 @@ Demand: type: result dtype: float default: 0 +DiscountedCapitalInvestment: + indices: [REGION, TECHNOLOGY, YEAR] + type: result + dtype: float + default: 0 +DiscountedCostByTechnology: + indices: [REGION, TECHNOLOGY, YEAR] + type: result + dtype: float + default: 0 +DiscountedOperationalCost: + indices: [REGION, TECHNOLOGY, YEAR] + type: result + dtype: float + default: 0 DiscountedSalvageValue: indices: [REGION, TECHNOLOGY, YEAR] type: result