Fix some merge issues

Merge branch 'dev' into akazachk/formulations
Implement multiple formulations
2025-12-06 08:18:51 -06:00 · 2020-11-20 12:17:59 -06:00 · 2020-11-20 10:55:48 -06:00 · 2020-11-20 10:52:23 -06:00
371 changed files with 7258 additions and 12295 deletions
--- a/.JuliaFormatter.toml
+++ b/.JuliaFormatter.toml
@@ -1,5 +0,0 @@
-always_for_in = true
-always_use_return = true
-margin = 80
-remove_extra_newlines = true
-short_to_long_function_def = true
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,25 +0,0 @@
---
-name: Bug report
-about: Something is broken in the package
-title: ''
-labels: ''
-assignees: ''
-
---
-
-## Description
-
-A clear and concise description of what the bug is.
-
-## Steps to Reproduce
-
-Please describe how can the developers reproduce the problem in their own computers. Code snippets and sample input files are specially helpful. For example:
-
-1. Install the package
-2. Run the code below with the attached input file...
-3. The following error appears...
-
-## System Information
- - Operating System: [e.g. Ubuntu 20.04]
- - Julia version: [e.g. 1.4]
- - Package version: [e.g. 0.0.1]
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Feature Request
-    url: https://github.com/ANL-CEEESA/UnitCommitment.jl/discussions/categories/feature-requests
-    about:  Submit ideas for new features and small enhancements
-  - name: Help & FAQ
-    url: https://github.com/ANL-CEEESA/UnitCommitment.jl/discussions/categories/help-faq
-    about: Ask questions about the package and get help from the community
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -0,0 +1,28 @@
+name: Benchmark
+on: push
+jobs:
+  benchmark:
+    runs-on: [self-hosted, benchmark]
+    if: "contains(github.event.head_commit.message, '[benchmark]')"
+    timeout-minutes: 10080
+    steps:
+    - uses: actions/checkout@v1
+    - name: Benchmark
+      run: |
+        julia --project=@. -e 'using Pkg; Pkg.instantiate()'
+        make build/sysimage.so
+        make -C benchmark clean
+        make -C benchmark -kj4
+        make -C benchmark tables
+        make -C benchmark clean-mps clean-sol
+    - name: Upload logs
+      uses: actions/upload-artifact@v2
+      with:
+        name: Logs
+        path: benchmark/results/*
+    - name: Upload tables & charts
+      uses: actions/upload-artifact@v2
+      with:
+        name: Tables
+        path: benchmark/tables/*
+
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,28 +0,0 @@
-name: lint
-on:
-  push:
-  pull_request:
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: julia-actions/setup-julia@latest
-        with:
-          version: '1'
-      - uses: actions/checkout@v1
-      - name: Format check
-        shell: julia --color=yes {0}
-        run: |
-          using Pkg
-          Pkg.add(PackageSpec(name="JuliaFormatter", version="0.14.4"))
-          using JuliaFormatter
-          format("src", verbose=true)
-          format("test", verbose=true)
-          format("benchmark", verbose=true)
-          out = String(read(Cmd(`git diff`)))
-          if isempty(out)
-              exit(0)
-          end
-          @error "Some files have not been formatted !!!"
-          write(stdout, out)
-          exit(1)
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,35 +1,28 @@
-name: Build & Test
+name: Tests
 on:
  push:
+    paths:
+      - '**.jl'
+      - '**.toml'
  pull_request:
-  schedule:
-    - cron: '45 10 * * *'
+    paths:
+      - '**.jl'
+      - '**.toml'
 jobs:
  test:
-    name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        version: ['1.6', '1.7', '1.8', '1.9']
-        os:
-          - ubuntu-latest
-        arch:
-          - x64
+        julia-version: ['1.3', '1.4', '1']
+        julia-arch: [x64, x86]
+        os: [ubuntu-latest, windows-latest, macOS-latest]
+        exclude:
+          - os: macOS-latest
+            julia-arch: x86
    steps:
      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1
+      - uses: julia-actions/setup-julia@latest
        with:
-          version: ${{ matrix.version }}
-          arch: ${{ matrix.arch }}
-      - name: Run tests
-        shell: julia --color=yes --project=test {0}
-        run: |
-          using Pkg
-          Pkg.develop(path=".")
-          Pkg.update()
-          using UnitCommitmentT
-          try
-            runtests()
-          catch
-            exit(1)
-          end
+          version: ${{ matrix.julia-version }}
+      - uses: julia-actions/julia-buildpkg@latest
+      - uses: julia-actions/julia-runtest@latest
--- a/.gitignore
+++ b/.gitignore
@@ -1,38 +1,16 @@
 *.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
--- a/.zenodo.json
+++ b/.zenodo.json
@@ -1,27 +0,0 @@
-{
-    "creators": [
-      {
-        "orcid": "0000-0002-5022-9802",
-        "affiliation": "Argonne National Laboratory",
-        "name": "Santos Xavier, Alinson"
-      },
-      {
-        "affiliation": "University of Florida",
-        "name": "Kazachkov, Aleksandr M."
-      },
-      {
-        "affiliation": "Technische Universität Berlin",
-        "name": "Yurdakul, Ogün"
-      },
-      {
-        "affiliation": "Purdue University",
-        "name": "He, Jun"
-      },
-      {
-        "affiliation": "Argonne National Laboratory",
-        "name": "Qiu, Feng"
-      }
-    ],
-    "title": "UnitCommitment.jl: A Julia/JuMP Optimization Package for Security-Constrained Unit Commitment",
-    "description": "<b>UnitCommitment.jl</b> (UC.jl) is an optimization package for the Security-Constrained Unit Commitment Problem (SCUC), a fundamental optimization problem in power systems used, for example, to clear the day-ahead electricity markets. The package provides benchmark instances for the problem and Julia/JuMP implementations of state-of-the-art mixed-integer programming formulations."
-  }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,75 +1,11 @@
-# Changelog
+# UnitCommitment.jl

-All notable changes to this project will be documented in this file.
+### Version 0.1.1 (Nov 16, 2020)

- The format is based on [Keep a Changelog][changelog].
- This project adheres to [Semantic Versioning][semver].
- For versions before 1.0, we follow the [Pkg.jl convention][pkjjl]
-  that `0.a.b` is compatible with `0.a.c`.
+* Fixes to MATLAB and PGLIB-UC instances
+* Add OR-LIB and Tejada19 instances
+* Improve documentation

-[changelog]: https://keepachangelog.com/en/1.0.0/
-[semver]: https://semver.org/spec/v2.0.0.html
-[pkjjl]: https://pkgdocs.julialang.org/v1/compatibility/#compat-pre-1.0
+### Version 0.1.0 (Nov 6, 2020)

-## [0.3.0] - 2022-07-18
-### Added
- Add support for multiple reserve products and zonal reserves.
- Add flexiramp reserve products, following WanHob2016's formulation (@oyurdakul, #21).
- Add 365 variations for each MATPOWER instance, corresponding to each day of the year.
-
-### Changed
- To support multiple/zonal reserves, 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
- To allow new versions of UnitCommitment.jl to read old instance files, a new required field `Version` has been added to the `Parameters` section. To load v0.2 files in v0.3, please add `{"Parameters":{"Version":"0.2"}}` to the file.
- Benchmark test cases are now downloaded on-the-fly as needed, instead of being stored in our GitHub repository. Test cases can also be directly downloaded from: https://axavier.org/UnitCommitment.jl/
-
-
-## [0.2.2] - 2021-07-21
-### Fixed
- Fix small bug in validation scripts related to startup costs
- Fix duplicated startup constraints (@mtanneau, #12)
-
-## [0.2.1] - 2021-06-02
-### Added
- Add multiple ramping formulations (ArrCon2000, MorLatRam2013, DamKucRajAta2016, PanGua2016)
- Add multiple piecewise-linear costs formulations (Garver1962, CarArr2006, KnuOstWat2018)
- Allow benchmark scripts to compare multiple formulations
-
-## [0.2.0] - 2021-05-28
-### Added
- Add sub-hourly unit commitment.
- Add `UnitCommitment.write(filename, solution)`.
- Add current mathematical formulation to the documentation.
-
-### Changed
- Rename "Time (h)" parameter to "Time horizon (h)".
- Rename `UnitCommitment.get_solution` to `UnitCommitment.solution`, for better
-  consistency with JuMP style.
- Add an underscore to the name of all functions that do not appear in the
-  documentation (e.g. `something` becomes `_something`) These functions are not
-  part of the public API and may change without notice, even in PATCH releases.
- The function `UnitCommitment.build_model` now returns a plain JuMP model. The
-  struct `UnitCommitmentModel` has been completely removed. Accessing model
-  elements can now be accomplished as follows:
-    - `model.vars.x[idx]` becomes `model[:x][idx]`
-    - `model.eqs.y[idx]` becomes `model[:eq_y][idx]`
-    - `model.expr.z[idx]` becomes `model[:expr_z][idx]`
-    - `model.obj` becomes `model[:obj]`
-    - `model.isf` becomes `model[:isf]`
-    - `model.lodf` becomes `model[:lodf]`
-
-### Fixed
- Properly validate solutions with price-sensitive loads.
-
-## [0.1.1] - 2020-11-16
-### Added
- Add OR-LIB and Tejada19 instances.
- Improve documentation.
-
-## Fixed
- Fixes to MATLAB and PGLIB-UC instances.
-
-## [0.1.0] - 2020-11-06
- Initial public release.
+* Initial public release
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright © 2020-2022, UChicago Argonne, LLC
+Copyright © 2020, UChicago Argonne, LLC

 All Rights Reserved

--- a/26
+++ b/26
@@ -2,10 +2,28 @@
 # Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
 # Released under the modified BSD license. See COPYING.md for more details.

-VERSION := 0.3
+JULIA := julia --color=yes --project=@.
+MKDOCS := ~/.local/bin/mkdocs
+VERSION := 0.1
+
+build/sysimage.so: src/sysimage.jl Project.toml Manifest.toml
+	mkdir -p build
+	mkdir -p benchmark/results/test
+	cd benchmark; $(JULIA) --trace-compile=../build/precompile.jl run.jl test/case14.1.sol.json
+	$(JULIA) src/sysimage.jl
+
+clean:
+	rm -rf build/*

 docs:
-	cd docs; julia --project=. make.jl; cd ..
-	rsync -avP --delete-after docs/build/ ../docs/$(VERSION)/
+	$(MKDOCS) build -d ../docs/$(VERSION)/
+	rm ../docs/$(VERSION)/*.ipynb
 	
-.PHONY: docs
+install-deps-docs:
+	pip install --user mkdocs mkdocs-cinder python-markdown-math
+
+test: build/sysimage.so
+	@echo Running tests...
+	$(JULIA) --sysimage build/sysimage.so -e 'using Pkg; Pkg.test("UnitCommitment")' | tee build/test.log
+
+.PHONY: docs test
--- a/Manifest.toml
+++ b/Manifest.toml
@@ -0,0 +1,367 @@
+# This file is machine-generated - editing it directly is not advised
+
+[[Artifacts]]
+deps = ["Pkg"]
+git-tree-sha1 = "c30985d8821e0cd73870b17b0ed0ce6dc44cb744"
+uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
+version = "1.3.0"
+
+[[Base64]]
+uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
+
+[[BenchmarkTools]]
+deps = ["JSON", "Logging", "Printf", "Statistics", "UUIDs"]
+git-tree-sha1 = "9e62e66db34540a0c919d72172cc2f642ac71260"
+uuid = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
+version = "0.5.0"
+
+[[BinaryProvider]]
+deps = ["Libdl", "Logging", "SHA"]
+git-tree-sha1 = "ecdec412a9abc8db54c0efc5548c64dfce072058"
+uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
+version = "0.5.10"
+
+[[Bzip2_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "c3598e525718abcc440f69cc6d5f60dda0a1b61e"
+uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0"
+version = "1.0.6+5"
+
+[[CEnum]]
+git-tree-sha1 = "215a9aa4a1f23fbd05b92769fdd62559488d70e9"
+uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82"
+version = "0.4.1"
+
+[[Calculus]]
+deps = ["LinearAlgebra"]
+git-tree-sha1 = "f641eb0a4f00c343bbc32346e1217b86f3ce9dad"
+uuid = "49dc2e85-a5d0-5ad3-a950-438e2897f1b9"
+version = "0.5.1"
+
+[[Cbc]]
+deps = ["BinaryProvider", "CEnum", "Cbc_jll", "Libdl", "MathOptInterface", "SparseArrays"]
+git-tree-sha1 = "929d0500c50387e7ac7ae9956ca7d7ce5312c90d"
+uuid = "9961bab8-2fa3-5c5a-9d89-47fab24efd76"
+version = "0.7.1"
+
+[[Cbc_jll]]
+deps = ["Cgl_jll", "Clp_jll", "CoinUtils_jll", "CompilerSupportLibraries_jll", "Libdl", "OpenBLAS32_jll", "Osi_jll", "Pkg"]
+git-tree-sha1 = "16b8ffa56b3ded6b201aa2f50623f260448aa205"
+uuid = "38041ee0-ae04-5750-a4d2-bb4d0d83d27d"
+version = "2.10.3+4"
+
+[[Cgl_jll]]
+deps = ["Clp_jll", "CompilerSupportLibraries_jll", "Libdl", "Pkg"]
+git-tree-sha1 = "32be20ec1e4c40e5c5d1bbf949ba9918a92a7569"
+uuid = "3830e938-1dd0-5f3e-8b8e-b3ee43226782"
+version = "0.60.2+5"
+
+[[Clp_jll]]
+deps = ["CoinUtils_jll", "CompilerSupportLibraries_jll", "Libdl", "OpenBLAS32_jll", "Osi_jll", "Pkg"]
+git-tree-sha1 = "79263d9383ca89b35f31c33ab5b880536a8413a4"
+uuid = "06985876-5285-5a41-9fcb-8948a742cc53"
+version = "1.17.6+6"
+
+[[CodecBzip2]]
+deps = ["Bzip2_jll", "Libdl", "TranscodingStreams"]
+git-tree-sha1 = "2e62a725210ce3c3c2e1a3080190e7ca491f18d7"
+uuid = "523fee87-0ab8-5b00-afb7-3ecf72e48cfd"
+version = "0.7.2"
+
+[[CodecZlib]]
+deps = ["TranscodingStreams", "Zlib_jll"]
+git-tree-sha1 = "ded953804d019afa9a3f98981d99b33e3db7b6da"
+uuid = "944b1d66-785c-5afd-91f1-9de20f533193"
+version = "0.7.0"
+
+[[CoinUtils_jll]]
+deps = ["CompilerSupportLibraries_jll", "Libdl", "OpenBLAS32_jll", "Pkg"]
+git-tree-sha1 = "ee1f06ab89337b7f194c29377ab174e752cdf60d"
+uuid = "be027038-0da8-5614-b30d-e42594cb92df"
+version = "2.11.3+3"
+
+[[CommonSubexpressions]]
+deps = ["MacroTools", "Test"]
+git-tree-sha1 = "7b8a93dba8af7e3b42fecabf646260105ac373f7"
+uuid = "bbf7d656-a473-5ed7-a52c-81e309532950"
+version = "0.3.0"
+
+[[Compat]]
+deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
+git-tree-sha1 = "a706ff10f1cd8dab94f59fd09c0e657db8e77ff0"
+uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
+version = "3.23.0"
+
+[[CompilerSupportLibraries_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "8e695f735fca77e9708e795eda62afdb869cbb70"
+uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
+version = "0.3.4+0"
+
+[[DataStructures]]
+deps = ["Compat", "InteractiveUtils", "OrderedCollections"]
+git-tree-sha1 = "fb0aa371da91c1ff9dc7fbed6122d3e411420b9c"
+uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
+version = "0.18.8"
+
+[[Dates]]
+deps = ["Printf"]
+uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
+
+[[DelimitedFiles]]
+deps = ["Mmap"]
+uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
+
+[[DiffResults]]
+deps = ["StaticArrays"]
+git-tree-sha1 = "da24935df8e0c6cf28de340b958f6aac88eaa0cc"
+uuid = "163ba53b-c6d8-5494-b064-1a9d43ac40c5"
+version = "1.0.2"
+
+[[DiffRules]]
+deps = ["NaNMath", "Random", "SpecialFunctions"]
+git-tree-sha1 = "eb0c34204c8410888844ada5359ac8b96292cfd1"
+uuid = "b552c78f-8df3-52c6-915a-8e097449b14b"
+version = "1.0.1"
+
+[[Distributed]]
+deps = ["Random", "Serialization", "Sockets"]
+uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
+
+[[DocStringExtensions]]
+deps = ["LibGit2", "Markdown", "Pkg", "Test"]
+git-tree-sha1 = "50ddf44c53698f5e784bbebb3f4b21c5807401b1"
+uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
+version = "0.8.3"
+
+[[Documenter]]
+deps = ["Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"]
+git-tree-sha1 = "71e35e069daa9969b8af06cef595a1add76e0a11"
+uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
+version = "0.25.3"
+
+[[ForwardDiff]]
+deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"]
+git-tree-sha1 = "1d090099fb82223abc48f7ce176d3f7696ede36d"
+uuid = "f6369f11-7733-5829-9624-2563aa707210"
+version = "0.10.12"
+
+[[GZip]]
+deps = ["Libdl"]
+git-tree-sha1 = "039be665faf0b8ae36e089cd694233f5dee3f7d6"
+uuid = "92fee26a-97fe-5a0c-ad85-20a5f3185b63"
+version = "0.5.1"
+
+[[HTTP]]
+deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"]
+git-tree-sha1 = "c7ec02c4c6a039a98a15f955462cd7aea5df4508"
+uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
+version = "0.8.19"
+
+[[IOCapture]]
+deps = ["Logging"]
+git-tree-sha1 = "377252859f740c217b936cebcd918a44f9b53b59"
+uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89"
+version = "0.1.1"
+
+[[IniFile]]
+deps = ["Test"]
+git-tree-sha1 = "098e4d2c533924c921f9f9847274f2ad89e018b8"
+uuid = "83e8ac13-25f8-5344-8a64-a9f2b223428f"
+version = "0.5.0"
+
+[[InteractiveUtils]]
+deps = ["Markdown"]
+uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+
+[[JLLWrappers]]
+git-tree-sha1 = "c70593677bbf2c3ccab4f7500d0f4dacfff7b75c"
+uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
+version = "1.1.3"
+
+[[JSON]]
+deps = ["Dates", "Mmap", "Parsers", "Unicode"]
+git-tree-sha1 = "81690084b6198a2e1da36fcfda16eeca9f9f24e4"
+uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
+version = "0.21.1"
+
+[[JSONSchema]]
+deps = ["HTTP", "JSON", "ZipFile"]
+git-tree-sha1 = "a9ecdbc90be216912a2e3e8a8e38dc4c93f0d065"
+uuid = "7d188eb4-7ad8-530c-ae41-71a32a6d4692"
+version = "0.3.2"
+
+[[JuMP]]
+deps = ["Calculus", "DataStructures", "ForwardDiff", "JSON", "LinearAlgebra", "MathOptInterface", "MutableArithmetics", "NaNMath", "Random", "SparseArrays", "Statistics"]
+git-tree-sha1 = "57c17a221a55f81890aabf00f478886859e25eaf"
+uuid = "4076af6c-e467-56ae-b986-b466b2749572"
+version = "0.21.5"
+
+[[LibGit2]]
+deps = ["Printf"]
+uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
+
+[[Libdl]]
+uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+
+[[LinearAlgebra]]
+deps = ["Libdl"]
+uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+
+[[Logging]]
+uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
+
+[[MacroTools]]
+deps = ["Markdown", "Random"]
+git-tree-sha1 = "6a8a2a625ab0dea913aba95c11370589e0239ff0"
+uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
+version = "0.5.6"
+
+[[Markdown]]
+deps = ["Base64"]
+uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
+
+[[MathOptInterface]]
+deps = ["BenchmarkTools", "CodecBzip2", "CodecZlib", "JSON", "JSONSchema", "LinearAlgebra", "MutableArithmetics", "OrderedCollections", "SparseArrays", "Test", "Unicode"]
+git-tree-sha1 = "4fd15565d1811be771e87a877f1e691a005d2b90"
+uuid = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
+version = "0.9.18"
+
+[[MbedTLS]]
+deps = ["Dates", "MbedTLS_jll", "Random", "Sockets"]
+git-tree-sha1 = "1c38e51c3d08ef2278062ebceade0e46cefc96fe"
+uuid = "739be429-bea8-5141-9913-cc70e7f3736d"
+version = "1.0.3"
+
+[[MbedTLS_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "0eef589dd1c26a3ac9d753fe1a8bcad63f956fa6"
+uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
+version = "2.16.8+1"
+
+[[Mmap]]
+uuid = "a63ad114-7e13-5084-954f-fe012c677804"
+
+[[MutableArithmetics]]
+deps = ["LinearAlgebra", "SparseArrays", "Test"]
+git-tree-sha1 = "c14dea152799bd0376024e3c3c1c3a6cb06764c7"
+uuid = "d8a4904e-b15c-11e9-3269-09a3773c0cb0"
+version = "0.2.11"
+
+[[NaNMath]]
+git-tree-sha1 = "c84c576296d0e2fbb3fc134d3e09086b3ea617cd"
+uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
+version = "0.3.4"
+
+[[OpenBLAS32_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "19c33675cdeb572c1b17f96c492459d4f4958036"
+uuid = "656ef2d0-ae68-5445-9ca0-591084a874a2"
+version = "0.3.10+0"
+
+[[OpenSpecFun_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "9db77584158d0ab52307f8c04f8e7c08ca76b5b3"
+uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e"
+version = "0.5.3+4"
+
+[[OrderedCollections]]
+git-tree-sha1 = "cf59cfed2e2c12e8a2ff0a4f1e9b2cd8650da6db"
+uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
+version = "1.3.2"
+
+[[Osi_jll]]
+deps = ["CoinUtils_jll", "CompilerSupportLibraries_jll", "Libdl", "OpenBLAS32_jll", "Pkg"]
+git-tree-sha1 = "bd436a97280df40938e66ae8d18e57aceb072856"
+uuid = "7da25872-d9ce-5375-a4d3-7a845f58efdd"
+version = "0.108.5+3"
+
+[[PackageCompiler]]
+deps = ["Libdl", "Pkg", "UUIDs"]
+git-tree-sha1 = "3eee77c94646163f15bd8626acf494360897f890"
+uuid = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d"
+version = "1.2.3"
+
+[[Parsers]]
+deps = ["Dates"]
+git-tree-sha1 = "6fa4202675c05ba0f8268a6ddf07606350eda3ce"
+uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
+version = "1.0.11"
+
+[[Pkg]]
+deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
+uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+
+[[Printf]]
+deps = ["Unicode"]
+uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+
+[[REPL]]
+deps = ["InteractiveUtils", "Markdown", "Sockets"]
+uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
+
+[[Random]]
+deps = ["Serialization"]
+uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+
+[[SHA]]
+uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
+
+[[Serialization]]
+uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
+
+[[SharedArrays]]
+deps = ["Distributed", "Mmap", "Random", "Serialization"]
+uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
+
+[[Sockets]]
+uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
+
+[[SparseArrays]]
+deps = ["LinearAlgebra", "Random"]
+uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+
+[[SpecialFunctions]]
+deps = ["OpenSpecFun_jll"]
+git-tree-sha1 = "d8d8b8a9f4119829410ecd706da4cc8594a1e020"
+uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
+version = "0.10.3"
+
+[[StaticArrays]]
+deps = ["LinearAlgebra", "Random", "Statistics"]
+git-tree-sha1 = "da4cf579416c81994afd6322365d00916c79b8ae"
+uuid = "90137ffa-7385-5640-81b9-e52037218182"
+version = "0.12.5"
+
+[[Statistics]]
+deps = ["LinearAlgebra", "SparseArrays"]
+uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
+
+[[Test]]
+deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
+uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[[TranscodingStreams]]
+deps = ["Random", "Test"]
+git-tree-sha1 = "7c53c35547de1c5b9d46a4797cf6d8253807108c"
+uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
+version = "0.9.5"
+
+[[UUIDs]]
+deps = ["Random", "SHA"]
+uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
+
+[[Unicode]]
+uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
+
+[[ZipFile]]
+deps = ["Libdl", "Printf", "Zlib_jll"]
+git-tree-sha1 = "c3a5637e27e914a7a445b8d0ad063d701931e9f7"
+uuid = "a5390f91-8eb1-5f08-bee0-b1d1ffed6cea"
+version = "0.9.3"
+
+[[Zlib_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "320228915c8debb12cb434c59057290f0834dbf6"
+uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
+version = "1.2.11+18"
--- a/Project.toml
+++ b/Project.toml
@@ -2,35 +2,34 @@ 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.1.1"

 [deps]
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
-Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
-Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 GZip = "92fee26a-97fe-5a0c-ad85-20a5f3185b63"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
-MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
 MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
+OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
 PackageCompiler = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
-Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
-Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
-Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
-TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"

 [compat]
+Cbc = "0.7"
 DataStructures = "0.18"
-Distributions = "0.25"
 GZip = "0.5"
 JSON = "0.21"
-JuMP = "1"
-MPI = "0.20"
-MathOptInterface = "1"
+JuMP = "0.21"
+MathOptInterface = "0.9"
 PackageCompiler = "1"
-TimerOutputs = "0.5"
 julia = "1"
+
+[extras]
+Cbc = "9961bab8-2fa3-5c5a-9d89-47fab24efd76"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["Cbc", "Test"]
--- a/README.md
+++ b/README.md
@@ -1,147 +1,44 @@
-<h1 align="center">UnitCommitment.jl</h1>
-<p align="center">
-  <a href="https://github.com/ANL-CEEESA/UnitCommitment.jl/actions?query=workflow%3ATest+branch%3Adev">
-    <img src="https://github.com/iSoron/UnitCommitment.jl/workflows/Tests/badge.svg"></img>
-  </a>
-  <a href="https://doi.org/10.5281/zenodo.4269874">
-    <img src="https://zenodo.org/badge/doi/10.5281/zenodo.4269874.svg" alt="DOI"></img>
-  </a>
-  <a href="https://github.com/ANL-CEEESA/UnitCommitment.jl/releases/">
-    <img src="https://img.shields.io/github/v/release/ANL-CEEESA/UnitCommitment.jl?include_prereleases&label=pre-release">
-  </a>
-  <a href="https://github.com/ANL-CEEESA/UnitCommitment.jl/discussions">
-    <img src="https://img.shields.io/badge/GitHub-Discussions-%23fc4ebc" />
-  </a>
-</p>
+<a href="https://github.com/ANL-CEEESA/UnitCommitment.jl/actions?query=workflow%3ATest+branch%3Adev"><img src="https://github.com/iSoron/UnitCommitment.jl/workflows/Tests/badge.svg"></img></a>
+<a href="https://github.com/ANL-CEEESA/UnitCommitment.jl/actions?query=workflow%3ABenchmark+branch%3Adev+is%3Asuccess"><img src="https://github.com/iSoron/UnitCommitment.jl/workflows/Benchmark/badge.svg"></img></a>
+<a href="https://doi.org/10.5281/zenodo.4269874"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.4269874.svg" alt="DOI"></a>

-**UnitCommitment.jl** (UC.jl) is an optimization package for the Security-Constrained Unit Commitment Problem (SCUC), a fundamental optimization problem in power systems used, for example, to clear the day-ahead electricity markets. The package provides benchmark instances for the problem and Julia/JuMP implementations of state-of-the-art mixed-integer programming formulations.

-## Package Components
+# UnitCommitment.jl

-* **Data Format:** The package proposes an extensible and fully-documented JSON-based data format for SCUC, developed in collaboration with Independent System Operators (ISOs), which describes the most important aspects of the problem. The format supports the most common generator characteristics (including ramping, piecewise-linear production cost curves and time-dependent startup costs), as well as operating reserves, price-sensitive loads, transmission networks and contingencies.
-* **Benchmark Instances:** The package provides a diverse collection of large-scale benchmark instances collected from the literature, converted into a common data format, and extended using data-driven methods to make them more challenging and realistic.
-* **Model Implementation**: The package provides Julia/JuMP implementations of state-of-the-art formulations and solution methods for SCUC, including multiple ramping formulations ([ArrCon2000][ArrCon2000], [MorLatRam2013][MorLatRam2013], [DamKucRajAta2016][DamKucRajAta2016], [PanGua2016][PanGua2016]), multiple piecewise-linear costs formulations ([Gar1962][Gar1962], [CarArr2006][CarArr2006], [KnuOstWat2018][KnuOstWat2018]) and contingency screening methods ([XavQiuWanThi2019][XavQiuWanThi2019]). Our goal is to keep these implementations up-to-date as new methods are proposed in the literature.
+**UnitCommitment.jl** (UC.jl) is an optimization package for the Security-Constrained Unit Commitment Problem (SCUC), a fundamental optimization problem in power systems used, for example, to clear the day-ahead electricity markets. The package provides benchmark instances for the problem and JuMP implementations of state-of-the-art mixed-integer programming formulations.
+
+### Package Components
+
+* **Data Format:** The package proposes an extensible and fully-documented JSON-based data specification format for SCUC, developed in collaboration with Independent System Operators (ISOs), which describes the most important aspects of the problem. The format supports all the most common generator characteristics (including ramping, piecewise-linear production cost curves and time-dependent startup costs), as well as operating reserves, price-sensitive loads, transmission networks and contingencies.
+* **Benchmark Instances:** The package provides a diverse collection of large-scale benchmark instances collected from the literature and extended to make them more challenging and realistic.
+* **Model Implementation**: The package provides a Julia/JuMP implementation of state-of-the-art formulations and solution methods for SCUC. Our goal is to keep this implementation up-to-date, as new methods are proposed in the literature.
 * **Benchmark Tools:** The package provides automated benchmark scripts to accurately evaluate the performance impact of proposed code changes.

-[ArrCon2000]: https://doi.org/10.1109/59.871739
-[CarArr2006]: https://doi.org/10.1109/TPWRS.2006.876672
-[DamKucRajAta2016]: https://doi.org/10.1007/s10107-015-0919-9
-[Gar1962]: https://doi.org/10.1109/AIEEPAS.1962.4501405
-[KnuOstWat2018]: https://doi.org/10.1109/TPWRS.2017.2783850
-[MorLatRam2013]: https://doi.org/10.1109/TPWRS.2013.2251373
-[PanGua2016]: https://doi.org/10.1287/opre.2016.1520
-[XavQiuWanThi2019]: https://doi.org/10.1109/TPWRS.2019.2892620
+### Documentation

-## Sample Usage
+* [Usage](https://anl-ceeesa.github.io/UnitCommitment.jl/0.1/usage/)
+* [Data Format](https://anl-ceeesa.github.io/UnitCommitment.jl/0.1/format/)
+* [Instances](https://anl-ceeesa.github.io/UnitCommitment.jl/0.1/instances/)

-```julia
-using Cbc
-using JuMP
-using UnitCommitment
-
-import UnitCommitment:
-    Formulation,
-    KnuOstWat2018,
-    MorLatRam2013,
-    ShiftFactorsFormulation
-
-# Read benchmark instance
-instance = UnitCommitment.read_benchmark(
-    "matpower/case118/2017-02-01",
-)
-
-# Construct model (using state-of-the-art defaults)
-model = UnitCommitment.build_model(
-    instance = instance,
-    optimizer = Cbc.Optimizer,
-)
-
-# Construct model (using customized formulation)
-model = UnitCommitment.build_model(
-    instance = instance,
-    optimizer = Cbc.Optimizer,
-    formulation = Formulation(
-        pwl_costs = KnuOstWat2018.PwlCosts(),
-        ramping = MorLatRam2013.Ramping(),
-        startup_costs = MorLatRam2013.StartupCosts(),
-        transmission = ShiftFactorsFormulation(
-            isf_cutoff = 0.005,
-            lodf_cutoff = 0.001,
-        ),
-    ),
-)
-
-# Modify the model (e.g. add custom constraints)
-@constraint(
-    model,
-    model[:is_on]["g3", 1] + model[:is_on]["g4", 1] <= 1,
-)
-
-# Solve model
-UnitCommitment.optimize!(model)
-
-# Extract solution
-solution = UnitCommitment.solution(model)
-UnitCommitment.write("/tmp/output.json", solution)
-```
-
-## Documentation
-
-1. [Usage](https://anl-ceeesa.github.io/UnitCommitment.jl/0.3/usage/)
-2. [Data Format](https://anl-ceeesa.github.io/UnitCommitment.jl/0.3/format/)
-3. [Instances](https://anl-ceeesa.github.io/UnitCommitment.jl/0.3/instances/)
-4. [JuMP Model](https://anl-ceeesa.github.io/UnitCommitment.jl/0.3/model/)
-5. [API Reference](https://anl-ceeesa.github.io/UnitCommitment.jl/0.3/api/)
-
-## Authors
-* **Alinson S. Xavier** (Argonne National Laboratory)
-* **Aleksandr M. Kazachkov** (University of Florida)
-* **Ogün Yurdakul** (Technische Universität Berlin)
-* **Jun He** (Purdue University)
+### Authors
+* **Alinson Santos Xavier** (Argonne National Laboratory)
 * **Feng Qiu** (Argonne National Laboratory)

-## Acknowledgments
+### Acknowledgments

-* We would like to thank **Yonghong Chen** (Midcontinent Independent System Operator), **Feng Pan** (Pacific Northwest National Laboratory) for valuable feedback on early versions of this package.
+* We would like to thank **Aleksandr M. Kazachkov** (University of Florida), **Yonghong Chen** (Midcontinent Independent System Operator), **Feng Pan** (Pacific Northwest National Laboratory) for valuable feedback on early versions of this package.

-* Based upon work supported by **Laboratory Directed Research and Development** (LDRD) funding from Argonne National Laboratory, provided by the Director, Office of Science, of the U.S. Department of Energy under Contract No. DE-AC02-06CH11357
+* Based upon work supported by **Laboratory Directed Research and Development** (LDRD) funding from Argonne National Laboratory, provided by the Director, Office of Science, of the U.S. Department of Energy under Contract No. DE-AC02-06CH11357.

-* Based upon work supported by the **U.S. Department of Energy Advanced Grid Modeling Program** under Grant DE-OE0000875.
+### Citing

-## Citing
+If you use UnitCommitment.jl in your research, we request that you cite the package as follows:

-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, 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, Ogün Yurdakul, Feng Qiu**. "UnitCommitment.jl: A Julia/JuMP Optimization Package for Security-Constrained Unit Commitment (Version 0.3)". Zenodo (2022). [DOI: 10.5281/zenodo.4269874](https://doi.org/10.5281/zenodo.4269874).
+If you make use of the provided instances files, we request that you additionally cite the original sources, as described in the [instances page](https://anl-ceeesa.github.io/UnitCommitment.jl/0.1/instances/).

-If you use the instances, we additionally request that you cite the original sources, as described in the documentation.
+### License

-## License
-
-```text
-UnitCommitment.jl: A Julia/JuMP Optimization Package for Security-Constrained Unit Commitment
-Copyright © 2020-2022, UChicago Argonne, LLC. All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted
-provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of
-   conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice, this list of
-   conditions and the following disclaimer in the documentation and/or other materials provided
-   with the distribution.
-3. Neither the name of the copyright holder nor the names of its contributors may be used to
-   endorse or promote products derived from this software without specific prior written
-   permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-```
+Released under the modified BSD license. See `LICENSE.md` for more details.

--- a/benchmark/Makefile
+++ b/benchmark/Makefile
@@ -0,0 +1,327 @@
+# 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.
+
+SHELL := /bin/bash
+JULIA := julia --project=. --sysimage ../build/sysimage.so
+TIMESTAMP := $(shell date "+%Y-%m-%d %H:%M")
+SRC_FILES := $(wildcard ../src/*.jl)
+DEST := .
+FORMULATION := tight
+results_dir := results_$(FORMULATION)
+
+INSTANCES_PGLIB := \
+        pglib-uc/ca/2014-09-01_reserves_0 \
+        pglib-uc/ca/2014-09-01_reserves_1 \
+        pglib-uc/ca/2015-03-01_reserves_0 \
+        pglib-uc/ca/2015-06-01_reserves_0 \
+        pglib-uc/ca/Scenario400_reserves_1 \
+        pglib-uc/ferc/2015-01-01_lw \
+        pglib-uc/ferc/2015-05-01_lw \
+        pglib-uc/ferc/2015-07-01_hw \
+        pglib-uc/ferc/2015-10-01_lw \
+        pglib-uc/ferc/2015-12-01_lw \
+        pglib-uc/rts_gmlc/2020-04-03 \
+        pglib-uc/rts_gmlc/2020-09-20 \
+        pglib-uc/rts_gmlc/2020-10-27 \
+        pglib-uc/rts_gmlc/2020-11-25 \
+        pglib-uc/rts_gmlc/2020-12-23
+
+INSTANCES_MATPOWER := \
+	matpower/case118/2017-02-01 \
+	matpower/case118/2017-08-01 \
+	matpower/case300/2017-02-01 \
+	matpower/case300/2017-08-01 \
+	matpower/case1354pegase/2017-02-01 \
+	matpower/case1888rte/2017-02-01 \
+	matpower/case1951rte/2017-08-01 \
+	matpower/case2848rte/2017-02-01 \
+	matpower/case2868rte/2017-08-01 \
+	matpower/case3375wp/2017-08-01 \
+	matpower/case6468rte/2017-08-01 \
+	matpower/case6515rte/2017-08-01
+
+INSTANCES_INFORMS1 := \
+  matpower/case1888rte/2017-01-01 \
+  matpower/case1888rte/2017-01-02 \
+  matpower/case1888rte/2017-01-03 \
+  matpower/case1888rte/2017-01-04 \
+  matpower/case1888rte/2017-01-05 \
+  matpower/case1888rte/2017-01-06 \
+  matpower/case1888rte/2017-01-07 \
+  matpower/case1888rte/2017-01-08 \
+  matpower/case1888rte/2017-01-09 \
+  matpower/case1888rte/2017-01-10 \
+  matpower/case1888rte/2017-01-11 \
+  matpower/case1888rte/2017-01-12 \
+  matpower/case1888rte/2017-01-13 \
+  matpower/case1888rte/2017-01-14 \
+  matpower/case1888rte/2017-01-15 \
+  matpower/case1888rte/2017-01-16 \
+  matpower/case1888rte/2017-01-17 \
+  matpower/case1888rte/2017-01-18 \
+  matpower/case1888rte/2017-01-19 \
+  matpower/case1888rte/2017-01-20 \
+  matpower/case1888rte/2017-01-21 \
+  matpower/case1888rte/2017-01-22 \
+  matpower/case1888rte/2017-01-23 \
+  matpower/case1888rte/2017-01-24 \
+  matpower/case1888rte/2017-01-25 \
+  matpower/case1888rte/2017-01-26 \
+  matpower/case1888rte/2017-01-27 \
+  matpower/case1888rte/2017-01-28 \
+  matpower/case1888rte/2017-01-29 \
+  matpower/case1888rte/2017-01-30 \
+  matpower/case1888rte/2017-01-31 \
+  matpower/case1888rte/2017-02-01 \
+  matpower/case1888rte/2017-02-02 \
+  matpower/case1888rte/2017-02-03 \
+  matpower/case1888rte/2017-02-04 \
+  matpower/case1888rte/2017-02-05 \
+  matpower/case1888rte/2017-02-06 \
+  matpower/case1888rte/2017-02-07 \
+  matpower/case1888rte/2017-02-08 \
+  matpower/case1888rte/2017-02-09 \
+  matpower/case1888rte/2017-02-10 \
+  matpower/case1888rte/2017-02-11 \
+  matpower/case1888rte/2017-02-12 \
+  matpower/case1888rte/2017-02-13 \
+  matpower/case1888rte/2017-02-14 \
+  matpower/case1888rte/2017-02-15 \
+  matpower/case1888rte/2017-02-16 \
+  matpower/case1888rte/2017-02-17 \
+  matpower/case1888rte/2017-02-18 \
+  matpower/case1888rte/2017-02-19 \
+  matpower/case1888rte/2017-02-20 \
+  matpower/case1888rte/2017-02-21 \
+  matpower/case1888rte/2017-02-22 \
+  matpower/case1888rte/2017-02-23 \
+  matpower/case1888rte/2017-02-24 \
+  matpower/case1888rte/2017-02-25 \
+  matpower/case1888rte/2017-02-26 \
+  matpower/case1888rte/2017-02-27 \
+  matpower/case1888rte/2017-02-28 \
+  matpower/case1888rte/2017-03-01
+
+INSTANCES_INFORMS2 := \
+  matpower/case3375wp/2017-01-01 \
+  matpower/case3375wp/2017-01-02 \
+  matpower/case3375wp/2017-01-03 \
+  matpower/case3375wp/2017-01-04 \
+  matpower/case3375wp/2017-01-05 \
+  matpower/case3375wp/2017-01-06 \
+  matpower/case3375wp/2017-01-07 \
+  matpower/case3375wp/2017-01-08 \
+  matpower/case3375wp/2017-01-09 \
+  matpower/case3375wp/2017-01-10 \
+  matpower/case3375wp/2017-01-11 \
+  matpower/case3375wp/2017-01-12 \
+  matpower/case3375wp/2017-01-13 \
+  matpower/case3375wp/2017-01-14 \
+  matpower/case3375wp/2017-01-15 \
+  matpower/case3375wp/2017-01-16 \
+  matpower/case3375wp/2017-01-17 \
+  matpower/case3375wp/2017-01-18 \
+  matpower/case3375wp/2017-01-19 \
+  matpower/case3375wp/2017-01-20 \
+  matpower/case3375wp/2017-01-21 \
+  matpower/case3375wp/2017-01-22 \
+  matpower/case3375wp/2017-01-23 \
+  matpower/case3375wp/2017-01-24 \
+  matpower/case3375wp/2017-01-25 \
+  matpower/case3375wp/2017-01-26 \
+  matpower/case3375wp/2017-01-27 \
+  matpower/case3375wp/2017-01-28 \
+  matpower/case3375wp/2017-01-29 \
+  matpower/case3375wp/2017-01-30 \
+  matpower/case3375wp/2017-01-31 \
+  matpower/case3375wp/2017-02-01 \
+  matpower/case3375wp/2017-02-02 \
+  matpower/case3375wp/2017-02-03 \
+  matpower/case3375wp/2017-02-04 \
+  matpower/case3375wp/2017-02-05 \
+  matpower/case3375wp/2017-02-06 \
+  matpower/case3375wp/2017-02-07 \
+  matpower/case3375wp/2017-02-08 \
+  matpower/case3375wp/2017-02-09 \
+  matpower/case3375wp/2017-02-10 \
+  matpower/case3375wp/2017-02-11 \
+  matpower/case3375wp/2017-02-12 \
+  matpower/case3375wp/2017-02-13 \
+  matpower/case3375wp/2017-02-14 \
+  matpower/case3375wp/2017-02-15 \
+  matpower/case3375wp/2017-02-16 \
+  matpower/case3375wp/2017-02-17 \
+  matpower/case3375wp/2017-02-18 \
+  matpower/case3375wp/2017-02-19 \
+  matpower/case3375wp/2017-02-20 \
+  matpower/case3375wp/2017-02-21 \
+  matpower/case3375wp/2017-02-22 \
+  matpower/case3375wp/2017-02-23 \
+  matpower/case3375wp/2017-02-24 \
+  matpower/case3375wp/2017-02-25 \
+  matpower/case3375wp/2017-02-26 \
+  matpower/case3375wp/2017-02-27 \
+  matpower/case3375wp/2017-02-28 \
+  matpower/case3375wp/2017-03-01
+
+INSTANCES_INFORMS3 := \
+  matpower/case6468rte/2017-01-01 \
+  matpower/case6468rte/2017-01-02 \
+  matpower/case6468rte/2017-01-03 \
+  matpower/case6468rte/2017-01-04 \
+  matpower/case6468rte/2017-01-05 \
+  matpower/case6468rte/2017-01-06 \
+  matpower/case6468rte/2017-01-07 \
+  matpower/case6468rte/2017-01-08 \
+  matpower/case6468rte/2017-01-09 \
+  matpower/case6468rte/2017-01-10 \
+  matpower/case6468rte/2017-01-11 \
+  matpower/case6468rte/2017-01-12 \
+  matpower/case6468rte/2017-01-13 \
+  matpower/case6468rte/2017-01-14 \
+  matpower/case6468rte/2017-01-15 \
+  matpower/case6468rte/2017-01-16 \
+  matpower/case6468rte/2017-01-17 \
+  matpower/case6468rte/2017-01-18 \
+  matpower/case6468rte/2017-01-19 \
+  matpower/case6468rte/2017-01-20 \
+  matpower/case6468rte/2017-01-21 \
+  matpower/case6468rte/2017-01-22 \
+  matpower/case6468rte/2017-01-23 \
+  matpower/case6468rte/2017-01-24 \
+  matpower/case6468rte/2017-01-25 \
+  matpower/case6468rte/2017-01-26 \
+  matpower/case6468rte/2017-01-27 \
+  matpower/case6468rte/2017-01-28 \
+  matpower/case6468rte/2017-01-29 \
+  matpower/case6468rte/2017-01-30 \
+  matpower/case6468rte/2017-01-31 \
+  matpower/case6468rte/2017-02-01 \
+  matpower/case6468rte/2017-02-02 \
+  matpower/case6468rte/2017-02-03 \
+  matpower/case6468rte/2017-02-04 \
+  matpower/case6468rte/2017-02-05 \
+  matpower/case6468rte/2017-02-06 \
+  matpower/case6468rte/2017-02-07 \
+  matpower/case6468rte/2017-02-08 \
+  matpower/case6468rte/2017-02-09 \
+  matpower/case6468rte/2017-02-10 \
+  matpower/case6468rte/2017-02-11 \
+  matpower/case6468rte/2017-02-12 \
+  matpower/case6468rte/2017-02-13 \
+  matpower/case6468rte/2017-02-14 \
+  matpower/case6468rte/2017-02-15 \
+  matpower/case6468rte/2017-02-16 \
+  matpower/case6468rte/2017-02-17 \
+  matpower/case6468rte/2017-02-18 \
+  matpower/case6468rte/2017-02-19 \
+  matpower/case6468rte/2017-02-20 \
+  matpower/case6468rte/2017-02-21 \
+  matpower/case6468rte/2017-02-22 \
+  matpower/case6468rte/2017-02-23 \
+  matpower/case6468rte/2017-02-24 \
+  matpower/case6468rte/2017-02-25 \
+  matpower/case6468rte/2017-02-26 \
+  matpower/case6468rte/2017-02-27 \
+  matpower/case6468rte/2017-02-28 \
+  matpower/case6468rte/2017-03-01
+
+INSTANCES_TEST := \
+	test/case14
+
+#SAMPLES := 1 2 3
+SAMPLES := 1
+SOLUTIONS_MATPOWER := $(foreach s,$(SAMPLES),$(addprefix $(results_dir)/,$(addsuffix .$(s).sol.json,$(INSTANCES_MATPOWER))))
+SOLUTIONS_PGLIB := $(foreach s,$(SAMPLES),$(addprefix $(results_dir)/,$(addsuffix .$(s).sol.json,$(INSTANCES_PGLIB))))
+SOLUTIONS_INFORMS1 := $(foreach s,$(SAMPLES),$(addprefix $(results_dir)/,$(addsuffix .$(s).sol.json,$(INSTANCES_INFORMS1))))
+SOLUTIONS_INFORMS2 := $(foreach s,$(SAMPLES),$(addprefix $(results_dir)/,$(addsuffix .$(s).sol.json,$(INSTANCES_INFORMS2))))
+SOLUTIONS_INFORMS3 := $(foreach s,$(SAMPLES),$(addprefix $(results_dir)/,$(addsuffix .$(s).sol.json,$(INSTANCES_INFORMS3))))
+SOLUTIONS_TEST := $(foreach s,$(SAMPLES),$(addprefix $(results_dir)/,$(addsuffix .$(s).sol.json,$(INSTANCES_TEST))))
+
+.PHONY: tables save small large clean-mps matpower pglib informs1 informs2 informs3 test pglib orlib
+
+INSTANCES_ORLIB := \
+	or-lib/20_0_1_w \
+	or-lib/20_0_5_w \
+	or-lib/50_0_2_w \
+	or-lib/75_0_2_w \
+	or-lib/100_0_1_w \
+	or-lib/100_0_4_w \
+	or-lib/100_0_5_w \
+	or-lib/200_0_3_w \
+	or-lib/200_0_7_w \
+	or-lib/200_0_9_w
+
+INSTANCES_TEJADA19 := \
+	tejada19/UC_24h_290g \
+	tejada19/UC_24h_623g \
+	tejada19/UC_24h_959g \
+	tejada19/UC_24h_1577g \
+	tejada19/UC_24h_1888g \
+	tejada19/UC_168h_72g \
+	tejada19/UC_168h_86g \
+	tejada19/UC_168h_130g \
+	tejada19/UC_168h_131g \
+	tejada19/UC_168h_199g
+
+SOLUTIONS_ORLIB := $(foreach s,$(SAMPLES),$(addprefix $(results_dir)/,$(addsuffix .$(s).sol.json,$(INSTANCES_ORLIB))))
+SOLUTIONS_TEJADA19 := $(foreach s,$(SAMPLES),$(addprefix $(results_dir)/,$(addsuffix .$(s).sol.json,$(INSTANCES_TEJADA19))))
+
+all: matpower pglib orlib tejada19
+
+matpower: $(SOLUTIONS_MATPOWER)
+
+pglib: $(SOLUTIONS_PGLIB)
+
+informs1: $(SOLUTIONS_INFORMS1)
+informs2: $(SOLUTIONS_INFORMS2)
+informs3: $(SOLUTIONS_INFORMS3)
+
+test: $(SOLUTIONS_TEST)
+
+orlib: $(SOLUTIONS_ORLIB)
+
+tejada19: $(SOLUTIONS_TEJADA19)
+
+clean:
+	@rm -rf tables/benchmark* tables/compare* $(results_dir)
+    
+clean-mps:
+	@rm -fv $(results_dir)/*/*.mps.gz results/*/*/*.mps.gz
+
+clean-sol:
+	@rm -rf $(results_dir)/*/*.sol.* results/*/*/*.sol.*
+        
+save:
+	mkdir -p "runs/$(TIMESTAMP)"
+	rsync -avP $(results_dir) tables "runs/$(TIMESTAMP)/"
+
+results/%.sol.json: run.jl
+	@echo "run  $*"
+	@mkdir -p $(dir $(DEST)/$(results_dir)/$*)
+	@$(JULIA) run.jl $* default $(DEST)/$(results_dir) 2>&1 | cat > $(DEST)/$(results_dir)/$*.log
+	@echo "run  $* [done]"
+
+results_tight/%.sol.json: run.jl
+	@echo "run  $*"
+	@mkdir -p $(dir $(DEST)/$(results_dir)/$*)
+	@$(JULIA) run.jl $* tight $(DEST)/$(results_dir) 2>&1 | cat > $(DEST)/$(results_dir)/$*.log
+	@echo "run  $* [done]"
+
+results_default/%.sol.json: run.jl
+	@echo "run  $*"
+	@mkdir -p $(dir $(DEST)/$(results_dir)/$*)
+	@$(JULIA) run.jl $* default $(DEST)/$(results_dir) 2>&1 | cat > $(DEST)/$(results_dir)/$*.log
+	@echo "run  $* [done]"
+
+results_sparse/%.sol.json: run.jl
+	@echo "run  $*"
+	@mkdir -p $(dir $(DEST)/$(results_dir)/$*)
+	@$(JULIA) run.jl $* sparse $(DEST)/$(results_dir) 2>&1 | cat > $(DEST)/$(results_dir)/$*.log
+	@echo "run  $* [done]"
+
+tables:
+	@mkdir -p tables
+	@python scripts/table.py
+	#@python scripts/compare.py tables/reference.csv tables/benchmark.csv
--- a/benchmark/Manifest.toml
+++ b/benchmark/Manifest.toml
@@ -0,0 +1,389 @@
+# This file is machine-generated - editing it directly is not advised
+
+[[Artifacts]]
+deps = ["Pkg"]
+git-tree-sha1 = "c30985d8821e0cd73870b17b0ed0ce6dc44cb744"
+uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
+version = "1.3.0"
+
+[[Base64]]
+uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
+
+[[BenchmarkTools]]
+deps = ["JSON", "Logging", "Printf", "Statistics", "UUIDs"]
+git-tree-sha1 = "9e62e66db34540a0c919d72172cc2f642ac71260"
+uuid = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
+version = "0.5.0"
+
+[[BinaryProvider]]
+deps = ["Libdl", "Logging", "SHA"]
+git-tree-sha1 = "ecdec412a9abc8db54c0efc5548c64dfce072058"
+uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
+version = "0.5.10"
+
+[[Bzip2_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "c3598e525718abcc440f69cc6d5f60dda0a1b61e"
+uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0"
+version = "1.0.6+5"
+
+[[CEnum]]
+git-tree-sha1 = "215a9aa4a1f23fbd05b92769fdd62559488d70e9"
+uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82"
+version = "0.4.1"
+
+[[Calculus]]
+deps = ["LinearAlgebra"]
+git-tree-sha1 = "f641eb0a4f00c343bbc32346e1217b86f3ce9dad"
+uuid = "49dc2e85-a5d0-5ad3-a950-438e2897f1b9"
+version = "0.5.1"
+
+[[Cbc]]
+deps = ["BinaryProvider", "CEnum", "Cbc_jll", "Libdl", "MathOptInterface", "SparseArrays"]
+git-tree-sha1 = "929d0500c50387e7ac7ae9956ca7d7ce5312c90d"
+uuid = "9961bab8-2fa3-5c5a-9d89-47fab24efd76"
+version = "0.7.1"
+
+[[Cbc_jll]]
+deps = ["Cgl_jll", "Clp_jll", "CoinUtils_jll", "CompilerSupportLibraries_jll", "Libdl", "OpenBLAS32_jll", "Osi_jll", "Pkg"]
+git-tree-sha1 = "16b8ffa56b3ded6b201aa2f50623f260448aa205"
+uuid = "38041ee0-ae04-5750-a4d2-bb4d0d83d27d"
+version = "2.10.3+4"
+
+[[Cgl_jll]]
+deps = ["Clp_jll", "CompilerSupportLibraries_jll", "Libdl", "Pkg"]
+git-tree-sha1 = "32be20ec1e4c40e5c5d1bbf949ba9918a92a7569"
+uuid = "3830e938-1dd0-5f3e-8b8e-b3ee43226782"
+version = "0.60.2+5"
+
+[[Clp_jll]]
+deps = ["CoinUtils_jll", "CompilerSupportLibraries_jll", "Libdl", "OpenBLAS32_jll", "Osi_jll", "Pkg"]
+git-tree-sha1 = "79263d9383ca89b35f31c33ab5b880536a8413a4"
+uuid = "06985876-5285-5a41-9fcb-8948a742cc53"
+version = "1.17.6+6"
+
+[[CodecBzip2]]
+deps = ["Bzip2_jll", "Libdl", "TranscodingStreams"]
+git-tree-sha1 = "2e62a725210ce3c3c2e1a3080190e7ca491f18d7"
+uuid = "523fee87-0ab8-5b00-afb7-3ecf72e48cfd"
+version = "0.7.2"
+
+[[CodecZlib]]
+deps = ["TranscodingStreams", "Zlib_jll"]
+git-tree-sha1 = "ded953804d019afa9a3f98981d99b33e3db7b6da"
+uuid = "944b1d66-785c-5afd-91f1-9de20f533193"
+version = "0.7.0"
+
+[[CoinUtils_jll]]
+deps = ["CompilerSupportLibraries_jll", "Libdl", "OpenBLAS32_jll", "Pkg"]
+git-tree-sha1 = "ee1f06ab89337b7f194c29377ab174e752cdf60d"
+uuid = "be027038-0da8-5614-b30d-e42594cb92df"
+version = "2.11.3+3"
+
+[[CommonSubexpressions]]
+deps = ["MacroTools", "Test"]
+git-tree-sha1 = "7b8a93dba8af7e3b42fecabf646260105ac373f7"
+uuid = "bbf7d656-a473-5ed7-a52c-81e309532950"
+version = "0.3.0"
+
+[[CompilerSupportLibraries_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "8e695f735fca77e9708e795eda62afdb869cbb70"
+uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
+version = "0.3.4+0"
+
+[[DataStructures]]
+deps = ["InteractiveUtils", "OrderedCollections"]
+git-tree-sha1 = "88d48e133e6d3dd68183309877eac74393daa7eb"
+uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
+version = "0.17.20"
+
+[[Dates]]
+deps = ["Printf"]
+uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
+
+[[DiffResults]]
+deps = ["StaticArrays"]
+git-tree-sha1 = "da24935df8e0c6cf28de340b958f6aac88eaa0cc"
+uuid = "163ba53b-c6d8-5494-b064-1a9d43ac40c5"
+version = "1.0.2"
+
+[[DiffRules]]
+deps = ["NaNMath", "Random", "SpecialFunctions"]
+git-tree-sha1 = "eb0c34204c8410888844ada5359ac8b96292cfd1"
+uuid = "b552c78f-8df3-52c6-915a-8e097449b14b"
+version = "1.0.1"
+
+[[Distributed]]
+deps = ["Random", "Serialization", "Sockets"]
+uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
+
+[[DocStringExtensions]]
+deps = ["LibGit2", "Markdown", "Pkg", "Test"]
+git-tree-sha1 = "50ddf44c53698f5e784bbebb3f4b21c5807401b1"
+uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
+version = "0.8.3"
+
+[[Documenter]]
+deps = ["Base64", "Dates", "DocStringExtensions", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"]
+git-tree-sha1 = "fb1ff838470573adc15c71ba79f8d31328f035da"
+uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
+version = "0.25.2"
+
+[[ForwardDiff]]
+deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"]
+git-tree-sha1 = "1d090099fb82223abc48f7ce176d3f7696ede36d"
+uuid = "f6369f11-7733-5829-9624-2563aa707210"
+version = "0.10.12"
+
+[[GLPK]]
+deps = ["BinaryProvider", "CEnum", "GLPK_jll", "Libdl", "MathOptInterface"]
+git-tree-sha1 = "0984f1669480cdecd465458b4abf81b238fbfe50"
+uuid = "60bf3e95-4087-53dc-ae20-288a0d20c6a6"
+version = "0.14.2"
+
+[[GLPK_jll]]
+deps = ["GMP_jll", "Libdl", "Pkg"]
+git-tree-sha1 = "ccc855de74292e478d4278e3a6fdd8212f75e81e"
+uuid = "e8aa6df9-e6ca-548a-97ff-1f85fc5b8b98"
+version = "4.64.0+0"
+
+[[GMP_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "15abc5f976569a1c9d651aff02f7222ef305eb2a"
+uuid = "781609d7-10c4-51f6-84f2-b8444358ff6d"
+version = "6.1.2+6"
+
+[[GZip]]
+deps = ["Libdl"]
+git-tree-sha1 = "039be665faf0b8ae36e089cd694233f5dee3f7d6"
+uuid = "92fee26a-97fe-5a0c-ad85-20a5f3185b63"
+version = "0.5.1"
+
+[[Gurobi]]
+deps = ["CEnum", "Libdl", "MathOptInterface"]
+git-tree-sha1 = "de2015da3bffcf005ef51b78163e81bfb7b2301d"
+uuid = "2e9cd046-0924-5485-92f1-d5272153d98b"
+version = "0.9.2"
+
+[[HTTP]]
+deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"]
+git-tree-sha1 = "c7ec02c4c6a039a98a15f955462cd7aea5df4508"
+uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
+version = "0.8.19"
+
+[[IniFile]]
+deps = ["Test"]
+git-tree-sha1 = "098e4d2c533924c921f9f9847274f2ad89e018b8"
+uuid = "83e8ac13-25f8-5344-8a64-a9f2b223428f"
+version = "0.5.0"
+
+[[InteractiveUtils]]
+deps = ["Markdown"]
+uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+
+[[JLLWrappers]]
+git-tree-sha1 = "c70593677bbf2c3ccab4f7500d0f4dacfff7b75c"
+uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
+version = "1.1.3"
+
+[[JSON]]
+deps = ["Dates", "Mmap", "Parsers", "Unicode"]
+git-tree-sha1 = "b34d7cef7b337321e97d22242c3c2b91f476748e"
+uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
+version = "0.21.0"
+
+[[JSONSchema]]
+deps = ["HTTP", "JSON", "ZipFile"]
+git-tree-sha1 = "a9ecdbc90be216912a2e3e8a8e38dc4c93f0d065"
+uuid = "7d188eb4-7ad8-530c-ae41-71a32a6d4692"
+version = "0.3.2"
+
+[[JuMP]]
+deps = ["Calculus", "DataStructures", "ForwardDiff", "LinearAlgebra", "MathOptInterface", "MutableArithmetics", "NaNMath", "Random", "SparseArrays", "Statistics"]
+git-tree-sha1 = "cbab42e2e912109d27046aa88f02a283a9abac7c"
+uuid = "4076af6c-e467-56ae-b986-b466b2749572"
+version = "0.21.3"
+
+[[LibGit2]]
+deps = ["Printf"]
+uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
+
+[[Libdl]]
+uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+
+[[LinearAlgebra]]
+deps = ["Libdl"]
+uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+
+[[Logging]]
+uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
+
+[[MacroTools]]
+deps = ["Markdown", "Random"]
+git-tree-sha1 = "6a8a2a625ab0dea913aba95c11370589e0239ff0"
+uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
+version = "0.5.6"
+
+[[Markdown]]
+deps = ["Base64"]
+uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
+
+[[MathOptInterface]]
+deps = ["BenchmarkTools", "CodecBzip2", "CodecZlib", "JSON", "JSONSchema", "LinearAlgebra", "MutableArithmetics", "OrderedCollections", "SparseArrays", "Test", "Unicode"]
+git-tree-sha1 = "5a1d631e0a9087d425e024d66b9c71e92e78fda8"
+uuid = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
+version = "0.9.17"
+
+[[MbedTLS]]
+deps = ["Dates", "MbedTLS_jll", "Random", "Sockets"]
+git-tree-sha1 = "1c38e51c3d08ef2278062ebceade0e46cefc96fe"
+uuid = "739be429-bea8-5141-9913-cc70e7f3736d"
+version = "1.0.3"
+
+[[MbedTLS_jll]]
+deps = ["Libdl", "Pkg"]
+git-tree-sha1 = "c0b1286883cac4e2b617539de41111e0776d02e8"
+uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
+version = "2.16.8+0"
+
+[[Mmap]]
+uuid = "a63ad114-7e13-5084-954f-fe012c677804"
+
+[[MutableArithmetics]]
+deps = ["LinearAlgebra", "SparseArrays", "Test"]
+git-tree-sha1 = "6cf09794783b9de2e662c4e8b60d743021e338d0"
+uuid = "d8a4904e-b15c-11e9-3269-09a3773c0cb0"
+version = "0.2.10"
+
+[[NaNMath]]
+git-tree-sha1 = "c84c576296d0e2fbb3fc134d3e09086b3ea617cd"
+uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
+version = "0.3.4"
+
+[[OpenBLAS32_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "19c33675cdeb572c1b17f96c492459d4f4958036"
+uuid = "656ef2d0-ae68-5445-9ca0-591084a874a2"
+version = "0.3.10+0"
+
+[[OpenSpecFun_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "9db77584158d0ab52307f8c04f8e7c08ca76b5b3"
+uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e"
+version = "0.5.3+4"
+
+[[OrderedCollections]]
+git-tree-sha1 = "16c08bf5dba06609fe45e30860092d6fa41fde7b"
+uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
+version = "1.3.1"
+
+[[Osi_jll]]
+deps = ["CoinUtils_jll", "CompilerSupportLibraries_jll", "Libdl", "OpenBLAS32_jll", "Pkg"]
+git-tree-sha1 = "bd436a97280df40938e66ae8d18e57aceb072856"
+uuid = "7da25872-d9ce-5375-a4d3-7a845f58efdd"
+version = "0.108.5+3"
+
+[[PackageCompiler]]
+deps = ["Libdl", "Pkg", "UUIDs"]
+git-tree-sha1 = "3eee77c94646163f15bd8626acf494360897f890"
+uuid = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d"
+version = "1.2.3"
+
+[[Parsers]]
+deps = ["Dates"]
+git-tree-sha1 = "6fa4202675c05ba0f8268a6ddf07606350eda3ce"
+uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
+version = "1.0.11"
+
+[[Pkg]]
+deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
+uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+
+[[Printf]]
+deps = ["Unicode"]
+uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+
+[[REPL]]
+deps = ["InteractiveUtils", "Markdown", "Sockets"]
+uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
+
+[[Random]]
+deps = ["Serialization"]
+uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+
+[[Requires]]
+deps = ["UUIDs"]
+git-tree-sha1 = "28faf1c963ca1dc3ec87f166d92982e3c4a1f66d"
+uuid = "ae029012-a4dd-5104-9daa-d747884805df"
+version = "1.1.0"
+
+[[SHA]]
+uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
+
+[[Serialization]]
+uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
+
+[[Sockets]]
+uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
+
+[[SparseArrays]]
+deps = ["LinearAlgebra", "Random"]
+uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+
+[[SpecialFunctions]]
+deps = ["OpenSpecFun_jll"]
+git-tree-sha1 = "d8d8b8a9f4119829410ecd706da4cc8594a1e020"
+uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
+version = "0.10.3"
+
+[[StaticArrays]]
+deps = ["LinearAlgebra", "Random", "Statistics"]
+git-tree-sha1 = "016d1e1a00fabc556473b07161da3d39726ded35"
+uuid = "90137ffa-7385-5640-81b9-e52037218182"
+version = "0.12.4"
+
+[[Statistics]]
+deps = ["LinearAlgebra", "SparseArrays"]
+uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
+
+[[Test]]
+deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
+uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[[TimerOutputs]]
+deps = ["Printf"]
+git-tree-sha1 = "f458ca23ff80e46a630922c555d838303e4b9603"
+uuid = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
+version = "0.5.6"
+
+[[TranscodingStreams]]
+deps = ["Random", "Test"]
+git-tree-sha1 = "7c53c35547de1c5b9d46a4797cf6d8253807108c"
+uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
+version = "0.9.5"
+
+[[UUIDs]]
+deps = ["Random", "SHA"]
+uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
+
+[[Unicode]]
+uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
+
+[[UnitCommitment]]
+deps = ["Cbc", "DataStructures", "Documenter", "GLPK", "GZip", "Gurobi", "JSON", "JuMP", "LinearAlgebra", "Logging", "MathOptInterface", "OrderedCollections", "PackageCompiler", "Printf", "Requires", "SparseArrays", "Test", "TimerOutputs"]
+path = ".."
+uuid = "64606440-39ea-11e9-0f29-3303a1d3d877"
+version = "2.1.0"
+
+[[ZipFile]]
+deps = ["Libdl", "Printf", "Zlib_jll"]
+git-tree-sha1 = "c3a5637e27e914a7a445b8d0ad063d701931e9f7"
+uuid = "a5390f91-8eb1-5f08-bee0-b1d1ffed6cea"
+version = "0.9.3"
+
+[[Zlib_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
+git-tree-sha1 = "320228915c8debb12cb434c59057290f0834dbf6"
+uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
+version = "1.2.11+18"
--- a/benchmark/Project.toml
+++ b/benchmark/Project.toml
@@ -1,5 +1,4 @@
 [deps]
-DocOpt = "968ba79b-81e4-546f-ab3a-2eecfa62a9db"
 Gurobi = "2e9cd046-0924-5485-92f1-d5272153d98b"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
--- a/benchmark/run.jl
+++ b/benchmark/run.jl
@@ -2,208 +2,103 @@
 # Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
 # Released under the modified BSD license. See COPYING.md for more details.

-doc = """UnitCommitment.jl Benchmark Runner
-
-Usage:
-  run.jl [-s ARG]... [-m ARG]... [-c ARG]... [-f ARG]... [options]
-
-Examples:
-
-    1. Benchmark all solvers, methods and formulations:
-
-        julia run.jl
-
-    2. Benchmark formulations "default" and "ArrCon200" using Gurobi:
-
-        julia run.jl -s gurobi -f default -f ArrCon2000
-
-    3. Benchmark a few test cases, using all solvers, methods and formulations:
-
-        julia run.jl -c or-lib/20_0_1_w -c matpower/case1888rte/2017-02-01
-
-    4. Solve 4 test cases in parallel, with 2 threads available per worker:
-
-        JULIA_NUM_THREADS=2 julia --procs 4 run.jl
-
-Options:
-  -h --help             Show this screen.
-  -s --solver=ARG       Mixed-integer linear solver (e.g. gurobi)
-  -c --case=ARG         Unit commitment test case (e.g. or-lib/20_0_1_w)
-  -m --method=ARG       Solution method (e.g. default)
-  -f --formulation=ARG  Formulation (e.g. ArrCon2000)
-  --time-limit=ARG      Time limit in seconds [default: 3600]
-  --gap=ARG             Relative MIP gap tolerance [default: 0.001]
-  --trials=ARG          Number of trials [default: 5]
-"""
-
-using Distributed
-using Pkg
-Pkg.activate(".")
-@everywhere using Pkg
-@everywhere Pkg.activate(".")
-
-using DocOpt
-args = docopt(doc)
-
-@everywhere using UnitCommitment
-@everywhere UnitCommitment._setup_logger()
-
 using UnitCommitment
-using Gurobi
-using Logging
 using JuMP
+using Gurobi
+using JSON
+using Logging
+using Printf
+using LinearAlgebra

-import UnitCommitment:
-    ArrCon2000,
-    CarArr2006,
-    DamKucRajAta2016,
-    Formulation,
-    Gar1962,
-    KnuOstWat2018,
-    MorLatRam2013,
-    PanGua2016,
-    XavQiuWanThi2019
+function main()
+    NUM_THREADS = 4
+    time_limit = 60 * 20
+    BLAS.set_num_threads(NUM_THREADS)

-# Benchmark test cases
-# -----------------------------------------------------------------------------
-cases = [
-    "pglib-uc/ca/2014-09-01_reserves_0",
-    "pglib-uc/ca/2014-09-01_reserves_1",
-    "pglib-uc/ca/2015-03-01_reserves_0",
-    "pglib-uc/ca/2015-06-01_reserves_0",
-    "pglib-uc/ca/Scenario400_reserves_1",
-    "pglib-uc/ferc/2015-01-01_lw",
-    "pglib-uc/ferc/2015-05-01_lw",
-    "pglib-uc/ferc/2015-07-01_hw",
-    "pglib-uc/ferc/2015-10-01_lw",
-    "pglib-uc/ferc/2015-12-01_lw",
-    "pglib-uc/rts_gmlc/2020-04-03",
-    "pglib-uc/rts_gmlc/2020-09-20",
-    "pglib-uc/rts_gmlc/2020-10-27",
-    "pglib-uc/rts_gmlc/2020-11-25",
-    "pglib-uc/rts_gmlc/2020-12-23",
-    "or-lib/20_0_1_w",
-    "or-lib/20_0_5_w",
-    "or-lib/50_0_2_w",
-    "or-lib/75_0_2_w",
-    "or-lib/100_0_1_w",
-    "or-lib/100_0_4_w",
-    "or-lib/100_0_5_w",
-    "or-lib/200_0_3_w",
-    "or-lib/200_0_7_w",
-    "or-lib/200_0_9_w",
-    "tejada19/UC_24h_290g",
-    "tejada19/UC_24h_623g",
-    "tejada19/UC_24h_959g",
-    "tejada19/UC_24h_1577g",
-    "tejada19/UC_24h_1888g",
-    "tejada19/UC_168h_72g",
-    "tejada19/UC_168h_86g",
-    "tejada19/UC_168h_130g",
-    "tejada19/UC_168h_131g",
-    "tejada19/UC_168h_199g",
-    "matpower/case1888rte/2017-02-01",
-    "matpower/case1951rte/2017-02-01",
-    "matpower/case2848rte/2017-02-01",
-    "matpower/case3012wp/2017-02-01",
-    "matpower/case3375wp/2017-02-01",
-    "matpower/case6468rte/2017-02-01",
-    "matpower/case6515rte/2017-02-01",
-]
-
-# Formulations
-# -----------------------------------------------------------------------------
-formulations = Dict(
-    "default" => Formulation(),
-    "ArrCon2000" => Formulation(ramping = ArrCon2000.Ramping()),
-    "CarArr2006" => Formulation(pwl_costs = CarArr2006.PwlCosts()),
-    "DamKucRajAta2016" => Formulation(ramping = DamKucRajAta2016.Ramping()),
-    "Gar1962" => Formulation(pwl_costs = Gar1962.PwlCosts()),
-    "KnuOstWat2018" => Formulation(pwl_costs = KnuOstWat2018.PwlCosts()),
-    "MorLatRam2013" => Formulation(ramping = MorLatRam2013.Ramping()),
-    "PanGua2016" => Formulation(ramping = PanGua2016.Ramping()),
-)
-
-# Solution methods
-# -----------------------------------------------------------------------------
-const gap_limit = parse(Float64, args["--gap"])
-const time_limit = parse(Float64, args["--time-limit"])
-methods = Dict(
-    "default" => XavQiuWanThi2019.Method(
-        time_limit = time_limit,
-        gap_limit = gap_limit,
-    ),
-)
-
-# MIP solvers
-# -----------------------------------------------------------------------------
-optimizers = Dict(
-    "gurobi" => optimizer_with_attributes(
-        Gurobi.Optimizer,
-        "Threads" => Threads.nthreads(),
-    ),
-)
-
-# Parse command line arguments
-# -----------------------------------------------------------------------------
-if !isempty(args["--case"])
-    cases = args["--case"]
-end
-if !isempty(args["--formulation"])
-    formulations = filter(p -> p.first in args["--formulation"], formulations)
-end
-if !isempty(args["--method"])
-    methods = filter(p -> p.first in args["--method"], methods)
-end
-if !isempty(args["--solver"])
-    optimizers = filter(p -> p.first in args["--solver"], optimizers)
-end
-const ntrials = parse(Int, args["--trials"])
-
-# Print benchmark settings
-# -----------------------------------------------------------------------------
-function printlist(d::Dict)
-    for key in keys(d)
-        @info "  - $key"
+    if length(ARGS) >= 2
+      mode = string("_", ARGS[2])
+    else
+      mode = "_default"
    end
-end
-
-function printlist(d::Vector)
-    for key in d
-        @info "  - $key"
+    if length(ARGS) >= 3 && !isempty(strip(ARGS[3]))
+      results_dir = ARGS[3]
+    else
+      results_dir = string("./","results$mode")
    end
-end

-@info "Computational environment:"
-@info "  - CPU: $(Sys.cpu_info()[1].model)"
-@info "  - Logical CPU cores: $(length(Sys.cpu_info()))"
-@info "  - System memory: $(round(Sys.total_memory() / 2^30, digits=2)) GiB"
-@info "  - Available workers: $(nworkers())"
-@info "  - Available threads per worker: $(Threads.nthreads())"
+    # Validate mode and set formulation
+    if mode == "_default"
+      formulation = UnitCommitment.DefaultFormulation
+    elseif mode == "_tight"
+      formulation = UnitCommitment.TightFormulation
+    elseif mode == "_sparse"
+      formulation = UnitCommitment.SparseDefaultFormulation
+    else
+      error("Unknown formulation requested: ", ARGS[2])
+    end

-@info "Parameters:"
-@info "  - Number of trials: $ntrials"
-@info "  - Time limit (s): $time_limit"
-@info "  - Relative MIP gap tolerance: $gap_limit"
+    # Filename is instance_name.sample_number.sol.gz
+    # Parse out the instance + sample parts to create output files
+    basename, suffix = split(ARGS[1], ".") # will not work if suffix part is not present
+    model_filename_stub = string(results_dir,"/$basename.$suffix")
+    solution_filename = string("$model_filename_stub.sol.json")

-@info "Solvers:"
-printlist(optimizers)
+    # Choose logging options
+    logname, logfile = nothing, nothing
+    #logname = string("$model_filename_stub.out")
+    if isa(logname, String) && !isempty(logname)
+      logfile = open(logname, "w")
+      global_logger(TimeLogger(initial_time = time(), file = logfile))
+    else
+      global_logger(TimeLogger(initial_time = time()))
+    end

-@info "Methods:"
-printlist(methods)
+    total_time = @elapsed begin
+        @info "Reading: $basename"
+        time_read = @elapsed begin
+            instance = UnitCommitment.read_benchmark(basename)
+        end
+        @info @sprintf("Read problem in %.2f seconds", time_read)

-@info "Formulations:"
-printlist(formulations)
+        time_model = @elapsed begin
+            optimizer=optimizer_with_attributes(Gurobi.Optimizer,
+                                                "Threads" => NUM_THREADS,
+                                                "Seed" => rand(1:1000))
+            model = build_model(instance=instance, optimizer=optimizer, formulation=formulation)
+        end
+    end

-@info "Cases:"
-printlist(cases)
+    @info "Setting names..."
+    UnitCommitment.set_variable_names!(model)

-# Run benchmarks
-# -----------------------------------------------------------------------------
-UnitCommitment._run_benchmarks(
-    cases = cases,
-    formulations = formulations,
-    methods = methods,
-    optimizers = optimizers,
-    trials = 1:ntrials,
-)
+    model_filename = string(model_filename_stub,".init",".mps.gz")
+    @info string("Exporting initial model without transmission constraints to ", model_filename)
+    JuMP.write_to_file(model.mip, model_filename)
+
+    total_time += @elapsed begin
+        @info "Optimizing..."
+        BLAS.set_num_threads(1)
+        UnitCommitment.optimize!(model, time_limit=time_limit, gap_limit=1e-3)
+    end
+
+    @info @sprintf("Total time was %.2f seconds", total_time)
+
+    @info "Writing: $solution_filename"
+    solution = UnitCommitment.get_solution(model)
+    open(solution_filename, "w") do file
+        JSON.print(file, solution, 2)
+    end
+
+    @info "Verifying solution..."
+    UnitCommitment.validate(instance, solution) 
+
+    model_filename = string(model_filename_stub,".final",".mps.gz")
+    @info string("Exporting final model to ", model_filename)
+    JuMP.write_to_file(model.mip, model_filename)
+
+    if !isnothing(logfile)
+      close(logfile)
+    end
+end # main
+
+main()
--- a/benchmark/scripts/compare.py
+++ b/benchmark/scripts/compare.py
@@ -5,82 +5,60 @@
 import pandas as pd
 import numpy as np
 import seaborn as sns
-import matplotlib
 import matplotlib.pyplot as plt
 import sys

-matplotlib.use("Agg")
-sns.set("talk")
-sns.set_palette(
-    [
-        "#9b59b6",
-        "#3498db",
-        "#95a5a6",
-        "#e74c3c",
-        "#34495e",
-        "#2ecc71",
-    ]
-)
+#easy_cutoff = 120

-filename = sys.argv[1]
-m1 = sys.argv[2]
-m2 = sys.argv[3]
+b1 = pd.read_csv(sys.argv[1], index_col=0)
+b2 = pd.read_csv(sys.argv[2], index_col=0)

-# Prepare data
-data = pd.read_csv(filename, index_col=0)
-b1 = (
-    data[data["Group"] == m1]
-    .groupby(["Instance", "Sample"])
-    .mean()[["Optimization time (s)"]]
-)
-b2 = (
-    data[data["Group"] == m2]
-    .groupby(["Instance", "Sample"])
-    .mean()[["Optimization time (s)"]]
-)
-b1.columns = [f"{m1} time (s)"]
-b2.columns = [f"{m2} time (s)"]
-merged = pd.merge(b1, b2, left_index=True, right_index=True).reset_index().dropna()
-merged["Speedup"] = merged[f"{m1} time (s)"] / merged[f"{m2} time (s)"]
-merged["Group"] = merged["Instance"].str.replace(r"\/.*", "", regex=True)
-merged = merged.sort_values(by=["Instance", "Sample"], ascending=True)
-merged = merged[(merged[f"{m1} time (s)"] > 0) & (merged[f"{m2} time (s)"] > 0)]
+c1 = b1.groupby(["Group", "Instance", "Sample"])[["Optimization time (s)", "Primal bound"]].mean()
+c2 = b2.groupby(["Group", "Instance", "Sample"])[["Optimization time (s)", "Primal bound"]].mean()
+c1.columns = ["A Time (s)", "A Value"]
+c2.columns = ["B Time (s)", "B Value"]

-# Plot results
-k1 = len(merged.groupby("Instance").mean())
-k2 = len(merged.groupby("Group").mean())
-k = k1 + k2
-fig = plt.figure(
-    constrained_layout=True,
-    figsize=(15, max(5, 0.75 * k)),
-)
-plt.suptitle(f"{m1} vs {m2}")
-gs1 = fig.add_gridspec(nrows=k, ncols=1)
-ax1 = fig.add_subplot(gs1[0:k1, 0:1])
-ax2 = fig.add_subplot(gs1[k1:, 0:1], sharex=ax1)
-sns.barplot(
-    data=merged,
-    x="Speedup",
-    y="Instance",
-    color="tab:purple",
-    errcolor="k",
-    errwidth=1.25,
-    ax=ax1,
-)
-sns.barplot(
-    data=merged,
-    x="Speedup",
-    y="Group",
-    color="tab:purple",
-    errcolor="k",
-    errwidth=1.25,
-    ax=ax2,
-)
-ax1.axvline(1.0, linestyle="--", color="k")
-ax2.axvline(1.0, linestyle="--", color="k")
+merged = pd.concat([c1, c2], axis=1)
+merged["Speedup"] = merged["A Time (s)"] / merged["B Time (s)"]
+merged["Time diff (s)"] = merged["B Time (s)"] - merged["A Time (s)"]
+merged["Value diff (%)"] = np.round((merged["B Value"] - merged["A Value"]) / merged["A Value"] * 100.0, 5)
+merged.loc[merged.loc[:, "B Time (s)"] <= 0, "Speedup"] = float("nan")
+merged.loc[merged.loc[:, "B Time (s)"] <= 0, "Time diff (s)"] = float("nan")
+#merged = merged[(merged["A Time (s)"] >= easy_cutoff) | (merged["B Time (s)"] >= easy_cutoff)]
+merged.reset_index(inplace=True)
+merged["Name"] = merged["Group"] + "/" + merged["Instance"]
+#merged = merged.sort_values(by="Speedup", ascending=False)
+
+
+k = len(merged.groupby("Name"))
+plt.figure(figsize=(12, 0.50 * k))
+plt.rcParams['xtick.bottom'] = plt.rcParams['xtick.labelbottom'] = True
+plt.rcParams['xtick.top'] = plt.rcParams['xtick.labeltop'] = True
+sns.set_style("whitegrid")
+sns.set_palette("Set1")
+sns.barplot(data=merged,
+            x="Speedup",
+            y="Name",
+            color="tab:red",
+            capsize=0.15,
+            errcolor="k",
+            errwidth=1.25)
+plt.axvline(1.0, linestyle="--", color="k")
+plt.tight_layout()

 print("Writing tables/compare.png")
 plt.savefig("tables/compare.png", dpi=150)

 print("Writing tables/compare.csv")
-merged.to_csv("tables/compare.csv", index_label="Index")
+merged.loc[:, ["Group",
+               "Instance",
+               "Sample",
+               "A Time (s)",
+               "B Time (s)",
+               "Speedup",
+               "Time diff (s)",
+               "A Value",
+               "B Value",
+               "Value diff (%)",
+              ]
+          ].to_csv("tables/compare.csv", index_label="Index")
--- a/benchmark/scripts/table.py
+++ b/benchmark/scripts/table.py
@@ -6,13 +6,11 @@ from pathlib import Path
 import pandas as pd
 import re
 from tabulate import tabulate
-from colorama import init, Fore, Back, Style
-
-init()


 def process_all_log_files():
-    pathlist = list(Path(".").glob("results/**/*.log"))
+    pathlist = list(Path(".").glob('results/*/*/*.log'))
+    pathlist += list(Path(".").glob('results/*/*.log'))
    rows = []
    for path in pathlist:
        if ".ipy" in str(path):
