Skip to content

Updates dollar conversion with 2024 values #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mckennapep merged 4 commits into from
Nov 17, 2025
Merged

Updates dollar conversion with 2024 values #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c4451c0
Updates dollar conversion with 2024 values
mckennapep Nov 17, 2025
ca6cf3c
Update actins/cache in ci to recent version
mckennapep Nov 17, 2025
4e1de62
Updates year of future conversion in tests
mckennapep Nov 17, 2025
a64bbcf
Merge branch 'update-gdp-cpi' of https://github.com/e4st-dev/E4STUtil…
mckennapep Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: actions/cache@v2
- uses: actions/cache@v3
env:
cache-name: cache-artifacts
with:
Expand All @@ -37,4 +37,4 @@ jobs:
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v1
with:
file: lcov.info
file: lcov.info
8 changes: 4 additions & 4 deletions metadata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
myname:
user: "eziegler"
user: "mpeplinski"
remote_path: "my remote path new"
time_created: "2024-07-16 16:31:29.083"
time_created: "2025-11-17 12:05:00.143"
caller_file: "C:/Program Files/Julia/julia-1.10.0/share/julia/stdlib/v1.10/Test/src/Test.jl"
description: "my message new"
myname2:
user: "eziegler"
user: "mpeplinski"
remote_path: "my remote path"
time_created: "2024-07-16 16:31:29.172"
time_created: "2025-11-17 12:05:00.252"
caller_file: "C:/Program Files/Julia/julia-1.10.0/share/julia/stdlib/v1.10/Test/src/Test.jl"
description: "my message"
10 changes: 6 additions & 4 deletions src/inflation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,12 @@ const _year2gdp = Dict(
2020=>113.648,
2021=>118.37,
2022=>117.965,
2023=>122.265
2023=>122.265,
2024=>125.172
)
struct GDP end
const gdp = GDP()
maxyear(::GDP) = 2023
maxyear(::GDP) = 2024

_year2cpi = Dict(
1913=>9.9,
Expand Down Expand Up @@ -210,12 +211,13 @@ _year2cpi = Dict(
2020=>258.811,
2021=>270.970,
2022=>292.655,
2023=>304.702
2023=>304.702,
2024=>313.684

)
struct CPI end
const cpi = CPI()
maxyear(::CPI) = 2023
maxyear(::CPI) = 2024

"""
usd_cr(y1, y2; source=gdp, future=nothing) -> r
Expand Down
4 changes: 2 additions & 2 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import E4STUtil.save_dep_metadata
@test usd_cr(2021, 1929, source=cpi) < 1
end
@testset "Test future" begin
@test usd_cr(1929, 2024, future=0.02) ≈ usd_cr(1929, 2023)*1.02
@test usd_cr(1929, 2025, future=0.02) ≈ usd_cr(1929, 2023)*1.02*1.02
@test usd_cr(1929, 2025, future=0.02) ≈ usd_cr(1929, 2024)*1.02
@test usd_cr(1929, 2026, future=0.02) ≈ usd_cr(1929, 2024)*1.02*1.02
end
end
@testset "Test saving metadata" begin
Expand Down
Loading