GitHub Actions: Add Julia 1.7, remove 1.4 and 1.5

2025-12-06 00:08:52 -06:00 · 2022-04-16 09:02:59 -05:00
54 changed files with 307 additions and 838 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,38 +1,21 @@
 *.bak
 *.gz
-*.ipynb
 *.lastrun
-*.mps
 *.so
-*/Manifest.toml
-.AppleDB
-.AppleDesktop
-.AppleDouble
-.DS_Store
-.DocumentRevisions-V100
-.LSOverride
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-._*
-.apdisk
-.com.apple.timemachine.donotpresent
-.fseventsd
+*.mps
+*.ipynb
 .ipy*
-.vscode
-Icon
-Manifest.toml
-Network Trash Folder
-TODO.md
-Temporary Items
 benchmark/results
 benchmark/runs
 benchmark/tables
 benchmark/tmp.json
 build
-docs/_build
 instances/**/*.json
 instances/_source
 local
 notebooks
+TODO.md
+docs/_build
+.vscode
+Manifest.toml
+*/Manifest.toml
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,17 +11,6 @@ All notable changes to this project will be documented in this file.
 [semver]: https://semver.org/spec/v2.0.0.html
 [pkjjl]: https://pkgdocs.julialang.org/v1/compatibility/#compat-pre-1.0

-## [Unreleased]
-### Added
- Add multiple reserve products
-
-### Changed
- To support multiple reserve products, the input data format has been modified as follows:
-    - In `Generators`, replace `Provides spinning reserves?` by `Reserve eligibility`
-    - In `Parameters`, remove `Reserve shortfall penalty`
-    - Revise `Reserves` section
-
-
 ## [0.2.2] - 2021-07-21
 ### Fixed
 - Fix small bug in validation scripts related to startup costs
--- a/4
+++ b/4
@@ -2,10 +2,10 @@
 # Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
 # Released under the modified BSD license. See COPYING.md for more details.

-VERSION := 0.3
+VERSION := 0.2

 clean:
-	rm -rfv build Manifest.toml test/Manifest.toml deps/formatter/build deps/formatter/Manifest.toml
+	rm -rfv build

 docs:
 	cd docs; make clean; make dirhtml
--- a/Project.toml
+++ b/Project.toml
@@ -2,7 +2,7 @@ name = "UnitCommitment"
 uuid = "64606440-39ea-11e9-0f29-3303a1d3d877"
 authors = ["Santos Xavier, Alinson <axavier@anl.gov>"]
 repo = "https://github.com/ANL-CEEESA/UnitCommitment.jl"
-version = "0.3.0"
+version = "0.2.2"

 [deps]
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
@@ -17,7 +17,6 @@ MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
 PackageCompiler = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
-Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"

 [compat]
@@ -25,7 +24,7 @@ DataStructures = "0.18"
 Distributions = "0.25"
 GZip = "0.5"
 JSON = "0.21"
-JuMP = "1"
-MathOptInterface = "1"
+JuMP = "0.21"
+MathOptInterface = "0.9"
 PackageCompiler = "1"
 julia = "1"
--- a/README.md
+++ b/README.md
@@ -95,7 +95,6 @@ UnitCommitment.write("/tmp/output.json", solution)
 ## Authors
 * **Alinson S. Xavier** (Argonne National Laboratory)
 * **Aleksandr M. Kazachkov** (University of Florida)
-* **Ogün Yurdakul** (Technische Universität Berlin)
 * **Feng Qiu** (Argonne National Laboratory)

 ## Acknowledgments
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,7 +1,7 @@
 project = "UnitCommitment.jl"
-copyright = "2020-2022, UChicago Argonne, LLC"
+copyright = "2020-2021, UChicago Argonne, LLC"
 author = ""
-release = "0.3"
+release = "0.2"
 extensions = ["myst_parser"]
 templates_path = ["_templates"]
 exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
@@ -10,7 +10,7 @@ html_static_path = ["_static"]
 html_css_files = ["custom.css"]
 html_theme_options = {
    "repository_url": "https://github.com/ANL-CEEESA/UnitCommitment.jl/",
-    "use_repository_button": False,
+    "use_repository_button": True,
    "extra_navbar": "",
 }
 html_title = f"UnitCommitment.jl<br/><small>{release}</small>"
--- a/docs/format.md
+++ b/docs/format.md
@@ -24,19 +24,18 @@ Instances are specified by JSON files containing the following main sections:
 * Reserves
 * Contingencies

-Each section is described in detail below. See [case118/2017-01-01.json.gz][example] for a complete example.
-
-[example]: https://axavier.org/UnitCommitment.jl/0.3/instances/matpower/case118/2017-01-01.json.gz
+Each section is described in detail below. For a complete example, see [case14](https://github.com/ANL-CEEESA/UnitCommitment.jl/tree/dev/instances/matpower/case14).

 ### Parameters

-This section describes system-wide parameters, such as power balance penalty, and optimization parameters, such as the length of the planning horizon and the time.
+This section describes system-wide parameters, such as power balance and reserve shortfall penalties, and optimization parameters, such as the length of the planning horizon and the time.

 | Key                            | Description                                       | Default  | Time series?
 | :----------------------------- | :------------------------------------------------ | :------: | :------------:
 | `Time horizon (h)` | Length of the planning horizon (in hours). | Required | N
 | `Time step (min)` | Length of each time step (in minutes). Must be a divisor of 60 (e.g. 60, 30, 20, 15, etc). | `60` | N
 | `Power balance penalty ($/MW)` | Penalty for system-wide shortage or surplus in production (in $/MW). This is charged per time step. For example, if there is a shortage of 1 MW for three time steps, three times this amount will be charged. | `1000.0` | Y
+| `Reserve shortfall penalty ($/MW)` | Penalty for system-wide shortage in meeting reserve requirements (in $/MW). This is charged per time step. Negative value implies reserve constraints must always be satisfied. | `-1` | Y


 #### Example
@@ -45,6 +44,7 @@ This section describes system-wide parameters, such as power balance penalty, an
    "Parameters": {
        "Time horizon (h)": 4,
        "Power balance penalty ($/MW)": 1000.0,
+        "Reserve shortfall penalty ($/MW)": -1.0
    }
 }
 ```
@@ -96,7 +96,7 @@ This section describes all generators in the system, including thermal units, re
 | `Initial status (h)`  | If set to a positive number, indicates the amount of time (in hours) the generator has been on at the beginning of the simulation, and if set to a negative number, the amount of time the generator has been off. For example, if `Initial status (h)` is `-2`, this means that the generator was off since `-02:00` (h:min). The simulation starts at time `00:00`. If `Initial status (h)` is `3`, this means that the generator was on since `-03:00`. A value of zero is not acceptable. | Required | N
 | `Initial power (MW)`  | Amount of power the generator at time step `-1`, immediately before the planning horizon starts. | Required | N
 | `Must run?`               | If `true`, the generator should be committed, even if that is not economical (Boolean). | `false` | Y
-| `Reserve eligibility` | List of reserve products this generator is eligibe to provide. By default, the generator is not eligible to provide any reserves. | `[]` | N
+| `Provides spinning reserves?`    | If `true`, this generator may provide spinning reserves (Boolean). | `true` | Y

 #### Production costs and limits

@@ -135,13 +135,13 @@ Note that this curve also specifies the production limits. Specifically, the fir
            "Minimum uptime (h)": 4,
            "Initial status (h)": 12,
            "Must run?": false,
-            "Reserve eligibility": ["r1"],
+            "Provides spinning reserves?": true,
        },
        "gen2": {
            "Bus": "b5",
            "Production cost curve (MW)": [0.0, [10.0, 8.0, 0.0, 3.0]],
            "Production cost curve ($)": [0.0, 0.0],
-            "Reserve eligibility": ["r1", "r2"],
+            "Provides spinning reserves?": true,
        }
    }
 }
@@ -206,39 +206,24 @@ This section describes the characteristics of transmission system, such as its t

 ### Reserves

-This section describes the hourly amount of reserves required.
+This section describes the hourly amount of operating reserves required.


 | Key                   | Description                                        | Default   |  Time series?
 | :-------------------- | :------------------------------------------------- | --------- |  :----:
-| `Type` | Type of reserve product. Must be either "spinning" or "flexiramp". | Required | N
-| `Amount (MW)` | Amount of reserves required. | Required | Y
-| `Shortfall penalty ($/MW)` | Penalty for shortage in meeting the reserve requirements (in $/MW). This is charged per time step. Negative value implies reserve constraints must always be satisfied. | `-1` | Y
+| `Spinning (MW)`       | Minimum amount of system-wide spinning reserves (in MW). Only generators which are online may provide this reserve. | `0.0` | Y

-#### Example 1
+#### Example

 ```json
 {
    "Reserves": {
-        "r1": {
-            "Type": "spinning",
-            "Amount (MW)": [
-                57.30552,
-                53.88429,
-                51.31838,
-                50.46307
-            ],
-            "Shortfall penalty ($/MW)": 5.0
-        },
-        "r2": {
-            "Type": "flexiramp",
-            "Amount (MW)": [
-                20.31042,
-                23.65273,
-                27.41784,
-                25.34057
-            ],
-        }
+        "Spinning (MW)": [
+            57.30552,
+            53.88429,
+            51.31838,
+            50.46307
+        ]
    }
 }
 ```
@@ -301,8 +286,9 @@ The output data format is also JSON-based, but it is not currently documented si
 Current limitations
 -------------------

+* All reserves are system-wide. Zonal reserves are not currently supported.
 * Network topology remains the same for all time periods
 * Only N-1 transmission contingencies are supported. Generator contingencies are not currently supported.
 * Time-varying minimum production amounts are not currently compatible with ramp/startup/shutdown limits.
-* Flexible ramping products can only be acquired under the `WanHob2016` formulation, which does not support spinning reserves. 
+

--- a/docs/index.md
+++ b/docs/index.md
@@ -21,7 +21,6 @@
 ### Authors
 * **Alinson S. Xavier** (Argonne National Laboratory)
 * **Aleksandr M. Kazachkov** (University of Florida)
-* **Ogün Yurdakul** (Technische Universität Berlin)
 * **Feng Qiu** (Argonne National Laboratory)

 ### Acknowledgments
@@ -36,7 +35,7 @@

 If you use UnitCommitment.jl in your research (instances, models or algorithms), we kindly request that you cite the package as follows:

-* **Alinson S. Xavier, Aleksandr M. Kazachkov, Ogün Yurdakul, Feng Qiu**, "UnitCommitment.jl: A Julia/JuMP Optimization Package for Security-Constrained Unit Commitment". Zenodo (2020). [DOI: 10.5281/zenodo.4269874](https://doi.org/10.5281/zenodo.4269874).
+* **Alinson S. Xavier, Aleksandr M. Kazachkov, Feng Qiu**, "UnitCommitment.jl: A Julia/JuMP Optimization Package for Security-Constrained Unit Commitment". Zenodo (2020). [DOI: 10.5281/zenodo.4269874](https://doi.org/10.5281/zenodo.4269874).

 If you use the instances, we additionally request that you cite the original sources, as described in the [instances page](instances.md).

--- a/docs/instances.md
+++ b/docs/instances.md
@@ -9,7 +9,7 @@ suffix: .
 Instances
 =========

-UnitCommitment.jl provides a large collection of benchmark instances collected from the literature and converted to a [common data format](format.md). In some cases, as indicated below, the original instances have been extended, with realistic parameters, using data-driven methods. If you use these instances in your research, we request that you cite UnitCommitment.jl, as well as the original sources, as listed below. Benchmark instances can be loaded with `UnitCommitment.read_benchmark(name)`, as explained in the [usage section](usage.md). Instance files can also be [directly downloaded from our website](https://axavier.org/UnitCommitment.jl/0.3/instances/).
+UnitCommitment.jl provides a large collection of benchmark instances collected from the literature and converted to a [common data format](format.md). In some cases, as indicated below, the original instances have been extended, with realistic parameters, using data-driven methods. If you use these instances in your research, we request that you cite UnitCommitment.jl, as well as the original sources, as listed below. Benchmark instances can be loaded with `UnitCommitment.read_benchmark(name)`, as explained in the [usage section](usage.md).

 ```{warning}
 The instances included in UC.jl are still under development and may change in the future. If you use these instances in your research, for reproducibility, you should specify what version of UC.jl they came from.