@@ -24,13 +22,13 @@ def process_all_log_files():
    df.index = range(len(df))
    print("Writing tables/benchmark.csv")
    df.to_csv("tables/benchmark.csv", index_label="Index")
-
-
+        
+        
 def process(filename):
    parts = filename.replace(".log", "").split("/")
-    group_name = parts[1]
-    instance_name = "/".join(parts[2:-1])
-    sample_name = parts[-1]
+    group_name = "/".join(parts[1:-1])
+    instance_name = parts[-1]
+    instance_name, sample_name = instance_name.split(".")
    nodes = 0.0
    optimize_time = 0.0
    simplex_iterations = 0.0
@@ -47,75 +45,56 @@ def process(filename):
    read_time, model_time, isf_time, total_time = None, None, None, None
    cb_calls, cb_time = 0, 0.0
    transmission_count, transmission_time, transmission_calls = 0, 0.0, 0
-
+    
    # m = re.search("case([0-9]*)", instance_name)
    # n_buses = int(m.group(1))
    n_buses = 0
-    validation_errors = 0
-
+    
    with open(filename) as file:
        for line in file.readlines():
-            m = re.search(
-                r"Explored ([0-9.e+]*) nodes \(([0-9.e+]*) simplex iterations\) in ([0-9.e+]*) seconds",
-                line,
-            )
+            m = re.search(r"Explored ([0-9.e+]*) nodes \(([0-9.e+]*) simplex iterations\) in ([0-9.e+]*) seconds", line)
            if m is not None:
                nodes += int(m.group(1))
                simplex_iterations += int(m.group(2))
                optimize_time += float(m.group(3))
