Skip to content
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.

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

Add technoeconomic cost projections and related data #99

Merged
merged 255 commits into from
Apr 9, 2024
Merged
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Apr 9, 2024

  1. Rename function

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    ee19ef1 View commit details
    Browse the repository at this point in the history
  2. Add comments

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    56eb164 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    770ca0c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ee38b17 View commit details
    Browse the repository at this point in the history
  5. Add cost assumption data

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    74d2f98 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3d4b358 View commit details
    Browse the repository at this point in the history
  7. Edit to conform to flake8 linting

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    92df57b View commit details
    Browse the repository at this point in the history
  8. Disable test for now

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    a63ca8d View commit details
    Browse the repository at this point in the history
  9. Get region differentiated costs

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    5d6fbe2 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    addea82 View commit details
    Browse the repository at this point in the history
  11. Add/remove comments

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    bf13d12 View commit details
    Browse the repository at this point in the history
  12. Add test for get_weo_data()

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    d59b382 View commit details
    Browse the repository at this point in the history
  13. Rename region ratios function

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    6bea19d View commit details
    Browse the repository at this point in the history
  14. Add tests

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    2ecfb7b View commit details
    Browse the repository at this point in the history
  15. Add pyxlsb to pyproject

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    cf8e863 View commit details
    Browse the repository at this point in the history
  16. Rename files and change description

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    251d820 View commit details
    Browse the repository at this point in the history
  17. Modify script for PR review

    The following changes were made:
    - renamed and sorted dicts
    - used pandas chaining when possible
    - replaced nested loop with itertools.product()
    - edited docstrings style
    - renamed data files
    - added source information when possible
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    ad4d288 View commit details
    Browse the repository at this point in the history
  18. Update tests

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    74cec53 View commit details
    Browse the repository at this point in the history
  19. Edit to comply with linting

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    5170c38 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    7825d0f View commit details
    Browse the repository at this point in the history
  21. Remove comment

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    aecf5b6 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    944721b View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    1ef1152 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    13a5ab1 View commit details
    Browse the repository at this point in the history
  25. Update to pass linting

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    cf7864e View commit details
    Browse the repository at this point in the history
  26. Fix input types for functions

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    c08106a View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    0b385b0 View commit details
    Browse the repository at this point in the history
  28. Add SPP cost reduction data

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    ae06841 View commit details
    Browse the repository at this point in the history
  29. Move to ssp data folder

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    ab17011 View commit details
    Browse the repository at this point in the history
  30. Rename module from iea to costs

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    fa66910 View commit details
    Browse the repository at this point in the history
  31. Update docs with new iea -> costs name

    Had to delete the _autosummary and _build folders and rebuild again for the sphinx build to work properly
    The files in the _autosummary kept looking for iea.costs module
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    b27938d View commit details
    Browse the repository at this point in the history
  32. Add GEA cost reduction data

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    286c529 View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    b0f1f40 View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    5b01365 View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    08e62dc View commit details
    Browse the repository at this point in the history
  36. Move and rename WEO tests

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    632454a View commit details
    Browse the repository at this point in the history
  37. Configuration menu
    Copy the full SHA
    275163b View commit details
    Browse the repository at this point in the history
  38. Remove pandas from import

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    478b8a1 View commit details
    Browse the repository at this point in the history
  39. Configuration menu
    Copy the full SHA
    72a56f5 View commit details
    Browse the repository at this point in the history
  40. Add SSP GDP per capita data

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    42f3bf6 View commit details
    Browse the repository at this point in the history
  41. Add functionality to derive technology costs vs GDP linear regressions

    The script does the following:
    - Read in raw GDP data for SSP1, SSP2, and SSP3 scenarios
    - Calculate regional GDP ratios
    - Apply linear regression using regional GDP regional ratios and regional cost ratios
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    7d4e964 View commit details
    Browse the repository at this point in the history
  42. Configuration menu
    Copy the full SHA
    be330fb View commit details
    Browse the repository at this point in the history
  43. Configuration menu
    Copy the full SHA
    e0fa4ba View commit details
    Browse the repository at this point in the history
  44. Remove docstring title

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    d6eac9f View commit details
    Browse the repository at this point in the history
  45. Configuration menu
    Copy the full SHA
    da8d6e6 View commit details
    Browse the repository at this point in the history
  46. Change some function inputs into global variables and some function v…

    …ariables into inputs
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    8889590 View commit details
    Browse the repository at this point in the history
  47. Update column name

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    956bda6 View commit details
    Browse the repository at this point in the history
  48. Configuration menu
    Copy the full SHA
    99914ed View commit details
    Browse the repository at this point in the history
  49. Add year to column name

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    cee0eb9 View commit details
    Browse the repository at this point in the history
  50. Configuration menu
    Copy the full SHA
    e981487 View commit details
    Browse the repository at this point in the history
  51. Configuration menu
    Copy the full SHA
    f467ffd View commit details
    Browse the repository at this point in the history
  52. Configuration menu
    Copy the full SHA
    78c0093 View commit details
    Browse the repository at this point in the history
  53. Configuration menu
    Copy the full SHA
    33bdf72 View commit details
    Browse the repository at this point in the history
  54. Configuration menu
    Copy the full SHA
    3ed3605 View commit details
    Browse the repository at this point in the history
  55. Add splines module to documentation

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    04b9ada View commit details
    Browse the repository at this point in the history
  56. Add scipy to mypy overrides

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    4e2ee6b View commit details
    Browse the repository at this point in the history
  57. Configuration menu
    Copy the full SHA
    ea7f921 View commit details
    Browse the repository at this point in the history
  58. Configuration menu
    Copy the full SHA
    eff575d View commit details
    Browse the repository at this point in the history
  59. Configuration menu
    Copy the full SHA
    81a833e View commit details
    Browse the repository at this point in the history
  60. Configuration menu
    Copy the full SHA
    0231e59 View commit details
    Browse the repository at this point in the history
  61. Configuration menu
    Copy the full SHA
    4e389f0 View commit details
    Browse the repository at this point in the history
  62. Change function name

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    448cf4a View commit details
    Browse the repository at this point in the history
  63. Configuration menu
    Copy the full SHA
    b712fb4 View commit details
    Browse the repository at this point in the history
  64. Configuration menu
    Copy the full SHA
    94f7447 View commit details
    Browse the repository at this point in the history
  65. Change column name

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    7883405 View commit details
    Browse the repository at this point in the history
  66. Configuration menu
    Copy the full SHA
    b733be8 View commit details
    Browse the repository at this point in the history
  67. Configuration menu
    Copy the full SHA
    cd9b436 View commit details
    Browse the repository at this point in the history
  68. Update WEO tests to match new inputs

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    77e33dd View commit details
    Browse the repository at this point in the history
  69. Configuration menu
    Copy the full SHA
    e2c6ee4 View commit details
    Browse the repository at this point in the history
  70. Configuration menu
    Copy the full SHA
    62460a7 View commit details
    Browse the repository at this point in the history
  71. Fix input for function in test

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    e4b05f5 View commit details
    Browse the repository at this point in the history
  72. Configuration menu
    Copy the full SHA
    5d4c5c0 View commit details
    Browse the repository at this point in the history
  73. Remove incorrect documentation

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    ec0215d View commit details
    Browse the repository at this point in the history
  74. Remove IAMC formatting code

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    8985418 View commit details
    Browse the repository at this point in the history
  75. Add function to create cost outputs

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    c9f4e24 View commit details
    Browse the repository at this point in the history
  76. Add short demo

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    243122f View commit details
    Browse the repository at this point in the history
  77. Remove unused functions import

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    f6ae0d9 View commit details
    Browse the repository at this point in the history
  78. Update methodology for calculating cost projections

    This updated methodology looks like following:
    1. Apply learning rates to NAM region investment costs
    2. Use regionally differentiated GDP ratios and cost ratios to develop a linear model (predict cost ratios based on GDP ratio)
    3. Calculate adjusted (annual) regionally differentiated cost ratio
    4. Project investment costs in all regions using the new adjusted cost ratios
    5. Perform polynomial regression on projections from (4)
    6. Use regression splines to project investment costs (if NAM, use learning projections from (4); for all other regions use splines results)
    7. Use fixed-to-investment cost ratios to calculate fixed O&M costs based on (6)
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    0a62a9d View commit details
    Browse the repository at this point in the history
  79. Configuration menu
    Copy the full SHA
    825325a View commit details
    Browse the repository at this point in the history
  80. Remove unused package import

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    5811041 View commit details
    Browse the repository at this point in the history
  81. Remove commented section at the end

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    4aac49a View commit details
    Browse the repository at this point in the history
  82. Add tests for GDP and learning

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    e98b03e View commit details
    Browse the repository at this point in the history
  83. Configuration menu
    Copy the full SHA
    ed6faf0 View commit details
    Browse the repository at this point in the history
  84. Update function names and docstrings

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    08d681b View commit details
    Browse the repository at this point in the history
  85. Configuration menu
    Copy the full SHA
    e1d74ef View commit details
    Browse the repository at this point in the history
  86. Configuration menu
    Copy the full SHA
    69c7fa1 View commit details
    Browse the repository at this point in the history
  87. Fix GDP tests

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    1d52c83 View commit details
    Browse the repository at this point in the history
  88. Configuration menu
    Copy the full SHA
    565a830 View commit details
    Browse the repository at this point in the history
  89. Configuration menu
    Copy the full SHA
    e9b051f View commit details
    Browse the repository at this point in the history
  90. Configuration menu
    Copy the full SHA
    9fee8ec View commit details
    Browse the repository at this point in the history
  91. Fix demo

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    3722006 View commit details
    Browse the repository at this point in the history
  92. Configuration menu
    Copy the full SHA
    d9f07ee View commit details
    Browse the repository at this point in the history
  93. Edit object name

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    3671942 View commit details
    Browse the repository at this point in the history
  94. Add tests for splines script

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    986bac3 View commit details
    Browse the repository at this point in the history
  95. Configuration menu
    Copy the full SHA
    1822c43 View commit details
    Browse the repository at this point in the history
  96. Configuration menu
    Copy the full SHA
    8ab6e13 View commit details
    Browse the repository at this point in the history
  97. Configuration menu
    Copy the full SHA
    9bd7c51 View commit details
    Browse the repository at this point in the history
  98. Configuration menu
    Copy the full SHA
    9f1a984 View commit details
    Browse the repository at this point in the history
  99. Implemented several changes to WEO module

    - Update methodology to read in mapping of technologies and base year costs
    - Removed manual calculations of base year and reference region costs
    - Allow for specification of node/spatial resolution, base year, and reference region
    - Change inflation rate
    - Replace missing values in WEO data with medians of technology
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    98113e1 View commit details
    Browse the repository at this point in the history
  100. Edit to comply with linting

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    f017cfb View commit details
    Browse the repository at this point in the history
  101. Configuration menu
    Copy the full SHA
    9b2bcf3 View commit details
    Browse the repository at this point in the history
  102. Configuration menu
    Copy the full SHA
    c709d57 View commit details
    Browse the repository at this point in the history
  103. Configuration menu
    Copy the full SHA
    935859f View commit details
    Browse the repository at this point in the history
  104. Configuration menu
    Copy the full SHA
    3c6dde6 View commit details
    Browse the repository at this point in the history
  105. Configuration menu
    Copy the full SHA
    ed59cd4 View commit details
    Browse the repository at this point in the history
  106. Configuration menu
    Copy the full SHA
    b51cf0d View commit details
    Browse the repository at this point in the history
  107. Script with basic configurations

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    d713f36 View commit details
    Browse the repository at this point in the history
  108. Restructure .tools.costs to allow for specifying:

    - Node (R11, R12, or R20)
    - Base region (by default NAM for each)
    - Base year
    - SSP scenario version (updated/review or previous)
    - SSP scenario
    - Projection method (learning, GDP adjusted, or convergence with splines)
    - Convergence year
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    23eff81 View commit details
    Browse the repository at this point in the history
  109. Configuration menu
    Copy the full SHA
    f69c00c View commit details
    Browse the repository at this point in the history
  110. Configuration menu
    Copy the full SHA
    5c5b726 View commit details
    Browse the repository at this point in the history
  111. Edit function inputs and defaults

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    cfcf0aa View commit details
    Browse the repository at this point in the history
  112. Configuration menu
    Copy the full SHA
    5096665 View commit details
    Browse the repository at this point in the history
  113. Add updated demo

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    c2d02b5 View commit details
    Browse the repository at this point in the history
  114. Configuration menu
    Copy the full SHA
    b77aa63 View commit details
    Browse the repository at this point in the history
  115. Configuration menu
    Copy the full SHA
    3ba07d0 View commit details
    Browse the repository at this point in the history
  116. Add more demos

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    14ae03b View commit details
    Browse the repository at this point in the history
  117. Add R20 mapping

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    7c4507f View commit details
    Browse the repository at this point in the history
  118. Configuration menu
    Copy the full SHA
    3b2b864 View commit details
    Browse the repository at this point in the history
  119. Configuration menu
    Copy the full SHA
    e616834 View commit details
    Browse the repository at this point in the history
  120. Configuration menu
    Copy the full SHA
    1ef4b3e View commit details
    Browse the repository at this point in the history
  121. Update GDP path equation

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    8f93c79 View commit details
    Browse the repository at this point in the history
  122. Edit for linting

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    bebac36 View commit details
    Browse the repository at this point in the history
  123. Add new GDP-adjusted cost ratio calculation

    The new calculation introduces a different linear regression where each region-technology's base year cost ratio is linearly regressed to a hypothetical (where GDP ratio == 1, cost ratio == 1).
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    c1a9092 View commit details
    Browse the repository at this point in the history
  124. Configuration menu
    Copy the full SHA
    7b00c9d View commit details
    Browse the repository at this point in the history
  125. Configuration menu
    Copy the full SHA
    598816e View commit details
    Browse the repository at this point in the history
  126. Remove commented code

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    9a922e9 View commit details
    Browse the repository at this point in the history
  127. Configuration menu
    Copy the full SHA
    03970a0 View commit details
    Browse the repository at this point in the history
  128. Configuration menu
    Copy the full SHA
    a4cbcc0 View commit details
    Browse the repository at this point in the history
  129. Configuration menu
    Copy the full SHA
    6608119 View commit details
    Browse the repository at this point in the history
  130. Configuration menu
    Copy the full SHA
    0e5a4f2 View commit details
    Browse the repository at this point in the history
  131. Configuration menu
    Copy the full SHA
    75022a2 View commit details
    Browse the repository at this point in the history
  132. Add LED scenario

    This is a very rough implementation of the LED (low energy demand) scenario. All assumptions need serious and careful verification, as I mainly guessed values for now.
    
    I added values of cost reduction rates and assigned learning rate categories for each technology under an LED scenario (see `cost_reduction_rates.csv` and `technology_learning_rates.csv`). I assigned SSP2 population and GDP per capita data to the LED scenario (see `gdp.py`). Finally, I added the LED scenario to the projections functions (see `projections.py`).
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    493f102 View commit details
    Browse the repository at this point in the history
  133. Configuration menu
    Copy the full SHA
    1000de0 View commit details
    Browse the repository at this point in the history
  134. message_ix_models/tools/costs/projections.py

    Remove unused code
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    19dbf08 View commit details
    Browse the repository at this point in the history
  135. Update demo

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    334ac39 View commit details
    Browse the repository at this point in the history
  136. Remove old WEO tests

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    6d876bf View commit details
    Browse the repository at this point in the history
  137. Rename base technology costs mapping

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    5829178 View commit details
    Browse the repository at this point in the history
  138. Configuration menu
    Copy the full SHA
    6f26260 View commit details
    Browse the repository at this point in the history
  139. Add initial set of materials technologies to cost projections

    For now, only projecting the technologies that can be mapped to the base set of technologies
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    d26a1d9 View commit details
    Browse the repository at this point in the history
  140. Remove old tests

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    1cfd5d7 View commit details
    Browse the repository at this point in the history
  141. Edit for linting

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    bcf0648 View commit details
    Browse the repository at this point in the history
  142. Add new tests for WEO

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    a07421e View commit details
    Browse the repository at this point in the history
  143. Fix for linting

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    511bc59 View commit details
    Browse the repository at this point in the history
  144. Remove old data reading function

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    32412c5 View commit details
    Browse the repository at this point in the history
  145. Add new tests for GDP

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    c63e9a2 View commit details
    Browse the repository at this point in the history
  146. Update tests for learning

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    1a19e2e View commit details
    Browse the repository at this point in the history
  147. Add module input to projections

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    e5d7653 View commit details
    Browse the repository at this point in the history
  148. Configuration menu
    Copy the full SHA
    0af592c View commit details
    Browse the repository at this point in the history
  149. Add updated tests for splines

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    9066ba3 View commit details
    Browse the repository at this point in the history
  150. Comment out other GDP test for now

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    929bdb0 View commit details
    Browse the repository at this point in the history
  151. Fix for linting

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    cb8cdc6 View commit details
    Browse the repository at this point in the history
  152. Fix missing variable

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    11a94d4 View commit details
    Browse the repository at this point in the history
  153. Return outputs as class instead

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    fe09a85 View commit details
    Browse the repository at this point in the history
  154. Configuration menu
    Copy the full SHA
    b218eac View commit details
    Browse the repository at this point in the history
  155. Add .tools.costs.config.Config dataclass

    Also cherry-pick 80464da
    to satisfy mypy.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    154fa52 View commit details
    Browse the repository at this point in the history
  156. Assign EEU to European Union

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    8d75930 View commit details
    Browse the repository at this point in the history
  157. Configuration menu
    Copy the full SHA
    79879c2 View commit details
    Browse the repository at this point in the history
  158. Configuration menu
    Copy the full SHA
    f51875f View commit details
    Browse the repository at this point in the history
  159. Simple formatting for ruff

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    fbf72a4 View commit details
    Browse the repository at this point in the history
  160. Remove misplaced code bit

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    c17f04b View commit details
    Browse the repository at this point in the history
  161. Configuration menu
    Copy the full SHA
    f3a7e11 View commit details
    Browse the repository at this point in the history
  162. Configuration menu
    Copy the full SHA
    8530d11 View commit details
    Browse the repository at this point in the history
  163. Implement using Config

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    10f1ffa View commit details
    Browse the repository at this point in the history
  164. Fix median calculation in WEO data

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    a3bffa8 View commit details
    Browse the repository at this point in the history
  165. Configuration menu
    Copy the full SHA
    f6a6268 View commit details
    Browse the repository at this point in the history
  166. Configuration menu
    Copy the full SHA
    417843b View commit details
    Browse the repository at this point in the history
  167. Made small organizational and renaming changes

    1. Renamed input CSVs
    2. Renamed weo.py script to regional_differentiation.py
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    a2fb5ee View commit details
    Browse the repository at this point in the history
  168. Delete unused data files

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    8303343 View commit details
    Browse the repository at this point in the history
  169. Configuration menu
    Copy the full SHA
    eef061a View commit details
    Browse the repository at this point in the history
  170. Rename base module to energy module

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    fb7ded0 View commit details
    Browse the repository at this point in the history
  171. Configuration menu
    Copy the full SHA
    5d034f0 View commit details
    Browse the repository at this point in the history
  172. Rename map_source and map_technology columns to reg_diff_source and r…

    …eg_diff_technology
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    570b409 View commit details
    Browse the repository at this point in the history
  173. Configuration menu
    Copy the full SHA
    fba9389 View commit details
    Browse the repository at this point in the history
  174. Fix column names

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    ab8e516 View commit details
    Browse the repository at this point in the history
  175. Implement changes for materials module:

    - Add Intratec regional differentiation
    - Make assumptions for missing regional differentiation mappings
    - Make assumptions for cost reduction rates and scenarios
    - Add fix-to-inv cost ratios as input
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    4934c57 View commit details
    Browse the repository at this point in the history
  176. Configuration menu
    Copy the full SHA
    6b08140 View commit details
    Browse the repository at this point in the history
  177. Configuration menu
    Copy the full SHA
    ed8634f View commit details
    Browse the repository at this point in the history
  178. Change LED scenario cost reduction rates

    Use same cost reduction rates as SSP2 except for VRE and coal
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    1182295 View commit details
    Browse the repository at this point in the history
  179. Fix for linting

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    6ee2d86 View commit details
    Browse the repository at this point in the history
  180. Update docs

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    1422a60 View commit details
    Browse the repository at this point in the history
  181. Configuration menu
    Copy the full SHA
    207b770 View commit details
    Browse the repository at this point in the history
  182. Drop duplicates in projections

    This is more of a quick fix, the duplicates are most likely happening during some merging. In the `learning.py` script, adding the `drop_duplicates()` got rid of some of the duplicates, but not all of them. I think the final duplication is happening in `create_message_outputs()`, as adding `drop_duplicates()` there seemed to get rid of them all.
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    e4f571c View commit details
    Browse the repository at this point in the history
  183. Allow functionality to filter scenarios to come in earlier in GDP adj…

    …ustment
    
    Tests were taking too long (linearly regressing GDP data), so I've added the option to filter by scenario during the GDP regression process as well. Code is a little redundant now and clunky but to be fixed later.
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    2c1bd9b View commit details
    Browse the repository at this point in the history
  184. Switch from .pivot() to .pivot_table()

    `.pivot()` was crashing for some reason (saying there were duplicates in the index), but `.pivot_table()` from `pandas` seems to work just fine
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    04690b0 View commit details
    Browse the repository at this point in the history
  185. Update tests

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    2b714c6 View commit details
    Browse the repository at this point in the history
  186. Configuration menu
    Copy the full SHA
    89c2e76 View commit details
    Browse the repository at this point in the history
  187. Parametrize test_process_raw_ssp_data()

    - This is possible because the assertions are the same in both cases.
    - Use get_codes() instead of hard-coded lists of node IDs.
    - Use f-string for ref_region argument.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    12c5816 View commit details
    Browse the repository at this point in the history
  188. Configuration menu
    Copy the full SHA
    ac1ac25 View commit details
    Browse the repository at this point in the history
  189. Configuration menu
    Copy the full SHA
    a07616a View commit details
    Browse the repository at this point in the history
  190. Pass context to process_raw_ssp_data*()

    Also: Xfail some cases.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    8219b26 View commit details
    Browse the repository at this point in the history
  191. Add a function to handle ref_region arg

    - Improve typing
    - Set context.model.regions in test
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    66c92e7 View commit details
    Browse the repository at this point in the history
  192. Configuration menu
    Copy the full SHA
    f073a51 View commit details
    Browse the repository at this point in the history
  193. Update ExoDataSource.raise_on_extra_kw()

    - Store a "name" keyword argument, if given.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    c87dc36 View commit details
    Browse the repository at this point in the history
  194. Configuration menu
    Copy the full SHA
    8271714 View commit details
    Browse the repository at this point in the history
  195. Configuration menu
    Copy the full SHA
    80eca5c View commit details
    Browse the repository at this point in the history
  196. Configuration menu
    Copy the full SHA
    6fda70d View commit details
    Browse the repository at this point in the history
  197. Tidy imports in .costs.gdp

    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    5b96529 View commit details
    Browse the repository at this point in the history
  198. Configuration menu
    Copy the full SHA
    47524a9 View commit details
    Browse the repository at this point in the history
  199. Configuration menu
    Copy the full SHA
    a56f5a1 View commit details
    Browse the repository at this point in the history
  200. Parametrize test_adjust_cost_ratios_with_gdp()

    Also set test_context.model.regions.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    d52b937 View commit details
    Browse the repository at this point in the history
  201. Configuration menu
    Copy the full SHA
    2d68d6d View commit details
    Browse the repository at this point in the history
  202. Configuration menu
    Copy the full SHA
    a3b62c3 View commit details
    Browse the repository at this point in the history
  203. Specify selected regions to context

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    4f7e047 View commit details
    Browse the repository at this point in the history
  204. Configuration menu
    Copy the full SHA
    b11bbdb View commit details
    Browse the repository at this point in the history
  205. Fix and reorganize docs

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    13160be View commit details
    Browse the repository at this point in the history
  206. Update demo

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    e881b8a View commit details
    Browse the repository at this point in the history
  207. Use .costs.Config as sole arg to create_cost_projections()

    - Adjust tests.
    - Adjust usage in demo.py; expand comments.
    - Add Config.check() for validation of settings.
    - Use dataclass default Config.__repr__() to show contents.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    b55847c View commit details
    Browse the repository at this point in the history
  208. Use Config as sole arg to create_projections_*()

    - Use f-strings for output.
    - Simplify/align construction of scen, scen_vers variables.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    f1af015 View commit details
    Browse the repository at this point in the history
  209. Export .costs.Config, .costs.create_cost_projections

    - Also use relative imports within .tools.costs
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    f926877 View commit details
    Browse the repository at this point in the history
  210. Configuration menu
    Copy the full SHA
    c9dffc6 View commit details
    Browse the repository at this point in the history
  211. Use Config as arg to 3 functions in .tools.costs.

    - .gdp.adjust_cost_ratios_with_gdp().
      - Also re-use .projections._maybe_query_*() functions instead of
        duplicated logic.
    - .learning.project_ref_region_inv_costs_using_learning_rates()
    - .regional_differentiation.apply_regional_differentiation()
      - Also rely on Config logic for node/ref_region.
    
    Adjust tests to align.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    021e9ed View commit details
    Browse the repository at this point in the history
  212. Configuration menu
    Copy the full SHA
    26894ad View commit details
    Browse the repository at this point in the history
  213. Configuration menu
    Copy the full SHA
    012778a View commit details
    Browse the repository at this point in the history
  214. Configuration menu
    Copy the full SHA
    43c9939 View commit details
    Browse the repository at this point in the history
  215. Configuration menu
    Copy the full SHA
    9ca582a View commit details
    Browse the repository at this point in the history
  216. Return dict from create_cost_projections()

    - Remove "projections" class.
    - Adjust tests, demo.py.
    - Add "-> None" to ensure .tests.tools.costs functions are type checked.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    1d3995e View commit details
    Browse the repository at this point in the history
  217. Configuration menu
    Copy the full SHA
    35980d9 View commit details
    Browse the repository at this point in the history
  218. Use log.info() instead of print() in .tools.costs

    Log output can be handled (redirected, tested, filtered) more precisely
    than standard output.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    fac8ed5 View commit details
    Browse the repository at this point in the history
  219. Reduce special-casing on Config.modules

    - Move common statements before or after if-blocks.
    - Specify required file format, location, and name in docstring of
      get_raw_technology_mapping().
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    faaebc1 View commit details
    Browse the repository at this point in the history
  220. Remove hard-coded currency deflator

    - Retrieve World Bank data via IAM-units.
    - Adjust test.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    fa37754 View commit details
    Browse the repository at this point in the history
  221. Parametrize tests of .tools.costs

    - Deduplicate code for module="energy" and module="materials".
    - Simplify set logic for assertions about returned data.
    - Correct rtol=3 (factor of 3) to rtol=5e-2 (± 5%) in test of
      apply_splines_to_convergence(); expand to all technologies.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    e04d57e View commit details
    Browse the repository at this point in the history
  222. Remove hard-coded BASE_YEAR, HORIZON_{START,END}

    - Reference Config.base_year.
    - Use built-in get_codes() to get the year set.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    4407e2c View commit details
    Browse the repository at this point in the history
  223. Move remaining .costs.config globals to .Config

    - Generate the `seq_years` variable via Config.
    - Reuse ScenarioInfo.y0 semantics for FIRST_MODEL_YEAR.
    - Document difference between "LAST_MODEL_YEAR"/Config.final_year
      and the actual final model year appearing in most MESSAGEix-GLOBIOM
      scenarios.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    ef2d5b7 View commit details
    Browse the repository at this point in the history
  224. Type hint ScenarioInfo.Y

    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    986f609 View commit details
    Browse the repository at this point in the history
  225. Use DataFrame.astype() instead of assign/lambda

    - Filter year_* data using Config properties.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    1354f29 View commit details
    Browse the repository at this point in the history
  226. Use pandas groupby-apply in apply_splines_to_convergence()

    - Avoid product() and manual handling of group keys.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    8e9776e View commit details
    Browse the repository at this point in the history
  227. Simplify apply_splines_to_convergence()

    - Use numpy.polynomial instead of scikits-learn: lower-level, faster,
      avoids a new dependency, identical output.
    - Improve performance:
      - Fit and predict in the same step.
      - Chain all pandas operations in the function.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    b7658eb View commit details
    Browse the repository at this point in the history
  228. Tidy docstrings in .tools.costs

    - First line of docstring ends with a period.
    - Incorporate pre-function comments into docstring, so they are visible
      in the built documentation.
    - Ensure ReST list items are wrapped.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    e0312a2 View commit details
    Browse the repository at this point in the history
  229. Simplify adjust_cost_ratios_with_gdp()

    - Use .eval(…) with direct formulae instead of 2-stage linregress()/predict
      on 2 data points per group.
    - Vectorize calculations for performance.
    - Chain pandas operations.
    - Remove .gdp.default_ref_region(); this predates Config, is now handled
      by Config.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    3cc6c0b View commit details
    Browse the repository at this point in the history
  230. Configuration menu
    Copy the full SHA
    62cbf0f View commit details
    Browse the repository at this point in the history
  231. Configuration menu
    Copy the full SHA
    9a4a2ca View commit details
    Browse the repository at this point in the history
  232. Configuration menu
    Copy the full SHA
    4175116 View commit details
    Browse the repository at this point in the history
  233. Add #99 to doc/whatsnew

    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    fb36b3d View commit details
    Browse the repository at this point in the history
  234. Configuration menu
    Copy the full SHA
    1ada44a View commit details
    Browse the repository at this point in the history
  235. Configuration menu
    Copy the full SHA
    fb781c7 View commit details
    Browse the repository at this point in the history
  236. Configuration menu
    Copy the full SHA
    d05102c View commit details
    Browse the repository at this point in the history
  237. Remove print() statement

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    86e68cd View commit details
    Browse the repository at this point in the history
  238. Configuration menu
    Copy the full SHA
    893176c View commit details
    Browse the repository at this point in the history
  239. Configuration menu
    Copy the full SHA
    d802083 View commit details
    Browse the repository at this point in the history
  240. Remove filter_data.py script

    This file was initially created to subset the large SSP data file. But with the new SSP data hhandler, I think this script is no longer needed.
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    d1ff973 View commit details
    Browse the repository at this point in the history
  241. Remove the use of the term learning in the projections methods

    - For projecting costs of reference region, used words like `decay` or `cost reduction` instead
    - Renamed `learning.py` to `decay.py` and also the corresponding test file
    - Changed `learning` projection method to `constant` instead
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    ea30670 View commit details
    Browse the repository at this point in the history
  242. Update docs to reflect changes to splines and learning methods

    Namely, that `splines` have been removed and mentions of the term `learning` have been changed to `decay`, `cost reduction`, and `constant` (where appropriate)
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    9259882 View commit details
    Browse the repository at this point in the history
  243. Update docs to add feedback from reviewers

    - Explain more about the costs module functionality and different projection methods
    - Explain how to add additional technology modules
    - Give example of how to use code
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    817b9ae View commit details
    Browse the repository at this point in the history
  244. Edit for linting

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    d01c1ec View commit details
    Browse the repository at this point in the history
  245. Add linear interpolation between base year and convergence year for a…

    …ll non-reference regions
    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    cf5868d View commit details
    Browse the repository at this point in the history
  246. Configuration menu
    Copy the full SHA
    0afc6b8 View commit details
    Browse the repository at this point in the history
  247. Edit for linting

    measrainsey authored and khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    9d83bb4 View commit details
    Browse the repository at this point in the history
  248. Configuration menu
    Copy the full SHA
    9c9c7d2 View commit details
    Browse the repository at this point in the history
  249. Tidy ReST usage in doc/api/tools-costs

    - Start new sentences on new lines.
    - Use "-" consistently for bullet lists (don't mix "*" and "-").
    - Ensure a blank line before bullet lists.
    - Use the ReST :file:`...` role for file names and paths.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    657a263 View commit details
    Browse the repository at this point in the history
  250. Copyedit doc/api/tools-costs.

    - Shorten title for display.
    - Explain terms used.
    - Correct spelling and grammar.
    - Update docstrings for .costs.Config attributes and refer to these,
      instead of duplicating descriptions in text.
    - Update headings.
    - Use quotes for values appearing in code or data files.
    khaeru committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    3a0d7ee View commit details
    Browse the repository at this point in the history