@@ -33,7 +33,7 @@ Because most MATPOWER test cases were originally designed for power flow studies

 * **Contingencies** were set to include all N-1 transmission line contingencies that do not generate islands or isolated buses. More specifically, there is one contingency for each transmission line, as long as that transmission line is not a bridge in the network graph.

-For each MATPOWER test case, UC.jl provides 364 variations (`2017-01-01` to `2017-12-30`) corresponding different days of the year.
+For each MATPOWER test case, UC.jl provides two variations (`2017-02-01` and `2017-08-01`) corresponding respectively to a winter and to a summer test case.

 ### MATPOWER/UW-PSTCA

@@ -41,11 +41,11 @@ A variety of smaller IEEE test cases, [compiled by University of Washington](htt

 | Name | Buses | Generators | Lines | Contingencies | References |
 |------|-------|------------|-------|---------------|--------|
-| `matpower/case14/2017-01-01` | 14 | 5 | 20 | 19 | [MTPWR, PSTCA]
-| `matpower/case30/2017-01-01` | 30 | 6 | 41 | 38 | [MTPWR, PSTCA]
-| `matpower/case57/2017-01-01` | 57 | 7 | 80 | 79 | [MTPWR, PSTCA]
-| `matpower/case118/2017-01-01` | 118 | 54 | 186 | 177 | [MTPWR, PSTCA]
-| `matpower/case300/2017-01-01` | 300 | 69 | 411 | 320 | [MTPWR, PSTCA]
+| `matpower/case14/2017-02-01` | 14 | 5 | 20 | 19 | [MTPWR, PSTCA]
+| `matpower/case30/2017-02-01` | 30 | 6 | 41 | 38 | [MTPWR, PSTCA]
+| `matpower/case57/2017-02-01` | 57 | 7 | 80 | 79 | [MTPWR, PSTCA]
+| `matpower/case118/2017-02-01` | 118 | 54 | 186 | 177 | [MTPWR, PSTCA]
+| `matpower/case300/2017-02-01` | 300 | 69 | 411 | 320 | [MTPWR, PSTCA]


 ### MATPOWER/Polish
@@ -54,14 +54,14 @@ Test cases based on the Polish 400, 220 and 110 kV networks, originally provided

 | Name | Buses | Generators | Lines | Contingencies | References |
 |------|-------|------------|-------|---------------|--------|
-| `matpower/case2383wp/2017-01-01` | 2383 | 323 | 2896 | 2240 | [MTPWR]
-| `matpower/case2736sp/2017-01-01` | 2736 | 289 | 3504 | 3159 | [MTPWR]
-| `matpower/case2737sop/2017-01-01` | 2737 | 267 | 3506 | 3161 | [MTPWR]
-| `matpower/case2746wop/2017-01-01` | 2746 | 443 | 3514 | 3155 | [MTPWR]
-| `matpower/case2746wp/2017-01-01` | 2746 | 457 | 3514 | 3156 | [MTPWR]
-| `matpower/case3012wp/2017-01-01` | 3012 | 496 | 3572 | 2854 | [MTPWR]
-| `matpower/case3120sp/2017-01-01` | 3120 | 483 | 3693 | 2950 | [MTPWR]
-| `matpower/case3375wp/2017-01-01` | 3374 | 590 | 4161 | 3245 | [MTPWR]
+| `matpower/case2383wp/2017-02-01` | 2383 | 323 | 2896 | 2240 | [MTPWR]
+| `matpower/case2736sp/2017-02-01` | 2736 | 289 | 3504 | 3159 | [MTPWR]
+| `matpower/case2737sop/2017-02-01` | 2737 | 267 | 3506 | 3161 | [MTPWR]
+| `matpower/case2746wop/2017-02-01` | 2746 | 443 | 3514 | 3155 | [MTPWR]
+| `matpower/case2746wp/2017-02-01` | 2746 | 457 | 3514 | 3156 | [MTPWR]
+| `matpower/case3012wp/2017-02-01` | 3012 | 496 | 3572 | 2854 | [MTPWR]
+| `matpower/case3120sp/2017-02-01` | 3120 | 483 | 3693 | 2950 | [MTPWR]
+| `matpower/case3375wp/2017-02-01` | 3374 | 590 | 4161 | 3245 | [MTPWR]

 ### MATPOWER/PEGASE

@@ -69,11 +69,11 @@ Test cases from the [Pan European Grid Advanced Simulation and State Estimation

 | Name | Buses | Generators | Lines | Contingencies | References |
 |------|-------|------------|-------|---------------|--------|
-| `matpower/case89pegase/2017-01-01` | 89 | 12 | 210 | 192 | [JoFlMa16, FlPaCa13, MTPWR]
-| `matpower/case1354pegase/2017-01-01` | 1354 | 260 | 1991 | 1288 | [JoFlMa16, FlPaCa13, MTPWR]
-| `matpower/case2869pegase/2017-01-01` | 2869 | 510 | 4582 | 3579 | [JoFlMa16, FlPaCa13, MTPWR]
-| `matpower/case9241pegase/2017-01-01` | 9241 | 1445 | 16049 | 13932 | [JoFlMa16, FlPaCa13, MTPWR]
-| `matpower/case13659pegase/2017-01-01` | 13659 | 4092 | 20467 | 13932 | [JoFlMa16, FlPaCa13, MTPWR]
+| `matpower/case89pegase/2017-02-01` | 89 | 12 | 210 | 192 | [JoFlMa16, FlPaCa13, MTPWR]
+| `matpower/case1354pegase/2017-02-01` | 1354 | 260 | 1991 | 1288 | [JoFlMa16, FlPaCa13, MTPWR]
+| `matpower/case2869pegase/2017-02-01` | 2869 | 510 | 4582 | 3579 | [JoFlMa16, FlPaCa13, MTPWR]
+| `matpower/case9241pegase/2017-02-01` | 9241 | 1445 | 16049 | 13932 | [JoFlMa16, FlPaCa13, MTPWR]
+| `matpower/case13659pegase/2017-02-01` | 13659 | 4092 | 20467 | 13932 | [JoFlMa16, FlPaCa13, MTPWR]

 ### MATPOWER/RTE

@@ -81,14 +81,14 @@ Test cases from the R&D Division at [Reseau de Transport d'Electricite](https://

 | Name | Buses | Generators | Lines | Contingencies | References |
 |------|-------|------------|-------|---------------|--------|
-| `matpower/case1888rte/2017-01-01` | 1888 | 296 | 2531 | 1484 | [MTPWR, JoFlMa16]
-| `matpower/case1951rte/2017-01-01` | 1951 | 390 | 2596 | 1497 | [MTPWR, JoFlMa16]
-| `matpower/case2848rte/2017-01-01` | 2848 | 544 | 3776 | 2242 | [MTPWR, JoFlMa16]
-| `matpower/case2868rte/2017-01-01` | 2868 | 596 | 3808 | 2260 | [MTPWR, JoFlMa16]
-| `matpower/case6468rte/2017-01-01` | 6468 | 1262 | 9000 | 6094 | [MTPWR, JoFlMa16]
-| `matpower/case6470rte/2017-01-01` | 6470 | 1306 | 9005 | 6085 | [MTPWR, JoFlMa16]
-| `matpower/case6495rte/2017-01-01` | 6495 | 1352 | 9019 | 6060 | [MTPWR, JoFlMa16]
-| `matpower/case6515rte/2017-01-01` | 6515 | 1368 | 9037 | 6063 | [MTPWR, JoFlMa16]
+| `matpower/case1888rte/2017-02-01` | 1888 | 296 | 2531 | 1484 | [MTPWR, JoFlMa16]
+| `matpower/case1951rte/2017-02-01` | 1951 | 390 | 2596 | 1497 | [MTPWR, JoFlMa16]
+| `matpower/case2848rte/2017-02-01` | 2848 | 544 | 3776 | 2242 | [MTPWR, JoFlMa16]
+| `matpower/case2868rte/2017-02-01` | 2868 | 596 | 3808 | 2260 | [MTPWR, JoFlMa16]
+| `matpower/case6468rte/2017-02-01` | 6468 | 1262 | 9000 | 6094 | [MTPWR, JoFlMa16]
+| `matpower/case6470rte/2017-02-01` | 6470 | 1306 | 9005 | 6085 | [MTPWR, JoFlMa16]
+| `matpower/case6495rte/2017-02-01` | 6495 | 1352 | 9019 | 6060 | [MTPWR, JoFlMa16]
+| `matpower/case6515rte/2017-02-01` | 6515 | 1368 | 9037 | 6063 | [MTPWR, JoFlMa16]


 PGLIB-UC Instances
@@ -288,7 +288,7 @@ Tejada19
 References
 ----------

-* [UCJL] **Alinson S. Xavier, Aleksandr M. Kazachkov, Ogün Yurdakul, Feng Qiu.** "UnitCommitment.jl: A Julia/JuMP Optimization Package for Security-Constrained Unit Commitment". Zenodo (2020). [DOI: 10.5281/zenodo.4269874](https://doi.org/10.5281/zenodo.4269874)
+* [UCJL] **Alinson S. Xavier, Aleksandr M. Kazachkov, Feng Qiu.** "UnitCommitment.jl: A Julia/JuMP Optimization Package for Security-Constrained Unit Commitment". Zenodo (2020). [DOI: 10.5281/zenodo.4269874](https://doi.org/10.5281/zenodo.4269874)

 * [KnOsWa20] **Bernard Knueven, James Ostrowski and Jean-Paul Watson.** "On Mixed-Integer Programming Formulations for the Unit Commitment Problem". INFORMS Journal on Computing (2020). [DOI: 10.1287/ijoc.2019.0944](https://doi.org/10.1287/ijoc.2019.0944)

--- a/docs/model.md
+++ b/docs/model.md
@@ -23,7 +23,7 @@ Name | Symbol | Description | Unit
 `switch_off[g,t]` | $w_{g}(t)$ | True if generator `g` switches off at time `t`. | Binary
 `prod_above[g,t]` |$p'_{g}(t)$ | Amount of power produced by generator `g` above its minimum power output at time `t`. For example, if the minimum power of generator `g` is 100 MW and `g` is producing 115 MW of power at time `t`, then `prod_above[g,t]` equals `15.0`. | MW
 `segprod[g,t,k]` | $p^k_g(t)$ | Amount of power from piecewise linear segment `k` produced by generator `g` at time `t`. For example, if cost curve for generator `g` is defined by the points `(100, 1400)`, `(110, 1600)`, `(130, 2200)` and `(135, 2400)`, and if the generator is producing 115 MW of power at time `t`, then `segprod[g,t,:]` equals `[10.0, 5.0, 0.0]`.| MW
-`reserve[r,g,t]` | $r_g(t)$ | Amount of reserve `r` provided by unit `g` at time `t`. | MW
+`reserve[g,t]` | $r_g(t)$ | Amount of reserves provided by generator `g` at time `t`. | MW
 `startup[g,t,s]` | $\delta^s_g(t)$ | True if generator `g` switches on at time `t` incurring start-up costs from start-up category `s`. | Binary


--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,4 +0,0 @@
-Sphinx==3.5.4
-sphinx-book-theme==0.1.0
-myst-parser==0.14.0
-Jinja2==3.0.2
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -12,10 +12,10 @@ Usage
 Installation
 ------------

-UnitCommitment.jl was tested and developed with [Julia 1.7](https://julialang.org/). To install Julia, please follow the [installation guide on the official Julia website](https://julialang.org/downloads/). To install UnitCommitment.jl, run the Julia interpreter, type `]` to open the package manager, then type:
+UnitCommitment.jl was tested and developed with [Julia 1.6](https://julialang.org/). To install Julia, please follow the [installation guide on the official Julia website](https://julialang.org/downloads/platform.html). To install UnitCommitment.jl, run the Julia interpreter, type `]` to open the package manager, then type:

 ```text
-pkg> add UnitCommitment@0.3
+pkg> add UnitCommitment@0.2
 ```

 To test that the package has been correctly installed, run:
--- a/9
+++ b/9
@@ -47,14 +47,7 @@ project = TOML.parsefile("Project.toml")
 manifest = TOML.parsefile("Manifest.toml")
 deps = Symbol[]
 for dep in keys(project["deps"])
-    if dep in keys(manifest)
-	# Up to Julia 1.6
-        dep_entry = manifest[dep][1]
-    else
-        # Julia 1.7+
-        dep_entry = manifest["deps"][dep][1]
-    end
-    if "path" in keys(dep_entry)
+    if "path" in keys(manifest[dep][1])
        println("  - \$(dep) [skip]")
    else
        println("  - \$(dep)")
--- a/src/UnitCommitment.jl
+++ b/src/UnitCommitment.jl
@@ -16,11 +16,9 @@ include("model/formulations/KnuOstWat2018/structs.jl")
 include("model/formulations/MorLatRam2013/structs.jl")
 include("model/formulations/PanGua2016/structs.jl")
 include("solution/methods/XavQiuWanThi2019/structs.jl")
-include("model/formulations/WanHob2016/structs.jl")

 include("import/egret.jl")
 include("instance/read.jl")
-include("instance/migrate.jl")
 include("model/build.jl")
 include("model/formulations/ArrCon2000/ramp.jl")
 include("model/formulations/base/bus.jl")
@@ -38,7 +36,6 @@ include("model/formulations/KnuOstWat2018/pwlcosts.jl")
 include("model/formulations/MorLatRam2013/ramp.jl")
 include("model/formulations/MorLatRam2013/scosts.jl")
 include("model/formulations/PanGua2016/ramp.jl")
-include("model/formulations/WanHob2016/ramp.jl")
 include("model/jumpext.jl")
 include("solution/fix.jl")
 include("solution/methods/XavQiuWanThi2019/enforce.jl")
--- a/src/instance/migrate.jl
+++ b/src/instance/migrate.jl
@@ -1,38 +0,0 @@
-# UnitCommitment.jl: Optimization Package for Security-Constrained Unit Commitment
-# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
-# Released under the modified BSD license. See COPYING.md for more details.
-
-using DataStructures
-using JSON
-
-function _migrate(json)
-    version = json["Parameters"]["Version"]
-    if version === nothing
-        error(
-            "The provided input file cannot be loaded because it does not " *
-            "specify what version of UnitCommitment.jl it was written for. " *
-            "Please modify the \"Parameters\" section of the file and include " *
-            "a \"Version\" entry. For example: {\"Parameters\":{\"Version\":\"0.3\"}}",
-        )
-    end
-    version = VersionNumber(version)
-    version >= v"0.3" || _migrate_to_v03(json)
-    return
-end
-
-function _migrate_to_v03(json)
-    # Migrate reserves
-    if json["Reserves"] !== nothing &&
-       json["Reserves"]["Spinning (MW)"] !== nothing
-        amount = json["Reserves"]["Spinning (MW)"]
-        json["Reserves"] = DefaultOrderedDict(nothing)
-        json["Reserves"]["r1"] = DefaultOrderedDict(nothing)
-        json["Reserves"]["r1"]["Type"] = "spinning"
-        json["Reserves"]["r1"]["Amount (MW)"] = amount
-        for (gen_name, gen) in json["Generators"]
-            if gen["Provides spinning reserves?"] == true
-                gen["Reserve eligibility"] = ["r1"]
-            end
-        end
-    end
-end
--- a/src/instance/read.jl
+++ b/src/instance/read.jl
@@ -8,7 +8,7 @@ using DataStructures
 using GZip
 import Base: getindex, time

-const INSTANCES_URL = "https://axavier.org/UnitCommitment.jl/0.3/instances"
+const INSTANCES_URL = "https://axavier.org/UnitCommitment.jl/0.2/instances"

 """
    read_benchmark(name::AbstractString)::UnitCommitmentInstance
@@ -80,13 +80,11 @@ function _read_json(path::String)::OrderedDict
 end

 function _from_json(json; repair = true)
-    _migrate(json)
    units = Unit[]
    buses = Bus[]
    contingencies = Contingency[]
    lines = TransmissionLine[]
    loads = PriceSensitiveLoad[]
-    reserves = Reserve[]

    function scalar(x; default = nothing)
        x !== nothing || return default
@@ -107,7 +105,6 @@ function _from_json(json; repair = true)
    name_to_bus = Dict{String,Bus}()
    name_to_line = Dict{String,TransmissionLine}()
    name_to_unit = Dict{String,Unit}()
-    name_to_reserve = Dict{String,Reserve}()

    function timeseries(x; default = nothing)
        x !== nothing || return default
@@ -120,11 +117,6 @@ function _from_json(json; repair = true)
        json["Parameters"]["Power balance penalty (\$/MW)"],
        default = [1000.0 for t in 1:T],
    )
-    # Penalty price for shortage in meeting system-wide flexiramp requirements
-    flexiramp_shortfall_penalty = timeseries(
-        json["Parameters"]["Flexiramp penalty (\$/MW)"],
-        default = [500.0 for t in 1:T],
-    )
    shortfall_penalty = timeseries(
        json["Parameters"]["Reserve shortfall penalty (\$/MW)"],
        default = [-1.0 for t in 1:T],
@@ -143,24 +135,6 @@ function _from_json(json; repair = true)
        push!(buses, bus)
    end

-    # Read reserves
-    if "Reserves" in keys(json)
-        for (reserve_name, dict) in json["Reserves"]
-            r = Reserve(
-                name = reserve_name,
-                type = lowercase(dict["Type"]),
-                amount = timeseries(dict["Amount (MW)"]),
-                units = [],
-                shortfall_penalty = scalar(
-                    dict["Shortfall penalty (\$/MW)"],
-                    default = -1,
-                ),
-            )
-            name_to_reserve[reserve_name] = r
-            push!(reserves, r)
-        end
-    end
-
    # Read units
    for (unit_name, dict) in json["Generators"]
        bus = name_to_bus[dict["Bus"]]
@@ -198,13 +172,6 @@ function _from_json(json; repair = true)
            )
        end

-        # Read reserve eligibility
-        unit_reserves = Reserve[]
-        if "Reserve eligibility" in keys(dict)
-            unit_reserves =
-                [name_to_reserve[n] for n in dict["Reserve eligibility"]]
-        end
-
        # Read and validate initial conditions
        initial_power = scalar(dict["Initial power (MW)"], default = nothing)
        initial_status = scalar(dict["Initial status (h)"], default = nothing)
@@ -238,17 +205,24 @@ function _from_json(json; repair = true)
            scalar(dict["Shutdown limit (MW)"], default = 1e6),
            initial_status,
            initial_power,
+            timeseries(
+                dict["Provides spinning reserves?"],
+                default = [true for t in 1:T],
+            ),
            startup_categories,
-            unit_reserves,
        )
        push!(bus.units, unit)
-        for r in unit_reserves
-            push!(r.units, unit)
-        end
        name_to_unit[unit_name] = unit
        push!(units, unit)
    end

+    # Read reserves
+    reserves = Reserves(zeros(T))
+    if "Reserves" in keys(json)
+        reserves.spinning =
+            timeseries(json["Reserves"]["Spinning (MW)"], default = zeros(T))
+    end
+
    # Read transmission lines
    if "Transmission lines" in keys(json)
        for (line_name, dict) in json["Transmission lines"]
@@ -321,9 +295,7 @@ function _from_json(json; repair = true)
        price_sensitive_loads_by_name = Dict(ps.name => ps for ps in loads),
        price_sensitive_loads = loads,
        reserves = reserves,
-        reserves_by_name = name_to_reserve,
        shortfall_penalty = shortfall_penalty,
-        flexiramp_shortfall_penalty = flexiramp_shortfall_penalty,
        time = T,
        units_by_name = Dict(g.name => g for g in units),
        units = units,
--- a/src/instance/structs.jl
+++ b/src/instance/structs.jl
@@ -20,14 +20,6 @@ mutable struct StartupCategory
    cost::Float64
 end

-Base.@kwdef mutable struct Reserve
-    name::String
-    type::String
-    amount::Vector{Float64}
-    units::Vector
-    shortfall_penalty::Float64
-end
-
 mutable struct Unit
    name::String
    bus::Bus
@@ -44,8 +36,8 @@ mutable struct Unit
    shutdown_limit::Float64
    initial_status::Union{Int,Nothing}
    initial_power::Union{Float64,Nothing}
+    provides_spinning_reserves::Vector{Bool}
    startup_categories::Vector{StartupCategory}
-    reserves::Vector{Reserve}
 end

 mutable struct TransmissionLine
@@ -60,6 +52,10 @@ mutable struct TransmissionLine
    flow_limit_penalty::Vector{Float64}
 end

+mutable struct Reserves
+    spinning::Vector{Float64}
+end
+
 mutable struct Contingency
    name::String
    lines::Vector{TransmissionLine}
@@ -83,10 +79,8 @@ Base.@kwdef mutable struct UnitCommitmentInstance
    power_balance_penalty::Vector{Float64}
    price_sensitive_loads_by_name::Dict{AbstractString,PriceSensitiveLoad}
    price_sensitive_loads::Vector{PriceSensitiveLoad}
-    reserves::Vector{Reserve}
-    reserves_by_name::Dict{AbstractString,Reserve}
+    reserves::Reserves
    shortfall_penalty::Vector{Float64}
-    flexiramp_shortfall_penalty::Vector{Float64}
    time::Int
    units_by_name::Dict{AbstractString,Unit}
    units::Vector{Unit}
--- a/src/model/formulations/ArrCon2000/ramp.jl
+++ b/src/model/formulations/ArrCon2000/ramp.jl
@@ -19,10 +19,10 @@ function _add_ramp_eqs!(
    RD = g.ramp_down_limit
    SU = g.startup_limit
    SD = g.shutdown_limit
+    reserve = model[:reserve]
    eq_ramp_down = _init(model, :eq_ramp_down)
    eq_ramp_up = _init(model, :eq_ramp_up)
    is_initially_on = (g.initial_status > 0)
-    reserve = _total_reserves(model, g)

    # Gar1962.ProdVars
    prod_above = model[:prod_above]
@@ -41,7 +41,7 @@ function _add_ramp_eqs!(
                    model,
                    g.min_power[t] +
                    prod_above[gn, t] +
-                    (RESERVES_WHEN_RAMP_UP ? reserve[t] : 0.0) <=
+                    (RESERVES_WHEN_RAMP_UP ? reserve[gn, t] : 0.0) <=
                    g.initial_power + RU
                )
            end
@@ -51,7 +51,7 @@ function _add_ramp_eqs!(
                prod_above[gn, t] +
                (
                    RESERVES_WHEN_START_UP || RESERVES_WHEN_RAMP_UP ?
-                    reserve[t] : 0.0
+                    reserve[gn, t] : 0.0
                )
            min_prod_last_period =
                g.min_power[t-1] * is_on[gn, t-1] + prod_above[gn, t-1]
@@ -82,7 +82,7 @@ function _add_ramp_eqs!(
                prod_above[gn, t-1] +
                (
                    RESERVES_WHEN_SHUT_DOWN || RESERVES_WHEN_RAMP_DOWN ?
-                    reserve[t-1] : 0.0
+                    reserve[gn, t-1] : 0.0
                )
            min_prod_this_period =
                g.min_power[t] * is_on[gn, t] + prod_above[gn, t]
--- a/src/model/formulations/DamKucRajAta2016/ramp.jl
+++ b/src/model/formulations/DamKucRajAta2016/ramp.jl
@@ -23,7 +23,7 @@ function _add_ramp_eqs!(
    gn = g.name
    eq_str_ramp_down = _init(model, :eq_str_ramp_down)
    eq_str_ramp_up = _init(model, :eq_str_ramp_up)
-    reserve = _total_reserves(model, g)
+    reserve = model[:reserve]

    # Gar1962.ProdVars
    prod_above = model[:prod_above]
@@ -48,8 +48,10 @@ function _add_ramp_eqs!(
        # end

        max_prod_this_period =
-            prod_above[gn, t] +
-            (RESERVES_WHEN_START_UP || RESERVES_WHEN_RAMP_UP ? reserve[t] : 0.0)
+            prod_above[gn, t] + (
+                RESERVES_WHEN_START_UP || RESERVES_WHEN_RAMP_UP ?
+                reserve[gn, t] : 0.0
+            )
        min_prod_last_period = 0.0
        if t > 1 && time_invariant
            min_prod_last_period = prod_above[gn, t-1]
@@ -86,7 +88,7 @@ function _add_ramp_eqs!(
        max_prod_last_period =
            min_prod_last_period + (
                t > 1 && (RESERVES_WHEN_SHUT_DOWN || RESERVES_WHEN_RAMP_DOWN) ?
-                reserve[t-1] : 0.0
+                reserve[gn, t-1] : 0.0
            )
        min_prod_this_period = prod_above[gn, t]
        on_last_period = 0.0
--- a/src/model/formulations/Gar1962/prod.jl
+++ b/src/model/formulations/Gar1962/prod.jl
@@ -26,7 +26,7 @@ function _add_production_limit_eqs!(
    eq_prod_limit = _init(model, :eq_prod_limit)
    is_on = model[:is_on]
    prod_above = model[:prod_above]
-    reserve = _total_reserves(model, g)
+    reserve = model[:reserve]
    gn = g.name
    for t in 1:model[:instance].time
        # Objective function terms for production costs
@@ -44,7 +44,7 @@ function _add_production_limit_eqs!(
        end
        eq_prod_limit[gn, t] = @constraint(
            model,
-            prod_above[gn, t] + reserve[t] <= power_diff * is_on[gn, t]
+            prod_above[gn, t] + reserve[gn, t] <= power_diff * is_on[gn, t]
        )
    end
 end
--- a/src/model/formulations/MorLatRam2013/ramp.jl
+++ b/src/model/formulations/MorLatRam2013/ramp.jl
@@ -22,7 +22,7 @@ function _add_ramp_eqs!(
    gn = g.name
    eq_ramp_down = _init(model, :eq_ramp_down)
    eq_ramp_up = _init(model, :eq_str_ramp_up)
-    reserve = _total_reserves(model, g)
+    reserve = model[:reserve]

    # Gar1962.ProdVars
    prod_above = model[:prod_above]
@@ -43,7 +43,7 @@ function _add_ramp_eqs!(
                    model,
                    g.min_power[t] +
                    prod_above[gn, t] +
-                    (RESERVES_WHEN_RAMP_UP ? reserve[t] : 0.0) <=
+                    (RESERVES_WHEN_RAMP_UP ? reserve[gn, t] : 0.0) <=
                    g.initial_power + RU
                )
            end
@@ -61,7 +61,7 @@ function _add_ramp_eqs!(
                    prod_above[gn, t] +
                    (
                        RESERVES_WHEN_START_UP || RESERVES_WHEN_RAMP_UP ?
-                        reserve[t] : 0.0
+                        reserve[gn, t] : 0.0
                    )
                min_prod_last_period =
                    g.min_power[t-1] * is_on[gn, t-1] + prod_above[gn, t-1]
@@ -77,7 +77,7 @@ function _add_ramp_eqs!(
                eq_ramp_up[gn, t] = @constraint(
                    model,
                    prod_above[gn, t] +
-                    (RESERVES_WHEN_RAMP_UP ? reserve[t] : 0.0) -
+                    (RESERVES_WHEN_RAMP_UP ? reserve[gn, t] : 0.0) -
                    prod_above[gn, t-1] <= RU
                )
            end
@@ -105,7 +105,7 @@ function _add_ramp_eqs!(
                    prod_above[gn, t-1] +
                    (
                        RESERVES_WHEN_SHUT_DOWN || RESERVES_WHEN_RAMP_DOWN ?
-                        reserve[t-1] : 0.0
+                        reserve[gn, t-1] : 0.0
                    )
                min_prod_this_period =
                    g.min_power[t] * is_on[gn, t] + prod_above[gn, t]
@@ -121,7 +121,7 @@ function _add_ramp_eqs!(
                eq_ramp_down[gn, t] = @constraint(
                    model,
                    prod_above[gn, t-1] +
-                    (RESERVES_WHEN_RAMP_DOWN ? reserve[t-1] : 0.0) -
+                    (RESERVES_WHEN_RAMP_DOWN ? reserve[gn, t-1] : 0.0) -
                    prod_above[gn, t] <= RD
                )
            end
--- a/src/model/formulations/PanGua2016/ramp.jl
+++ b/src/model/formulations/PanGua2016/ramp.jl
@@ -12,7 +12,7 @@ function _add_ramp_eqs!(
    # TODO: Move upper case constants to model[:instance]
    RESERVES_WHEN_SHUT_DOWN = true
    gn = g.name
-    reserve = _total_reserves(model, g)
+    reserve = model[:reserve]
    eq_str_prod_limit = _init(model, :eq_str_prod_limit)
    eq_prod_limit_ramp_up_extra_period =
        _init(model, :eq_prod_limit_ramp_up_extra_period)
@@ -56,7 +56,7 @@ function _add_ramp_eqs!(
                model,
                prod_above[gn, t] +
                g.min_power[t] * is_on[gn, t] +
-                reserve[t] <=
+                reserve[gn, t] <=
                Pbar * is_on[gn, t] -
                (t < T ? (Pbar - SD) * switch_off[gn, t+1] : 0.0) - sum(
                    (Pbar - (SU + i * RU)) * switch_on[gn, t-i] for
@@ -71,7 +71,7 @@ function _add_ramp_eqs!(
                    model,
                    prod_above[gn, t] +
                    g.min_power[t] * is_on[gn, t] +
-                    reserve[t] <=
+                    reserve[gn, t] <=
                    Pbar * is_on[gn, t] - sum(
                        (Pbar - (SU + i * RU)) * switch_on[gn, t-i] for
                        i in 0:min(UT - 1, TRU, t - 1)
@@ -88,7 +88,7 @@ function _add_ramp_eqs!(
                    model,
                    prod_above[gn, t] +
                    g.min_power[t] * is_on[gn, t] +
-                    (RESERVES_WHEN_SHUT_DOWN ? reserve[t] : 0.0) <=
+                    (RESERVES_WHEN_SHUT_DOWN ? reserve[gn, t] : 0.0) <=
                    Pbar * is_on[gn, t] - sum(
                        (Pbar - (SD + i * RD)) * switch_off[gn, t+1+i] for
                        i in 0:KSD
--- a/src/model/formulations/WanHob2016/ramp.jl
+++ b/src/model/formulations/WanHob2016/ramp.jl
@@ -1,177 +0,0 @@
-# UnitCommitmentFL.jl: Optimization Package for Security-Constrained Unit Commitment
-# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
-# Released under the modified BSD license. See COPYING.md for more details.
-
-function _add_ramp_eqs!(
-    model::JuMP.Model,
-    g::Unit,
-    ::Gar1962.ProdVars,
-    ::WanHob2016.Ramping,
-    ::Gar1962.StatusVars,
-)::Nothing
-    is_initially_on = (g.initial_status > 0)
-    SU = g.startup_limit
-    SD = g.shutdown_limit
-    RU = g.ramp_up_limit
-    RD = g.ramp_down_limit
-    gn = g.name
-    minp = g.min_power
-    maxp = g.max_power
-    initial_power = g.initial_power
-
-    is_on = model[:is_on]
-    prod_above = model[:prod_above]
-    upflexiramp = model[:upflexiramp]
-    dwflexiramp = model[:dwflexiramp]
-    mfg = model[:mfg]
-
-    if length(g.reserves) > 1
-        error("Each generator may only provide one flexiramp reserve")
-    end
-    for r in g.reserves
-        if r.type !== "flexiramp"
-            error(
-                "This formulation only supports flexiramp reserves, not $(r.type)",
-            )
-        end
-        rn = r.name
-        for t in 1:model[:instance].time
-            @constraint(
-                model,
-                prod_above[gn, t] + (is_on[gn, t] * minp[t]) <= mfg[rn, gn, t]
-            ) # Eq. (19) in Wang & Hobbs (2016)
-            @constraint(model, mfg[rn, gn, t] <= is_on[gn, t] * maxp[t]) # Eq. (22) in Wang & Hobbs (2016)
-            if t != model[:instance].time
-                @constraint(
-                    model,
-                    minp[t] * (is_on[gn, t+1] + is_on[gn, t] - 1) <=
-                    prod_above[gn, t] - dwflexiramp[rn, gn, t] +
-                    (is_on[gn, t] * minp[t])
-                ) # first inequality of Eq. (20) in Wang & Hobbs (2016)
-                @constraint(
-                    model,
-                    prod_above[gn, t] - dwflexiramp[rn, gn, t] +
-                    (is_on[gn, t] * minp[t]) <=
-                    mfg[rn, gn, t+1] + (maxp[t] * (1 - is_on[gn, t+1]))
-                ) # second inequality of Eq. (20) in Wang & Hobbs (2016)
-                @constraint(
-                    model,
-                    minp[t] * (is_on[gn, t+1] + is_on[gn, t] - 1) <=
-                    prod_above[gn, t] +
-                    upflexiramp[rn, gn, t] +
-                    (is_on[gn, t] * minp[t])
-                ) # first inequality of Eq. (21) in Wang & Hobbs (2016)
-                @constraint(
-                    model,
-                    prod_above[gn, t] +
-                    upflexiramp[rn, gn, t] +
-                    (is_on[gn, t] * minp[t]) <=
-                    mfg[rn, gn, t+1] + (maxp[t] * (1 - is_on[gn, t+1]))
-                ) # second inequality of Eq. (21) in Wang & Hobbs (2016)
-                if t != 1
-                    @constraint(
-                        model,
-                        mfg[rn, gn, t] <=
-                        prod_above[gn, t-1] +
-                        (is_on[gn, t-1] * minp[t]) +
-                        (RU * is_on[gn, t-1]) +
-                        (SU * (is_on[gn, t] - is_on[gn, t-1])) +
-                        maxp[t] * (1 - is_on[gn, t])
-                    ) # Eq. (23) in Wang & Hobbs (2016)
-                    @constraint(
-                        model,
-                        (prod_above[gn, t-1] + (is_on[gn, t-1] * minp[t])) -
-                        (prod_above[gn, t] + (is_on[gn, t] * minp[t])) <=
-                        RD * is_on[gn, t] +
-                        SD * (is_on[gn, t-1] - is_on[gn, t]) +
-                        maxp[t] * (1 - is_on[gn, t-1])
-                    ) # Eq. (25) in Wang & Hobbs (2016)
-                else
-                    @constraint(
-                        model,
-                        mfg[rn, gn, t] <=
-                        initial_power +
-                        (RU * is_initially_on) +
-                        (SU * (is_on[gn, t] - is_initially_on)) +
-                        maxp[t] * (1 - is_on[gn, t])
-                    ) # Eq. (23) in Wang & Hobbs (2016) for the first time period
-                    @constraint(
-                        model,
-                        initial_power -
-                        (prod_above[gn, t] + (is_on[gn, t] * minp[t])) <=
-                        RD * is_on[gn, t] +
-                        SD * (is_initially_on - is_on[gn, t]) +
-                        maxp[t] * (1 - is_initially_on)
-                    ) # Eq. (25) in Wang & Hobbs (2016) for the first time period
-                end
-                @constraint(
-                    model,
-                    mfg[rn, gn, t] <=
-                    (SD * (is_on[gn, t] - is_on[gn, t+1])) +
-                    (maxp[t] * is_on[gn, t+1])
-                ) # Eq. (24) in Wang & Hobbs (2016)
-                @constraint(
-                    model,
-                    -RD * is_on[gn, t+1] -
-                    SD * (is_on[gn, t] - is_on[gn, t+1]) -
-                    maxp[t] * (1 - is_on[gn, t]) <= upflexiramp[rn, gn, t]
-                ) # first inequality of Eq. (26) in Wang & Hobbs (2016)
-                @constraint(
-                    model,
-                    upflexiramp[rn, gn, t] <=
-                    RU * is_on[gn, t] +
-                    SU * (is_on[gn, t+1] - is_on[gn, t]) +
-                    maxp[t] * (1 - is_on[gn, t+1])
-                ) # second inequality of Eq. (26) in Wang & Hobbs (2016)
-                @constraint(
-                    model,
-                    -RU * is_on[gn, t] - SU * (is_on[gn, t+1] - is_on[gn, t]) -
-                    maxp[t] * (1 - is_on[gn, t+1]) <= dwflexiramp[rn, gn, t]
-                ) # first inequality of Eq. (27) in Wang & Hobbs (2016)
-                @constraint(
-                    model,
-                    dwflexiramp[rn, gn, t] <=
-                    RD * is_on[gn, t+1] +
-                    SD * (is_on[gn, t] - is_on[gn, t+1]) +
-                    maxp[t] * (1 - is_on[gn, t])
-                ) # second inequality of Eq. (27) in Wang & Hobbs (2016)
-                @constraint(
-                    model,
-                    -maxp[t] * is_on[gn, t] + minp[t] * is_on[gn, t+1] <=
-                    upflexiramp[rn, gn, t]
-                ) # first inequality of Eq. (28) in Wang & Hobbs (2016)
-                @constraint(
-                    model,
-                    upflexiramp[rn, gn, t] <= maxp[t] * is_on[gn, t+1]
-                ) # second inequality of Eq. (28) in Wang & Hobbs (2016)
-                @constraint(
-                    model,
-                    -maxp[t] * is_on[gn, t+1] <= dwflexiramp[rn, gn, t]
-                ) # first inequality of Eq. (29) in Wang & Hobbs (2016)
-                @constraint(
-                    model,
-                    dwflexiramp[rn, gn, t] <=
-                    (maxp[t] * is_on[gn, t]) - (minp[t] * is_on[gn, t+1])
-                ) # second inequality of Eq. (29) in Wang & Hobbs (2016)
-            else
-                @constraint(
-                    model,
-                    mfg[rn, gn, t] <=
-                    prod_above[gn, t-1] +
-                    (is_on[gn, t-1] * minp[t]) +
-                    (RU * is_on[gn, t-1]) +
-                    (SU * (is_on[gn, t] - is_on[gn, t-1])) +
-                    maxp[t] * (1 - is_on[gn, t])
-                ) # Eq. (23) in Wang & Hobbs (2016) for the last time period
-                @constraint(
-                    model,
-                    (prod_above[gn, t-1] + (is_on[gn, t-1] * minp[t])) -
-                    (prod_above[gn, t] + (is_on[gn, t] * minp[t])) <=
-                    RD * is_on[gn, t] +
-                    SD * (is_on[gn, t-1] - is_on[gn, t]) +
-                    maxp[t] * (1 - is_on[gn, t-1])
-                ) # Eq. (25) in Wang & Hobbs (2016) for the last time period
-            end
-        end
-    end
-end
--- a/src/model/formulations/WanHob2016/structs.jl
+++ b/src/model/formulations/WanHob2016/structs.jl
@@ -1,17 +0,0 @@
-# UnitCommitmentFL.jl: Optimization Package for Security-Constrained Unit Commitment
-# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
-# Released under the modified BSD license. See COPYING.md for more details.
-
-"""
-Formulation described in:
-    B. Wang and B. F. Hobbs, "Real-Time Markets for Flexiramp: A Stochastic 
-    Unit Commitment-Based Analysis," in IEEE Transactions on Power Systems, 
-    vol. 31, no. 2, pp. 846-860, March 2016, doi: 10.1109/TPWRS.2015.2411268.
-"""
-module WanHob2016
-
-import ..RampingFormulation
-
-struct Ramping <: RampingFormulation end
-
-end
--- a/src/model/formulations/base/system.jl
+++ b/src/model/formulations/base/system.jl
@@ -4,8 +4,7 @@

 function _add_system_wide_eqs!(model::JuMP.Model)::Nothing
    _add_net_injection_eqs!(model)
-    _add_spinning_reserve_eqs!(model)
-    _add_flexiramp_reserve_eqs!(model)
+    _add_reserve_eqs!(model)
    return
 end

@@ -28,69 +27,29 @@ function _add_net_injection_eqs!(model::JuMP.Model)::Nothing
    return
 end

-function _add_spinning_reserve_eqs!(model::JuMP.Model)::Nothing
+function _add_reserve_eqs!(model::JuMP.Model)::Nothing
+    eq_min_reserve = _init(model, :eq_min_reserve)
    instance = model[:instance]
-    eq_min_spinning_reserve = _init(model, :eq_min_spinning_reserve)
-    for r in instance.reserves
-        r.type == "spinning" || continue
-        for t in 1:instance.time
-            # Equation (68) in Kneuven et al. (2020)
-            # As in Morales-España et al. (2013a)
-            # Akin to the alternative formulation with max_power_avail
-            # from Carrión and Arroyo (2006) and Ostrowski et al. (2012)
-            eq_min_spinning_reserve[r.name, t] = @constraint(
-                model,
-                sum(model[:reserve][r.name, g.name, t] for g in r.units) +
-                model[:reserve_shortfall][r.name, t] >= r.amount[t]
-            )
+    for t in 1:instance.time
+        # Equation (68) in Kneuven et al. (2020)
+        # As in Morales-España et al. (2013a)
+        # Akin to the alternative formulation with max_power_avail
+        # from Carrión and Arroyo (2006) and Ostrowski et al. (2012)
+        shortfall_penalty = instance.shortfall_penalty[t]
+        eq_min_reserve[t] = @constraint(
+            model,
+            sum(model[:reserve][g.name, t] for g in instance.units) +
+            (shortfall_penalty >= 0 ? model[:reserve_shortfall][t] : 0.0) >=
+            instance.reserves.spinning[t]
+        )

-            # Account for shortfall contribution to objective
-            if r.shortfall_penalty >= 0
-                add_to_expression!(
-                    model[:obj],
-                    r.shortfall_penalty,
-                    model[:reserve_shortfall][r.name, t],
-                )
-            end
-        end
-    end
-    return
-end
-
-function _add_flexiramp_reserve_eqs!(model::JuMP.Model)::Nothing
-    # Note: The flexpramp requirements in Wang & Hobbs (2016) are imposed as hard constraints 
-    #       through Eq. (17) and Eq. (18). The constraints eq_min_upflexiramp and eq_min_dwflexiramp 
-    #       provided below are modified versions of Eq. (17) and Eq. (18), respectively, in that   
-    #       they include slack variables for flexiramp shortfall, which are penalized in the
-    #       objective function.
-    eq_min_upflexiramp = _init(model, :eq_min_upflexiramp)
-    eq_min_dwflexiramp = _init(model, :eq_min_dwflexiramp)
-    instance = model[:instance]
-    for r in instance.reserves
-        r.type == "flexiramp" || continue
-        for t in 1:instance.time
-            # Eq. (17) in Wang & Hobbs (2016)
-            eq_min_upflexiramp[r.name, t] = @constraint(
-                model,
-                sum(model[:upflexiramp][r.name, g.name, t] for g in r.units) + model[:upflexiramp_shortfall][r.name, t] >= r.amount[t]
-            )
-            # Eq. (18) in Wang & Hobbs (2016)
-            eq_min_dwflexiramp[r.name, t] = @constraint(
-                model,
-                sum(model[:dwflexiramp][r.name, g.name, t] for g in r.units) + model[:dwflexiramp_shortfall][r.name, t] >= r.amount[t]
-            )
-
-            # Account for flexiramp shortfall contribution to objective
-            if r.shortfall_penalty >= 0
-                add_to_expression!(
-                    model[:obj],
-                    r.shortfall_penalty,
-                    (
-                        model[:upflexiramp_shortfall][r.name, t] +
-                        model[:dwflexiramp_shortfall][r.name, t]
-                    ),
-                )
-            end
+        # Account for shortfall contribution to objective
+        if shortfall_penalty >= 0
+            add_to_expression!(
+                model[:obj],
+                shortfall_penalty,
+                model[:reserve_shortfall][t],
+            )
        end
    end
    return
--- a/src/model/formulations/base/unit.jl
+++ b/src/model/formulations/base/unit.jl
@@ -12,8 +12,7 @@ function _add_unit!(model::JuMP.Model, g::Unit, formulation::Formulation)

    # Variables
    _add_production_vars!(model, g, formulation.prod_vars)
-    _add_spinning_reserve_vars!(model, g)
-    _add_flexiramp_reserve_vars!(model, g)
+    _add_reserve_vars!(model, g)
    _add_startup_shutdown_vars!(model, g)
    _add_status_vars!(model, g, formulation.status_vars)

@@ -43,48 +42,26 @@ end

 _is_initially_on(g::Unit)::Float64 = (g.initial_status > 0 ? 1.0 : 0.0)

-function _add_spinning_reserve_vars!(model::JuMP.Model, g::Unit)::Nothing
+function _add_reserve_vars!(model::JuMP.Model, g::Unit)::Nothing
    reserve = _init(model, :reserve)
    reserve_shortfall = _init(model, :reserve_shortfall)
-    for r in g.reserves
-        r.type == "spinning" || continue
-        for t in 1:model[:instance].time
-            reserve[r.name, g.name, t] = @variable(model, lower_bound = 0)
-            if (r.name, t) ∉ keys(reserve_shortfall)
-                reserve_shortfall[r.name, t] = @variable(model, lower_bound = 0)
-                if r.shortfall_penalty < 0
-                    set_upper_bound(reserve_shortfall[r.name, t], 0.0)
-                end
-            end
+    for t in 1:model[:instance].time
+        if g.provides_spinning_reserves[t]
+            reserve[g.name, t] = @variable(model, lower_bound = 0)
+        else
+            reserve[g.name, t] = 0.0
        end
+        reserve_shortfall[t] =
+            (model[:instance].shortfall_penalty[t] >= 0) ?
+            @variable(model, lower_bound = 0) : 0.0
    end
    return
 end

-function _add_flexiramp_reserve_vars!(model::JuMP.Model, g::Unit)::Nothing
-    upflexiramp = _init(model, :upflexiramp)
-    upflexiramp_shortfall = _init(model, :upflexiramp_shortfall)
-    mfg = _init(model, :mfg)
-    dwflexiramp = _init(model, :dwflexiramp)
-    dwflexiramp_shortfall = _init(model, :dwflexiramp_shortfall)
-    for r in g.reserves
-        r.type == "flexiramp" || continue
-        for t in 1:model[:instance].time
-            # maximum feasible generation, \bar{g_{its}} in Wang & Hobbs (2016)
-            mfg[r.name, g.name, t] = @variable(model, lower_bound = 0)
-            upflexiramp[r.name, g.name, t] = @variable(model) # up-flexiramp, ur_{it} in Wang & Hobbs (2016)
-            dwflexiramp[r.name, g.name, t] = @variable(model) # down-flexiramp, dr_{it} in Wang & Hobbs (2016)
-            if (r.name, t) ∉ keys(upflexiramp_shortfall)
-                upflexiramp_shortfall[r.name, t] =
-                    @variable(model, lower_bound = 0)
-                dwflexiramp_shortfall[r.name, t] =
-                    @variable(model, lower_bound = 0)
-                if r.shortfall_penalty < 0
-                    set_upper_bound(upflexiramp_shortfall[r.name, t], 0.0)
-                    set_upper_bound(dwflexiramp_shortfall[r.name, t], 0.0)
-                end
-            end
-        end
+function _add_reserve_eqs!(model::JuMP.Model, g::Unit)::Nothing
+    reserve = model[:reserve]
+    for t in 1:model[:instance].time
+        add_to_expression!(expr_reserve[g.bus.name, t], reserve[g.name, t], 1.0)
    end
    return
 end
@@ -104,7 +81,7 @@ function _add_startup_shutdown_limit_eqs!(model::JuMP.Model, g::Unit)::Nothing
    eq_startup_limit = _init(model, :eq_startup_limit)
    is_on = model[:is_on]
    prod_above = model[:prod_above]
-    reserve = _total_reserves(model, g)
+    reserve = model[:reserve]
    switch_off = model[:switch_off]
    switch_on = model[:switch_on]
    T = model[:instance].time
@@ -112,7 +89,7 @@ function _add_startup_shutdown_limit_eqs!(model::JuMP.Model, g::Unit)::Nothing
        # Startup limit
        eq_startup_limit[g.name, t] = @constraint(
            model,
-            prod_above[g.name, t] + reserve[t] <=
+            prod_above[g.name, t] + reserve[g.name, t] <=
            (g.max_power[t] - g.min_power[t]) * is_on[g.name, t] -
            max(0, g.max_power[t] - g.startup_limit) * switch_on[g.name, t]
        )
@@ -140,7 +117,7 @@ function _add_ramp_eqs!(
    formulation::RampingFormulation,
 )::Nothing
    prod_above = model[:prod_above]
-    reserve = _total_reserves(model, g)
+    reserve = model[:reserve]
    eq_ramp_up = _init(model, :eq_ramp_up)
    eq_ramp_down = _init(model, :eq_ramp_down)
    for t in 1:model[:instance].time
@@ -149,14 +126,14 @@ function _add_ramp_eqs!(
            if _is_initially_on(g) == 1
                eq_ramp_up[g.name, t] = @constraint(
                    model,
-                    prod_above[g.name, t] + reserve[t] <=
+                    prod_above[g.name, t] + reserve[g.name, t] <=
                    (g.initial_power - g.min_power[t]) + g.ramp_up_limit
                )
            end
        else
            eq_ramp_up[g.name, t] = @constraint(
                model,
-                prod_above[g.name, t] + reserve[t] <=
+                prod_above[g.name, t] + reserve[g.name, t] <=
                prod_above[g.name, t-1] + g.ramp_up_limit
            )
        end
@@ -239,15 +216,3 @@ function _add_net_injection_eqs!(model::JuMP.Model, g::Unit)::Nothing
        )
    end
 end
-
-function _total_reserves(model, g)::Vector
-    T = model[:instance].time
-    reserve = [0.0 for _ in 1:T]
-    spinning_reserves = [r for r in g.reserves if r.type == "spinning"]
-    if !isempty(spinning_reserves)
-        reserve += [
-            sum(model[:reserve][r.name, g.name, t] for r in spinning_reserves) for t in 1:model[:instance].time
-        ]
-    end
-    return reserve
-end
--- a/src/solution/fix.jl
+++ b/src/solution/fix.jl
@@ -18,28 +18,15 @@ function fix!(model::JuMP.Model, solution::AbstractDict)::Nothing
            is_on_value = round(solution["Is on"][g.name][t])
            prod_value =
                round(solution["Production (MW)"][g.name][t], digits = 5)
+            reserve_value =
+                round(solution["Reserve (MW)"][g.name][t], digits = 5)
            JuMP.fix(is_on[g.name, t], is_on_value, force = true)
            JuMP.fix(
                prod_above[g.name, t],
                prod_value - is_on_value * g.min_power[t],
                force = true,
            )
-        end
-    end
-    for r in instance.reserves
-        r.type == "spinning" || continue
-        for g in r.units
-            for t in 1:T
-                reserve_value = round(
-                    solution["Spinning reserve (MW)"][r.name][g.name][t],
-                    digits = 5,
-                )
-                JuMP.fix(
-                    reserve[r.name, g.name, t],
-                    reserve_value,
-                    force = true,
-                )
-            end
+            JuMP.fix(reserve[g.name, t], reserve_value, force = true)
        end
    end
    return
--- a/src/solution/methods/XavQiuWanThi2019/optimize.jl
+++ b/src/solution/methods/XavQiuWanThi2019/optimize.jl
@@ -3,12 +3,13 @@
 # Released under the modified BSD license. See COPYING.md for more details.

 function optimize!(model::JuMP.Model, method::XavQiuWanThi2019.Method)::Nothing
-    if !occursin("Gurobi", JuMP.solver_name(model))
-        method.two_phase_gap = false
-    end
    function set_gap(gap)
-        JuMP.set_optimizer_attribute(model, "MIPGap", gap)
-        @info @sprintf("MIP gap tolerance set to %f", gap)
+        try
+            JuMP.set_optimizer_attribute(model, "MIPGap", gap)
+            @info @sprintf("MIP gap tolerance set to %f", gap)
+        catch
+            @warn "Could not change MIP gap tolerance"
+        end
    end
    initial_time = time()
    large_gap = false
@@ -16,6 +17,8 @@ function optimize!(model::JuMP.Model, method::XavQiuWanThi2019.Method)::Nothing
    if has_transmission && method.two_phase_gap
        set_gap(1e-2)
        large_gap = true
+    else
+        set_gap(method.gap_limit)
    end
    while true
        time_elapsed = time() - initial_time
--- a/src/solution/methods/XavQiuWanThi2019/structs.jl
+++ b/src/solution/methods/XavQiuWanThi2019/structs.jl
@@ -13,7 +13,7 @@ Lazy constraint solution method described in:
 module XavQiuWanThi2019
 import ..SolutionMethod
 """
-    mutable struct Method
+    struct Method
        time_limit::Float64
        gap_limit::Float64
        two_phase_gap::Bool
@@ -27,7 +27,7 @@ Fields
 - `time_limit`:
    the time limit over the entire optimization procedure.
 - `gap_limit`: 
-    the desired relative optimality gap. Only used when `two_phase_gap=true`.
+    the desired relative optimality gap.
 - `two_phase_gap`: 
    if true, solve the problem with large gap tolerance first, then reduce
    the gap tolerance when no further violated constraints are found.
@@ -39,7 +39,7 @@ Fields
    formulation per time period.

 """
-mutable struct Method <: SolutionMethod
+struct Method <: SolutionMethod
    time_limit::Float64
    gap_limit::Float64
    two_phase_gap::Bool
--- a/src/solution/solution.jl
+++ b/src/solution/solution.jl
@@ -50,6 +50,13 @@ function solution(model::JuMP.Model)::OrderedDict
    sol["Is on"] = timeseries(model[:is_on], instance.units)
    sol["Switch on"] = timeseries(model[:switch_on], instance.units)
    sol["Switch off"] = timeseries(model[:switch_off], instance.units)
+    sol["Reserve (MW)"] = timeseries(model[:reserve], instance.units)
+    sol["Reserve shortfall (MW)"] = OrderedDict(
+        t =>
+            (instance.shortfall_penalty[t] >= 0) ?
+            round(value(model[:reserve_shortfall][t]), digits = 5) : 0.0 for
+        t in 1:instance.time
+    )
    sol["Net injection (MW)"] =
        timeseries(model[:net_injection], instance.buses)
    sol["Load curtail (MW)"] = timeseries(model[:curtail], instance.buses)
@@ -60,47 +67,5 @@ function solution(model::JuMP.Model)::OrderedDict
        sol["Price-sensitive loads (MW)"] =
            timeseries(model[:loads], instance.price_sensitive_loads)
    end
-    sol["Spinning reserve (MW)"] = OrderedDict(
-        r.name => OrderedDict(
-            g.name => [
-                value(model[:reserve][r.name, g.name, t]) for
-                t in 1:instance.time
-            ] for g in r.units
-        ) for r in instance.reserves if r.type == "spinning"
-    )
-    sol["Spinning reserve shortfall (MW)"] = OrderedDict(
-        r.name => [
-            value(model[:reserve_shortfall][r.name, t]) for
-            t in 1:instance.time
-        ] for r in instance.reserves if r.type == "spinning"
-    )
-    sol["Up-flexiramp (MW)"] = OrderedDict(
-        r.name => OrderedDict(
-            g.name => [
-                value(model[:upflexiramp][r.name, g.name, t]) for
-                t in 1:instance.time
-            ] for g in r.units
-        ) for r in instance.reserves if r.type == "flexiramp"
-    )
-    sol["Up-flexiramp shortfall (MW)"] = OrderedDict(
-        r.name => [
-            value(model[:upflexiramp_shortfall][r.name, t]) for
-            t in 1:instance.time
-        ] for r in instance.reserves if r.type == "flexiramp"
-    )
-    sol["Down-flexiramp (MW)"] = OrderedDict(
-        r.name => OrderedDict(
-            g.name => [
-                value(model[:dwflexiramp][r.name, g.name, t]) for
-                t in 1:instance.time
-            ] for g in r.units
-        ) for r in instance.reserves if r.type == "flexiramp"
-    )
-    sol["Down-flexiramp shortfall (MW)"] = OrderedDict(
-        r.name => [
-            value(model[:upflexiramp_shortfall][r.name, t]) for
-            t in 1:instance.time
-        ] for r in instance.reserves if r.type == "flexiramp"
-    )
    return sol
 end
--- a/src/transform/randomize/XavQiuAhm2021.jl
+++ b/src/transform/randomize/XavQiuAhm2021.jl
@@ -118,12 +118,11 @@ Base.@kwdef struct Randomization
 end

 function _randomize_costs(
-    rng,
    instance::UnitCommitmentInstance,
    distribution,
 )::Nothing
    for unit in instance.units
-        α = rand(rng, distribution)
+        α = rand(distribution)
        unit.min_power_cost *= α
        for k in unit.cost_segments
            k.cost *= α
@@ -136,11 +135,10 @@ function _randomize_costs(
 end

 function _randomize_load_share(
-    rng,
    instance::UnitCommitmentInstance,
    distribution,
 )::Nothing
-    α = rand(rng, distribution, length(instance.buses))
+    α = rand(distribution, length(instance.buses))
    for t in 1:instance.time
        total = sum(bus.load[t] for bus in instance.buses)
        den = sum(
@@ -155,7 +153,6 @@ function _randomize_load_share(
 end

 function _randomize_load_profile(
-    rng,
    instance::UnitCommitmentInstance,
    params::Randomization,
 )::Nothing
@@ -164,13 +161,12 @@ function _randomize_load_profile(
    for t in 2:instance.time
        idx = (t - 1) % length(params.load_profile_mu) + 1
        gamma = rand(
-            rng,
            Normal(params.load_profile_mu[idx], params.load_profile_sigma[idx]),
        )
        push!(system_load, system_load[t-1] * gamma)
    end
    capacity = sum(maximum(u.max_power) for u in instance.units)
-    peak_load = rand(rng, params.peak_load) * capacity
+    peak_load = rand(params.peak_load) * capacity
    system_load = system_load ./ maximum(system_load) .* peak_load

    # Scale bus loads to match the new system load
@@ -190,24 +186,22 @@ end
    function randomize!(
        instance::UnitCommitment.UnitCommitmentInstance,
        method::XavQiuAhm2021.Randomization,
-        rng = MersenneTwister(),
    )::Nothing

 Randomize costs and loads based on the method described in XavQiuAhm2021.
 """
 function randomize!(
    instance::UnitCommitment.UnitCommitmentInstance,
-    method::XavQiuAhm2021.Randomization;
-    rng = MersenneTwister(),
+    method::XavQiuAhm2021.Randomization,
 )::Nothing
    if method.randomize_costs
-        XavQiuAhm2021._randomize_costs(rng, instance, method.cost)
+        XavQiuAhm2021._randomize_costs(instance, method.cost)
    end
    if method.randomize_load_share
-        XavQiuAhm2021._randomize_load_share(rng, instance, method.load_share)
+        XavQiuAhm2021._randomize_load_share(instance, method.load_share)
    end
    if method.randomize_load_profile
-        XavQiuAhm2021._randomize_load_profile(rng, instance, method)
+        XavQiuAhm2021._randomize_load_profile(instance, method)
    end
    return
 end
--- a/src/transform/slice.jl
+++ b/src/transform/slice.jl
@@ -24,14 +24,13 @@ function slice(
    modified = deepcopy(instance)
    modified.time = length(range)
    modified.power_balance_penalty = modified.power_balance_penalty[range]
-    for r in modified.reserves
-        r.amount = r.amount[range]
-    end
+    modified.reserves.spinning = modified.reserves.spinning[range]
    for u in modified.units
        u.max_power = u.max_power[range]
        u.min_power = u.min_power[range]
        u.must_run = u.must_run[range]
        u.min_power_cost = u.min_power_cost[range]
+        u.provides_spinning_reserves = u.provides_spinning_reserves[range]
        for s in u.cost_segments
            s.mw = s.mw[range]
            s.cost = s.cost[range]
--- a/src/utils/log.jl
+++ b/src/utils/log.jl
@@ -5,11 +5,20 @@
 import Logging: min_enabled_level, shouldlog, handle_message
 using Base.CoreLogging, Logging, Printf

-Base.@kwdef struct TimeLogger <: AbstractLogger
+struct TimeLogger <: AbstractLogger
    initial_time::Float64
-    file::Union{Nothing,IOStream} = nothing
-    screen_log_level::Any = CoreLogging.Info
-    io_log_level::Any = CoreLogging.Info
+    file::Union{Nothing,IOStream}
+    screen_log_level::Any
+    io_log_level::Any
+end
+
+function TimeLogger(;
+    initial_time::Float64,
+    file::Union{Nothing,IOStream} = nothing,
+    screen_log_level = CoreLogging.Info,
+    io_log_level = CoreLogging.Info,
+)::TimeLogger
+    return TimeLogger(initial_time, file, screen_log_level, io_log_level)
 end

 min_enabled_level(logger::TimeLogger) = logger.io_log_level
@@ -52,9 +61,7 @@ function handle_message(
    end
 end

-function _setup_logger(; level = CoreLogging.Info)
+function _setup_logger()
    initial_time = time()
-    return global_logger(
-        TimeLogger(initial_time = initial_time, screen_log_level = level),
-    )
+    return global_logger(TimeLogger(initial_time = initial_time))
 end
--- a/src/validation/validate.jl
+++ b/src/validation/validate.jl
@@ -40,19 +40,12 @@ function validate(
    return true
 end

-function _validate_units(instance::UnitCommitmentInstance, solution; tol = 0.01)
+function _validate_units(instance, solution; tol = 0.01)
    err_count = 0

    for unit in instance.units
        production = solution["Production (MW)"][unit.name]
-        reserve = [0.0 for _ in 1:instance.time]
-        spinning_reserves = [r for r in unit.reserves if r.type == "spinning"]
-        if !isempty(spinning_reserves)
-            reserve += sum(
-                solution["Spinning reserve (MW)"][r.name][unit.name] for
-                r in spinning_reserves
-            )
-        end
+        reserve = solution["Reserve (MW)"][unit.name]
        actual_production_cost = solution["Production cost (\$)"][unit.name]
        actual_startup_cost = solution["Startup cost (\$)"][unit.name]
        is_on = bin(solution["Is on"][unit.name])
@@ -106,18 +99,13 @@ function _validate_units(instance::UnitCommitmentInstance, solution; tol = 0.01)
            end

            # Verify reserve eligibility
-            for r in instance.reserves
-                if r.type == "spinning"
-                    if unit ∉ r.units &&
-                       (unit in keys(solution["Spinning reserve (MW)"][r.name]))
-                        @error @sprintf(
-                            "Unit %s is not eligible to provide reserve %s",
-                            unit.name,
-                            r.name,
-                        )
-                        err_count += 1
-                    end
-                end
+            if !unit.provides_spinning_reserves[t] && reserve[t] > tol
+                @error @sprintf(
+                    "Unit %s is not eligible to provide spinning reserves at time %d",
+                    unit.name,
+                    t
+                )
+                err_count += 1
            end

            # If unit is on, must produce at least its minimum power
@@ -149,11 +137,9 @@ function _validate_units(instance::UnitCommitmentInstance, solution; tol = 0.01)
            # If unit is off, must produce zero
            if !is_on[t] && production[t] + reserve[t] > tol
                @error @sprintf(
-                    "Unit %s produces power at time %d while off (%.2f + %.2f > 0)",
+                    "Unit %s produces power at time %d while off",
                    unit.name,
-                    t,
-                    production[t],
-                    reserve[t],
+                    t
                )
                err_count += 1
            end
@@ -335,66 +321,22 @@ function _validate_reserve_and_demand(instance, solution, tol = 0.01)
            err_count += 1
        end

-        # Verify reserves
-        for r in instance.reserves
-            if r.type == "spinning"
-                provided = sum(
-                    solution["Spinning reserve (MW)"][r.name][g.name][t] for
-                    g in r.units
-                )
-                shortfall =
-                    solution["Spinning reserve shortfall (MW)"][r.name][t]
-                required = r.amount[t]
+        # Verify spinning reserves
+        reserve =
+            sum(solution["Reserve (MW)"][g.name][t] for g in instance.units)
+        reserve_shortfall =
+            (instance.shortfall_penalty[t] >= 0) ?
+            solution["Reserve shortfall (MW)"][t] : 0

-                if provided + shortfall < required - tol
-                    @error @sprintf(
-                        "Insufficient reserve %s at time %d (%.2f + %.2f < %.2f)",
-                        r.name,
-                        t,
-                        provided,
-                        shortfall,
-                        required,
-                    )
-                end
-            elseif r.type == "flexiramp"
-                upflexiramp = sum(
-                    solution["Up-flexiramp (MW)"][r.name][g.name][t] for
-                    g in r.units
-                )
-                upflexiramp_shortfall =
-                    solution["Up-flexiramp shortfall (MW)"][r.name][t]
-
-                if upflexiramp + upflexiramp_shortfall < r.amount[t] - tol
-                    @error @sprintf(
-                        "Insufficient up-flexiramp at time %d (%.2f + %.2f < %.2f)",
-                        t,
-                        upflexiramp,
-                        upflexiramp_shortfall,
-                        r.amount[t],
-                    )
-                    err_count += 1
-                end
-
-                dwflexiramp = sum(
-                    solution["Down-flexiramp (MW)"][r.name][g.name][t] for
-                    g in r.units
-                )
-                dwflexiramp_shortfall =
-                    solution["Down-flexiramp shortfall (MW)"][r.name][t]
-
-                if dwflexiramp + dwflexiramp_shortfall < r.amount[t] - tol
-                    @error @sprintf(
-                        "Insufficient down-flexiramp at time %d (%.2f + %.2f < %.2f)",
-                        t,
-                        dwflexiramp,
-                        dwflexiramp_shortfall,
-                        r.amount[t],
-                    )
-                    err_count += 1
-                end
-            else
-                error("Unknown reserve type: $(r.type)")
-            end
+        if reserve + reserve_shortfall < instance.reserves.spinning[t] - tol
+            @error @sprintf(
+                "Insufficient spinning reserves at time %d (%.2f + %.2f should be %.2f)",
+                t,
+                reserve,
+                reserve_shortfall,
+                instance.reserves.spinning[t],
+            )
+            err_count += 1
        end
    end

--- a/test/Project.toml
+++ b/test/Project.toml
@@ -3,6 +3,7 @@ Cbc = "9961bab8-2fa3-5c5a-9d89-47fab24efd76"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 GZip = "92fee26a-97fe-5a0c-ad85-20a5f3185b63"
+Gurobi = "2e9cd046-0924-5485-92f1-d5272153d98b"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -19,7 +20,7 @@ DataStructures = "0.18"
 Distributions = "0.25"
 GZip = "0.5"
 JSON = "0.21"
-JuMP = "1"
-MathOptInterface = "1"
+JuMP = "0.21"
+MathOptInterface = "0.9"
 PackageCompiler = "1"
 julia = "1"
--- a/test/fixtures/case118-initcond.json.gz
+++ b/test/fixtures/case118-initcond.json.gz
--- a/test/fixtures/case14-flex.json.gz
+++ b/test/fixtures/case14-flex.json.gz
--- a/test/fixtures/case14-sub-hourly.json.gz
+++ b/test/fixtures/case14-sub-hourly.json.gz
--- a/test/fixtures/case14.json.gz
+++ b/test/fixtures/case14.json.gz
--- a/test/fixtures/ucjl-0.2.json.gz
+++ b/test/fixtures/ucjl-0.2.json.gz
--- a/test/fixtures/ucjl-0.3.json.gz
+++ b/test/fixtures/ucjl-0.3.json.gz
--- a/test/import/egret_test.jl
+++ b/test/import/egret_test.jl
@@ -4,9 +4,12 @@

 using UnitCommitment

+basedir = @__DIR__
+
@testset "read_egret_solution" begin
-    solution =
-        UnitCommitment.read_egret_solution("$FIXTURES/egret_output.json.gz")
+    solution = UnitCommitment.read_egret_solution(
+        "$basedir/../fixtures/egret_output.json.gz",
+    )
    for attr in ["Is on", "Production (MW)", "Production cost (\$)"]
        @test attr in keys(solution)
        @test "115_STEAM_1" in keys(solution[attr])
--- a/test/instance/migrate_test.jl
+++ b/test/instance/migrate_test.jl
@@ -1,18 +0,0 @@
-# UnitCommitment.jl: Optimization Package for Security-Constrained Unit Commitment
-# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
-# Released under the modified BSD license. See COPYING.md for more details.
-
-using UnitCommitment, LinearAlgebra, Cbc, JuMP, JSON, GZip
-
-@testset "read v0.2" begin
-    instance = UnitCommitment.read("$FIXTURES/ucjl-0.2.json.gz")
-    @test length(instance.reserves_by_name["r1"].amount) == 4
-    @test instance.units_by_name["g2"].reserves[1].name == "r1"
-end
-
-@testset "read v0.3" begin
-    instance = UnitCommitment.read("$FIXTURES/ucjl-0.3.json.gz")
-    @test length(instance.units) == 6
-    @test length(instance.buses) == 14
-    @test length(instance.lines) == 20
-end
--- a/test/instance/read_test.jl
+++ b/test/instance/read_test.jl
@@ -5,7 +5,7 @@
 using UnitCommitment, LinearAlgebra, Cbc, JuMP, JSON, GZip

@testset "read_benchmark" begin
-    instance = UnitCommitment.read("$FIXTURES/case14.json.gz")
+    instance = UnitCommitment.read_benchmark("test/case14")

    @test length(instance.lines) == 20
    @test length(instance.buses) == 14
@@ -37,11 +37,6 @@ using UnitCommitment, LinearAlgebra, Cbc, JuMP, JSON, GZip
    @test instance.buses[9].load == [35.36638, 33.25495, 31.67138, 31.14353]
    @test instance.buses_by_name["b9"].name == "b9"

-    @test instance.reserves[1].name == "r1"
-    @test instance.reserves[1].type == "spinning"
-    @test instance.reserves[1].amount == [100.0, 100.0, 100.0, 100.0]
-    @test instance.reserves_by_name["r1"].name == "r1"
-
    unit = instance.units[1]
    @test unit.name == "g1"
    @test unit.bus.name == "b1"
@@ -53,6 +48,7 @@ using UnitCommitment, LinearAlgebra, Cbc, JuMP, JSON, GZip
    @test unit.min_power_cost == [1400.0 for t in 1:4]
    @test unit.min_uptime == 1
    @test unit.min_downtime == 1
+    @test unit.provides_spinning_reserves == [true for t in 1:4]
    for t in 1:1
        @test unit.cost_segments[1].mw[t] == 10.0
        @test unit.cost_segments[2].mw[t] == 20.0
@@ -68,13 +64,11 @@ using UnitCommitment, LinearAlgebra, Cbc, JuMP, JSON, GZip
    @test unit.startup_categories[1].cost == 1000.0
    @test unit.startup_categories[2].cost == 1500.0
    @test unit.startup_categories[3].cost == 2000.0
-    @test length(unit.reserves) == 0
    @test instance.units_by_name["g1"].name == "g1"

    unit = instance.units[2]
    @test unit.name == "g2"
    @test unit.must_run == [false for t in 1:4]
-    @test length(unit.reserves) == 1

    unit = instance.units[3]
    @test unit.name == "g3"
@@ -87,6 +81,7 @@ using UnitCommitment, LinearAlgebra, Cbc, JuMP, JSON, GZip
    @test unit.min_power_cost == [0.0 for t in 1:4]
    @test unit.min_uptime == 1
    @test unit.min_downtime == 1
+    @test unit.provides_spinning_reserves == [true for t in 1:4]
    for t in 1:4
        @test unit.cost_segments[1].mw[t] ≈ 33
        @test unit.cost_segments[2].mw[t] ≈ 33
@@ -95,8 +90,8 @@ using UnitCommitment, LinearAlgebra, Cbc, JuMP, JSON, GZip
        @test unit.cost_segments[2].cost[t] ≈ 38.04
        @test unit.cost_segments[3].cost[t] ≈ 44.77853
    end
-    @test length(unit.reserves) == 1
-    @test unit.reserves[1].name == "r1"
+
+    @test instance.reserves.spinning == zeros(4)

    @test instance.contingencies[1].lines == [instance.lines[1]]
    @test instance.contingencies[1].units == []
@@ -112,7 +107,7 @@ using UnitCommitment, LinearAlgebra, Cbc, JuMP, JSON, GZip
 end

@testset "read_benchmark sub-hourly" begin
-    instance = UnitCommitment.read("$FIXTURES/case14-sub-hourly.json.gz")
+    instance = UnitCommitment.read_benchmark("test/case14-sub-hourly")
    @test instance.time == 4
    unit = instance.units[1]
    @test unit.name == "g1"
--- a/test/model/formulations_test.jl
+++ b/test/model/formulations_test.jl
@@ -4,8 +4,6 @@

 using UnitCommitment
 using JuMP
-using Cbc
-using JSON
 import UnitCommitment:
    ArrCon2000,
    CarArr2006,
@@ -15,70 +13,62 @@ import UnitCommitment:
    KnuOstWat2018,
    MorLatRam2013,
    PanGua2016,
-    XavQiuWanThi2019,
-    WanHob2016
+    XavQiuWanThi2019

-function _test(
-    formulation::Formulation;
-    instances = ["case14"],
-    dump::Bool = false,
-)::Nothing
-    for instance_name in instances
-        instance = UnitCommitment.read("$(FIXTURES)/$(instance_name).json.gz")
+if ENABLE_LARGE_TESTS
+    using Gurobi
+end
+
+function _small_test(formulation::Formulation)::Nothing
+    instances = ["matpower/case118/2017-02-01", "test/case14"]
+    for instance in instances
+        # Should not crash
+        UnitCommitment.build_model(
+            instance = UnitCommitment.read_benchmark(instance),
+            formulation = formulation,
+        )
+    end
+    return
+end
+
+function _large_test(formulation::Formulation)::Nothing
+    instances = ["pglib-uc/ca/Scenario400_reserves_1"]
+    for instance in instances
+        instance = UnitCommitment.read_benchmark(instance)
        model = UnitCommitment.build_model(
            instance = instance,
            formulation = formulation,
-            optimizer = Cbc.Optimizer,
-            variable_names = true,
+            optimizer = Gurobi.Optimizer,
+        )
+        UnitCommitment.optimize!(
+            model,
+            XavQiuWanThi2019.Method(two_phase_gap = false, gap_limit = 0.1),
        )
-        set_silent(model)
-        UnitCommitment.optimize!(model)
        solution = UnitCommitment.solution(model)
-        if dump
-            open("/tmp/ucjl.json", "w") do f
-                return write(f, JSON.json(solution, 2))
-            end
-            write_to_file(model, "/tmp/ucjl.lp")
-        end
        @test UnitCommitment.validate(instance, solution)
    end
    return
 end

-@testset "formulations" begin
-    @testset "default" begin
-        _test(Formulation())
-    end
-    @testset "ArrCon2000" begin
-        _test(Formulation(ramping = ArrCon2000.Ramping()))
-    end
-    @testset "DamKucRajAta2016" begin
-        _test(Formulation(ramping = DamKucRajAta2016.Ramping()))
-    end
-    @testset "MorLatRam2013" begin
-        _test(
-            Formulation(
-                ramping = MorLatRam2013.Ramping(),
-                startup_costs = MorLatRam2013.StartupCosts(),
-            ),
-        )
-    end
-    @testset "PanGua2016" begin
-        _test(Formulation(ramping = PanGua2016.Ramping()))
-    end
-    @testset "Gar1962" begin
-        _test(Formulation(pwl_costs = Gar1962.PwlCosts()))
-    end
-    @testset "CarArr2006" begin
-        _test(Formulation(pwl_costs = CarArr2006.PwlCosts()))
-    end
-    @testset "KnuOstWat2018" begin
-        _test(Formulation(pwl_costs = KnuOstWat2018.PwlCosts()))
-    end
-    @testset "WanHob2016" begin
-        _test(
-            Formulation(ramping = WanHob2016.Ramping()),
-            instances = ["case14-flex"],
-        )
+function _test(formulation::Formulation)::Nothing
+    _small_test(formulation)
+    if ENABLE_LARGE_TESTS
+        _large_test(formulation)
    end
 end
+
+@testset "formulations" begin
+    _test(Formulation())
+    _test(Formulation(ramping = ArrCon2000.Ramping()))
+    # _test(Formulation(ramping = DamKucRajAta2016.Ramping()))
+    _test(
+        Formulation(
+            ramping = MorLatRam2013.Ramping(),
+            startup_costs = MorLatRam2013.StartupCosts(),
+        ),
+    )
+    _test(Formulation(ramping = PanGua2016.Ramping()))
+    _test(Formulation(pwl_costs = Gar1962.PwlCosts()))
+    _test(Formulation(pwl_costs = CarArr2006.PwlCosts()))
+    _test(Formulation(pwl_costs = KnuOstWat2018.PwlCosts()))
+end
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -6,9 +6,9 @@ using Test
 using UnitCommitment

 push!(Base.LOAD_PATH, @__DIR__)
-UnitCommitment._setup_logger(level = Base.CoreLogging.Error)
+UnitCommitment._setup_logger()

-FIXTURES = "$(@__DIR__)/fixtures"
+const ENABLE_LARGE_TESTS = ("UCJL_LARGE_TESTS" in keys(ENV))

@testset "UnitCommitment" begin
    include("usage.jl")
@@ -17,17 +17,14 @@ FIXTURES = "$(@__DIR__)/fixtures"
    end
    @testset "instance" begin
        include("instance/read_test.jl")
-        include("instance/migrate_test.jl")
    end
    @testset "model" begin
        include("model/formulations_test.jl")
    end
-    @testset "solution" begin
-        @testset "XavQiuWanThi19" begin
-            include("solution/methods/XavQiuWanThi19/filter_test.jl")
-            include("solution/methods/XavQiuWanThi19/find_test.jl")
-            include("solution/methods/XavQiuWanThi19/sensitivity_test.jl")
-        end
+    @testset "XavQiuWanThi19" begin
+        include("solution/methods/XavQiuWanThi19/filter_test.jl")
+        include("solution/methods/XavQiuWanThi19/find_test.jl")
+        include("solution/methods/XavQiuWanThi19/sensitivity_test.jl")
    end
    @testset "transform" begin
        include("transform/initcond_test.jl")
--- a/test/solution/methods/XavQiuWanThi19/filter_test.jl
+++ b/test/solution/methods/XavQiuWanThi19/filter_test.jl
@@ -6,7 +6,7 @@ using UnitCommitment, Test, LinearAlgebra
 import UnitCommitment: _Violation, _offer, _query

@testset "_ViolationFilter" begin
-    instance = UnitCommitment.read("$FIXTURES/case14.json.gz")
+    instance = UnitCommitment.read_benchmark("test/case14")
    filter = UnitCommitment._ViolationFilter(max_per_line = 1, max_total = 2)

    _offer(
--- a/test/solution/methods/XavQiuWanThi19/find_test.jl
+++ b/test/solution/methods/XavQiuWanThi19/find_test.jl
@@ -6,7 +6,7 @@ using UnitCommitment, Test, LinearAlgebra
 import UnitCommitment: _Violation, _offer, _query

@testset "find_violations" begin
-    instance = UnitCommitment.read("$FIXTURES/case14.json.gz")
+    instance = UnitCommitment.read_benchmark("test/case14")
    for line in instance.lines, t in 1:instance.time
        line.normal_flow_limit[t] = 1.0
        line.emergency_flow_limit[t] = 1.0
--- a/test/solution/methods/XavQiuWanThi19/sensitivity_test.jl
+++ b/test/solution/methods/XavQiuWanThi19/sensitivity_test.jl
@@ -5,7 +5,7 @@
 using UnitCommitment, Test, LinearAlgebra

@testset "_susceptance_matrix" begin
-    instance = UnitCommitment.read("$FIXTURES/case14.json.gz")
+    instance = UnitCommitment.read_benchmark("test/case14")
    actual = UnitCommitment._susceptance_matrix(instance.lines)
    @test size(actual) == (20, 20)
    expected = Diagonal([
@@ -34,7 +34,7 @@ using UnitCommitment, Test, LinearAlgebra
 end

@testset "_reduced_incidence_matrix" begin
-    instance = UnitCommitment.read("$FIXTURES/case14.json.gz")
+    instance = UnitCommitment.read_benchmark("test/case14")
    actual = UnitCommitment._reduced_incidence_matrix(
        lines = instance.lines,
        buses = instance.buses,
@@ -81,7 +81,7 @@ end
 end

@testset "_injection_shift_factors" begin
-    instance = UnitCommitment.read("$FIXTURES/case14.json.gz")
+    instance = UnitCommitment.read_benchmark("test/case14")
    actual = UnitCommitment._injection_shift_factors(
        lines = instance.lines,
        buses = instance.buses,
@@ -112,7 +112,7 @@ end
 end

@testset "_line_outage_factors" begin
-    instance = UnitCommitment.read("$FIXTURES/case14.json.gz")
+    instance = UnitCommitment.read_benchmark("test/case14")
    isf_before = UnitCommitment._injection_shift_factors(
        lines = instance.lines,
        buses = instance.buses,
--- a/test/transform/initcond_test.jl
+++ b/test/transform/initcond_test.jl
@@ -4,9 +4,12 @@

 using UnitCommitment, Cbc, JuMP

+basedir = @__DIR__
+
@testset "generate_initial_conditions!" begin
    # Load instance
-    instance = UnitCommitment.read("$FIXTURES/case118-initcond.json.gz")
+    instance =
+        UnitCommitment.read("$basedir/../fixtures/case118-initcond.json.gz")
    optimizer = optimizer_with_attributes(Cbc.Optimizer, "logLevel" => 0)

    # All units should have unknown initial conditions
--- a/test/transform/randomize/XavQiuAhm2021_test.jl
+++ b/test/transform/randomize/XavQiuAhm2021_test.jl
@@ -6,7 +6,6 @@ import Random
 import UnitCommitment: XavQiuAhm2021

 using Distributions
-using Random
 using UnitCommitment, Cbc, JuMP

 get_instance() = UnitCommitment.read_benchmark("matpower/case118/2017-02-01")
@@ -28,10 +27,10 @@ test_approx(x, y) = @test isapprox(x, y, atol = 1e-3)
        prev_system_load = system_load(instance)
        test_approx(bus.load[1] / prev_system_load[1], 0.012)

+        Random.seed!(42)
        randomize!(
            instance,
            XavQiuAhm2021.Randomization(randomize_load_profile = false),
-            rng = MersenneTwister(42),
        )

        # Check randomized costs
@@ -54,11 +53,8 @@ test_approx(x, y) = @test isapprox(x, y, atol = 1e-3)
        @test round.(system_load(instance), digits = 1)[1:8] ≈
              [3059.5, 2983.2, 2937.5, 2953.9, 3073.1, 3356.4, 4068.5, 4018.8]

-        randomize!(
-            instance,
-            XavQiuAhm2021.Randomization(),
-            rng = MersenneTwister(42),
-        )
+        Random.seed!(42)
+        randomize!(instance, XavQiuAhm2021.Randomization())

        # Check randomized load profile
        @test round.(system_load(instance), digits = 1)[1:8] ≈
--- a/test/transform/slice_test.jl
+++ b/test/transform/slice_test.jl
@@ -5,18 +5,19 @@
 using UnitCommitment, LinearAlgebra, Cbc, JuMP, JSON, GZip

@testset "slice" begin
-    instance = UnitCommitment.read("$FIXTURES/case14.json.gz")
+    instance = UnitCommitment.read_benchmark("test/case14")
    modified = UnitCommitment.slice(instance, 1:2)

    # Should update all time-dependent fields
    @test modified.time == 2
    @test length(modified.power_balance_penalty) == 2
-    @test length(modified.reserves_by_name["r1"].amount) == 2
+    @test length(modified.reserves.spinning) == 2
    for u in modified.units
        @test length(u.max_power) == 2
        @test length(u.min_power) == 2
        @test length(u.must_run) == 2
        @test length(u.min_power_cost) == 2
+        @test length(u.provides_spinning_reserves) == 2
        for s in u.cost_segments
            @test length(s.mw) == 2
            @test length(s.cost) == 2
@@ -34,6 +35,7 @@ using UnitCommitment, LinearAlgebra, Cbc, JuMP, JSON, GZip
        @test length(ps.demand) == 2
        @test length(ps.revenue) == 2
    end
+
    # Should be able to build model without errors
    optimizer = optimizer_with_attributes(Cbc.Optimizer, "logLevel" => 0)
    model = UnitCommitment.build_model(
--- a/test/usage.jl
+++ b/test/usage.jl
@@ -4,8 +4,8 @@

 using UnitCommitment, LinearAlgebra, Cbc, JuMP, JSON

-@testset "usage" begin
-    instance = UnitCommitment.read("$FIXTURES/case14.json.gz")
+@testset "build_model" begin
+    instance = UnitCommitment.read_benchmark("test/case14")
    for line in instance.lines, t in 1:4
        line.normal_flow_limit[t] = 10.0
    end
--- a/test/validation/repair_test.jl
+++ b/test/validation/repair_test.jl
@@ -4,9 +4,11 @@

 using UnitCommitment, JSON, GZip, DataStructures

+basedir = @__DIR__
+
 function parse_case14()
    return JSON.parse(
-        GZip.gzopen("$FIXTURES/case14.json.gz"),
+        GZip.gzopen("$basedir/../../instances/test/case14.json.gz"),
        dicttype = () -> DefaultOrderedDict(nothing),
    )
 end