-
-            m = re.search(
-                r"Best objective ([0-9.e+]*), best bound ([0-9.e+]*), gap ([0-9.e+]*)\%",
-                line,
-            )
+                
+            m = re.search(r"Best objective ([0-9.e+]*), best bound ([0-9.e+]*), gap ([0-9.e+]*)\%", line)
            if m is not None:
                primal_bound = float(m.group(1))
                dual_bound = float(m.group(2))
                gap = round(float(m.group(3)), 3)
-
-            m = re.search(
-                r"Root relaxation: objective ([0-9.e+]*), ([0-9.e+]*) iterations, ([0-9.e+]*) seconds",
-                line,
-            )
+                
+            m = re.search(r"Root relaxation: objective ([0-9.e+]*), ([0-9.e+]*) iterations, ([0-9.e+]*) seconds", line)
            if m is not None:
                root_obj = float(m.group(1))
                root_iterations += int(m.group(2))
                root_time += float(m.group(3))
-
-            m = re.search(
-                r"Presolved: ([0-9.e+]*) rows, ([0-9.e+]*) columns, ([0-9.e+]*) nonzeros",
-                line,
-            )
+                
+            m = re.search(r"Presolved: ([0-9.e+]*) rows, ([0-9.e+]*) columns, ([0-9.e+]*) nonzeros", line)
            if m is not None:
                n_rows_presolved = int(m.group(1))
                n_cols_presolved = int(m.group(2))
                n_nz_presolved = int(m.group(3))
-
-            m = re.search(
-                r"Optimize a model with ([0-9.e+]*) rows, ([0-9.e+]*) columns and ([0-9.e+]*) nonzeros",
-                line,
-            )
+                
+            m = re.search(r"Optimize a model with ([0-9.e+]*) rows, ([0-9.e+]*) columns and ([0-9.e+]*) nonzeros", line)
            if m is not None:
                n_rows_orig = int(m.group(1))
                n_cols_orig = int(m.group(2))
                n_nz_orig = int(m.group(3))
-
-            m = re.search(
-                r"Variable types: ([0-9.e+]*) continuous, ([0-9.e+]*) integer \(([0-9.e+]*) binary\)",
-                line,
-            )
+                
+            m = re.search(r"Variable types: ([0-9.e+]*) continuous, ([0-9.e+]*) integer \(([0-9.e+]*) binary\)", line)
            if m is not None:
                n_cont_vars_presolved = int(m.group(1))
-                n_bin_vars_presolved = int(m.group(3))
-
+                n_bin_vars_presolved = int(m.group(3))  
+            
            m = re.search(r"Read problem in ([0-9.e+]*) seconds", line)
            if m is not None:
                read_time = float(m.group(1))
-
+            
            m = re.search(r"Computed ISF in ([0-9.e+]*) seconds", line)
            if m is not None:
                isf_time = float(m.group(1))
-
+            
            m = re.search(r"Built model in ([0-9.e+]*) seconds", line)
            if m is not None:
                model_time = float(m.group(1))
@@ -124,10 +103,7 @@ def process(filename):
            if m is not None:
                total_time = float(m.group(1))

-            m = re.search(
-                r"User-callback calls ([0-9.e+]*), time in user-callback ([0-9.e+]*) sec",
-                line,
-            )
+            m = re.search(r"User-callback calls ([0-9.e+]*), time in user-callback ([0-9.e+]*) sec", line)
            if m is not None:
                cb_calls = int(m.group(1))
                cb_time = float(m.group(2))
@@ -140,15 +116,7 @@ def process(filename):
            m = re.search(r".*MW overflow", line)
            if m is not None:
                transmission_count += 1
-
-            m = re.search(r".*Found ([0-9]*) validation errors", line)
-            if m is not None:
-                validation_errors += int(m.group(1))
-                print(
-                    f"{Fore.YELLOW}{Style.BRIGHT}Warning:{Style.RESET_ALL} {validation_errors:8d} "
-                    f"{Style.DIM}validation errors in {Style.RESET_ALL}{group_name}/{instance_name}/{sample_name}"
-                )
-
+                
    return {
        "Group": group_name,
        "Instance": instance_name,
@@ -180,51 +148,36 @@ def process(filename):
        "Transmission screening constraints": transmission_count,
        "Transmission screening time": transmission_time,
        "Transmission screening calls": transmission_calls,
-        "Validation errors": validation_errors,
    }

-
 def generate_chart():
    import pandas as pd
-    import matplotlib
    import matplotlib.pyplot as plt
    import seaborn as sns

-    matplotlib.use("Agg")
-    sns.set("talk")
-    sns.set_palette(
-        [
-            "#9b59b6",
-            "#3498db",
-            "#95a5a6",
-            "#e74c3c",
-            "#34495e",
-            "#2ecc71",
-        ]
-    )
-
    tables = []
    files = ["tables/benchmark.csv"]
    for f in files:
        table = pd.read_csv(f, index_col=0)
+        table.loc[:, "Instance"] = table.loc[:,"Group"] + "/" + table.loc[:,"Instance"]
        table.loc[:, "Filename"] = f
        tables += [table]
    benchmark = pd.concat(tables, sort=True)
-    benchmark = benchmark.sort_values(by=["Group", "Instance"])
-    k1 = len(benchmark.groupby("Instance"))
-    k2 = len(benchmark.groupby("Group"))
-    plt.figure(figsize=(12, 0.25 * k1 * k2))
-    sns.barplot(
-        y="Instance",
-        x="Total time (s)",
-        hue="Group",
-        errcolor="k",
-        errwidth=1.25,
-        data=benchmark,
-    )
+    benchmark = benchmark.sort_values(by="Instance")
+    k = len(benchmark.groupby("Instance"))
+    plt.figure(figsize=(12, 0.50 * k))
+    sns.set_style("whitegrid")
+    sns.set_palette("Set1")
+    sns.barplot(y="Instance",
+                x="Total time (s)",
+                color="tab:red",
+                capsize=0.15,
+                errcolor="k",
+                errwidth=1.25,
+                data=benchmark);
    plt.tight_layout()
    print("Writing tables/benchmark.png")
-    plt.savefig("tables/benchmark.png", dpi=150)
+    plt.savefig("tables/benchmark.png", dpi=150);


 if __name__ == "__main__":
--- a/docs/Project.toml
+++ b/docs/Project.toml
@@ -1,9 +0,0 @@
-[deps]
-Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
-Glob = "c27321d9-0574-5035-807b-f59d2c89b15c"
-HiGHS = "87dc4568-4c63-4d18-b0c0-bb2238e4078b"
-JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
-JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
-MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
-Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
-UnitCommitment = "64606440-39ea-11e9-0f29-3303a1d3d877"
--- a/docs/example/out.json
+++ b/docs/example/out.json
--- a/docs/example/s1.json
+++ b/docs/example/s1.json
@@ -1,495 +0,0 @@
-{
-    "Parameters": {
-	"Version": "0.3",
-        "Time horizon (h)": 4
-    },
-    "Generators": {
-        "g1": {
-            "Bus": "b1",
-            "Production cost curve (MW)": [
-                100,
-                110,
-                130,
-                135
-            ],
-            "Production cost curve ($)": [
-                1400,
-                1600,
-                2200,
-                2400
-            ],
-            "Startup delays (h)": [
-                1,
-                2,
-                3
-            ],
-            "Startup costs ($)": [
-                1000.0,
-                1500.0,
-                2000.0
-            ],
-            "Initial status (h)": -100,
-            "Initial power (MW)": 0
-        },
-        "g2": {
-            "Bus": "b2",
-            "Production cost curve (MW)": [
-                0,
-                47,
-                94,
-                140
-            ],
-            "Production cost curve ($)": [
-                0,
-                2256.00,
-                4733.37,
-                7395.39
-            ],
-            "Startup delays (h)": [
-                1,
-                4
-            ],
-            "Startup costs ($)": [
-                3000.0,
-                4000.0
-            ],
-            "Ramp up limit (MW)": 98.0,
-            "Ramp down limit (MW)": 98.0,
-            "Startup limit (MW)": 98.0,
-            "Shutdown limit (MW)": 98.0,
-            "Minimum uptime (h)": 4,
-            "Minimum downtime (h)": 4,
-            "Maximum daily energy (MWh)": null,
-            "Maximum daily starts": null,
-            "Initial status (h)": -8,
-            "Initial power (MW)": 0,
-            "Reserve eligibility": [
-                "r1"
-            ]
-        },
-        "g3": {
-            "Bus": "b3",
-            "Production cost curve (MW)": [
-                0,
-                33,
-                66,
-                100
-            ],
-            "Production cost curve ($)": [
-                0,
-                1113.75,
-                2369.07,
-                3891.54
-            ],
-            "Startup delays (h)": [
-                1,
-                4,
-                8
-            ],
-            "Startup costs ($)": [
-                1000.0,
-                2000.0,
-                3000.0
-            ],
-            "Ramp up limit (MW)": 70.0,
-            "Ramp down limit (MW)": 70.0,
-            "Startup limit (MW)": 70.0,
-            "Shutdown limit (MW)": 70.0,
-            "Must run?": true,
-            "Minimum uptime (h)": 1,
-            "Minimum downtime (h)": 1,
-            "Maximum daily energy (MWh)": null,
-            "Maximum daily starts": null,
-            "Initial status (h)": -6,
-            "Initial power (MW)": 0,
-            "Reserve eligibility": [
-                "r1"
-            ]
-        },
-        "g4": {
-            "Bus": "b6",
-            "Production cost curve (MW)": [
-                33,
-                66,
-                100
-            ],
-            "Production cost curve ($)": [
-                1113.75,
-                2369.07,
-                3891.54
-            ],
-            "Initial status (h)": -100,
-            "Initial power (MW)": 0,
-            "Reserve eligibility": [
-                "r1"
-            ]
-        },
-        "g5": {
-            "Bus": "b8",
-            "Production cost curve (MW)": [
-                33,
-                66,
-                100
-            ],
-            "Production cost curve ($)": [
-                1113.75,
-                2369.07,
-                3891.54
-            ],
-            "Initial status (h)": -100,
-            "Initial power (MW)": 0,
-            "Reserve eligibility": [
-                "r1"
-            ]
-        },
-        "g6": {
-            "Bus": "b8",
-            "Production cost curve (MW)": [
-                100
-            ],
-            "Production cost curve ($)": [
-                10000.00
-            ],
-            "Initial status (h)": -100,
-            "Initial power (MW)": 0,
-            "Reserve eligibility": [
-                "r1"
-            ]
-        }
-    },
-    "Buses": {
-        "b1": {
-            "Load (MW)": 0.0
-        },
-        "b2": {
-            "Load (MW)": [
-                26.01527,
-                24.46212,
-                23.29725,
-                22.90897
-            ]
-        },
-        "b3": {
-            "Load (MW)": [
-                112.93263,
-                106.19039,
-                101.1337,
-                99.44814
-            ]
-        },
-        "b4": {
-            "Load (MW)": [
-                57.30552,
-                53.88429,
-                51.31838,
-                50.46307
-            ]
-        },
-        "b5": {
-            "Load (MW)": [
-                9.11134,
-                8.56738,
-                8.15941,
-                8.02342
-            ]
-        },
-        "b6": {
-            "Load (MW)": [
-                13.42723,
-                12.62561,
-                12.02439,
-                11.82398
-            ]
-        },
-        "b7": {
-            "Load (MW)": 0.0
-        },
-        "b8": {
-            "Load (MW)": 0.0
-        },
-        "b9": {
-            "Load (MW)": [
-                35.36638,
-                33.25495,
-                31.67138,
-                31.14353
-            ]
-        },
-        "b10": {
-            "Load (MW)": [
-                10.78974,
-                10.14558,
-                9.66246,
-                9.50141
-            ]
-        },
-        "b11": {
-            "Load (MW)": [
-                4.19601,
-                3.9455,
-                3.75762,
-                3.69499
-            ]
-        },
-        "b12": {
-            "Load (MW)": [
-                7.31305,
-                6.87645,
-                6.549,
-                6.43985
-            ]
-        },
-        "b13": {
-            "Load (MW)": [
-                16.18461,
-                15.21837,
-                14.49368,
-                14.25212
-            ]
-        },
-        "b14": {
-            "Load (MW)": [
-                17.86302,
-                16.79657,
-                15.99673,
-                15.73012
-            ]
-        }
-    },
-    "Transmission lines": {
-        "l1": {
-            "Source bus": "b1",
-            "Target bus": "b2",
-            "Reactance (ohms)": 0.05917000000000001,
-            "Susceptance (S)": 29.496860773945063,
-            "Normal flow limit (MW)": 300.0,
-            "Emergency flow limit (MW)": 400.0,
-            "Flow limit penalty ($/MW)": 1000.0
-        },
-        "l2": {
-            "Source bus": "b1",
-            "Target bus": "b5",
-            "Reactance (ohms)": 0.22304000000000002,
-            "Susceptance (S)": 7.825184953346168
-        },
-        "l3": {
-            "Source bus": "b2",
-            "Target bus": "b3",
-            "Reactance (ohms)": 0.19797,
-            "Susceptance (S)": 8.816129979261149
-        },
-        "l4": {
-            "Source bus": "b2",
-            "Target bus": "b4",
-            "Reactance (ohms)": 0.17632,
-            "Susceptance (S)": 9.898645939169292
-        },
-        "l5": {
-            "Source bus": "b2",
-            "Target bus": "b5",
-            "Reactance (ohms)": 0.17388,
-            "Susceptance (S)": 10.037550333530765
-        },
-        "l6": {
-            "Source bus": "b3",
-            "Target bus": "b4",
-            "Reactance (ohms)": 0.17103,
-            "Susceptance (S)": 10.204813494675376
-        },
-        "l7": {
-            "Source bus": "b4",
-            "Target bus": "b5",
-            "Reactance (ohms)": 0.04211,
-            "Susceptance (S)": 41.44690695783257
-        },
-        "l8": {
-            "Source bus": "b4",
-            "Target bus": "b7",
-            "Reactance (ohms)": 0.20911999999999997,
-            "Susceptance (S)": 8.346065665619404
-        },
-        "l9": {
-            "Source bus": "b4",
-            "Target bus": "b9",
-            "Reactance (ohms)": 0.55618,
-            "Susceptance (S)": 3.1380654680037567
-        },
-        "l10": {
-            "Source bus": "b5",
-            "Target bus": "b6",
-            "Reactance (ohms)": 0.25201999999999997,
-            "Susceptance (S)": 6.92536009838239
-        },
-        "l11": {
-            "Source bus": "b6",
-            "Target bus": "b11",
-            "Reactance (ohms)": 0.1989,
-            "Susceptance (S)": 8.774908255376218
-        },
-        "l12": {
-            "Source bus": "b6",
-            "Target bus": "b12",
-            "Reactance (ohms)": 0.25581,
-            "Susceptance (S)": 6.8227561549365925
-        },
-        "l13": {
-            "Source bus": "b6",
-            "Target bus": "b13",
-            "Reactance (ohms)": 0.13027,
-            "Susceptance (S)": 13.397783465067395
-        },
-        "l14": {
-            "Source bus": "b7",
-            "Target bus": "b8",
-            "Reactance (ohms)": 0.17615,
-            "Susceptance (S)": 9.908198989465395
-        },
-        "l15": {
-            "Source bus": "b7",
-            "Target bus": "b9",
-            "Reactance (ohms)": 0.11001,
-            "Susceptance (S)": 15.865187273832648
-        },
-        "l16": {
-            "Source bus": "b9",
-            "Target bus": "b10",
-            "Reactance (ohms)": 0.0845,
-            "Susceptance (S)": 20.65478404727017
-        },
-        "l17": {
-            "Source bus": "b9",
-            "Target bus": "b14",
-            "Reactance (ohms)": 0.27038,
-            "Susceptance (S)": 6.4550974628091184
-        },
-        "l18": {
-            "Source bus": "b10",
-            "Target bus": "b11",
-            "Reactance (ohms)": 0.19207,
-            "Susceptance (S)": 9.08694357262628
-        },
-        "l19": {
-            "Source bus": "b12",
-            "Target bus": "b13",
-            "Reactance (ohms)": 0.19988,
-            "Susceptance (S)": 8.73188539120637
-        },
-        "l20": {
-            "Source bus": "b13",
-            "Target bus": "b14",
-            "Reactance (ohms)": 0.34802,
-            "Susceptance (S)": 5.0150257226433235
-        }
-    },
-    "Contingencies": {
-        "c1": {
-            "Affected lines": [
-                "l1"
-            ]
-        },
-        "c2": {
-            "Affected lines": [
-                "l2"
-            ]
-        },
-        "c3": {
-            "Affected lines": [
-                "l3"
-            ]
-        },
-        "c4": {
-            "Affected lines": [
-                "l4"
-            ]
-        },
-        "c5": {
-            "Affected lines": [
-                "l5"
-            ]
-        },
-        "c6": {
-            "Affected lines": [
-                "l6"
-            ]
-        },
-        "c7": {
-            "Affected lines": [
-                "l7"
-            ]
-        },
-        "c8": {
-            "Affected lines": [
-                "l8"
-            ]
-        },
-        "c9": {
-            "Affected lines": [
-                "l9"
-            ]
-        },
-        "c10": {
-            "Affected lines": [
-                "l10"
-            ]
-        },
-        "c11": {
-            "Affected lines": [
-                "l11"
-            ]
-        },
-        "c12": {
-            "Affected lines": [
-                "l12"
-            ]
-        },
-        "c13": {
-            "Affected lines": [
-                "l13"
-            ]
-        },
-        "c15": {
-            "Affected lines": [
-                "l15"
-            ]
-        },
-        "c16": {
-            "Affected lines": [
-                "l16"
-            ]
-        },
-        "c17": {
-            "Affected lines": [
-                "l17"
-            ]
-        },
-        "c18": {
-            "Affected lines": [
-                "l18"
-            ]
-        },
-        "c19": {
-            "Affected lines": [
-                "l19"
-            ]
-        },
-        "c20": {
-            "Affected lines": [
-                "l20"
-            ]
-        }
-    },
-    "Price-sensitive loads": {
-        "ps1": {
-            "Bus": "b3",
-            "Revenue ($/MW)": 100.0,
-            "Demand (MW)": 50.0
-        }
-    },
-    "Reserves": {
-        "r1": {
-            "Type": "Spinning",
-            "Amount (MW)": 100.0,
-            "Shortfall penalty ($/MW)": 1000.0
-        }
-    }
-}
--- a/docs/example/s2.json
+++ b/docs/example/s2.json
@@ -1,495 +0,0 @@
-{
-    "Parameters": {
-	"Version": "0.3",
-        "Time horizon (h)": 4
-    },
-    "Generators": {
-        "g1": {
-            "Bus": "b1",
-            "Production cost curve (MW)": [
-                100,
-                110,
-                130,
-                135
-            ],
-            "Production cost curve ($)": [
-                1400,
-                1600,
-                2200,
-                2400
-            ],
-            "Startup delays (h)": [
-                1,
-                2,
-                3
-            ],
-            "Startup costs ($)": [
-                1000.0,
-                1500.0,
-                2000.0
-            ],
-            "Initial status (h)": -100,
-            "Initial power (MW)": 0
-        },
-        "g2": {
-            "Bus": "b2",
-            "Production cost curve (MW)": [
-                0,
-                47,
-                94,
-                140
-            ],
-            "Production cost curve ($)": [
-                0,
-                2256.00,
-                4733.37,
-                7395.39
-            ],
-            "Startup delays (h)": [
-                1,
-                4
-            ],
-            "Startup costs ($)": [
-                3000.0,
-                4000.0
-            ],
-            "Ramp up limit (MW)": 98.0,
-            "Ramp down limit (MW)": 98.0,
-            "Startup limit (MW)": 98.0,
-            "Shutdown limit (MW)": 98.0,
-            "Minimum uptime (h)": 4,
-            "Minimum downtime (h)": 4,
-            "Maximum daily energy (MWh)": null,
-            "Maximum daily starts": null,
-            "Initial status (h)": -8,
-            "Initial power (MW)": 0,
-            "Reserve eligibility": [
-                "r1"
-            ]
-        },
-        "g3": {
-            "Bus": "b3",
-            "Production cost curve (MW)": [
-                0,
-                33,
-                66,
-                100
-            ],
-            "Production cost curve ($)": [
-                0,
-                1113.75,
-                2369.07,
-                3891.54
-            ],
-            "Startup delays (h)": [
-                1,
-                4,
-                8
-            ],
-            "Startup costs ($)": [
-                1000.0,
-                2000.0,
-                3000.0
-            ],
-            "Ramp up limit (MW)": 70.0,
-            "Ramp down limit (MW)": 70.0,
-            "Startup limit (MW)": 70.0,
-            "Shutdown limit (MW)": 70.0,
-            "Must run?": true,
-            "Minimum uptime (h)": 1,
-            "Minimum downtime (h)": 1,
-            "Maximum daily energy (MWh)": null,
-            "Maximum daily starts": null,
-            "Initial status (h)": -6,
-            "Initial power (MW)": 0,
-            "Reserve eligibility": [
-                "r1"
-            ]
-        },
-        "g4": {
-            "Bus": "b6",
-            "Production cost curve (MW)": [
-                33,
-                66,
-                100
-            ],
-            "Production cost curve ($)": [
-                1113.75,
-                2369.07,
-                3891.54
-            ],
-            "Initial status (h)": -100,
-            "Initial power (MW)": 0,
-            "Reserve eligibility": [
-                "r1"
-            ]
-        },
-        "g5": {
-            "Bus": "b8",
-            "Production cost curve (MW)": [
-                33,
-                66,
-                100
-            ],
-            "Production cost curve ($)": [
-                1113.75,
-                2369.07,
-                3891.54
-            ],
-            "Initial status (h)": -100,
-            "Initial power (MW)": 0,
-            "Reserve eligibility": [
-                "r1"
-            ]
-        },
-        "g6": {
-            "Bus": "b8",
-            "Production cost curve (MW)": [
-                100
-            ],
-            "Production cost curve ($)": [
-                10000.00
-            ],
-            "Initial status (h)": -100,
-            "Initial power (MW)": 0,
-            "Reserve eligibility": [
-                "r1"
-            ]
-        }
-    },
-    "Buses": {
-        "b1": {
-            "Load (MW)": 0.0
-        },
-        "b2": {
-            "Load (MW)": [
-                26.01527,
-                24.46212,
-                23.29725,
-                22.90897
-            ]
-        },
-        "b3": {
-            "Load (MW)": [
-                112.93263,
-                106.19039,
-                101.1337,
-                99.44814
-            ]
-        },
-        "b4": {
-            "Load (MW)": [
-                57.30552,
-                53.88429,
-                51.31838,
-                50.46307
-            ]
-        },
-        "b5": {
-            "Load (MW)": [
-                9.11134,
-                8.56738,
-                8.15941,
-                8.02342
-            ]
-        },
-        "b6": {
-            "Load (MW)": [
-                13.42723,
-                12.62561,
-                12.02439,
-                11.82398
-            ]
-        },
-        "b7": {
-            "Load (MW)": 0.0
-        },
-        "b8": {
-            "Load (MW)": 0.0
-        },
-        "b9": {
-            "Load (MW)": [
-                35.36638,
-                33.25495,
-                31.67138,
-                31.14353
-            ]
-        },
-        "b10": {
-            "Load (MW)": [
-                10.78974,
-                10.14558,
-                9.66246,
-                9.50141
-            ]
-        },
-        "b11": {
-            "Load (MW)": [
-                4.19601,
-                3.9455,
-                3.75762,
-                3.69499
-            ]
-        },
-        "b12": {
-            "Load (MW)": [
-                7.31305,
-                6.87645,
-                6.549,
-                6.43985
-            ]
-        },
-        "b13": {
-            "Load (MW)": [
-                16.18461,
-                15.21837,
-                14.49368,
-                14.25212
-            ]
-        },
-        "b14": {
-            "Load (MW)": [
-                17.86302,
-                16.79657,
-                15.99673,
-                15.73012
-            ]
-        }
-    },
-    "Transmission lines": {
-        "l1": {
-            "Source bus": "b1",
-            "Target bus": "b2",
-            "Reactance (ohms)": 0.05917000000000001,
-            "Susceptance (S)": 29.496860773945063,
-            "Normal flow limit (MW)": 300.0,
-            "Emergency flow limit (MW)": 400.0,
-            "Flow limit penalty ($/MW)": 1000.0
-        },
-        "l2": {
-            "Source bus": "b1",
-            "Target bus": "b5",
-            "Reactance (ohms)": 0.22304000000000002,
-            "Susceptance (S)": 7.825184953346168
-        },
-        "l3": {
-            "Source bus": "b2",
-            "Target bus": "b3",
-            "Reactance (ohms)": 0.19797,
-            "Susceptance (S)": 8.816129979261149
-        },
-        "l4": {
-            "Source bus": "b2",
-            "Target bus": "b4",
-            "Reactance (ohms)": 0.17632,
-            "Susceptance (S)": 9.898645939169292
-        },
-        "l5": {
-            "Source bus": "b2",
-            "Target bus": "b5",
-            "Reactance (ohms)": 0.17388,
-            "Susceptance (S)": 10.037550333530765
-        },
-        "l6": {
-            "Source bus": "b3",
-            "Target bus": "b4",
-            "Reactance (ohms)": 0.17103,
-            "Susceptance (S)": 10.204813494675376
-        },
-        "l7": {
-            "Source bus": "b4",
-            "Target bus": "b5",
-            "Reactance (ohms)": 0.04211,
-            "Susceptance (S)": 41.44690695783257
-        },
-        "l8": {
-            "Source bus": "b4",
-            "Target bus": "b7",
-            "Reactance (ohms)": 0.20911999999999997,
-            "Susceptance (S)": 8.346065665619404
-        },
-        "l9": {
-            "Source bus": "b4",
-            "Target bus": "b9",
-            "Reactance (ohms)": 0.55618,
-            "Susceptance (S)": 3.1380654680037567
-        },
-        "l10": {
-            "Source bus": "b5",
-            "Target bus": "b6",
-            "Reactance (ohms)": 0.25201999999999997,
-            "Susceptance (S)": 6.92536009838239
-        },
-        "l11": {
-            "Source bus": "b6",
-            "Target bus": "b11",
-            "Reactance (ohms)": 0.1989,
-            "Susceptance (S)": 8.774908255376218
-        },
-        "l12": {
-            "Source bus": "b6",
-            "Target bus": "b12",
-            "Reactance (ohms)": 0.25581,
-            "Susceptance (S)": 6.8227561549365925
-        },
-        "l13": {
-            "Source bus": "b6",
-            "Target bus": "b13",
-            "Reactance (ohms)": 0.13027,
-            "Susceptance (S)": 13.397783465067395
-        },
-        "l14": {
-            "Source bus": "b7",
-            "Target bus": "b8",
-            "Reactance (ohms)": 0.17615,
-            "Susceptance (S)": 9.908198989465395
-        },
-        "l15": {
-            "Source bus": "b7",
-            "Target bus": "b9",
-            "Reactance (ohms)": 0.11001,
-            "Susceptance (S)": 15.865187273832648
-        },
-        "l16": {
-            "Source bus": "b9",
-            "Target bus": "b10",
-            "Reactance (ohms)": 0.0845,
-            "Susceptance (S)": 20.65478404727017
-        },
-        "l17": {
-            "Source bus": "b9",
-            "Target bus": "b14",
-            "Reactance (ohms)": 0.27038,
-            "Susceptance (S)": 6.4550974628091184
-        },
-        "l18": {
-            "Source bus": "b10",
-            "Target bus": "b11",
-            "Reactance (ohms)": 0.19207,
-            "Susceptance (S)": 9.08694357262628
-        },
-        "l19": {
-            "Source bus": "b12",
-            "Target bus": "b13",
-            "Reactance (ohms)": 0.19988,
-            "Susceptance (S)": 8.73188539120637
-        },
-        "l20": {
-            "Source bus": "b13",
-            "Target bus": "b14",
-            "Reactance (ohms)": 0.34802,
-            "Susceptance (S)": 5.0150257226433235
-        }
-    },
-    "Contingencies": {
-        "c1": {
-            "Affected lines": [
-                "l1"
-            ]
-        },
-        "c2": {
-            "Affected lines": [
-                "l2"
-            ]
-        },
-        "c3": {
-            "Affected lines": [
-                "l3"
-            ]
-        },
-        "c4": {
-            "Affected lines": [
-                "l4"
-            ]
-        },
-        "c5": {
-            "Affected lines": [
-                "l5"
-            ]
-        },
-        "c6": {
-            "Affected lines": [
-                "l6"
-            ]
-        },
-        "c7": {
-            "Affected lines": [
-                "l7"
-            ]
-        },
-        "c8": {
-            "Affected lines": [
-                "l8"
-            ]
-        },
-        "c9": {
-            "Affected lines": [
-                "l9"
-            ]
-        },
-        "c10": {
-            "Affected lines": [
-                "l10"
-            ]
-        },
-        "c11": {
-            "Affected lines": [
-                "l11"
-            ]
-        },
-        "c12": {
-            "Affected lines": [
-                "l12"
-            ]
-        },
-        "c13": {
-            "Affected lines": [
-                "l13"
-            ]
-        },
-        "c15": {
-            "Affected lines": [
-                "l15"
-            ]
-        },
-        "c16": {
-            "Affected lines": [
-                "l16"
-            ]
-        },
-        "c17": {
-            "Affected lines": [
-                "l17"
-            ]
-        },
-        "c18": {
-            "Affected lines": [
-                "l18"
-            ]
-        },
-        "c19": {
-            "Affected lines": [
-                "l19"
-            ]
-        },
-        "c20": {
-            "Affected lines": [
-                "l20"
-            ]
-        }
-    },
-    "Price-sensitive loads": {
-        "ps1": {
-            "Bus": "b3",
-            "Revenue ($/MW)": 100.0,
-            "Demand (MW)": 50.0
-        }
-    },
-    "Reserves": {
-        "r1": {
-            "Type": "Spinning",
-            "Amount (MW)": 100.0,
-            "Shortfall penalty ($/MW)": 1000.0
-        }
-    }
-}
--- a/docs/make.jl
+++ b/docs/make.jl
@@ -1,18 +0,0 @@
-using Documenter, UnitCommitment, JuMP
-
-function make()
-    makedocs(
-        sitename="UnitCommitment.jl",
-        pages=[
-            "Home" => "index.md",
-            "usage.md",
-            "format.md",
-            "instances.md",
-            "model.md",
-            "api.md",
-        ],
-        format = Documenter.HTML(
-            assets=["assets/custom.css"],
-        )
-    )
-end
--- a/docs/src/api.md
+++ b/docs/src/api.md
@@ -1,62 +0,0 @@
-# API Reference
-
-## Read data, build model & optimize
-
-```@docs
-UnitCommitment.read
-UnitCommitment.read_benchmark
-UnitCommitment.build_model
-UnitCommitment.optimize!
-UnitCommitment.solution
-UnitCommitment.validate
-UnitCommitment.write
-```
-
-## Locational Marginal Prices
-
-### Conventional LMPs
-```@docs
-UnitCommitment.compute_lmp(::JuMP.Model,::UnitCommitment.ConventionalLMP)
-```
-
-### Approximated Extended LMPs
-```@docs
-UnitCommitment.AELMP
-UnitCommitment.compute_lmp(::JuMP.Model,::UnitCommitment.AELMP)
-```
-
-
-## Modify instance
-
-```@docs
-UnitCommitment.slice
-UnitCommitment.randomize!(::UnitCommitment.UnitCommitmentInstance)
-UnitCommitment.generate_initial_conditions!
-```
-
-## Formulations
-
-```@docs
-UnitCommitment.Formulation
-UnitCommitment.ShiftFactorsFormulation
-UnitCommitment.ArrCon2000
-UnitCommitment.CarArr2006
-UnitCommitment.DamKucRajAta2016
-UnitCommitment.Gar1962
-UnitCommitment.KnuOstWat2018
-UnitCommitment.MorLatRam2013
-UnitCommitment.PanGua2016
-UnitCommitment.WanHob2016
-```
-
-## Solution Methods
-
-```@docs
-UnitCommitment.XavQiuWanThi2019.Method
-```
-
-## Randomization Methods
-
-```@docs
-UnitCommitment.XavQiuAhm2021.Randomization
-```
--- a/docs/src/assets/custom.css
+++ b/docs/src/assets/custom.css
@@ -1,36 +0,0 @@
-@media screen and (min-width: 1056px) {
-    #documenter .docs-main {
-      max-width: 65rem !important;
-    }
-}
-  
-
-tbody, thead, pre {
-    border: 1px solid rgba(0, 0, 0, 0.25);
-}
-
-table td, th {
-    padding: 8px;
-}
-
-table p {
-    margin-bottom: 0;
-}
-
-table td code {
-    white-space: nowrap;
-}
-
-table tr,
-table th {
-    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-}
-
-table tr:last-child {
-    border-bottom: 0;
-}
-
-code {
-    background-color: transparent;
-    color: rgb(232, 62, 140);
-}
--- a/docs/src/format.md
+++ b/docs/src/format.md
@@ -1,408 +0,0 @@
-Data Format
-===========
-
-Input Data Format
-----------------
-
-An instance of the stochastic security-constrained unit commitment (SCUC) problem is composed multiple scenarios. Each scenario should be described in an individual JSON file containing the main section belows. For deterministic instances, a single scenario file, following the same format below, may also be provided. Fields that are allowed to differ among scenarios are marked as "uncertain". Fields that are allowed to be time-dependent are marked as "time series".
-
-* [Parameters](#Parameters)
-* [Buses](#Buses)
-* [Generators](#Generators)
-* [Storage units](#Storage-units)
-* [Price-sensitive loads](#Price-sensitive-loads)
-* [Transmission lines](#Transmission-lines)
-* [Reserves](#Reserves)
-* [Contingencies](#Contingencies)
-
-Each section is described in detail below. See [case118/2017-01-01.json.gz](https://axavier.org/UnitCommitment.jl/0.3/instances/matpower/case118/2017-01-01.json.gz) for a complete example.
-
-### 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.
-
-| Key                            | Description                                       | Default  | Time series? | Uncertain?
-| :----------------------------- | :------------------------------------------------ | :------: | :------------:| :----------:
-| `Version` | Version of UnitCommitment.jl this file was written for. Required to ensure that the file remains readable in future versions of the package. If you are following this page to construct the file, this field should equal `0.4`. | Required | No | No
-| `Time horizon (min)` or  `Time horizon (h)` | Length of the planning horizon (in minutes or hours). Either `Time horizon (min)` or `Time horizon (h)` is required, but not both.  | Required | No | No
-| `Time step (min)` | Length of each time step (in minutes). Must be a divisor of 60 (e.g. 60, 30, 20, 15, etc). | `60` | No | No
-| `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` | No | Yes
-| `Scenario name` | Name of the scenario. | `"s1"` | No | ---
-| `Scenario weight` | Weight of the scenario. The scenario weight can be any positive real number, that is, it does not have to be between zero and one. The package normalizes the weights to ensure that the probability of all scenarios sum up to one. | 1.0 | No | ---
-
-
-#### Example
-```json
-{
-    "Parameters": {
-        "Version": "0.3",
-        "Time horizon (h)": 4,
-        "Power balance penalty ($/MW)": 1000.0,
-        "Scenario name": "s1",
-        "Scenario weight": 0.5
-    }
-}
-```
-
-### Buses
-
-This section describes the characteristics of each bus in the system. 
-
-| Key                | Description                                                   | Default | Time series? | Uncertain?
-| :----------------- | :------------------------------------------------------------ | ------- | :-----------: | :---:
-| `Load (MW)`        | Fixed load connected to the bus (in MW).                      | Required | Yes | Yes
-
-
-#### Example
-```json
-{
-    "Buses": {
-        "b1": {
-            "Load (MW)": 0.0
-        },
-        "b2": {
-            "Load (MW)": [
-                26.01527,
-                24.46212,
-                23.29725,
-                22.90897
-            ]
-        }
-    }
-}
-```
-
-
-### Generators
-
-This section describes all generators in the system. Two types of units can be specified:
-
- **Thermal units:** Units that produce power by converting heat into electrical energy, such as coal and oil power plants. These units use a more complex model, with binary decision variables, and various constraints to enforce ramp rates and minimum up/down time.
- **Profiled units:** Simplified model for units that do not require the constraints mentioned above, only a maximum and minimum power output for each time period. Typically used for renewables and hydro.
-
-#### Thermal Units
-
-| Key                       | Description                                      | Default | Time series? | Uncertain?
-| :------------------------ | :------------------------------------------------| ------- | :-----------: | :---:
-| `Bus`                     | Identifier of the bus where this generator is located (string). | Required | No | Yes
-| `Type`                     | Type of the generator (string). For thermal generators, this must be `Thermal`.  | Required | No | No
-| `Production cost curve (MW)` and `Production cost curve ($)` | Parameters describing the piecewise-linear production costs. See below for more details. | Required | Yes | Yes
-| `Startup costs ($)` and `Startup delays (h)` | Parameters describing how much it costs to start the generator after it has been shut down for a certain amount of time. If `Startup costs ($)` and `Startup delays (h)` are set to `[300.0, 400.0]` and `[1, 4]`, for example, and the generator is shut down at time `00:00` (h:min), then it costs \$300 to start up the generator at any time between `01:00` and `03:59`, and \$400 to start the generator at time `04:00` or any time after that.  The number of startup cost points is unlimited, and may be different for each generator. Startup delays must be strictly increasing and the first entry must equal `Minimum downtime (h)`. | `[0.0]` and `[1]` | No | Yes
-| `Minimum uptime (h)`      | Minimum amount of time the generator must stay operational after starting up (in hours). For example, if the generator starts up at time `00:00` (h:min) and `Minimum uptime (h)` is set to 4, then the generator can only shut down at time `04:00`. | `1` | No | Yes
-| `Minimum downtime (h)`    | Minimum amount of time the generator must stay offline after shutting down (in hours). For example, if the generator shuts down at time `00:00` (h:min) and `Minimum downtime (h)` is set to 4, then the generator can only start producing power again at time `04:00`. | `1` | No | Yes
-| `Ramp up limit (MW)`      | Maximum increase in production from one time step to the next (in MW). For example, if the generator is producing 100 MW at time step 1 and if this parameter is set to 40 MW, then the generator will produce at most 140 MW at time step 2. | `+inf` | No | Yes
-| `Ramp down limit (MW)`    | Maximum decrease in production from one time step to the next (in MW). For example, if the generator is producing 100 MW at time step 1 and this parameter is set to 40 MW, then the generator will produce at least 60 MW at time step 2. | `+inf` | No | Yes
-| `Startup limit (MW)`   | Maximum amount of power a generator can produce immediately after starting up (in MW). For example, if `Startup limit (MW)` is set to 100 MW and the unit is off at time step 1, then it may produce at most 100 MW at time step 2.| `+inf` | No | Yes
-| `Shutdown limit (MW)`     | Maximum amount of power a generator can produce immediately before shutting down (in MW). Specifically, the generator can only shut down at time step `t+1` if its production at time step `t` is below this limit.  | `+inf` | No | Yes
-| `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 | No | No
-| `Initial power (MW)`  | Amount of power the generator at time step `-1`, immediately before the planning horizon starts. | Required | No | No
-| `Must run?`               | If `true`, the generator should be committed, even if that is not economical (Boolean). | `false` | Yes | Yes
-| `Reserve eligibility` | List of reserve products this generator is eligibe to provide. By default, the generator is not eligible to provide any reserves. | `[]` | No | Yes
-| `Commitment status` | List of commitment status over the time horizon. At time `t`, if `true`, the generator must be commited at that time period; if `false`, the generator must not be commited at that time period. If `null` at time `t`, the generator's commitment status is then decided by the model. By default, the status is a list of `null` values. | `null` | Yes | Yes
-
-#### Profiled Units
-
-| Key               | Description                                       | Default  | Time series? | Uncertain?
-| :---------------- | :------------------------------------------------ | :------: | :------------: | :---:
-| `Bus`             | Identifier of the bus where this generator is located (string). | Required | No | Yes
-| `Type`            | Type of the generator (string). For profiled generators, this must be `Profiled`.  | Required | No | No
-| `Cost ($/MW)`     | Cost incurred for serving each MW of power by this generator. | Required | Yes | Yes
-| `Minimum power (MW)` | Minimum amount of power this generator may supply. | `0.0` | Yes | Yes
-| `Maximum power (MW)` | Maximum amount of power this generator may supply. | Required | Yes | Yes
-
-#### Production costs and limits
-
-Production costs are represented as piecewise-linear curves. Figure 1 shows an example cost curve with three segments, where it costs \$1400, \$1600, \$2200 and \$2400 to generate, respectively, 100, 110, 130 and 135 MW of power. To model this generator, `Production cost curve (MW)` should be set to `[100, 110, 130, 135]`, and `Production cost curve ($)`  should be set to `[1400, 1600, 2200, 2400]`.
-Note that this curve also specifies the production limits. Specifically, the first point identifies the minimum power output when the unit is operational, while the last point identifies the maximum power output.
-
-```@raw html
-<center>
-    <img src="../assets/cost_curve.png" style="max-width: 500px"/>
-    <div><b>Figure 1.</b> Piecewise-linear production cost curve.</div>
-    <br/>
-</center>
-```
-
-#### Additional remarks:
-
-* For time-dependent production limits or time-dependent production costs, the usage of nested arrays is allowed. For example,  if `Production cost curve (MW)` is set to `[5.0, [10.0, 12.0, 15.0, 20.0]]`, then the unit may generate at most 10, 12, 15 and 20 MW of power during time steps 1, 2, 3 and 4, respectively. The minimum output for all time periods is fixed to at 5 MW.
-* There is no limit to the number of piecewise-linear segments, and different generators may have a different number of segments.
-* If `Production cost curve (MW)` and `Production cost curve ($)` both contain a single element, then the generator must produce exactly that amount of power when operational. To specify that the generator may produce any amount of power up to a certain limit `P`, the parameter `Production cost curve (MW)` should be set to `[0, P]`. 
-* Production cost curves must be convex.
-
-#### Example
-
-```json
-{
-    "Generators": {
-        "gen1": {
-            "Bus": "b1",
-            "Type": "Thermal",
-            "Production cost curve (MW)": [100.0, 110.0, 130.0, 135.0],
-            "Production cost curve ($)": [1400.0, 1600.0, 2200.0, 2400.0],
-            "Startup costs ($)": [300.0, 400.0],
-            "Startup delays (h)": [1, 4],
-            "Ramp up limit (MW)": 232.68,
-            "Ramp down limit (MW)": 232.68,
-            "Startup limit (MW)": 232.68,
-            "Shutdown limit (MW)": 232.68,
-            "Minimum downtime (h)": 4,
-            "Minimum uptime (h)": 4,
-            "Initial status (h)": 12,
-            "Initial power (MW)": 115,
-            "Must run?": false,
-            "Reserve eligibility": ["r1"]
-        },
-        "gen2": {
-            "Bus": "b5",
-            "Type": "Thermal",
-            "Production cost curve (MW)": [0.0, [10.0, 8.0, 0.0, 3.0]],
-            "Production cost curve ($)": [0.0, 0.0],
-            "Initial status (h)": -100,
-            "Initial power (MW)": 0,
-            "Reserve eligibility": ["r1", "r2"],
-            "Commitment status": [true, false, null, true]
-        },
-        "gen3": {
-            "Bus": "b6",
-            "Type": "Profiled",
-            "Minimum power (MW)": 10.0,
-            "Maximum power (MW)": 120.0,
-            "Cost ($/MW)": 100.0
-        }
-    }
-}
-```
-
-### Storage units
-
-This section describes energy storage units in the system which charge and discharge power. The storage units consume power while charging, and generate power while discharging. 
-
-| Key               | Description                                       | Default  | Time series? | Uncertain?
-| :---------------- | :------------------------------------------------ | :------: | :------------: | :----: 
-| `Bus`             | Bus where the storage unit is located. Multiple storage units may be placed at the same bus. | Required | No | Yes
-| `Minimum level (MWh)`  | Minimum of energy level this storage unit may contain. | `0.0` | Yes | Yes
-| `Maximum level (MWh)`  | Maximum of energy level this storage unit may contain. | Required | Yes | Yes
-| `Allow simultaneous charging and discharging`  | If `false`, the storage unit is not allowed to charge and discharge at the same time (Boolean). | `true` | Yes | Yes
-| `Charge cost ($/MW)`  | Cost incurred for charging each MW of power into this storage unit. | Required | Yes | Yes
-| `Discharge cost ($/MW)`  | Cost incurred for discharging each MW of power from this storage unit. | Required | Yes | Yes
-| `Charge efficiency`  | Efficiency rate to charge power into this storage unit. This value must be greater than or equal to `0.0`, and less than or equal to `1.0`. | `1.0` | Yes | Yes
-| `Discharge efficiency`  | Efficiency rate to discharge power from this storage unit. This value must be greater than or equal to `0.0`, and less than or equal to `1.0`. | `1.0` | Yes | Yes
-| `Loss factor`  | The energy dissipation rate of this storage unit. This value must be greater than or equal to `0.0`, and less than or equal to `1.0`. | `0.0` | Yes | Yes
-| `Minimum charge rate (MW)`  | Minimum amount of power rate this storage unit may charge. | `0.0` | Yes | Yes
-| `Maximum charge rate (MW)`  | Maximum amount of power rate this storage unit may charge. | Required | Yes | Yes
-| `Minimum discharge rate (MW)`  | Minimum amount of power rate this storage unit may discharge. | `0.0` | Yes | Yes
-| `Maximum discharge rate (MW)`  | Maximum amount of power rate this storage unit may discharge. | Required | Yes | Yes
-| `Initial level (MWh)`  | Amount of energy this storage unit at time step `-1`, immediately before the planning horizon starts. | `0.0` | No | Yes
-| `Last period minimum level (MWh)`  | Minimum of energy level this storage unit may contain in the last time step. By default, this value is the same as the last value of `Minimum level (MWh)`. | `Minimum level (MWh)` | No | Yes
-| `Last period maximum level (MWh)`  | Maximum of energy level this storage unit may contain in the last time step. By default, this value is the same as the last value of `Maximum level (MWh)`. | `Maximum level (MWh)` | No | Yes
-
-#### Example
-```json
-{
-    "Storage units": {
-        "su1": {
-            "Bus": "b2",
-            "Maximum level (MWh)": 100.0,
-            "Charge cost ($/MW)": 2.0,
-            "Discharge cost ($/MW)": 2.5,
-            "Maximum charge rate (MW)": 10.0,
-            "Maximum discharge rate (MW)": 8.0
-        },
-        "su2": {
-            "Bus": "b2",
-            "Minimum level (MWh)": 10.0,
-            "Maximum level (MWh)": 100.0,
-            "Allow simultaneous charging and discharging": false,
-            "Charge cost ($/MW)": 3.0,
-            "Discharge cost ($/MW)": 3.5,
-            "Charge efficiency": 0.8,
-            "Discharge efficiency": 0.85,
-            "Loss factor": 0.01,
-            "Minimum charge rate (MW)": 5.0,
-            "Maximum charge rate (MW)": 10.0,
-            "Minimum discharge rate (MW)": 2.0,
-            "Maximum discharge rate (MW)": 10.0,
-            "Initial level (MWh)": 70.0,
-            "Last period minimum level (MWh)": 80.0,
-            "Last period maximum level (MWh)": 85.0
-        },
-        "su3": {
-            "Bus": "b9",
-            "Minimum level (MWh)": [10.0, 11.0, 12.0, 13.0],
-            "Maximum level (MWh)": [100.0, 110.0, 120.0, 130.0],
-            "Allow simultaneous charging and discharging": [false, false, true, true],
-            "Charge cost ($/MW)": [2.0, 2.1, 2.2, 2.3],
-            "Discharge cost ($/MW)": [1.0, 1.1, 1.2, 1.3],
-            "Charge efficiency": [0.8, 0.81, 0.82, 0.82],
-            "Discharge efficiency": [0.85, 0.86, 0.87, 0.88],
-            "Loss factor": [0.01, 0.01, 0.02, 0.02],
-            "Minimum charge rate (MW)": [5.0, 5.1, 5.2, 5.3],
-            "Maximum charge rate (MW)": [10.0, 10.1, 10.2, 10.3],
-            "Minimum discharge rate (MW)": [4.0, 4.1, 4.2, 4.3],
-            "Maximum discharge rate (MW)": [8.0, 8.1, 8.2, 8.3],
-            "Initial level (MWh)": 20.0,
-            "Last period minimum level (MWh)": 21.0,
-            "Last period maximum level (MWh)": 22.0
-        }
-    }
-}
-```
-
-### Price-sensitive loads
-
-This section describes components in the system which may increase or reduce their energy consumption according to the energy prices. Fixed loads (as described in the `buses` section) are always served, regardless of the price, unless there is significant congestion in the system or insufficient production capacity. Price-sensitive loads, on the other hand, are only served if it is economical to do so. 
-
-| Key               | Description                                       | Default  | Time series? | Uncertain?
-| :---------------- | :------------------------------------------------ | :------: | :------------: | :----: 
-| `Bus`             | Bus where the load is located. Multiple price-sensitive loads may be placed at the same bus. | Required | No | Yes
-| `Revenue ($/MW)`  | Revenue obtained for serving each MW of power to this load. | Required | Yes | Yes
-| `Demand (MW)`     | Maximum amount of power required by this load. Any amount lower than this may be served. | Required | Yes | Yes
-
-
-#### Example
-```json
-{
-    "Price-sensitive loads": {
-        "p1": {
-            "Bus": "b3",
-            "Revenue ($/MW)": 23.0,
-            "Demand (MW)": 50.0
-        }
-    }
-}
-```
-
-### Transmission lines
-
-This section describes the characteristics of transmission system, such as its topology and the susceptance of each transmission line.
-
-| Key                    | Description                                      | Default | Time series? | Uncertain?
-| :--------------------- | :----------------------------------------------- | ------- | :------------: | :---:
-| `Source bus`           | Identifier of the bus where the transmission line originates. | Required | No | Yes
-| `Target bus`           | Identifier of the bus where the transmission line reaches. | Required | No | Yes
-| `Susceptance (S)`      | Susceptance of the transmission line (in siemens). | Required | No | Yes
-| `Normal flow limit (MW)` | Maximum amount of power (in MW) allowed to flow through the line when the system is in its regular, fully-operational state. | `+inf` | Yes | Yes
-| `Emergency flow limit (MW)` | Maximum amount of power (in MW) allowed to flow through the line when the system is in degraded state (for example, after the failure of another transmission line). | `+inf` | Y | Yes
-| `Flow limit penalty ($/MW)` | Penalty for violating the flow limits of the transmission line (in $/MW). This is charged per time step. For example, if there is a thermal violation of 1 MW for three time steps, then three times this amount will be charged. | `5000.0` | Yes | Yes
-
-#### Example
-
-```json
-{
-    "Transmission lines": {
-        "l1": {
-            "Source bus": "b1",
-            "Target bus": "b2",
-            "Susceptance (S)": 29.49686,
-            "Normal flow limit (MW)": 15000.0,
-            "Emergency flow limit (MW)": 20000.0,
-            "Flow limit penalty ($/MW)": 5000.0
-        }
-    }
-}
-```
-
-
-### Reserves
-
-This section describes the hourly amount of reserves required.
-
-
-| Key                   | Description                                        | Default   | Time series? | Uncertain?
-| :-------------------- | :------------------------------------------------- | --------- | :----: | :---:
-| `Type` | Type of reserve product. Must be either "spinning" or "flexiramp". | Required | No | No
-| `Amount (MW)` | Amount of reserves required. | Required | Yes | Yes
-| `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` | Yes | Yes
-
-#### Example 1
-
-```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
-            ],
-        }
-    }
-}
-```
-
-### Contingencies
-
-This section describes credible contingency scenarios in the optimization, such as the loss of a transmission line or generator.
-
-| Key                   | Description                                      | Default | Uncertain?
-| :-------------------- | :----------------------------------------------- | :--------: | :---:
-| `Affected generators` | List of generators affected by this contingency. May be omitted if no generators are affected. | `[]` | Yes
-| `Affected lines`      | List of transmission lines affected by this contingency. May be omitted if no lines are affected. | `[]` | Yes
-
-#### Example
-
-```json
-{
-    "Contingencies": {
-        "c1": {
-            "Affected lines": ["l1", "l2", "l3"],
-            "Affected generators": ["g1"]
-        },
-        "c2": {
-            "Affected lines": ["l4"]
-        },
-    }
-}
-```
-
-### Additional remarks
-
-#### Time series parameters
-
-Many numerical properties in the JSON file can be specified either as a single floating point number if they are time-independent, or as an array containing exactly `T` elements, if they are time-dependent, where `T` is the number of time steps in the planning horizon. For example, both formats below are valid when `T=3`:
-
-```json
-{
-    "Load (MW)": 800.0,
-    "Load (MW)": [800.0, 850.0, 730.0]
-}
-```
-
-The value `T` depends on both `Time horizon (h)` and `Time step (min)`, as the table below illustrates.
-
-Time horizon (h) | Time step (min) | T
-:---------------:|:---------------:|:----:
-24               | 60              | 24
-24               | 15              | 96
-24               | 5               | 288
-36               | 60              | 36
-36               | 15              | 144
-36               | 5               | 432
-
-Output Data Format
------------------
-
-The output data format is also JSON-based, but it is not currently documented since we expect it to change significantly in a future version of the package.
-
-
-Current limitations
-------------------
-
-* Network topology must remain 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. 
-* The set of generators must be the same in all scenarios.
--- a/docs/src/index.md
+++ b/docs/src/index.md
@@ -1,69 +0,0 @@
-# UnitCommitment.jl
-
-**UnitCommitment.jl** (UC.jl) is an optimization package for the Security-Constrained Unit Commitment Problem (SCUC), a fundamental optimization problem in power systems used, for example, to clear the day-ahead electricity markets. Both deterministic and two-stage stochastic versions of the problem are supported. The package provides benchmark instances for the problem, a flexible and well-documented data format for the problem, as well as Julia/JuMP implementations of state-of-the-art mixed-integer programming formulations and solution methods.
-
-## Package Components
-
-* **Data Format:** The package proposes an extensible and fully-documented JSON-based data specification format for SCUC, developed in collaboration with Independent System Operators (ISOs), which describes the most important aspects of the problem. The format supports all the most common thermal generator characteristics (including ramping, piecewise-linear production cost curves and time-dependent startup costs), as well as profiled generators, reserves, price-sensitive loads, battery storage, transmission, and contingencies.
-* **Benchmark Instances:** The package provides a diverse collection of large-scale benchmark instances collected from the literature, converted into a common data format, and extended using data-driven methods to make them more challenging and realistic.
-* **Model Implementation**: The package provides a Julia/JuMP implementations of state-of-the-art formulations and solution methods for the deterministic and stochastic SCUC, including multiple ramping formulations ([ArrCon2000](https://doi.org/10.1109/59.871739), [MorLatRam2013](https://doi.org/10.1109/TPWRS.2013.2251373), [DamKucRajAta2016](https://doi.org/10.1007/s10107-015-0919-9), [PanGua2016](https://doi.org/10.1287/opre.2016.1520)), piecewise-linear costs formulations ([Gar1962](https://doi.org/10.1109/AIEEPAS.1962.4501405), [CarArr2006](https://doi.org/10.1109/TPWRS.2006.876672), [KnuOstWat2018](https://doi.org/10.1109/TPWRS.2017.2783850)), contingency screening methods ([XavQiuWanThi2019](https://doi.org/10.1109/TPWRS.2019.2892620)) and decomposition methods. Our goal is to keep these implementations up-to-date as new methods are proposed in the literature.
-* **Benchmark Tools:** The package provides automated benchmark scripts to accurately evaluate the performance impact of proposed code changes.
-
-## Table of Contents
-
-```@contents
-Pages = ["usage.md", "format.md", "instances.md", "model.md", "api.md"]
-Depth = 3
-```
-
-## Authors
-* **Alinson S. Xavier** (Argonne National Laboratory)
-* **Aleksandr M. Kazachkov** (University of Florida)
-* **Ogün Yurdakul** (Technische Universität Berlin)
-* **Jun He** (Purdue University)
-* **Feng Qiu** (Argonne National Laboratory)
-
-## Acknowledgments
-
-* We would like to thank **Yonghong Chen** (Midcontinent Independent System Operator), **Feng Pan** (Pacific Northwest National Laboratory) for valuable feedback on early versions of this package.
-
-* Based upon work supported by **Laboratory Directed Research and Development** (LDRD) funding from Argonne National Laboratory, provided by the Director, Office of Science, of the U.S. Department of Energy under Contract No. DE-AC02-06CH11357
-
-* Based upon work supported by the **U.S. Department of Energy Advanced Grid Modeling Program** under Grant DE-OE0000875.
-
-## Citing
-
-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, Jun He, Feng Qiu**, "UnitCommitment.jl: A Julia/JuMP Optimization Package for Security-Constrained Unit Commitment (Version 0.4)". Zenodo (2023). [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).
-
-## License
-
-```text
-UnitCommitment.jl: A Julia/JuMP Optimization Package for Security-Constrained Unit Commitment
-Copyright © 2020-2023, UChicago Argonne, LLC. All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted
-provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of
-   conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice, this list of
-   conditions and the following disclaimer in the documentation and/or other materials provided
-   with the distribution.
-3. Neither the name of the copyright holder nor the names of its contributors may be used to
-   endorse or promote products derived from this software without specific prior written
-   permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-```
--- a/docs/src/model.md
+++ b/docs/src/model.md
@@ -1,233 +0,0 @@
-JuMP Model
-==========
-
-In this page, we describe the JuMP optimization model produced by the function `build_model`. A detailed understanding of this model is not necessary if you are just interested in using the package to solve some standard unit commitment cases, but it may be useful, for example, if you need to solve a slightly different problem, with additional variables and constraints. The notation in this page generally follows [KnOsWa20].
-
-Decision variables
------------------
-
-UC.jl models the security-constrained unit commitment problem as a two-stage stochastic program. In this approach, some of the decision variables are *first-stage decisions*, which are taken before the uncertainty is realized and must therefore be the same across all scenarios, while the remaining variables are *second-stage decisions*, which can attain a different values in each scenario. In the current version of the package, all binary variables (which model commitment decisions of thermal units) are first-stage decisions and all continuous variables are second-stage decisions.
-
-!!! note
-
-    UC.jl treats deterministic SCUC instances as a special case of the stochastic problem in which there is only one scenario, named `"s1"` by default. To access second-stage decisions, therefore, you must provide this scenario name as the value for `sn`. For example, `model[:prod_above]["s1", g, t]`. 
-
-### Generators
-
-In this section, we describe the decision variables associated with the generators, which include both thermal units (e.g., natural gas-fired power plant) and profiled units (e.g., wind turbine). 
-
-#### Thermal Units
-
-Name |  Description | Unit | Stage
-:-----|:-------------|:------: | :------:
-`is_on[g,t]` | True if generator `g` is on at time `t`. | Binary | 1
-`switch_on[g,t]` | True is generator `g` switches on at time `t`. | Binary| 1
-`switch_off[g,t]` | True if generator `g` switches off at time `t`. | Binary| 1
-`startup[g,t,s]` | True if generator `g` switches on at time `t` incurring start-up costs from start-up category `s`. | Binary| 1
-`prod_above[sn,g,t]` | Amount of power produced by generator `g` above its minimum power output at time `t` in scenario `sn`. For example, if the minimum power of generator `g` is 100 MW and `g` is producing 115 MW of power at time `t` in scenario `sn`, then `prod_above[sn,g,t]` equals `15.0`. | MW | 2
-`segprod[sn,g,t,k]` | Amount of power from piecewise linear segment `k` produced by generator `g` at time `t` in scenario `sn`. 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` in scenario `sn`, then `segprod[sn,g,t,:]` equals `[10.0, 5.0, 0.0]`.| MW | 2
-`reserve[sn,r,g,t]` | Amount of reserve `r` provided by unit `g` at time `t` in scenario `sn`. | MW | 2
-
-!!! warning
-
-    The first-stage decision variables of the JuMP model are `is_on[g,t]`, `switch_on[g,t]`, `switch_off[g,t]`, and `startup[g,t,s]`. As such, the dictionaries corresponding to these variables do not include the scenario index in their keys. In contrast, all other variables of the created JuMP model are allowed to obtain a different value in each scenario and are thus modeled as second-stage decision variables. Accordingly, the dictionaries of all second-stage decision variables have the scenario index in their keys. This is true even if the model is created to solve the deterministic SCUC, in which case the default scenario index `s1` is included in the dictionary key.
-    
-
-#### Profiled Units
-
-Name | Description | Unit | Stage
-:-----|:-------------|:------: | :------:
-`prod_profiled[s,t]` | Amount of power produced by profiled unit `g` at time `t`. | MW | 2
-
-
-### Buses
-
-Name | Description | Unit | Stage
-:-----|:-------------|:------:| :------:
-`net_injection[sn,b,t]` | Net injection at bus `b` at time `t` in scenario `sn`. | MW | 2
-`curtail[sn,b,t]` | Amount of load curtailed at bus `b` at time `t` in scenario `sn`. | MW | 2
-
-
-### Price-sensitive loads
-
-Name |  Description | Unit | Stage
-:-----|:-------------|:------:| :------:
-`loads[sn,s,t]` | Amount of power served to price-sensitive load `s` at time `t` in scenario `sn`. | MW | 2
-
-### Transmission lines
-
-Name |  Description | Unit | Stage 
-:-----|:-------------|:------:| :------:
-`flow[sn,l,t]` |  Power flow on line `l` at time `t` in scenario `sn`. | MW | 2
-`overflow[sn,l,t]` | Amount of flow above the limit for line `l` at time `t` in scenario `sn`. | MW | 2
-
-!!! warning
-
-    Since transmission and N-1 security constraints are enforced in a lazy way, most of the `flow[l,t]` variables are never added to the model. Accessing `model[:flow][sn,l,t]` without first checking that the variable exists will likely generate an error.
-
-Objective function
------------------
-
-TODO
-
-Constraints
-----------
-
-TODO
-
-
-Inspecting and modifying the model
----------------------------------
-
-### Accessing decision variables
-
-After building a model using `UnitCommitment.build_model`, it is possible to obtain a reference to the decision variables by calling `model[:varname][index]`. For example, `model[:is_on]["g1",1]` returns a direct reference to the JuMP variable indicating whether generator named "g1" is on at time 1. The script below illustrates how to build a model, solve it and display the solution without using the function `UnitCommitment.solution`.
-
-```julia
-using Cbc
-using Printf
-using JuMP
-using UnitCommitment
-
-# Load benchmark instance
-instance = UnitCommitment.read_benchmark("matpower/case118/2017-02-01")
-
-# Build JuMP model
-model = UnitCommitment.build_model(
-    instance=instance,
-    optimizer=Cbc.Optimizer,
-)
-
-# Solve the model
-UnitCommitment.optimize!(model)
-
-# Display commitment status
-for g in instance.units
-    for t in 1:instance.time
-        @printf(
-            "%-10s %5d %5.1f %5.1f %5.1f\n",
-            g.name,
-            t,
-            value(model[:is_on][g.name, t]),
-            value(model[:switch_on][g.name, t]),
-            value(model[:switch_off][g.name, t]),
-        )
-    end
-end
-```
-
-### Fixing variables, modifying objective function and adding constraints
-
-Since we now have a direct reference to the JuMP decision variables, it is possible to fix variables, change the coefficients in the objective function, or even add new constraints to the model before solving it. 
-!!! warning
-
-    It is important to take into account the stage of the decision variables in modifying the optimization model. In changing a deterministic SCUC model, modifying the second-stage decision variables requires adding the term `s1`, which is the default scenario name assigned to the second-stage decision variables in the SCUC model. For an SUC model, the package permits the modification of the second-stage decision variables individually for each scenario. 
-
-The script below shows how the JuMP model can be modified after it is created. For more information on modifying an existing model, [see the JuMP documentation](https://jump.dev/JuMP.jl/stable/manual/variables/).
-
-```julia
-using Cbc
-using JuMP
-using UnitCommitment
-
-# Load benchmark instance
-instance = UnitCommitment.read_benchmark("matpower/case118/2017-02-01")
-
-# Construct JuMP model
-model = UnitCommitment.build_model(
-    instance=instance,
-    optimizer=Cbc.Optimizer,
-)
-
-# Fix the commitment status of the generator "g1" in time period 1 to 1.0
-JuMP.fix(
-    model[:is_on]["g1",1],
-    1.0,
-    force=true,
-)
-
-# Fix the production level of the generator "g1" above its minimum level in time period 1 and 
-# in scenario "s1" to 20.0 MW. Observe that the three-tuple dictionary key involves the scenario 
-# index "s1", as production above minimum is a second-stage decision variable.
-JuMP.fix(
-    model[:prod_above]["s1", "g1", 1],
-    20.0,
-    force=true,
-)
-
-# Enforce the curtailment of 20.0 MW of load at bus "b2" in time period 4 in scenario "s1".
-JuMP.fix(
-    curtail["s1", "b2", 4] =
-    20.0,
-    force=true,
-)
-
-# Change the objective function
-JuMP.set_objective_coefficient(
-    model,
-    model[:switch_on]["g2",1],
-    1000.0,
-)
-
-# Create a new constraint
-@constraint(
-    model,
-    model[:is_on]["g3",1] + model[:is_on]["g4",1] <= 1,
-)
-
-# Solve the model
-UnitCommitment.optimize!(model)
-```
-
-### Adding new component to a bus
-
-The following snippet shows how to add a new grid component to a particular bus. For each time step, we create decision variables for the new grid component, add these variables to the objective function, then attach the component to a particular bus by modifying some existing model constraints. 
-
-```julia
-using Cbc
-using JuMP
-using UnitCommitment
-
-# Load instance and build base model
-instance = UnitCommitment.read_benchmark("matpower/case118/2017-02-01")
-model = UnitCommitment.build_model(
-    instance=instance,
-    optimizer=Cbc.Optimizer,
-)
-
-# Get the number of time steps in the original instance
-T = instance.time
-
-# Create decision variables for the new grid component.
-# In this example, we assume that the new component can
-# inject up to 10 MW of power at each time step, so we
-# create new continuous variables 0 ≤ x[t] ≤ 10.
-@variable(model, x[1:T], lower_bound=0.0, upper_bound=10.0)
-
-# For each time step
-for t in 1:T
-
-    # Add production costs to the objective function.
-    # In this example, we assume a cost of $5/MW.
-    set_objective_coefficient(model, x[t], 5.0)
-
-    # Attach the new component to bus b1 in scenario s1, by modifying the
-    # constraint `eq_net_injection`.
-    set_normalized_coefficient(
-        model[:eq_net_injection]["s1", "b1", t],
-        x[t],
-        1.0,
-    )
-end
-
-# Solve the model
-UnitCommitment.optimize!(model)
-
-# Show optimal values for the x variables
-@show value.(x)
-```
-
-References
----------
-* [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/src/usage.md
+++ b/docs/src/usage.md
@@ -1,381 +0,0 @@
-Usage
-=====
-
-Installation
------------
-
-UnitCommitment.jl was tested and developed with [Julia 1.9](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:
-
-```text
-pkg> add UnitCommitment@0.4
-```
-
-To solve the optimization models, a mixed-integer linear programming (MILP) solver is also required. Please see the [JuMP installation guide](https://jump.dev/JuMP.jl/stable/installation/) for more instructions on installing a solver. Typical open-source choices are [HiGHS](https://github.com/jump-dev/HiGHS.jl), [Cbc](https://github.com/JuliaOpt/Cbc.jl) and [GLPK](https://github.com/JuliaOpt/GLPK.jl). In the instructions below, HiGHS will be used, but any other MILP solver listed in JuMP installation guide should also be compatible.
-
-Typical Usage
-------------
-
-### Solving user-provided instances
-
-The first step to use UC.jl is to construct JSON files that describe each scenario of your deterministic or stochastic unit commitment instance. See [Data Format](format.md) for a complete description of the data format UC.jl expects. The next steps, as shown below, are to: (1) read the scenario files; (2) build the optimization model; (3) run the optimization; and (4) extract the optimal solution.
-
-```julia
-using HiGHS
-using JuMP
-using UnitCommitment
-
-# 1. Read instance
-instance = UnitCommitment.read(["example/s1.json", "example/s2.json"])
-
-# 2. Construct optimization model
-model = UnitCommitment.build_model(
-    instance=instance,
-    optimizer=HiGHS.Optimizer,
-)
-
-# 3. Solve model
-UnitCommitment.optimize!(model)
-
-# 4. Write solution to a file
-solution = UnitCommitment.solution(model)
-UnitCommitment.write("example/out.json", solution)
-```
-
-To read multiple files from a given folder, the [Glob](https://github.com/vtjnash/Glob.jl) package can be used:
-
-```jldoctest usage1; output = false
-using Glob
-using UnitCommitment
-
-instance = UnitCommitment.read(glob("s*.json", "example/"))
-
-# output
-UnitCommitmentInstance(2 scenarios, 6 thermal units, 0 profiled units, 14 buses, 20 lines, 19 contingencies, 1 price sensitive loads, 4 time steps)
-```
-
-To solve deterministic instances, a single scenario file may be provided.
-
-```jldoctest usage1; output = false
-instance = UnitCommitment.read("example/s1.json")
-
-# output
-UnitCommitmentInstance(1 scenarios, 6 thermal units, 0 profiled units, 14 buses, 20 lines, 19 contingencies, 1 price sensitive loads, 4 time steps)
-```
-
-### Solving benchmark instances
-
-UnitCommitment.jl contains a large number of deterministic benchmark instances collected from the literature and converted into a common data format. To solve one of these instances individually, instead of constructing your own, the function `read_benchmark` can be used, as shown below. See [Instances](instances.md) for the complete list of available instances.
-
-```jldoctest usage1; output = false
-instance = UnitCommitment.read_benchmark("matpower/case3375wp/2017-02-01")
-
-# output
-UnitCommitmentInstance(1 scenarios, 590 thermal units, 0 profiled units, 3374 buses, 4161 lines, 3245 contingencies, 0 price sensitive loads, 36 time steps)
-```
-
-## Customizing the formulation
-
-By default, `build_model` uses a formulation that combines modeling components from different publications, and that has been carefully tested, using our own benchmark scripts, to provide good performance across a wide variety of instances. This default formulation is expected to change over time, as new methods are proposed in the literature. You can, however, construct your own formulation, based on the modeling components that you choose, as shown in the next example.
-
-```julia
-using HiGHS
-using UnitCommitment
-
-import UnitCommitment:
-    Formulation,
-    KnuOstWat2018,
-    MorLatRam2013,
-    ShiftFactorsFormulation
-
-instance = UnitCommitment.read_benchmark(
-    "matpower/case118/2017-02-01",
-)
-
-model = UnitCommitment.build_model(
-    instance = instance,
-    optimizer = HiGHS.Optimizer,
-    formulation = Formulation(
-        pwl_costs = KnuOstWat2018.PwlCosts(),
-        ramping = MorLatRam2013.Ramping(),
-        startup_costs = MorLatRam2013.StartupCosts(),
-        transmission = ShiftFactorsFormulation(
-            isf_cutoff = 0.005,
-            lodf_cutoff = 0.001,
-        ),
-    ),
-)
-```
-
-## Generating initial conditions
-
-When creating random unit commitment instances for benchmark purposes, it is often hard to compute, in advance, sensible initial conditions for all thermal generators. Setting initial conditions naively (for example, making all generators initially off and producing no power) can easily cause the instance to become infeasible due to excessive ramping. Initial conditions can also make it hard to modify existing instances. For example, increasing the system load without carefully modifying the initial conditions may make the problem infeasible or unrealistically challenging to solve.
-
-To help with this issue, UC.jl provides a utility function which can generate feasible initial conditions by solving a single-period optimization problem, as shown below:
-
-```julia
-using HiGHS
-using UnitCommitment
-
-# Read original instance
-instance = UnitCommitment.read("example/s1.json")
-
-# Generate initial conditions (in-place)
-UnitCommitment.generate_initial_conditions!(instance, HiGHS.Optimizer)
-
-# Construct and solve optimization model
-model = UnitCommitment.build_model(
-    instance=instance,
-    optimizer=HiGHS.Optimizer,
-)
-UnitCommitment.optimize!(model)
-```
-
-!!! warning
-
-    The function `generate_initial_conditions!` may return different initial conditions after each call, even if the same instance and the same optimizer is provided. The particular algorithm may also change in a future version of UC.jl. For these reasons, it is recommended that you generate initial conditions exactly once for each instance and store them for later use.
-    
-## Verifying solutions
-
-When developing new formulations, it is very easy to introduce subtle errors in the model that result in incorrect solutions. To help avoiding this, UC.jl includes a utility function that verifies if a given solution is feasible, and, if not, prints all the validation errors it found. The implementation of this function is completely independent from the implementation of the optimization model, and therefore can be used to validate it.
-
-```jldoctest; output = false
-using JSON
-using UnitCommitment
-
-# Read instance
-instance = UnitCommitment.read("example/s1.json")
-
-# Read solution (potentially produced by other packages) 
-solution = JSON.parsefile("example/out.json")
-
-# Validate solution and print validation errors
-UnitCommitment.validate(instance, solution)
-
-# output
-
-true
-```
-
-## Progressive Hedging
-
-By default, UC.jl uses the Extensive Form (EF) when solving stochastic instances. This approach involves constructing a single JuMP model that contains data and decision variables for all scenarios. Although EF has optimality guarantees and performs well with small test cases, it can become computationally intractable for large instances or substantial number of scenarios.
-
-Progressive Hedging (PH) is an alternative (heuristic) solution method provided by UC.jl in which the problem is decomposed into smaller scenario-based subproblems, which are then solved in parallel in separate Julia processes, potentially across multiple machines. Quadratic penalty terms are used to enforce convergence of first-stage decision variables. The method is closely related to the Alternative Direction Method of Multipliers (ADMM) and can handle larger instances, although it is not guaranteed to converge to the optimal solution. Our implementation of PH relies on Message Passing Interface (MPI) for communication. We refer to [MPI.jl Documentation](https://github.com/JuliaParallel/MPI.jl) for more details on installing MPI.
-
-The following example shows how to solve SCUC instances using progressive hedging. The script should be saved in a file, say `ph.jl`, and executed using `mpiexec -n <num-scenarios> julia ph.jl`.
-
-
-```julia
-using HiGHS
-using MPI
-using UnitCommitment
-using Glob
-
-# 1. Initialize MPI
-MPI.Init()
-
-# 2. Configure progressive hedging method
-ph = UnitCommitment.ProgressiveHedging()
-
-# 3. Read problem instance
-instance = UnitCommitment.read(["example/s1.json", "example/s2.json"], ph)
-
-# 4. Build JuMP model
-model = UnitCommitment.build_model(
-    instance = instance,
-    optimizer = HiGHS.Optimizer,
-)
-
-# 5. Run the decentralized optimization algorithm
-UnitCommitment.optimize!(model, ph)
-
-# 6. Fetch the solution
-solution = UnitCommitment.solution(model, ph)
-
-# 7. Close MPI
-MPI.Finalize()
-```
-
-When using PH, the model can be customized as usual, with different formulations or additional user-provided constraints. Note that `read`, in this case, takes `ph` as an argument. This allows each Julia process to read only the instance files that are relevant to it. Similarly, the `solution` function gathers the optimal solution of each processes and returns a combined dictionary. 
-
-Each process solves a sub-problem with $\frac{s}{p}$ scenarios, where $s$ is the total number of scenarios and $p$ is the number of MPI processes. For instance, if we have 15 scenario files and 5 processes, then each process will solve a JuMP model that contains data for 3 scenarios. If the total number of scenarios is not divisible by the number of processes, then an error will be thrown.
-
-
-!!! warning
-
-    Currently, PH can handle only equiprobable scenarios. Further, `solution(model, ph)` can only handle cases where only one scenario is modeled in each process.
-
-
-## Computing Locational Marginal Prices
-
-Locational marginal prices (LMPs) refer to the cost of supplying electricity at a particular location of the network. Multiple methods for computing LMPs have been proposed in the literature. UnitCommitment.jl implements two commonly-used methods: conventional LMPs and Approximated Extended LMPs (AELMPs). To compute LMPs for a given unit commitment instance, the `compute_lmp` function can be used, as shown in the examples below. The function accepts three arguments -- a solved SCUC model, an LMP method, and a linear optimizer -- and it returns a dictionary mapping `(bus_name, time)` to the marginal price.
-
-
-!!! warning
-
-    Most mixed-integer linear optimizers, such as `HiGHS`, `Gurobi` and `CPLEX` can be used with `compute_lmp`, with the notable exception of `Cbc`, which does not support dual value evaluations. If using `Cbc`, please provide `Clp` as the linear optimizer.
-
-### Conventional LMPs
-
-LMPs are conventionally computed by: (1) solving the SCUC model, (2) fixing all binary variables to their optimal values, and (3) re-solving the resulting linear programming model. In this approach, the LMPs are defined as the dual variables' values associated with the net injection constraints. The example below shows how to compute conventional LMPs for a given unit commitment instance. First, we build and optimize the SCUC model. Then, we call the `compute_lmp` function, providing as the second argument `ConventionalLMP()`.
-
-
-```julia
-using UnitCommitment
-using HiGHS
-
-import UnitCommitment: ConventionalLMP
-
-# Read benchmark instance
-instance = UnitCommitment.read_benchmark("matpower/case118/2018-01-01")
-
-# Build the model
-model = UnitCommitment.build_model(
-    instance = instance,
-    optimizer = HiGHS.Optimizer,
-)
-
-# Optimize the model
-UnitCommitment.optimize!(model)
-
-# Compute the LMPs using the conventional method
-lmp = UnitCommitment.compute_lmp(
-    model,
-    ConventionalLMP(),
-    optimizer = HiGHS.Optimizer,
-)
-
-# Access the LMPs
-# Example: "s1" is the scenario name, "b1" is the bus name, 1 is the first time slot
-@show lmp["s1","b1", 1]
-```
-
-### Approximate Extended LMPs
-
-Approximate Extended LMPs (AELMPs) are an alternative method to calculate locational marginal prices which attemps to minimize uplift payments. The method internally works by modifying the instance data in three ways: (1) it sets the minimum power output of each generator to zero, (2) it averages the start-up cost over the offer blocks for each generator, and (3) it relaxes all integrality constraints. To compute AELMPs, as shown in the example below, we call `compute_lmp` and provide `AELMP()` as the second argument.
-
-This method has two configurable parameters: `allow_offline_participation` and `consider_startup_costs`. If `allow_offline_participation = true`, then offline generators are allowed to participate in the pricing. If instead `allow_offline_participation = false`, offline generators are not allowed and therefore are excluded from the system. A solved UC model is optional if offline participation is allowed, but is required if not allowed. The method forces offline participation to be allowed if the UC model supplied by the user is not solved. For the second field, If `consider_startup_costs = true`, then start-up costs are integrated and averaged over each unit production; otherwise the production costs stay the same. By default, both fields are set to `true`.
-
-!!! warning
-
-    This approximation method is still under active research, and has several limitations. The implementation provided in the package is based on MISO Phase I only. It only supports fast start resources. More specifically, the minimum up/down time of all generators must be 1, the initial power of all generators must be 0, and the initial status of all generators must be negative. The method does not support time-varying start-up costs. The method does not support multiple scenarios. If offline participation is not allowed, AELMPs treats an asset to be  offline if it is never on throughout all time periods. 
-
-```julia
-using UnitCommitment
-using HiGHS
-
-import UnitCommitment: AELMP
-
-# Read benchmark instance
-instance = UnitCommitment.read_benchmark("matpower/case118/2017-02-01")
-
-# Build the model
-model = UnitCommitment.build_model(
-    instance = instance,
-    optimizer = HiGHS.Optimizer,
-)
-
-# Optimize the model
-UnitCommitment.optimize!(model)
-
-# Compute the AELMPs
-aelmp = UnitCommitment.compute_lmp(
-    model,
-    AELMP(
-        allow_offline_participation = false,
-        consider_startup_costs = true
-    ),
-    optimizer = HiGHS.Optimizer
-)
-
-# Access the AELMPs
-# Example: "s1" is the scenario name, "b1" is the bus name, 1 is the first time slot
-# Note: although scenario is supported, the query still keeps the scenario keys for consistency.
-@show aelmp["s1", "b1", 1]
-```
-
-## Time Decomposition
-
-Solving unit commitment instances that have long time horizons (for example, year-long 8760-hour instances) requires a substantial amount of computational power. To address this issue, UC.jl offers a time decomposition method, which breaks the instance down into multiple overlapping subproblems, solves them sequentially, then reassembles the solution.
-
-When solving a unit commitment instance with a dense time slot structure, computational complexity can become a significant challenge. For instance, if the instance contains hourly data for an entire year (8760 hours), solving such a model can require a substantial amount of computational power. To address this issue, UC.jl provides a time_decomposition method within the `optimize!` function. This method decomposes the problem into multiple sub-problems, solving them sequentially.
-
-The `optimize!` function takes 5 parameters: a unit commitment instance, a `TimeDecomposition` method, an optimizer, and two optional functions `after_build` and `after_optimize`. It returns a solution dictionary. The `TimeDecomposition` method itself requires four arguments: `time_window`, `time_increment`, `inner_method` (optional), and `formulation` (optional). These arguments define the time window for each sub-problem, the time increment to move to the next sub-problem, the method used to solve each sub-problem, and the formulation employed, respectively. The two functions, namely `after_build` and `after_optimize`, are invoked subsequent to the construction and optimization of each sub-model, respectively. It is imperative that the `after_build` function requires its two arguments to be consistently mapped to `model` and `instance`, while the `after_optimize` function necessitates its three arguments to be consistently mapped to `solution`, `model`, and `instance`.
-
-The code snippet below illustrates an example of solving an instance by decomposing the model into multiple 36-hour sub-problems using the `XavQiuWanThi2019` method. Each sub-problem advances 24 hours at a time. The first sub-problem covers time steps 1 to 36, the second covers time steps 25 to 60, the third covers time steps 49 to 84, and so on. The initial power levels and statuses of the second and subsequent sub-problems are set based on the results of the first 24 hours from each of their immediate prior sub-problems. In essence, this approach addresses the complexity of solving a large problem by tackling it in 24-hour intervals, while incorporating an additional 12-hour buffer to mitigate the closing window effect for each sub-problem. Furthermore, the `after_build` function imposes the restriction that `g3` and `g4` cannot be activated simultaneously during the initial time slot of each sub-problem. On the other hand, the `after_optimize` function is invoked to calculate the conventional Locational Marginal Prices (LMPs) for each sub-problem, and subsequently appends the computed values to the `lmps` vector.
-
-> **Warning** 
-> Specifying `TimeDecomposition` as the value of the `inner_method` field of another `TimeDecomposition` causes errors when calling the `optimize!` function due to the different argument structures between the two `optimize!` functions.
-
-```julia
-using UnitCommitment, JuMP, Cbc, HiGHS
-
-import UnitCommitment: 
-    TimeDecomposition,
-    ConventionalLMP,
-    XavQiuWanThi2019,
-    Formulation
-
-# specifying the after_build and after_optimize functions
-function after_build(model, instance)
-    @constraint(
-        model,
-        model[:is_on]["g3", 1] + model[:is_on]["g4", 1] <= 1,
-    )
-end
-
-lmps = []
-function after_optimize(solution, model, instance)
-    lmp = UnitCommitment.compute_lmp(
-        model,
-        ConventionalLMP(),
-        optimizer = HiGHS.Optimizer,
-    )
-    return push!(lmps, lmp)
-end
-
-# assume the instance is given as a 120h problem
-instance = UnitCommitment.read("instance.json")
-
-solution = UnitCommitment.optimize!(
-    instance,
-    TimeDecomposition(
-        time_window = 36,  # solve 36h problems
-        time_increment = 24,  # advance by 24h each time
-        inner_method = XavQiuWanThi2019.Method(),
-        formulation = Formulation(),
-    ),
-    optimizer = Cbc.Optimizer,
-    after_build = after_build,
-    after_optimize = after_optimize,
-)
-```
-
-## Day-ahead (DA) Market to Real-time (RT) Markets
-The UC.jl package offers a comprehensive set of functions for solving marketing problems. The primary function, `solve_market`, facilitates the solution of day-ahead (DA) markets, which can be either deterministic or stochastic in nature. Subsequently, it sequentially maps the commitment status obtained from the DA market to all the real-time (RT) markets, which are deterministic instances. It is essential to ensure that the time span of the DA market encompasses all the RT markets, and the file paths for the RT markets must be specified in chronological order. Each RT market should represent a single time slot, and it is recommended to include a few additional time slots to mitigate the closing window effect.
-
-The `solve_market` function accepts several parameters, including the file path (or a list of file paths in the case of stochastic markets) for the DA market, a list of file paths for the RT markets, the market settings specified by the `MarketSettings` structure, and an optimizer. The `MarketSettings` structure itself requires three optional arguments: `inner_method`, `lmp_method`, and `formulation`. If the computation of Locational Marginal Prices (LMPs) is not desired, the `lmp_method` can be set to `nothing`. Additional optional parameters include a linear programming optimizer for solving LMPs (if a different optimizer than the required one is desired), callback functions `after_build_da` and `after_optimize_da`, which are invoked after the construction and optimization of the DA market, and callback functions `after_build_rt` and `after_optimize_rt`, which are invoked after the construction and optimization of each RT market. It is crucial to note that the `after_build` function requires its two arguments to consistently correspond to `model` and `instance`, while the `after_optimize` function requires its three arguments to consistently correspond to `solution`, `model`, and `instance`.
-
-As an illustrative example, suppose the DA market predicts hourly data for a 24-hour period, while the RT markets represent 5-minute intervals. In this scenario, each RT market file corresponds to a specific 5-minute interval, with the first RT market representing the initial 5 minutes, the second RT market representing the subsequent 5 minutes, and so on. Consequently, there should be 12 RT market files for each hour. To mitigate the closing window effect, except for the last few RT markets, each RT market should contain three time slots, resulting in a total time span of 15 minutes. However, only the first time slot is considered in the final solution. The last two RT markets should only contain 2 and 1 time slot(s), respectively, to ensure that the total time covered by all RT markets does not exceed the time span of the DA market. The code snippet below demonstrates a simplified example of how to utilize the `solve_market` function. Please note that it only serves as a simplified example and may require further customization based on the specific requirements of your use case.
-
-```julia
-using UnitCommitment, Cbc, HiGHS
-
-import UnitCommitment: 
-    MarketSettings,
-    XavQiuWanThi2019,
-    ConventionalLMP,
-    Formulation
-
-solution = UnitCommitment.solve_market(
-    "da_instance.json",
-    ["rt_instance_1.json", "rt_instance_2.json", "rt_instance_3.json"],
-    MarketSettings(
-        inner_method = XavQiuWanThi2019.Method(),
-        lmp_method = ConventionalLMP(),
-        formulation = Formulation(),
-    ),
-    optimizer = Cbc.Optimizer,
-    lp_optimizer = HiGHS.Optimizer,
-)
-```
--- a/instances/README.md
+++ b/instances/README.md
@@ -0,0 +1,53 @@
+Instances
+=========
+
+UnitCommitment.jl provides a large collection of benchmark instances collected
+from the literature and converted to a common data format. If you use these instances in your research, we request that you cite UnitCommitment.jl, as well as the original sources, as listed below. [See documentation for more details](https://anl-ceeesa.github.io/UnitCommitment.jl/).
+
+References
+----------
+
+### UnitCommitment.jl
+
+* [UCJL] **Alinson S. Xavier, 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)
+
+
+### MATPOWER
+
+* [MTPWR] **D. Zimmerman, C. E. Murillo-Sandnchez and R. J. Thomas.** "Matpower:  Steady-state  operations,  planning,  and  analysis  tools  forpower systems research and education", IEEE Transactions on PowerSystems, vol. 26, no. 1, pp. 12 –19, Feb. 2011. [DOI: 10.1109/TPWRS.2010.2051168](https://doi.org/10.1109/TPWRS.2010.2051168)
+
+* [PSTCA] **University of Washington, Dept. of Electrical Engineering.** "Power Systems Test Case Archive". Available at: <http://www.ee.washington.edu/research/pstca/> (Accessed: Nov 14, 2020)
+
+* [JoFlMa16] **C. Josz, S. Fliscounakis, J. Maeght, and P. Panciatici.** "AC Power Flow
+Data in MATPOWER and QCQP Format: iTesla, RTE Snapshots, and PEGASE". [ArXiv (2016)](https://arxiv.org/abs/1603.01533).
+
+* [FlPaCa13] **S. Fliscounakis, P. Panciatici, F. Capitanescu, and L. Wehenkel.**
+"Contingency ranking with respect to overloads in very large power
+systems taking into account uncertainty, preventive and corrective
+actions", Power Systems, IEEE Trans. on, (28)4:4909-4917, 2013.
+[DOI: 10.1109/TPWRS.2013.2251015](https://doi.org/10.1109/TPWRS.2013.2251015)
+
+
+### PGLIB-UC
+
+* [PGLIB] **Carleton Coffrin and Bernard Knueven.** "Power Grid Lib - Unit Commitment". Available at: <https://github.com/power-grid-lib/pglib-uc> (Accessed: Nov 14, 2020)
+
+* [KrHiOn12] **Eric Krall, Michael Higgins and Richard P. O’Neill.** "RTO unit commitment test system." Federal Energy Regulatory Commission. Available at: <https://www.ferc.gov/industries-data/electric/power-sales-and-markets/increasing-efficiency-through-improved-software-1> (Accessed: Nov 14, 2020)
+
+* [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)
+
+### RTS-GMLC
+
+* https://github.com/GridMod/RTS-GMLC
+
+* [BaBlEh19] **Clayton Barrows, Aaron Bloom, Ali Ehlen, Jussi Ikaheimo, Jennie Jorgenson, Dheepak Krishnamurthy, Jessica Lau et al.** "The IEEE Reliability Test System: A Proposed 2019 Update." IEEE Transactions on Power Systems (2019). [DOI: 10.1109/TPWRS.2019.2925557](https://doi.org/10.1109/TPWRS.2019.2925557)
+
+### OR-LIB
+
+* [ORLIB] **J.E.Beasley.** "OR-Library: distributing test problems by electronic mail", Journal of the Operational Research Society 41(11) (1990). [DOI: 10.2307/2582903](https://doi.org/10.2307/2582903)
+
+* [FrGe06] **A. Frangioni, C. Gentile.** "Solving nonlinear single-unit commitment problems with ramping constraints" Operations Research 54(4), p. 767 - 775, 2006. [DOI: 10.1287/opre.1060.0309](https://doi.org/10.1287/opre.1060.0309)
+
+### Tejada19
+
+* [TeLuSa19] **D. A. Tejada-Arango, S. Lumbreras, P. Sanchez-Martin and A. Ramos.** "Which Unit-Commitment Formulation is Best? A Systematic Comparison," in IEEE Transactions on Power Systems. [DOI: 10.1109/TPWRS.2019.2962024](https://ieeexplore.ieee.org/document/8941313/).
--- a/instances/matpower/case118/2017-02-01.json.gz
+++ b/instances/matpower/case118/2017-02-01.json.gz
--- a/instances/matpower/case118/2017-08-01.json.gz
+++ b/instances/matpower/case118/2017-08-01.json.gz
--- a/instances/matpower/case1354pegase/2017-02-01.json.gz
+++ b/instances/matpower/case1354pegase/2017-02-01.json.gz
--- a/instances/matpower/case1354pegase/2017-08-01.json.gz
+++ b/instances/matpower/case1354pegase/2017-08-01.json.gz
--- a/instances/matpower/case13659pegase/2017-02-01.json.gz
+++ b/instances/matpower/case13659pegase/2017-02-01.json.gz
--- a/instances/matpower/case13659pegase/2017-08-01.json.gz
+++ b/instances/matpower/case13659pegase/2017-08-01.json.gz
--- a/instances/matpower/case14/2017-02-01.json.gz
+++ b/instances/matpower/case14/2017-02-01.json.gz
--- a/instances/matpower/case14/2017-08-01.json.gz
+++ b/instances/matpower/case14/2017-08-01.json.gz
--- a/instances/matpower/case1888rte/2017-02-01.json.gz
+++ b/instances/matpower/case1888rte/2017-02-01.json.gz
--- a/instances/matpower/case1888rte/2017-08-01.json.gz
+++ b/instances/matpower/case1888rte/2017-08-01.json.gz
--- a/instances/matpower/case1951rte/2017-02-01.json.gz
+++ b/instances/matpower/case1951rte/2017-02-01.json.gz
--- a/instances/matpower/case1951rte/2017-08-01.json.gz
+++ b/instances/matpower/case1951rte/2017-08-01.json.gz
--- a/instances/matpower/case2383wp/2017-02-01.json.gz
+++ b/instances/matpower/case2383wp/2017-02-01.json.gz
--- a/instances/matpower/case2383wp/2017-08-01.json.gz
+++ b/instances/matpower/case2383wp/2017-08-01.json.gz
--- a/instances/matpower/case2736sp/2017-02-01.json.gz
+++ b/instances/matpower/case2736sp/2017-02-01.json.gz
--- a/instances/matpower/case2736sp/2017-08-01.json.gz
+++ b/instances/matpower/case2736sp/2017-08-01.json.gz
--- a/instances/matpower/case2737sop/2017-02-01.json.gz
+++ b/instances/matpower/case2737sop/2017-02-01.json.gz
--- a/instances/matpower/case2737sop/2017-08-01.json.gz
+++ b/instances/matpower/case2737sop/2017-08-01.json.gz
--- a/instances/matpower/case2746wop/2017-02-01.json.gz
+++ b/instances/matpower/case2746wop/2017-02-01.json.gz
--- a/instances/matpower/case2746wop/2017-08-01.json.gz
+++ b/instances/matpower/case2746wop/2017-08-01.json.gz
--- a/instances/matpower/case2746wp/2017-02-01.json.gz
+++ b/instances/matpower/case2746wp/2017-02-01.json.gz
--- a/instances/matpower/case2746wp/2017-08-01.json.gz
+++ b/instances/matpower/case2746wp/2017-08-01.json.gz
--- a/instances/matpower/case2848rte/2017-02-01.json.gz
+++ b/instances/matpower/case2848rte/2017-02-01.json.gz
--- a/instances/matpower/case2848rte/2017-08-01.json.gz
+++ b/instances/matpower/case2848rte/2017-08-01.json.gz
--- a/instances/matpower/case2868rte/2017-02-01.json.gz
+++ b/instances/matpower/case2868rte/2017-02-01.json.gz
--- a/instances/matpower/case2868rte/2017-08-01.json.gz
+++ b/instances/matpower/case2868rte/2017-08-01.json.gz
--- a/instances/matpower/case2869pegase/2017-02-01.json.gz
+++ b/instances/matpower/case2869pegase/2017-02-01.json.gz
--- a/instances/matpower/case2869pegase/2017-08-01.json.gz
+++ b/instances/matpower/case2869pegase/2017-08-01.json.gz
--- a/instances/matpower/case30/2017-02-01.json.gz
+++ b/instances/matpower/case30/2017-02-01.json.gz
--- a/instances/matpower/case30/2017-08-01.json.gz
+++ b/instances/matpower/case30/2017-08-01.json.gz
--- a/instances/matpower/case300/2017-02-01.json.gz
+++ b/instances/matpower/case300/2017-02-01.json.gz
--- a/instances/matpower/case300/2017-08-01.json.gz
+++ b/instances/matpower/case300/2017-08-01.json.gz
--- a/instances/matpower/case3012wp/2017-02-01.json.gz
+++ b/instances/matpower/case3012wp/2017-02-01.json.gz
--- a/instances/matpower/case3012wp/2017-08-01.json.gz
+++ b/instances/matpower/case3012wp/2017-08-01.json.gz
--- a/instances/matpower/case3120sp/2017-02-01.json.gz
+++ b/instances/matpower/case3120sp/2017-02-01.json.gz
--- a/instances/matpower/case3120sp/2017-08-01.json.gz
+++ b/instances/matpower/case3120sp/2017-08-01.json.gz
--- a/instances/matpower/case3375wp/2017-02-01.json.gz
+++ b/instances/matpower/case3375wp/2017-02-01.json.gz
--- a/instances/matpower/case3375wp/2017-08-01.json.gz
+++ b/instances/matpower/case3375wp/2017-08-01.json.gz
--- a/instances/matpower/case57/2017-02-01.json.gz
+++ b/instances/matpower/case57/2017-02-01.json.gz
--- a/instances/matpower/case57/2017-08-01.json.gz
+++ b/instances/matpower/case57/2017-08-01.json.gz
--- a/instances/matpower/case6468rte/2017-02-01.json.gz
+++ b/instances/matpower/case6468rte/2017-02-01.json.gz
--- a/instances/matpower/case6468rte/2017-08-01.json.gz
+++ b/instances/matpower/case6468rte/2017-08-01.json.gz
--- a/instances/matpower/case6470rte/2017-02-01.json.gz
+++ b/instances/matpower/case6470rte/2017-02-01.json.gz
--- a/instances/matpower/case6470rte/2017-08-01.json.gz
+++ b/instances/matpower/case6470rte/2017-08-01.json.gz
--- a/instances/matpower/case6495rte/2017-02-01.json.gz
+++ b/instances/matpower/case6495rte/2017-02-01.json.gz
--- a/instances/matpower/case6495rte/2017-08-01.json.gz
+++ b/instances/matpower/case6495rte/2017-08-01.json.gz
--- a/instances/matpower/case6515rte/2017-02-01.json.gz
+++ b/instances/matpower/case6515rte/2017-02-01.json.gz
--- a/instances/matpower/case6515rte/2017-08-01.json.gz
+++ b/instances/matpower/case6515rte/2017-08-01.json.gz
--- a/instances/matpower/case89pegase/2017-02-01.json.gz
+++ b/instances/matpower/case89pegase/2017-02-01.json.gz
--- a/instances/matpower/case89pegase/2017-08-01.json.gz
+++ b/instances/matpower/case89pegase/2017-08-01.json.gz
--- a/instances/matpower/case9241pegase/2017-02-01.json.gz
+++ b/instances/matpower/case9241pegase/2017-02-01.json.gz
--- a/instances/matpower/case9241pegase/2017-08-01.json.gz
+++ b/instances/matpower/case9241pegase/2017-08-01.json.gz
--- a/instances/or-lib/100_0_1_w.json.gz
+++ b/instances/or-lib/100_0_1_w.json.gz
--- a/instances/or-lib/100_0_2_w.json.gz
+++ b/instances/or-lib/100_0_2_w.json.gz
--- a/instances/or-lib/100_0_3_w.json.gz
+++ b/instances/or-lib/100_0_3_w.json.gz
--- a/instances/or-lib/100_0_4_w.json.gz
+++ b/instances/or-lib/100_0_4_w.json.gz
--- a/instances/or-lib/100_0_5_w.json.gz
+++ b/instances/or-lib/100_0_5_w.json.gz
--- a/instances/or-lib/10_0_1_w.json.gz
+++ b/instances/or-lib/10_0_1_w.json.gz
--- a/instances/or-lib/10_0_2_w.json.gz
+++ b/instances/or-lib/10_0_2_w.json.gz
--- a/instances/or-lib/10_0_3_w.json.gz
+++ b/instances/or-lib/10_0_3_w.json.gz
--- a/instances/or-lib/10_0_4_w.json.gz
+++ b/instances/or-lib/10_0_4_w.json.gz
--- a/instances/or-lib/10_0_5_w.json.gz
+++ b/instances/or-lib/10_0_5_w.json.gz
--- a/instances/or-lib/150_0_1_w.json.gz
+++ b/instances/or-lib/150_0_1_w.json.gz
--- a/instances/or-lib/150_0_2_w.json.gz
+++ b/instances/or-lib/150_0_2_w.json.gz
--- a/instances/or-lib/150_0_3_w.json.gz
+++ b/instances/or-lib/150_0_3_w.json.gz
--- a/instances/or-lib/150_0_4_w.json.gz
+++ b/instances/or-lib/150_0_4_w.json.gz
--- a/instances/or-lib/150_0_5_w.json.gz
+++ b/instances/or-lib/150_0_5_w.json.gz
--- a/instances/or-lib/200_0_10_w.json.gz
+++ b/instances/or-lib/200_0_10_w.json.gz
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alinson S Xavier	675143967f	Fix some merge issues	2020-11-20 12:17:59 -06:00
Alinson S Xavier	ba9e086bea	Merge branch 'dev' into akazachk/formulations	2020-11-20 10:55:48 -06:00
Aleksandr Kazachkov	3baddf158a	Implement multiple formulations	2020-11-20 10:52:23 -06:00