Add units to input and output files; bump version to 0.2.0

Add marginal costs to output file
2025-12-06 07:48:50 -06:00 · 2020-06-05 15:39:01 -05:00 · 2020-05-29 17:32:25 -05:00
16 changed files with 785 additions and 1148 deletions
--- a/Manifest.toml
+++ b/Manifest.toml
@@ -10,16 +10,10 @@ uuid = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
 version = "0.5.0"

 [[BinaryProvider]]
-deps = ["Libdl", "Logging", "SHA"]
-git-tree-sha1 = "428e9106b1ff27593cbd979afac9b45b82372b8c"
+deps = ["Libdl", "SHA"]
+git-tree-sha1 = "5b08ed6036d9d3f0ee6369410b830f8873d4024c"
 uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
-version = "0.5.9"
-
-[[Bzip2_jll]]
-deps = ["Libdl", "Pkg"]
-git-tree-sha1 = "3663bfffede2ef41358b6fc2e1d8a6d50b3c3904"
-uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0"
-version = "1.0.6+2"
+version = "0.5.8"

 [[Calculus]]
 deps = ["LinearAlgebra"]
@@ -29,27 +23,33 @@ version = "0.5.1"

 [[Cbc]]
 deps = ["BinaryProvider", "Libdl", "MathOptInterface", "MathProgBase", "SparseArrays", "Test"]
-git-tree-sha1 = "62d80f448b5d77b3f0a59cecf6197aad2a3aa280"
+git-tree-sha1 = "0d51c2d66fc22e5e3fc64b6092ba0f0b3839c8c1"
 uuid = "9961bab8-2fa3-5c5a-9d89-47fab24efd76"
-version = "0.6.7"
+version = "0.6.6"
+
+[[Clp]]
+deps = ["BinaryProvider", "Libdl", "LinearAlgebra", "MathOptInterface", "MathProgBase", "SparseArrays"]
+git-tree-sha1 = "0872354eaeb05a86e400f45abaac1dc93da7bf76"
+uuid = "e2554f3b-3117-50c0-817c-e040a3ddf72d"
+version = "0.7.1"

 [[CodeTracking]]
 deps = ["InteractiveUtils", "UUIDs"]
-git-tree-sha1 = "cab4da992adc0a64f63fa30d2db2fd8bec40cab4"
+git-tree-sha1 = "0becdab7e6fbbcb7b88d8de5b72e5bb2f28239f3"
 uuid = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
-version = "0.5.11"
+version = "0.5.8"

 [[CodecBzip2]]
-deps = ["Bzip2_jll", "Libdl", "TranscodingStreams"]
-git-tree-sha1 = "2fee975d68f9a8b22187ae86e33c0829b30cf231"
+deps = ["BinaryProvider", "Libdl", "TranscodingStreams"]
+git-tree-sha1 = "5db086e510c11b4c87d05067627eadb2dc079995"
 uuid = "523fee87-0ab8-5b00-afb7-3ecf72e48cfd"
-version = "0.7.1"
+version = "0.6.0"

 [[CodecZlib]]
-deps = ["TranscodingStreams", "Zlib_jll"]
-git-tree-sha1 = "ded953804d019afa9a3f98981d99b33e3db7b6da"
+deps = ["BinaryProvider", "Libdl", "TranscodingStreams"]
+git-tree-sha1 = "05916673a2627dd91b4969ff8ba6941bc85a960e"
 uuid = "944b1d66-785c-5afd-91f1-9de20f533193"
-version = "0.7.0"
+version = "0.6.0"

 [[CommonSubexpressions]]
 deps = ["Test"]
@@ -59,21 +59,21 @@ version = "0.2.0"

 [[CompilerSupportLibraries_jll]]
 deps = ["Libdl", "Pkg"]
-git-tree-sha1 = "7c4f882c41faa72118841185afc58a2eb00ef612"
+git-tree-sha1 = "b57c5d019367c90f234a7bc7e24ff0a84971da5d"
 uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
-version = "0.3.3+0"
+version = "0.2.0+1"

 [[CoordinateTransformations]]
-deps = ["LinearAlgebra", "StaticArrays"]
-git-tree-sha1 = "c230b1d94db9fdd073168830437e64b9db627fcb"
+deps = ["LinearAlgebra", "Rotations", "StaticArrays"]
+git-tree-sha1 = "71333ea3f841bca6c1aa2863f11758eb9b37bfbc"
 uuid = "150eb455-5306-5404-9cee-2592286d6298"
-version = "0.6.0"
+version = "0.5.1"

 [[DataStructures]]
 deps = ["InteractiveUtils", "OrderedCollections"]
-git-tree-sha1 = "7d7578b00789cf16c5f68fad71868e773edd58a2"
+git-tree-sha1 = "5a431d46abf2ef2a4d5d00bd0ae61f651cf854c8"
 uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
-version = "0.17.16"
+version = "0.17.10"

 [[Dates]]
 deps = ["Printf"]
@@ -100,9 +100,9 @@ uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"

 [[ForwardDiff]]
 deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"]
-git-tree-sha1 = "869540e4367122fbffaace383a5bdc34d6e5e5ac"
+git-tree-sha1 = "88b082d492be6b63f967b6c96b352e25ced1a34c"
 uuid = "f6369f11-7733-5829-9624-2563aa707210"
-version = "0.10.10"
+version = "0.10.9"

 [[Geodesy]]
 deps = ["CoordinateTransformations", "Dates", "LinearAlgebra", "StaticArrays", "Test"]
@@ -112,9 +112,9 @@ version = "0.5.0"

 [[HTTP]]
 deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"]
-git-tree-sha1 = "fe31f4ff144392ad8176f5c7c03cca6ba320271c"
+git-tree-sha1 = "8d9bdd55c9d0d6ddf08f8b5229f90b7f274b6777"
 uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
-version = "0.8.14"
+version = "0.8.12"

 [[IniFile]]
 deps = ["Test"]
@@ -140,18 +140,17 @@ version = "0.2.0"

 [[JuMP]]
 deps = ["Calculus", "DataStructures", "ForwardDiff", "LinearAlgebra", "MathOptInterface", "MutableArithmetics", "NaNMath", "Random", "SparseArrays", "Statistics"]
-git-tree-sha1 = "84c1cf8bec4729b8b2ef4dfc4e1db1b892ad0d30"
+git-tree-sha1 = "8e87337fd19b6717fd9d5324bfab99848e363d9f"
 uuid = "4076af6c-e467-56ae-b986-b466b2749572"
-version = "0.21.2"
+version = "0.21.1"

 [[JuliaInterpreter]]
 deps = ["CodeTracking", "InteractiveUtils", "Random", "UUIDs"]
-git-tree-sha1 = "4ab65b7deb5af83f022f26ad3351a3bd5d80c6e2"
+git-tree-sha1 = "2eadbbde5534346cbb837c3a75b377cba477a06d"
 uuid = "aa1ae85d-cabe-5617-a682-6adf51b2e16a"
-version = "0.7.16"
+version = "0.7.13"

 [[LibGit2]]
-deps = ["Printf"]
 uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"

 [[Libdl]]
@@ -166,9 +165,9 @@ uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"

 [[LoweredCodeUtils]]
 deps = ["JuliaInterpreter"]
-git-tree-sha1 = "225f0035f01c24858c0884f38bb519e22b0a5150"
+git-tree-sha1 = "1c41621653250b2824b6e664ac5bd805558aeff9"
 uuid = "6f1432cf-f94c-5a45-995e-cdbf5db27b0b"
-version = "0.4.5"
+version = "0.4.3"

 [[Markdown]]
 deps = ["Base64"]
@@ -176,9 +175,9 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"

 [[MathOptInterface]]
 deps = ["BenchmarkTools", "CodecBzip2", "CodecZlib", "JSON", "JSONSchema", "LinearAlgebra", "MutableArithmetics", "OrderedCollections", "SparseArrays", "Test", "Unicode"]
-git-tree-sha1 = "27f2ef85879b8f1d144266ab44f076ba0dfbd8a1"
+git-tree-sha1 = "f0d60e42d8b64dd1b511e2dc13e0b72ba1dfc9cf"
 uuid = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
-version = "0.9.13"
+version = "0.9.12"

 [[MathProgBase]]
 deps = ["LinearAlgebra", "SparseArrays"]
@@ -188,24 +187,24 @@ version = "0.7.8"

 [[MbedTLS]]
 deps = ["Dates", "MbedTLS_jll", "Random", "Sockets"]
-git-tree-sha1 = "426a6978b03a97ceb7ead77775a1da066343ec6e"
+git-tree-sha1 = "a9e2221f06b42f56052f43ad7edecb01d0ef5ab4"
 uuid = "739be429-bea8-5141-9913-cc70e7f3736d"
-version = "1.0.2"
+version = "1.0.1"

 [[MbedTLS_jll]]
 deps = ["Libdl", "Pkg"]
-git-tree-sha1 = "c83f5a1d038f034ad0549f9ee4d5fac3fb429e33"
+git-tree-sha1 = "066a4467008745eed36dad973ceb66405785a621"
 uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
-version = "2.16.0+2"
+version = "2.16.0+1"

 [[Mmap]]
 uuid = "a63ad114-7e13-5084-954f-fe012c677804"

 [[MutableArithmetics]]
 deps = ["LinearAlgebra", "SparseArrays", "Test"]
-git-tree-sha1 = "e1edd618a8f39d16f8595dd622a63b25f759cf8a"
+git-tree-sha1 = "020d4f22e1151e0613edf91a56535379564c1ce8"
 uuid = "d8a4904e-b15c-11e9-3269-09a3773c0cb0"
-version = "0.2.9"
+version = "0.2.7"

 [[NaNMath]]
 git-tree-sha1 = "928b8ca9b2791081dc71a51c55347c27c618760f"
@@ -219,18 +218,19 @@ uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e"
 version = "0.5.3+3"

 [[OrderedCollections]]
-git-tree-sha1 = "12ce190210d278e12644bcadf5b21cbdcf225cd3"
+deps = ["Random", "Serialization", "Test"]
+git-tree-sha1 = "c4c13474d23c60d20a67b217f1d7f22a40edf8f1"
 uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
-version = "1.2.0"
+version = "1.1.0"

 [[Parsers]]
 deps = ["Dates", "Test"]
-git-tree-sha1 = "f0abb338b4d00306500056a3fd44c221b8473ef2"
+git-tree-sha1 = "0c16b3179190d3046c073440d94172cfc3bb0553"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "1.0.4"
+version = "0.3.12"

 [[Pkg]]
-deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
+deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Test", "UUIDs"]
 uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"

 [[Printf]]
@@ -239,9 +239,9 @@ uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"

 [[ProgressBars]]
 deps = ["Printf"]
-git-tree-sha1 = "fec529e15cccf342087de2ccda1b0b9064cbbb53"
+git-tree-sha1 = "e66732bbdaad368cfc642cef1f639df5812dc818"
 uuid = "49802e3a-d2f1-5c88-81d8-b72133a6f568"
-version = "0.7.1"
+version = "0.6.0"

 [[REPL]]
 deps = ["InteractiveUtils", "Markdown", "Sockets"]
@@ -253,9 +253,15 @@ uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

 [[Revise]]
 deps = ["CodeTracking", "Distributed", "FileWatching", "JuliaInterpreter", "LibGit2", "LoweredCodeUtils", "OrderedCollections", "Pkg", "REPL", "UUIDs", "Unicode"]
-git-tree-sha1 = "3185d2ee31756af9e20ce045ddfaedcd0df9e4aa"
+git-tree-sha1 = "3c04c929f8720c2fabb12534cd102a2356a7705c"
 uuid = "295af30f-e4ad-537b-8983-00126c2a3abe"
-version = "2.6.6"
+version = "2.5.4"
+
+[[Rotations]]
+deps = ["LinearAlgebra", "StaticArrays", "Statistics"]
+git-tree-sha1 = "d5f83867093db7319a9366d55f29280ecae9bcda"
+uuid = "6038ab10-8711-5258-84ad-4b1120ba62dc"
+version = "0.13.0"

 [[SHA]]
 uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
@@ -272,15 +278,15 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"

 [[SpecialFunctions]]
 deps = ["OpenSpecFun_jll"]
-git-tree-sha1 = "d8d8b8a9f4119829410ecd706da4cc8594a1e020"
+git-tree-sha1 = "e19b98acb182567bcb7b75bb5d9eedf3a3b5ec6c"
 uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
-version = "0.10.3"
+version = "0.10.0"

 [[StaticArrays]]
 deps = ["LinearAlgebra", "Random", "Statistics"]
-git-tree-sha1 = "5c06c0aeb81bef54aed4b3f446847905eb6cbda0"
+git-tree-sha1 = "5a3bcb6233adabde68ebc97be66e95dcb787424c"
 uuid = "90137ffa-7385-5640-81b9-e52037218182"
-version = "0.12.3"
+version = "0.12.1"

 [[Statistics]]
 deps = ["LinearAlgebra", "SparseArrays"]
@@ -302,9 +308,3 @@ uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"

 [[Unicode]]
 uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
-
-[[Zlib_jll]]
-deps = ["Libdl", "Pkg"]
-git-tree-sha1 = "a2e0d558f6031002e380a90613b199e37a8565bf"
-uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
-version = "1.2.11+10"
--- a/Project.toml
+++ b/Project.toml
@@ -1,10 +1,11 @@
 name = "RELOG"
 uuid = "a2afcdf7-cf04-4913-85f9-c0d81ddf2008"
 authors = ["Alinson S Xavier <axavier@anl.gov>"]
-version = "0.1.0"
+version = "0.2.0"

 [deps]
 Cbc = "9961bab8-2fa3-5c5a-9d89-47fab24efd76"
+Clp = "e2554f3b-3117-50c0-817c-e040a3ddf72d"
 Geodesy = "0ef565a4-170c-5f04-8de2-149903a85f3d"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 JSONSchema = "7d188eb4-7ad8-530c-ae41-71a32a6d4692"
@@ -23,4 +24,4 @@ JSON = "0.21"
 JSONSchema = "0.2"
 JuMP = "0.21"
 MathOptInterface = "0.9"
-ProgressBars = "0.7"
+ProgressBars = "0.6"
--- a/docs/index.html
+++ b/docs/index.html
@@ -275,6 +275,6 @@ POSSIBILITY OF SUCH DAMAGE.
 </html>

 <!--
-MkDocs version : 1.1
-Build Date UTC : 2020-05-22 20:22:06
+MkDocs version : 1.0.4
+Build Date UTC : 2020-06-05 20:38:00
 -->
--- a/docs/model/index.html
+++ b/docs/model/index.html
@@ -154,21 +154,21 @@
 </thead>
 <tbody>
 <tr>
-<td align="left"><code>time periods</code></td>
-<td>Number of time periods in the simulation.</td>
+<td align="left"><code>Time horizon (years)</code></td>
+<td>Number of years in the simulation.</td>
 </tr>
 </tbody>
 </table>
 <h3 id="example">Example</h3>
 <pre><code class="json">{
-    &quot;parameters&quot;: {
-        &quot;time periods&quot;: 2
+    &quot;Parameters&quot;: {
+        &quot;Time horizon (years)&quot;: 2
    }
 }
 </code></pre>

 <h2 id="products">Products</h2>
-<p>The <strong>products</strong> section describes all products and subproducts in the simulation. The field <code>instance["products"]</code> is a dictionary mapping the name of the product to a dictionary which describes its characteristics. Each product description contains the following keys:</p>
+<p>The <strong>products</strong> section describes all products and subproducts in the simulation. The field <code>instance["Products"]</code> is a dictionary mapping the name of the product to a dictionary which describes its characteristics. Each product description contains the following keys:</p>
 <table>
 <thead>
 <tr>
@@ -178,11 +178,11 @@
 </thead>
 <tbody>
 <tr>
-<td align="left"><code>transportation cost</code></td>
-<td>The cost (in dollars per km per tonnes) to transport this product. Must be a timeseries.</td>
+<td align="left"><code>Transportation cost ($/km/tonne)</code></td>
+<td>The cost to transport this product. Must be a timeseries.</td>
 </tr>
 <tr>
-<td align="left"><code>initial amounts</code></td>
+<td align="left"><code>Initial amounts</code></td>
 <td>A dictionary mapping the name of each location to its description (see below). If this product is not initially available, this key may be omitted. Must be a timeseries.</td>
 </tr>
 </tbody>
@@ -197,57 +197,57 @@
 </thead>
 <tbody>
 <tr>
-<td align="left"><code>latitude</code></td>
-<td>The latitude of the location, in degrees.</td>
+<td align="left"><code>Latitude (deg)</code></td>
+<td>The latitude of the location.</td>
 </tr>
 <tr>
-<td align="left"><code>longitude</code></td>
-<td>The longitude of the location, in degrees.</td>
+<td align="left"><code>Longitude (deg)</code></td>
+<td>The longitude of the location.</td>
 </tr>
 <tr>
-<td align="left"><code>amount</code></td>
-<td>The amount (in tonnes) of the product initially available at the location. Must be a timeseries.</td>
+<td align="left"><code>Amount (tonne)</code></td>
+<td>The amount of the product initially available at the location. Must be a timeseries.</td>
 </tr>
 </tbody>
 </table>
 <h3 id="example_1">Example</h3>
 <pre><code class="json">{
-    &quot;products&quot;: {
+    &quot;Products&quot;: {
        &quot;P1&quot;: {
-            &quot;transportation cost&quot;: [0.015, 0.015],
-            &quot;initial amounts&quot;: {
+            &quot;Transportation cost ($/km/tonne)&quot;: [0.015, 0.015],
+            &quot;Initial amounts&quot;: {
                &quot;C1&quot;: {
-                    &quot;latitude&quot;: 7.0,
-                    &quot;longitude&quot;: 7.0,
-                    &quot;amount&quot;: [934.56, 934.56]
+                    &quot;Latitude (deg)&quot;: 7.0,
+                    &quot;Longitude (deg)&quot;: 7.0,
+                    &quot;Amount (tonne)&quot;: [934.56, 934.56]
                },
                &quot;C2&quot;: {
-                    &quot;latitude&quot;: 7.0,
-                    &quot;longitude&quot;: 19.0,
-                    &quot;amount&quot;: [198.95, 198.95]
+                    &quot;Latitude (deg)&quot;: 7.0,
+                    &quot;Longitude (deg)&quot;: 19.0,
+                    &quot;Amount (tonne)&quot;: [198.95, 198.95]
                },
                &quot;C3&quot;: {
-                    &quot;latitude&quot;: 84.0,
-                    &quot;longitude&quot;: 76.0,
-                    &quot;amount&quot;: [212.97, 212.97]
+                    &quot;Latitude (deg)&quot;: 84.0,
+                    &quot;Longitude (deg)&quot;: 76.0,
+                    &quot;Amount (tonne)&quot;: [212.97, 212.97]
                }
            }
        },
        &quot;P2&quot;: {
-            &quot;transportation cost&quot;: [0.02, 0.02]
+            &quot;Transportation cost ($/km/tonne)&quot;: [0.02, 0.02]
        },
        &quot;P3&quot;: {
-            &quot;transportation cost&quot;: [0.0125, 0.0125]
+            &quot;Transportation cost ($/km/tonne)&quot;: [0.0125, 0.0125]
        },
        &quot;P4&quot;: {
-            &quot;transportation cost&quot;: [0.0175, 0.0175]
+            &quot;Transportation cost ($/km/tonne)&quot;: [0.0175, 0.0175]
        }
    }
 }
 </code></pre>

 <h2 id="processing-plants">Processing Plants</h2>
-<p>The <strong>plants</strong> section describes the available types of reverse manufacturing plants, their potential locations and associated costs, as well as their inputs and outputs. The field <code>instance["plants"]</code> is a dictionary mapping the name of the plant to a dictionary with the following keys:</p>
+<p>The <strong>plants</strong> section describes the available types of reverse manufacturing plants, their potential locations and associated costs, as well as their inputs and outputs. The field <code>instance["Plants"]</code> is a dictionary mapping the name of the plant to a dictionary with the following keys:</p>
 <table>
 <thead>
 <tr>
@@ -257,15 +257,15 @@
 </thead>
 <tbody>
 <tr>
-<td align="left"><code>input</code></td>
+<td align="left"><code>Input</code></td>
 <td>The name of the product that this plant takes as input. Only one input is accepted per plant.</td>
 </tr>
 <tr>
-<td align="left"><code>outputs</code></td>
+<td align="left"><code>Outputs (tonne)</code></td>
 <td>A dictionary specifying how many tonnes of each product is produced for each tonnes of input. For example, if the plant outputs 0.5 tonnes of P2 and 0.25 tonnes of P3 for each tonnes of P1 provided, then this entry should be <code>{"P2": 0.5, "P3": 0.25}</code>. If the plant does not output anything, this key may be omitted.</td>
 </tr>
 <tr>
-<td align="left"><code>locations</code></td>
+<td align="left"><code>Locations</code></td>
 <td>A dictionary mapping the name of the location to a dictionary which describes the site characteristics (see below).</td>
 </tr>
 </tbody>
@@ -280,19 +280,19 @@
 </thead>
 <tbody>
 <tr>
-<td align="left"><code>latitude</code></td>
+<td align="left"><code>Latitude (deg)</code></td>
 <td>The latitude of the location, in degrees.</td>
 </tr>
 <tr>
-<td align="left"><code>longitude</code></td>
+<td align="left"><code>Longitude (deg)</code></td>
 <td>The longitude of the location, in degrees.</td>
 </tr>
 <tr>
-<td align="left"><code>disposal</code></td>
+<td align="left"><code>Disposal</code></td>
 <td>A dictionary describing what products can be disposed locally at the plant.</td>
 </tr>
 <tr>
-<td align="left"><code>capacities</code></td>
+<td align="left"><code>Capacities (tonne)</code></td>
 <td>A dictionary describing what plant sizes are allowed, and their characteristics.</td>
 </tr>
 </tbody>
@@ -307,12 +307,12 @@
 </thead>
 <tbody>
 <tr>
-<td align="left"><code>cost</code></td>
-<td>The cost (in dollars per tonnes) to dispose of the product. Must be a timeseries.</td>
+<td align="left"><code>Cost ($/tonne)</code></td>
+<td>The cost to dispose of the product. Must be a timeseries.</td>
 </tr>
 <tr>
-<td align="left"><code>limit</code></td>
-<td>The maximum amount (in tonnes) that can be disposed of. If an unlimited amount can be disposed, this key may be omitted. Must be a timeseries.</td>
+<td align="left"><code>Limit (tonne)</code></td>
+<td>The maximum amount that can be disposed of. If an unlimited amount can be disposed, this key may be omitted. Must be a timeseries.</td>
 </tr>
 </tbody>
 </table>
@@ -326,48 +326,48 @@
 </thead>
 <tbody>
 <tr>
-<td align="left"><code>opening cost</code></td>
-<td>The cost (in dollars) to open a plant of this size.</td>
+<td align="left"><code>Opening cost ($)</code></td>
+<td>The cost to open a plant of this size.</td>
 </tr>
 <tr>
-<td align="left"><code>fixed operating cost</code></td>
-<td>The cost (in dollars) to keep the plant open, even if the plant doesn't process anything. Must be a timeseries.</td>
+<td align="left"><code>Fixed operating cost ($)</code></td>
+<td>The cost to keep the plant open, even if the plant doesn't process anything. Must be a timeseries.</td>
 </tr>
 <tr>
-<td align="left"><code>variable operating cost</code></td>
-<td>The cost (in dollars per tonnes) that the plant incurs to process each tonne of input. Must be a timeseries.</td>
+<td align="left"><code>Variable operating cost ($/tonne)</code></td>
+<td>The cost that the plant incurs to process each tonne of input. Must be a timeseries.</td>
 </tr>
 </tbody>
 </table>
 <h3 id="example_2">Example</h3>
 <pre><code class="json">{
-    &quot;plants&quot;: {
+    &quot;Plants&quot;: {
        &quot;F1&quot;: {
-            &quot;input&quot;: &quot;P1&quot;,
-            &quot;outputs&quot;: {
+            &quot;Input&quot;: &quot;P1&quot;,
+            &quot;Outputs (tonne)&quot;: {
                &quot;P2&quot;: 0.2,
                &quot;P3&quot;: 0.5
            },
-            &quot;locations&quot;: {
+            &quot;Locations&quot;: {
                &quot;L1&quot;: {
-                    &quot;latitude&quot;: 0.0,
-                    &quot;longitude&quot;: 0.0,
-                    &quot;disposal&quot;: {
+                    &quot;Latitude (deg)&quot;: 0.0,
+                    &quot;Longitude (deg)&quot;: 0.0,
+                    &quot;Disposal&quot;: {
                        &quot;P2&quot;: {
-                            &quot;cost&quot;: [-10.0, -12.0],
-                            &quot;limit&quot;: [1.0, 1.0]
+                            &quot;Cost ($/tonne)&quot;: [-10.0, -12.0],
+                            &quot;Limit (tonne)&quot;: [1.0, 1.0]
                        }
                    },
-                    &quot;capacities&quot;: {
+                    &quot;Capacities (tonne)&quot;: {
                        &quot;100&quot;: {
-                            &quot;opening cost&quot;: [500, 530],
-                            &quot;fixed operating cost&quot;: [300.0, 310.0],
-                            &quot;variable operating cost&quot;: [5.0, 5.2]
+                            &quot;Opening cost ($)&quot;: [500, 530],
+                            &quot;Fixed operating cost ($)&quot;: [300.0, 310.0],
+                            &quot;Variable operating cost ($/tonne)&quot;: [5.0, 5.2]
                        },
                        &quot;500&quot;: {
-                            &quot;opening cost&quot;: [750, 760],
-                            &quot;fixed operating cost&quot;: [400.0, 450.0],
-                            &quot;variable operating cost&quot;: [5.0, 5.2]
+                            &quot;Opening cost ($)&quot;: [750, 760],
+                            &quot;Fixed operating cost ($)&quot;: [400.0, 450.0],
+                            &quot;Variable operating cost ($/tonne)&quot;: [5.0, 5.2]
                        }
                    }
                }
--- a/docs/search/lunr.js
+++ b/docs/search/lunr.js
--- a/docs/search/search_index.json
+++ b/docs/search/search_index.json
--- a/docs/sitemap.xml
+++ b/docs/sitemap.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"><url>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+    <url>
     <loc>None</loc>
-     <lastmod>2020-05-22</lastmod>
+     <lastmod>2020-06-05</lastmod>
     <changefreq>daily</changefreq>
-    </url><url>
+    </url>
+    <url>
     <loc>None</loc>
-     <lastmod>2020-05-22</lastmod>
+     <lastmod>2020-06-05</lastmod>
     <changefreq>daily</changefreq>
-    </url><url>
+    </url>
+    <url>
     <loc>None</loc>
-     <lastmod>2020-05-22</lastmod>
+     <lastmod>2020-06-05</lastmod>
     <changefreq>daily</changefreq>
-    </url><url>
+    </url>
+    <url>
     <loc>None</loc>
-     <lastmod>2020-05-22</lastmod>
+     <lastmod>2020-06-05</lastmod>
     <changefreq>daily</changefreq>
    </url>
 </urlset>
--- a/docs/sitemap.xml.gz
+++ b/docs/sitemap.xml.gz
--- a/instances/s1.json
+++ b/instances/s1.json
@@ -1,188 +1,188 @@
 {
-    "parameters": {
-        "time periods": 2
+    "Parameters": {
+        "Time horizon (years)": 2
    },
-    "products": {
+    "Products": {
        "P1": {
-            "transportation cost": [0.015, 0.015],
-            "initial amounts": {
+            "Transportation cost ($/km/tonne)": [0.015, 0.015],
+            "Initial amounts": {
                "C1": {
-                    "latitude": 7.0,
-                    "longitude": 7.0,
-                    "amount": [934.56, 934.56]
+                    "Latitude (deg)": 7.0,
+                    "Longitude (deg)": 7.0,
+                    "Amount (tonne)": [934.56, 934.56]
                },
                "C2": {
-                    "latitude": 7.0,
-                    "longitude": 19.0,
-                    "amount": [198.95, 198.95]
+                    "Latitude (deg)": 7.0,
+                    "Longitude (deg)": 19.0,
+                    "Amount (tonne)": [198.95, 198.95]
                },
                "C3": {
-                    "latitude": 84.0,
-                    "longitude": 76.0,
-                    "amount": [212.97, 212.97]
+                    "Latitude (deg)": 84.0,
+                    "Longitude (deg)": 76.0,
+                    "Amount (tonne)": [212.97, 212.97]
                },
                "C4": {
-                    "latitude": 21.0,
-                    "longitude": 16.0,
-                    "amount": [352.19, 352.19]
+                    "Latitude (deg)": 21.0,
+                    "Longitude (deg)": 16.0,
+                    "Amount (tonne)": [352.19, 352.19]
                },
                "C5": {
-                    "latitude": 32.0,
-                    "longitude": 92.0,
-                    "amount": [510.33, 510.33]
+                    "Latitude (deg)": 32.0,
+                    "Longitude (deg)": 92.0,
+                    "Amount (tonne)": [510.33, 510.33]
                },
                "C6": {
-                    "latitude": 14.0,
-                    "longitude": 62.0,
-                    "amount": [471.66, 471.66]
+                    "Latitude (deg)": 14.0,
+                    "Longitude (deg)": 62.0,
+                    "Amount (tonne)": [471.66, 471.66]
                },
                "C7": {
-                    "latitude": 30.0,
-                    "longitude": 83.0,
-                    "amount": [785.21, 785.21]
+                    "Latitude (deg)": 30.0,
+                    "Longitude (deg)": 83.0,
+                    "Amount (tonne)": [785.21, 785.21]
                },
                "C8": {
-                    "latitude": 35.0,
-                    "longitude": 40.0,
-                    "amount": [706.17, 706.17]
+                    "Latitude (deg)": 35.0,
+                    "Longitude (deg)": 40.0,
+                    "Amount (tonne)": [706.17, 706.17]
                },
                "C9": {
-                    "latitude": 74.0,
-                    "longitude": 52.0,
-                    "amount": [30.08, 30.08]
+                    "Latitude (deg)": 74.0,
+                    "Longitude (deg)": 52.0,
+                    "Amount (tonne)": [30.08, 30.08]
                },
                "C10": {
-                    "latitude": 22.0,
-                    "longitude": 54.0,
-                    "amount": [536.52, 536.52]
+                    "Latitude (deg)": 22.0,
+                    "Longitude (deg)": 54.0,
+                    "Amount (tonne)": [536.52, 536.52]
                }
            }
        },
        "P2": {
-            "transportation cost": [0.02, 0.02]
+            "Transportation cost ($/km/tonne)": [0.02, 0.02]
        },
        "P3": {
-            "transportation cost": [0.0125, 0.0125]
+            "Transportation cost ($/km/tonne)": [0.0125, 0.0125]
        },
        "P4": {
-            "transportation cost": [0.0175, 0.0175]
+            "Transportation cost ($/km/tonne)": [0.0175, 0.0175]
        }
    },
-    "plants": {
+    "Plants": {
        "F1": {
-            "input": "P1",
-            "outputs": {
+            "Input": "P1",
+            "Outputs (tonne)": {
                "P2": 0.2,
                "P3": 0.5
            },
-            "locations": {
+            "Locations": {
                "L1": {
-                    "latitude": 0.0,
-                    "longitude": 0.0,
-                    "disposal": {
+                    "Latitude (deg)": 0.0,
+                    "Longitude (deg)": 0.0,
+                    "Disposal": {
                        "P2": {
-                            "cost": [-10.0, -10.0],
-                            "limit": [1.0, 1.0]
+                            "Cost ($/tonne)": [-10.0, -10.0],
+                            "Limit (tonne)": [1.0, 1.0]
                        },
                        "P3": {
-                            "cost": [-10.0, -10.0],
-                            "limit": [1.0, 1.0]
+                            "Cost ($/tonne)": [-10.0, -10.0],
+                            "Limit (tonne)": [1.0, 1.0]
                        }
                    },
-                    "capacities": {
+                    "Capacities (tonne)": {
                        "250.0": {
-                            "opening cost": [500.0, 500.0],
-                            "fixed operating cost": [30.0, 30.0],
-                            "variable operating cost": [30.0, 30.0]
+                            "Opening cost ($)": [500.0, 500.0],
+                            "Fixed operating cost ($)": [30.0, 30.0],
+                            "Variable operating cost ($/tonne)": [30.0, 30.0]
                        },
                        "1000.0": {
-                            "opening cost": [1250.0, 1250.0],
-                            "fixed operating cost": [30.0, 30.0],
-                            "variable operating cost": [30.0, 30.0]
+                            "Opening cost ($)": [1250.0, 1250.0],
+                            "Fixed operating cost ($)": [30.0, 30.0],
+                            "Variable operating cost ($/tonne)": [30.0, 30.0]
                        }
                    }
                },
                "L2": {
-                    "latitude": 0.5,
-                    "longitude": 0.5,
-                    "capacities": {
+                    "Latitude (deg)": 0.5,
+                    "Longitude (deg)": 0.5,
+                    "Capacities (tonne)": {
                        "0.0": {
-                            "opening cost": [1000, 1000],
-                            "fixed operating cost": [50.0, 50.0],
-                            "variable operating cost": [50.0, 50.0]
+                            "Opening cost ($)": [1000, 1000],
+                            "Fixed operating cost ($)": [50.0, 50.0],
+                            "Variable operating cost ($/tonne)": [50.0, 50.0]
                        },
                        "10000.0": {
-                            "opening cost": [10000, 10000],
-                            "fixed operating cost": [50.0, 50.0],
-                            "variable operating cost": [50.0, 50.0]
+                            "Opening cost ($)": [10000, 10000],
+                            "Fixed operating cost ($)": [50.0, 50.0],
+                            "Variable operating cost ($/tonne)": [50.0, 50.0]
                        }
                    }
                }               
            }
        },
        "F2": {
-            "input": "P2",
-            "outputs": {
+            "Input": "P2",
+            "Outputs (tonne)": {
                "P3": 0.05,
                "P4": 0.80
            },
-            "locations": {
+            "Locations": {
                "L3": {
-                    "latitude": 25.0,
-                    "longitude": 65.0,
-                    "disposal": {
+                    "Latitude (deg)": 25.0,
+                    "Longitude (deg)": 65.0,
+                    "Disposal": {
                        "P3": {
-                            "cost": [100.0, 100.0]
+                            "Cost ($/tonne)": [100.0, 100.0]
                        }
                    },
-                    "capacities": {
+                    "Capacities (tonne)": {
                        "1000.0": {
-                            "opening cost": [3000, 3000],
-                            "fixed operating cost": [50.0, 50.0],
-                            "variable operating cost": [50.0, 50.0]
+                            "Opening cost ($)": [3000, 3000],
+                            "Fixed operating cost ($)": [50.0, 50.0],
+                            "Variable operating cost ($/tonne)": [50.0, 50.0]
                        }
                    }
                },
                "L4": {
-                    "latitude": 0.75,
-                    "longitude": 0.20,
-                    "capacities": {
+                    "Latitude (deg)": 0.75,
+                    "Longitude (deg)": 0.20,
+                    "Capacities (tonne)": {
                        "10000": {
-                            "opening cost": [3000, 3000],
-                            "fixed operating cost": [50.0, 50.0],
-                            "variable operating cost": [50.0, 50.0]
+                            "Opening cost ($)": [3000, 3000],
+                            "Fixed operating cost ($)": [50.0, 50.0],
+                            "Variable operating cost ($/tonne)": [50.0, 50.0]
                        }
                    }
                }
            }
        },
        "F3": {
-            "input": "P4",
-            "locations": {
+            "Input": "P4",
+            "Locations": {
                "L5": {
-                    "latitude": 100.0,
-                    "longitude": 100.0,
-                    "capacities": {
+                    "Latitude (deg)": 100.0,
+                    "Longitude (deg)": 100.0,
+                    "Capacities (tonne)": {
                        "15000": {
-                            "opening cost": [0.0, 0.0],
-                            "fixed operating cost": [0.0, 0.0],
-                            "variable operating cost": [-15.0, -15.0]
+                            "Opening cost ($)": [0.0, 0.0],
+                            "Fixed operating cost ($)": [0.0, 0.0],
+                            "Variable operating cost ($/tonne)": [-15.0, -15.0]
                        }
                    }
                }           
            }
        },
        "F4": {
-            "input": "P3",
-            "locations": {
+            "Input": "P3",
+            "Locations": {
                "L6": {
-                    "latitude": 50.0,
-                    "longitude": 50.0,
-                    "capacities": {
+                    "Latitude (deg)": 50.0,
+                    "Longitude (deg)": 50.0,
+                    "Capacities (tonne)": {
                        "10000": {
-                            "opening cost": [0.0, 0.0],
-                            "fixed operating cost": [0.0, 0.0],
-                            "variable operating cost": [-15.0, -15.0]
+                            "Opening cost ($)": [0.0, 0.0],
+                            "Fixed operating cost ($)": [0.0, 0.0],
+                            "Variable operating cost ($/tonne)": [-15.0, -15.0]
                        }
                    }
                }           
--- a/instances/solutions/s1.json
+++ b/instances/solutions/s1.json
@@ -47,8 +47,8 @@
          0.0
        ],
        "capacity": [
-          1.0e8,
-          1.0e8
+          15000.0,
+          15000.0
        ]
      }
    },
@@ -66,8 +66,8 @@
        },
        "latitude": 0.0,
        "expansion cost": [
-          750.0,
-          0.0
+          0.0,
+          750.0
        ],
        "output": {
          "dispose": {
@@ -134,8 +134,8 @@
          "Origin": {
            "C3": {
              "amount": [
-                212.97,
-                212.97
+                212.97000000000003,
+                212.97000000000003
              ],
              "latitude": 84.0,
              "distance": 8889.75,
@@ -145,8 +145,8 @@
                6389.1
              ],
              "transportation cost": [
-                3.19455,
-                3.19455
+                3.1945500000000004,
+                3.1945500000000004
              ]
            },
            "C7": {
@@ -168,19 +168,19 @@
            },
            "C5": {
              "amount": [
-                510.33,
-                510.33
+                510.3299999999999,
+                510.3299999999999
              ],
              "latitude": 32.0,
              "distance": 9148.52,
              "longitude": 92.0,
              "variable operating cost": [
-                15309.9,
-                15309.9
+                15309.899999999998,
+                15309.899999999998
              ],
              "transportation cost": [
-                7.6549499999999995,
-                7.6549499999999995
+                7.654949999999999,
+                7.654949999999999
              ]
            },
            "C9": {
@@ -218,14 +218,14 @@
            747.728
          ],
          "P3": [
-            1869.3199999999997,
-            1869.3199999999997
+            1869.32,
+            1869.32
          ]
        },
        "latitude": 0.5,
        "expansion cost": [
-          3738.6399999999967,
-          0.0
+          0.0,
+          3364.7759999999994
        ],
        "output": {
          "dispose": {},
@@ -247,8 +247,8 @@
              "F4": {
                "L6": {
                  "amount": [
-                    1869.3199999999997,
-                    1869.3199999999997
+                    1869.32,
+                    1869.32
                  ],
                  "latitude": 50.0,
                  "distance": 6828.89,
@@ -391,12 +391,12 @@
          }
        },
        "opening cost": [
-          1000.0,
+          999.9999999999999,
          0.0
        ],
        "capacity": [
          3738.6399999999994,
-          3738.6399999999967
+          3738.6399999999994
        ]
      }
    },
@@ -496,12 +496,12 @@
          }
        },
        "opening cost": [
-          3000.0,
+          2999.9999999999995,
          0.0
        ],
        "capacity": [
-          946.728,
-          1.0e8
+          10000.0,
+          10000.0
        ]
      }
    },
@@ -547,19 +547,19 @@
            },
            "L2": {
              "amount": [
-                1869.3199999999997,
-                1869.3199999999997
+                1869.32,
+                1869.32
              ],
              "latitude": 0.5,
              "distance": 6828.89,
              "longitude": 0.5,
              "variable operating cost": [
-                -28039.799999999996,
-                -28039.799999999996
+                -28039.8,
+                -28039.8
              ],
              "transportation cost": [
-                23.3665,
-                23.3665
+                23.366500000000002,
+                23.366500000000002
              ]
            }
          },
@@ -588,8 +588,72 @@
          0.0
        ],
        "capacity": [
-          1.0e8,
-          1.0e8
+          10000.0,
+          10000.0
+        ]
+      }
+    }
+  },
+  "products": {
+    "P1": {
+      "C1": {
+        "marginal cost": [
+          133.59,
+          134.49
+        ]
+      },
+      "C2": {
+        "marginal cost": [
+          150.81,
+          151.71
+        ]
+      },
+      "C3": {
+        "marginal cost": [
+          250.83,
+          251.73
+        ]
+      },
+      "C8": {
+        "marginal cost": [
+          199.65,
+          200.55
+        ]
+      },
+      "C6": {
+        "marginal cost": [
+          217.26,
+          218.16
+        ]
+      },
+      "C10": {
+        "marginal cost": [
+          208.54,
+          209.44
+        ]
+      },
+      "C4": {
+        "marginal cost": [
+          160.36,
+          161.26
+        ]
+      },
+      "C5": {
+        "marginal cost": [
+          254.71,
+          255.61
+        ]
+      },
+      "C7": {
+        "marginal cost": [
+          245.38,
+          246.28
+        ]
+      },
+      "C9": {
+        "marginal cost": [
+          240.5,
+          241.4
        ]
      }
    }
@@ -600,8 +664,8 @@
      0.0
    ],
    "expansion": [
-      4488.639999999997,
-      0.0
+      0.0,
+      4114.776
    ],
    "variable operating": [
      216672.818,
@@ -612,8 +676,8 @@
      130.0
    ],
    "total": [
-      225904.922057,
-      216916.282057
+      221416.282057,
+      221031.05805700002
    ],
    "transportation": [
      133.464057,
--- a/instances/solutions/s1.log
+++ b/instances/solutions/s1.log
@@ -1,36 +1,56 @@
-Gurobi Optimizer version 9.0.0 build v9.0.0rc2 (linux64)
-Optimize a model with 112 rows, 141 columns and 378 nonzeros
-Model fingerprint: 0xf1c6e6cc
-Variable types: 117 continuous, 24 integer (24 binary)
-Coefficient statistics:
-  Matrix range     [5e-02, 1e+08]
-  Objective range  [1e+00, 3e+03]
-  Bounds range     [1e+00, 1e+08]
-  RHS range        [3e+01, 1e+08]
-Found heuristic solution: objective 2000175.3046
-Presolve removed 89 rows and 110 columns
-Presolve time: 0.00s
-Presolved: 23 rows, 31 columns, 68 nonzeros
-Found heuristic solution: objective 1999822.1568
-Variable types: 25 continuous, 6 integer (6 binary)
+Welcome to the CBC MILP Solver 
+Version: 2.10.3 
+Build Date: Oct  7 2019 

-Root relaxation: objective 1.871010e+06, 9 iterations, 0.00 seconds
+command line - Cbc_C_Interface -solve -quit (default strategy 1)
+Continuous objective value is 1.86768e+06 - 0.00 seconds
+Cgl0003I 7 fixed, 0 tightened bounds, 9 strengthened rows, 0 substitutions
+Cgl0003I 0 fixed, 0 tightened bounds, 2 strengthened rows, 0 substitutions
+Cgl0003I 0 fixed, 0 tightened bounds, 1 strengthened rows, 0 substitutions
+Cgl0004I processed model has 35 rows, 55 columns (9 integer (9 of which binary)) and 211 elements
+Cbc0012I Integer solution of 1871179 found by DiveCoefficient after 0 iterations and 0 nodes (0.00 seconds)
+Cbc0038I Full problem 35 rows 55 columns, reduced to 18 rows 37 columns
+Cbc0006I The LP relaxation is infeasible or too expensive
+Cbc0013I At root node, 0 cuts changed objective from 1869627.3 to 1871179 in 1 passes
+Cbc0014I Cut generator 0 (Probing) - 0 row cuts average 0.0 elements, 1 column cuts (1 active)  in 0.000 seconds - new frequency is 1
+Cbc0014I Cut generator 1 (Gomory) - 0 row cuts average 0.0 elements, 0 column cuts (0 active)  in 0.000 seconds - new frequency is -100
+Cbc0014I Cut generator 2 (Knapsack) - 0 row cuts average 0.0 elements, 0 column cuts (0 active)  in 0.000 seconds - new frequency is -100
+Cbc0014I Cut generator 3 (Clique) - 0 row cuts average 0.0 elements, 0 column cuts (0 active)  in 0.000 seconds - new frequency is -100
+Cbc0014I Cut generator 4 (MixedIntegerRounding2) - 0 row cuts average 0.0 elements, 0 column cuts (0 active)  in 0.000 seconds - new frequency is -100
+Cbc0014I Cut generator 5 (FlowCover) - 0 row cuts average 0.0 elements, 0 column cuts (0 active)  in 0.000 seconds - new frequency is -100
+Cbc0014I Cut generator 6 (TwoMirCuts) - 0 row cuts average 0.0 elements, 0 column cuts (0 active)  in 0.000 seconds - new frequency is -100
+Cbc0014I Cut generator 7 (ZeroHalf) - 0 row cuts average 0.0 elements, 0 column cuts (0 active)  in 0.000 seconds - new frequency is -100
+Cbc0001I Search completed - best objective 1871178.961662621, took 2 iterations and 0 nodes (0.00 seconds)
+Cbc0035I Maximum depth 0, 5 variables fixed on reduced cost
+Cuts at root node changed objective from 1.86963e+06 to 1.87118e+06
+Probing was tried 1 times and created 1 cuts of which 0 were active after adding rounds of cuts (0.000 seconds)
+Gomory was tried 0 times and created 0 cuts of which 0 were active after adding rounds of cuts (0.000 seconds)
+Knapsack was tried 0 times and created 0 cuts of which 0 were active after adding rounds of cuts (0.000 seconds)
+Clique was tried 0 times and created 0 cuts of which 0 were active after adding rounds of cuts (0.000 seconds)
+MixedIntegerRounding2 was tried 0 times and created 0 cuts of which 0 were active after adding rounds of cuts (0.000 seconds)
+FlowCover was tried 0 times and created 0 cuts of which 0 were active after adding rounds of cuts (0.000 seconds)
+TwoMirCuts was tried 0 times and created 0 cuts of which 0 were active after adding rounds of cuts (0.000 seconds)
+ZeroHalf was tried 0 times and created 0 cuts of which 0 were active after adding rounds of cuts (0.000 seconds)

-    Nodes    |    Current Node    |     Objective Bounds      |     Work
- Expl Unexpl |  Obj  Depth IntInf | Incumbent    BestBd   Gap | It/Node Time
+Result - Optimal solution found

-     0     0 1871009.93    0    2 1999822.16 1871009.93  6.44%     -    0s
-H    0     0                    1871552.8257 1871009.93  0.03%     -    0s
+Objective value:                1871178.96166262
+Enumerated nodes:               0
+Total iterations:               2
+Time (CPU seconds):             0.01
+Time (Wallclock seconds):       0.01

-Explored 1 nodes (9 simplex iterations) in 0.00 seconds
-Thread count was 4 (of 16 available processors)
+Total time (CPU seconds):       0.01   (Wallclock seconds):       0.01

-Solution count 3: 1.87155e+06 1.99982e+06 2.00018e+06 
-
-Optimal solution found (tolerance 1.00e-02)
-Best objective 1.871552825663e+06, best bound 1.871009926997e+06, gap 0.0290%
+Coin0506I Presolve 24 (-100) rows, 38 (-103) columns and 164 (-236) elements
+Clp0006I 0  Obj 1590708.5 Primal inf 13041.309 (4) Dual inf 429.24088 (24)
+Clp0006I 16  Obj 1871179
+Clp0000I Optimal - objective value 1871179
+Coin0511I After Postsolve, objective 1871179, infeasibilities - dual 0 (0), primal 0 (0)
+Clp0032I Optimal objective 1871178.962 - 16 iterations time 0.002, Presolve 0.00
 Reading s1.json...
 Building graph...
 Building optimization model...
-Optimizing...
+Optimizing MILP...
+Re-optimizing with integer variables fixed...
 Extracting solution...
--- a/src/docs/model.md
+++ b/src/docs/model.md
@@ -8,68 +8,68 @@ The **parameters** section describes details about the simulation itself.

 | Key                     | Description
 |:------------------------|---------------|
-|`time periods`           | Number of time periods in the simulation.
+|`Time horizon (years)`   | Number of years in the simulation.


 ### Example
 ```json
 {
-    "parameters": {
-        "time periods": 2
+    "Parameters": {
+        "Time horizon (years)": 2
    }
 }
 ```

 ## Products

-The **products** section describes all products and subproducts in the simulation. The field `instance["products"]` is a dictionary mapping the name of the product to a dictionary which describes its characteristics. Each product description contains the following keys:
+The **products** section describes all products and subproducts in the simulation. The field `instance["Products"]` is a dictionary mapping the name of the product to a dictionary which describes its characteristics. Each product description contains the following keys:

-| Key                     | Description
-|:------------------------|---------------|
-|`transportation cost`    | The cost (in dollars per km per tonnes) to transport this product. Must be a timeseries.
-|`initial amounts`        | A dictionary mapping the name of each location to its description (see below). If this product is not initially available, this key may be omitted. Must be a timeseries.
+| Key                                   | Description
+|:--------------------------------------|---------------|
+|`Transportation cost ($/km/tonne)`    | The cost to transport this product. Must be a timeseries.
+|`Initial amounts`                      | A dictionary mapping the name of each location to its description (see below). If this product is not initially available, this key may be omitted. Must be a timeseries.

 Each product may have some amount available at the beginning of each time period. In this case, the key `initial amounts` maps to a dictionary with the following keys:

 | Key                     | Description
 |:------------------------|---------------|
-| `latitude`              | The latitude of the location, in degrees.
-| `longitude`             | The longitude of the location, in degrees.
-| `amount`                | The amount (in tonnes) of the product initially available at the location. Must be a timeseries.
+| `Latitude (deg)`        | The latitude of the location.
+| `Longitude (deg)`       | The longitude of the location.
+| `Amount (tonne)`       | The amount of the product initially available at the location. Must be a timeseries.

 ### Example

 ```json
 {
-    "products": {
+    "Products": {
        "P1": {
-            "transportation cost": [0.015, 0.015],
-            "initial amounts": {
+            "Transportation cost ($/km/tonne)": [0.015, 0.015],
+            "Initial amounts": {
                "C1": {
-                    "latitude": 7.0,
-                    "longitude": 7.0,
-                    "amount": [934.56, 934.56]
+                    "Latitude (deg)": 7.0,
+                    "Longitude (deg)": 7.0,
+                    "Amount (tonne)": [934.56, 934.56]
                },
                "C2": {
-                    "latitude": 7.0,
-                    "longitude": 19.0,
-                    "amount": [198.95, 198.95]
+                    "Latitude (deg)": 7.0,
+                    "Longitude (deg)": 19.0,
+                    "Amount (tonne)": [198.95, 198.95]
                },
                "C3": {
-                    "latitude": 84.0,
-                    "longitude": 76.0,
-                    "amount": [212.97, 212.97]
+                    "Latitude (deg)": 84.0,
+                    "Longitude (deg)": 76.0,
+                    "Amount (tonne)": [212.97, 212.97]
                }
            }
        },
        "P2": {
-            "transportation cost": [0.02, 0.02]
+            "Transportation cost ($/km/tonne)": [0.02, 0.02]
        },
        "P3": {
-            "transportation cost": [0.0125, 0.0125]
+            "Transportation cost ($/km/tonne)": [0.0125, 0.0125]
        },
        "P4": {
-            "transportation cost": [0.0175, 0.0175]
+            "Transportation cost ($/km/tonne)": [0.0175, 0.0175]
        }
    }
 }
@@ -77,70 +77,70 @@ Each product may have some amount available at the beginning of each time period

 ## Processing Plants

-The **plants** section describes the available types of reverse manufacturing plants, their potential locations and associated costs, as well as their inputs and outputs. The field `instance["plants"]` is a dictionary mapping the name of the plant to a dictionary with the following keys:
+The **plants** section describes the available types of reverse manufacturing plants, their potential locations and associated costs, as well as their inputs and outputs. The field `instance["Plants"]` is a dictionary mapping the name of the plant to a dictionary with the following keys:

 | Key                     | Description
 |:------------------------|---------------|
-| `input`                 | The name of the product that this plant takes as input. Only one input is accepted per plant.
-| `outputs`               | A dictionary specifying how many tonnes of each product is produced for each tonnes of input. For example, if the plant outputs 0.5 tonnes of P2 and 0.25 tonnes of P3 for each tonnes of P1 provided, then this entry should be `{"P2": 0.5, "P3": 0.25}`. If the plant does not output anything, this key may be omitted.
-| `locations`             | A dictionary mapping the name of the location to a dictionary which describes the site characteristics (see below).
+| `Input`                 | The name of the product that this plant takes as input. Only one input is accepted per plant.
+| `Outputs (tonne)`               | A dictionary specifying how many tonnes of each product is produced for each tonnes of input. For example, if the plant outputs 0.5 tonnes of P2 and 0.25 tonnes of P3 for each tonnes of P1 provided, then this entry should be `{"P2": 0.5, "P3": 0.25}`. If the plant does not output anything, this key may be omitted.
+| `Locations`             | A dictionary mapping the name of the location to a dictionary which describes the site characteristics (see below).

 Each type of plant is associated with a set of potential locations where it can be built. Each location is represented by a dictionary with the following keys:

-| Key                     | Description
-|:------------------------|---------------|
-| `latitude`              | The latitude of the location, in degrees.
-| `longitude`             | The longitude of the location, in degrees.
-| `disposal`              | A dictionary describing what products can be disposed locally at the plant.
-| `capacities`            | A dictionary describing what plant sizes are allowed, and their characteristics.
+| Key                           | Description
+|:------------------------------|---------------|
+| `Latitude (deg)`              | The latitude of the location, in degrees.
+| `Longitude (deg)`             | The longitude of the location, in degrees.
+| `Disposal`                    | A dictionary describing what products can be disposed locally at the plant.
+| `Capacities (tonne)`         | A dictionary describing what plant sizes are allowed, and their characteristics.

 The keys in the `disposal` dictionary should be the names of the products. The values are dictionaries with the following keys:

 | Key                     | Description
 |:------------------------|---------------|
-| `cost`                  | The cost (in dollars per tonnes) to dispose of the product. Must be a timeseries.
-| `limit`                 | The maximum amount (in tonnes) that can be disposed of. If an unlimited amount can be disposed, this key may be omitted. Must be a timeseries.
+| `Cost ($/tonne)`       | The cost to dispose of the product. Must be a timeseries.
+| `Limit (tonne)`        | The maximum amount that can be disposed of. If an unlimited amount can be disposed, this key may be omitted. Must be a timeseries.


 The keys in the `capacities` dictionary should be the amounts (in tonnes). The values are dictionaries with the following keys:

-| Key                     | Description
-|:------------------------|---------------|
-| `opening cost`          | The cost (in dollars) to open a plant of this size.
-| `fixed operating cost`  | The cost (in dollars) to keep the plant open, even if the plant doesn't process anything. Must be a timeseries.
-| `variable operating cost` | The cost (in dollars per tonnes) that the plant incurs to process each tonne of input. Must be a timeseries.
+| Key                                   | Description
+|:--------------------------------------|---------------|
+| `Opening cost ($)`                    | The cost to open a plant of this size.
+| `Fixed operating cost ($)`            | The cost to keep the plant open, even if the plant doesn't process anything. Must be a timeseries.
+| `Variable operating cost ($/tonne)`  | The cost that the plant incurs to process each tonne of input. Must be a timeseries.

 ### Example

 ```json
 {
-    "plants": {
+    "Plants": {
        "F1": {
-            "input": "P1",
-            "outputs": {
+            "Input": "P1",
+            "Outputs (tonne)": {
                "P2": 0.2,
                "P3": 0.5
            },
-            "locations": {
+            "Locations": {
                "L1": {
-                    "latitude": 0.0,
-                    "longitude": 0.0,
-                    "disposal": {
+                    "Latitude (deg)": 0.0,
+                    "Longitude (deg)": 0.0,
+                    "Disposal": {
                        "P2": {
-                            "cost": [-10.0, -12.0],
-                            "limit": [1.0, 1.0]
+                            "Cost ($/tonne)": [-10.0, -12.0],
+                            "Limit (tonne)": [1.0, 1.0]
                        }
                    },
-                    "capacities": {
+                    "Capacities (tonne)": {
                        "100": {
-                            "opening cost": [500, 530],
-                            "fixed operating cost": [300.0, 310.0],
-                            "variable operating cost": [5.0, 5.2]
+                            "Opening cost ($)": [500, 530],
+                            "Fixed operating cost ($)": [300.0, 310.0],
+                            "Variable operating cost ($/tonne)": [5.0, 5.2]
                        },
                        "500": {
-                            "opening cost": [750, 760],
-                            "fixed operating cost": [400.0, 450.0],
-                            "variable operating cost": [5.0, 5.2]
+                            "Opening cost ($)": [750, 760],
+                            "Fixed operating cost ($)": [400.0, 450.0],
+                            "Variable operating cost ($/tonne)": [5.0, 5.2]
                        }
                    }
                }
--- a/src/instance.jl
+++ b/src/instance.jl
@@ -60,74 +60,77 @@ function load(path::String)::Instance
    if result !== nothing
        if result isa JSONSchema.SingleIssue
            path = join(result.path, " → ")
-            msg = "$(result.x) $(result.msg) in $(path)"
+            if length(path) == 0
+                path = "root"
+            end
+            msg = "$(result.msg) in $(path)"
        else
            msg = convert(String, result)
        end
        throw(msg)
    end
    
-    T = json["parameters"]["time periods"]
+    T = json["Parameters"]["Time horizon (years)"]
    plants = Plant[]
    products = Product[]
    collection_centers = CollectionCenter[]
    prod_name_to_product = Dict{String, Product}()
    
    # Create products
-    for (product_name, product_dict) in json["products"]
-        product = Product(product_name, product_dict["transportation cost"])
+    for (product_name, product_dict) in json["Products"]
+        product = Product(product_name, product_dict["Transportation cost (\$/km/tonne)"])
        push!(products, product)
        prod_name_to_product[product_name] = product
        
        # Create collection centers
-        if "initial amounts" in keys(product_dict)
-            for (center_name, center_dict) in product_dict["initial amounts"]
+        if "Initial amounts" in keys(product_dict)
+            for (center_name, center_dict) in product_dict["Initial amounts"]
                center = CollectionCenter(length(collection_centers) + 1,
                                          center_name,
-                                          center_dict["latitude"],
-                                          center_dict["longitude"],
+                                          center_dict["Latitude (deg)"],
+                                          center_dict["Longitude (deg)"],
                                          product,
-                                          center_dict["amount"])
+                                          center_dict["Amount (tonne)"])
                push!(collection_centers, center)
            end
        end
    end
    
    # Create plants
-    for (plant_name, plant_dict) in json["plants"]
-        input = prod_name_to_product[plant_dict["input"]]
+    for (plant_name, plant_dict) in json["Plants"]
+        input = prod_name_to_product[plant_dict["Input"]]
        output = Dict()
        
        # Plant outputs
-        if "outputs" in keys(plant_dict)
+        if "Outputs (tonne)" in keys(plant_dict)
            output = Dict(prod_name_to_product[key] => value
-                          for (key, value) in plant_dict["outputs"]
+                          for (key, value) in plant_dict["Outputs (tonne)"]
                          if value > 0)
        end
        
-        for (location_name, location_dict) in plant_dict["locations"]
+        for (location_name, location_dict) in plant_dict["Locations"]
            sizes = PlantSize[]
            disposal_limit = Dict(p => [0.0 for t in 1:T] for p in keys(output))
            disposal_cost = Dict(p => [0.0 for t in 1:T] for p in keys(output))
            
            # Disposal
-            if "disposal" in keys(location_dict)
-                for (product_name, disposal_dict) in location_dict["disposal"]
+            if "Disposal" in keys(location_dict)
+                for (product_name, disposal_dict) in location_dict["Disposal"]
                    limit = [1e8 for t in 1:T]
-                    if "limit" in keys(disposal_dict)
-                       limit = disposal_dict["limit"]
+                    if "Limit (tonne)" in keys(disposal_dict)
+                       limit = disposal_dict["Limit (tonne)"]
                    end
                    disposal_limit[prod_name_to_product[product_name]] = limit
-                    disposal_cost[prod_name_to_product[product_name]] = disposal_dict["cost"]
+                    disposal_cost[prod_name_to_product[product_name]] = disposal_dict["Cost (\$/tonne)"]
                end
            end
            
            # Capacities
-            for (capacity_name, capacity_dict) in location_dict["capacities"]
+            for (capacity_name, capacity_dict) in location_dict["Capacities (tonne)"]
                push!(sizes, PlantSize(parse(Float64, capacity_name),
-                                       capacity_dict["variable operating cost"],
-                                       capacity_dict["fixed operating cost"],
-                                       capacity_dict["opening cost"]))
+                                       capacity_dict["Variable operating cost (\$/tonne)"],
+                                       capacity_dict["Fixed operating cost (\$)"],
+                                       capacity_dict["Opening cost (\$)"]))
            end
            length(sizes) > 1 ||  push!(sizes, sizes[1])
            sort!(sizes, by = x -> x.capacity)
@@ -145,8 +148,8 @@ function load(path::String)::Instance
                          location_name,
                          input,
                          output,
-                          location_dict["latitude"],
-                          location_dict["longitude"],
+                          location_dict["Latitude (deg)"],
+                          location_dict["Longitude (deg)"],
                          disposal_limit,
                          disposal_cost,
                          sizes)
--- a/src/model.jl
+++ b/src/model.jl
@@ -2,19 +2,20 @@
 # Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
 # Released under the modified BSD license. See COPYING.md for more details.

-using JuMP, LinearAlgebra, Geodesy, Cbc, ProgressBars
+using JuMP, LinearAlgebra, Geodesy, Cbc, Clp, ProgressBars


 mutable struct ManufacturingModel
    mip::JuMP.Model
    vars::DotDict
+    eqs::DotDict
    instance::Instance
    graph::Graph
 end


 function build_model(instance::Instance, graph::Graph, optimizer)::ManufacturingModel
-    model = ManufacturingModel(Model(optimizer), DotDict(), instance, graph)
+    model = ManufacturingModel(Model(optimizer), DotDict(), DotDict(), instance, graph)
    create_vars!(model)
    create_objective_function!(model)
    create_shipping_node_constraints!(model)
@@ -133,11 +134,16 @@ end

 function create_shipping_node_constraints!(model::ManufacturingModel)
    mip, vars, graph, T = model.mip, model.vars, model.graph, model.instance.time
+    eqs = model.eqs
+    
+    eqs.balance = Dict()
    
    for t in 1:T
        # Collection centers
        for n in graph.collection_shipping_nodes
-            @constraint(mip, sum(vars.flow[a, t] for a in n.outgoing_arcs) == n.location.amount[t])
+            eqs.balance[n, t] = @constraint(mip,
+                                            sum(vars.flow[a, t] for a in n.outgoing_arcs)
+                                              == n.location.amount[t])
        end

        # Plants
@@ -188,7 +194,7 @@ function create_process_node_constraints!(model::ManufacturingModel)
    end
 end

-function solve(filename::String; optimizer=Cbc.Optimizer)
+function solve(filename::String; optimizer=Cbc.Optimizer, lp_optimizer=Clp.Optimizer)
    println("Reading $filename...")
    instance = RELOG.load(filename)
    
@@ -198,7 +204,19 @@ function solve(filename::String; optimizer=Cbc.Optimizer)
    println("Building optimization model...")
    model = RELOG.build_model(instance, graph, optimizer)
    
-    println("Optimizing...")
+    println("Optimizing MILP...")
+    JuMP.optimize!(model.mip)
+    
+    println("Re-optimizing with integer variables fixed...")
+    all_vars = JuMP.all_variables(model.mip)
+    vals = Dict(var => JuMP.value(var) for var in all_vars)
+    JuMP.set_optimizer(model.mip, lp_optimizer)
+    for var in all_vars
+        if JuMP.is_binary(var)
+            JuMP.unset_binary(var)
+            JuMP.fix(var, vals[var])
+        end
+    end
    JuMP.optimize!(model.mip)
    
    println("Extracting solution...")
@@ -206,19 +224,20 @@ function solve(filename::String; optimizer=Cbc.Optimizer)
 end

 function get_solution(model::ManufacturingModel)
-    mip, vars, graph, instance = model.mip, model.vars, model.graph, model.instance
+    mip, vars, eqs, graph, instance = model.mip, model.vars, model.eqs, model.graph, model.instance
    T = instance.time
    
    output = Dict(
-        "plants" => Dict(),
-        "costs" => Dict(
-            "fixed operating" => zeros(T),
-            "variable operating" => zeros(T),
-            "opening" => zeros(T),
-            "transportation" => zeros(T),
-            "disposal" => zeros(T),
-            "expansion" => zeros(T),
-            "total" => zeros(T),
+        "Plants" => Dict(),
+        "Products" => Dict(),
+        "Costs" => Dict(
+            "Fixed operating (\$)" => zeros(T),
+            "Variable operating (\$)" => zeros(T),
+            "Opening (\$)" => zeros(T),
+            "Transportation (\$)" => zeros(T),
+            "Disposal (\$)" => zeros(T),
+            "Expansion (\$)" => zeros(T),
+            "Total (\$)" => zeros(T),
        )
    )
    
@@ -231,40 +250,53 @@ function get_solution(model::ManufacturingModel)
        end
    end
    
+    # Products
+    for n in graph.collection_shipping_nodes
+        location_dict = Dict{Any, Any}(
+            "Marginal cost (\$/tonne)" => [round(abs(JuMP.shadow_price(eqs.balance[n, t])), digits=2)
+                                           for t in 1:T],
+        )
+        if n.product.name ∉ keys(output["Products"])
+            output["Products"][n.product.name] = Dict()
+        end
+        output["Products"][n.product.name][n.location.name] = location_dict
+    end
+    
+    # Plants
    for plant in instance.plants
        skip_plant = true
        process_node = plant_to_process_node[plant]
        plant_dict = Dict{Any, Any}(
-            "input" => Dict(),
-            "output" => Dict(
-                "send" => Dict(),
-                "dispose" => Dict(),
+            "Input" => Dict(),
+            "Output" => Dict(
+                "Send" => Dict(),
+                "Dispose" => Dict(),
            ),
-            "total input" => [0.0 for t in 1:T],
-            "total output" => Dict(),
-            "latitude" => plant.latitude,
-            "longitude" => plant.longitude,
-            "capacity" => [JuMP.value(vars.capacity[process_node, t])
-                           for t in 1:T],
-            "opening cost" => [JuMP.value(vars.open_plant[process_node, t]) *
-                               plant.sizes[1].opening_cost[t]
-                               for t in 1:T],
-            "fixed operating cost" => [JuMP.value(vars.is_open[process_node, t]) *
-                                       plant.sizes[1].fixed_operating_cost[t] +
-                                       JuMP.value(vars.expansion[process_node, t]) *
-                                       slope_fix_oper_cost(plant, t)
-                                       for t in 1:T],
-            "expansion cost" => [JuMP.value(vars.expansion[process_node, t]) *
-                                     (if t < T
-                                         slope_open(plant, t) - slope_open(plant, t + 1)
-                                      else
-                                         slope_open(plant, t)
-                                      end)
-                                 for t in 1:T],
+            "Total input (tonne)" => [0.0 for t in 1:T],
+            "Total output" => Dict(),
+            "Latitude (deg)" => plant.latitude,
+            "Longitude (deg)" => plant.longitude,
+            "Capacity (tonne)" => [JuMP.value(vars.capacity[process_node, t])
+                                   for t in 1:T],
+            "Opening cost (\$)" => [JuMP.value(vars.open_plant[process_node, t]) *
+                                    plant.sizes[1].opening_cost[t]
+                                    for t in 1:T],
+            "Fixed operating cost (\$)" => [JuMP.value(vars.is_open[process_node, t]) *
+                                            plant.sizes[1].fixed_operating_cost[t] +
+                                            JuMP.value(vars.expansion[process_node, t]) *
+                                            slope_fix_oper_cost(plant, t)
+                                            for t in 1:T],
+            "Expansion cost (\$)" => [JuMP.value(vars.expansion[process_node, t]) *
+                                          (if t < T
+                                              slope_open(plant, t) - slope_open(plant, t + 1)
+                                           else
+                                              slope_open(plant, t)
+                                           end)
+                                      for t in 1:T],
        )
-        output["costs"]["fixed operating"] += plant_dict["fixed operating cost"]
-        output["costs"]["opening"] += plant_dict["opening cost"]
-        output["costs"]["expansion"] += plant_dict["expansion cost"]
+        output["Costs"]["Fixed operating (\$)"] += plant_dict["Fixed operating cost (\$)"]
+        output["Costs"]["Opening (\$)"] += plant_dict["Opening cost (\$)"]
+        output["Costs"]["Expansion (\$)"] += plant_dict["Expansion cost (\$)"]

        # Inputs
        for a in process_node.incoming_arcs
@@ -274,14 +306,16 @@ function get_solution(model::ManufacturingModel)
            end
            skip_plant = false
            dict = Dict{Any, Any}(
-                "amount" => vals,
-                "distance" => a.values["distance"],
-                "latitude" => a.source.location.latitude,
-                "longitude" => a.source.location.longitude,
-                "transportation cost" => [a.source.product.transportation_cost[t] * vals[t]
-                                          for t in 1:T],
-                "variable operating cost" => [plant.sizes[1].variable_operating_cost[t] * vals[t]
-                                              for t in 1:T],
+                "Amount (tonne)" => vals,
+                "Distance (km)" => a.values["distance"],
+                "Latitude (deg)" => a.source.location.latitude,
+                "Longitude (deg)" => a.source.location.longitude,
+                "Transportation cost (\$)" => [a.source.product.transportation_cost[t] *
+                                                   vals[t] *
+                                                   a.values["distance"]
+                                               for t in 1:T],
+                "Variable operating cost (\$)" => [plant.sizes[1].variable_operating_cost[t] * vals[t]
+                                                   for t in 1:T],
            )
            if a.source.location isa CollectionCenter
                plant_name = "Origin"
@@ -291,31 +325,31 @@ function get_solution(model::ManufacturingModel)
                location_name = a.source.location.location_name
            end
            
-            if plant_name ∉ keys(plant_dict["input"])
-                plant_dict["input"][plant_name] = Dict()
+            if plant_name ∉ keys(plant_dict["Input"])
+                plant_dict["Input"][plant_name] = Dict()
            end
-            plant_dict["input"][plant_name][location_name] = dict
-            plant_dict["total input"] += vals
-            output["costs"]["transportation"] += dict["transportation cost"]
-            output["costs"]["variable operating"] += dict["variable operating cost"]
+            plant_dict["Input"][plant_name][location_name] = dict
+            plant_dict["Total input (tonne)"] += vals
+            output["Costs"]["Transportation (\$)"] += dict["Transportation cost (\$)"]
+            output["Costs"]["Variable operating (\$)"] += dict["Variable operating cost (\$)"]
        end

        # Outputs
        for shipping_node in plant_to_shipping_nodes[plant]
            product_name = shipping_node.product.name
-            plant_dict["total output"][product_name] = zeros(T)
-            plant_dict["output"]["send"][product_name] = product_dict = Dict()
+            plant_dict["Total output"][product_name] = zeros(T)
+            plant_dict["Output"]["Send"][product_name] = product_dict = Dict()

            disposal_amount = [JuMP.value(vars.dispose[shipping_node, t]) for t in 1:T]
            if sum(disposal_amount) > 1e-5
                skip_plant = false
-                plant_dict["output"]["dispose"][product_name] = disposal_dict = Dict()
-                disposal_dict["amount"] = [JuMP.value(model.vars.dispose[shipping_node, t]) for t in 1:T]
-                disposal_dict["cost"] = [disposal_dict["amount"][t] *
-                                         plant.disposal_cost[shipping_node.product][t]
-                                         for t in 1:T]
-                plant_dict["total output"][product_name] += disposal_amount
-                output["costs"]["disposal"] += disposal_dict["cost"]
+                plant_dict["Output"]["Dispose"][product_name] = disposal_dict = Dict()
+                disposal_dict["Amount (tonne)"] = [JuMP.value(model.vars.dispose[shipping_node, t]) for t in 1:T]
+                disposal_dict["Cost (\$)"] = [disposal_dict["Amount (tonne)"][t] *
+                                              plant.disposal_cost[shipping_node.product][t]
+                                              for t in 1:T]
+                plant_dict["Total output"][product_name] += disposal_amount
+                output["Costs"]["Disposal (\$)"] += disposal_dict["Cost (\$)"]
            end

            for a in shipping_node.outgoing_arcs
@@ -325,27 +359,27 @@ function get_solution(model::ManufacturingModel)
                end
                skip_plant = false
                dict = Dict(
-                    "amount" => vals,
-                    "distance" => a.values["distance"],
-                    "latitude" => a.dest.location.latitude,
-                    "longitude" => a.dest.location.longitude,
+                    "Amount (tonne)" => vals,
+                    "Distance (km)" => a.values["distance"],
+                    "Latitude (deg)" => a.dest.location.latitude,
+                    "Longitude (deg)" => a.dest.location.longitude,
                )
                if a.dest.location.plant_name ∉ keys(product_dict)
                    product_dict[a.dest.location.plant_name] = Dict()
                end
                product_dict[a.dest.location.plant_name][a.dest.location.location_name] = dict
-                plant_dict["total output"][product_name] += vals
+                plant_dict["Total output"][product_name] += vals
            end
        end
            
        if !skip_plant
-            if plant.plant_name ∉ keys(output["plants"])
-                output["plants"][plant.plant_name] = Dict()
+            if plant.plant_name ∉ keys(output["Plants"])
+                output["Plants"][plant.plant_name] = Dict()
            end
-            output["plants"][plant.plant_name][plant.location_name] = plant_dict
+            output["Plants"][plant.plant_name][plant.location_name] = plant_dict
        end
    end

-    output["costs"]["total"] = sum(values(output["costs"]))
+    output["Costs"]["Total (\$)"] = sum(values(output["Costs"]))
    return output
 end
--- a/src/schemas/input.json
+++ b/src/schemas/input.json
@@ -1,7 +1,7 @@
 {
    "$schema": "http://json-schema.org/draft-07/schema#",
    "$id": "https://anl-ceeesa.github.io/RELOG/input",
-    "title": "Schema for ReverseManufacturing Input File",
+    "title": "Schema for RELOG Input File",
    "definitions": {
        "TimeSeries": {
            "type": "array",
@@ -12,10 +12,10 @@
        "Parameters": {
            "type": "object",
            "properties": {
-                "time": { "type": "number" }
+                "Time horizon (years)": { "type": "number" }
            },
            "required": [
-                "time periods"
+                "Time horizon (years)"
            ]
        },
        "Plant": {
@@ -23,16 +23,16 @@
            "additionalProperties": {
                "type": "object",
                "properties": {
-                    "input": { "type": "string" },
-                    "outputs": {
+                    "Input": { "type": "string" },
+                    "Outputs (tonne)": {
                        "type": "object",
                        "additionalProperties": { "type": "number" }
                    },
-                    "locations": { "$ref": "#/definitions/PlantLocation" }
+                    "Locations": { "$ref": "#/definitions/PlantLocation" }
                },
                "required": [
-                    "input",
-                    "locations"
+                    "Input",
+                    "Locations"
                ]
            }
        },
@@ -41,42 +41,42 @@
            "additionalProperties": {
                "type": "object",
                "properties": {
-                    "latitude": { "type": "number" },
-                    "longitude": { "type": "number" },
-                    "disposal": {
+                    "Latitude (deg)": { "type": "number" },
+                    "Longitude (deg)": { "type": "number" },
+                    "Disposal": {
                        "type": "object",
                        "additionalProperties": {
                            "type": "object",
                            "properties": {
-                                "cost": { "$ref": "#/definitions/TimeSeries" },
-                                "limit": { "$ref": "#/definitions/TimeSeries" }
+                                "Cost ($/tonne)": { "$ref": "#/definitions/TimeSeries" },
+                                "Limit (tonne)": { "$ref": "#/definitions/TimeSeries" }
                            },
                            "required": [
-                                "cost"
+                                "Cost ($/tonne)"
                            ]
                        }
                    },
-                    "capacities": {
+                    "Capacities (tonne)": {
                        "type": "object",
                        "additionalProperties": {
                            "type": "object",
                            "properties": {
-                                "variable operating cost": { "$ref": "#/definitions/TimeSeries" },
-                                "fixed operating cost": { "$ref": "#/definitions/TimeSeries" },
-                                "opening cost": { "$ref": "#/definitions/TimeSeries" }
+                                "Variable operating cost ($/tonne)": { "$ref": "#/definitions/TimeSeries" },
+                                "Fixed operating cost ($)": { "$ref": "#/definitions/TimeSeries" },
+                                "Opening cost ($)": { "$ref": "#/definitions/TimeSeries" }
                            },
                            "required": [
-                                "variable operating cost",
-                                "fixed operating cost",
-                                "opening cost"
+                                "Variable operating cost ($/tonne)",
+                                "Fixed operating cost ($)",
+                                "Opening cost ($)"
                            ]
                        }
                    }                    
                },
                "required": [
-                    "latitude",
-                    "longitude",
-                    "capacities"
+                    "Latitude (deg)",
+                    "Longitude (deg)",
+                    "Capacities (tonne)"
                ]
            }
        },
@@ -85,14 +85,14 @@
            "additionalProperties": {
                "type": "object",
                "properties": {
-                    "latitude": { "type": "number" },
-                    "longitude": { "type": "number" },
-                    "amount": { "$ref": "#/definitions/TimeSeries" }
+                    "Latitude (deg)": { "type": "number" },
+                    "Longitude (deg)": { "type": "number" },
+                    "Amount (tonne)": { "$ref": "#/definitions/TimeSeries" }
                },
                "required": [
-                    "latitude",
-                    "longitude",
-                    "amount"
+                    "Latitude (deg)",
+                    "Longitude (deg)",
+                    "Amount (tonne)"
                ]
            }
        },
@@ -101,23 +101,24 @@
            "additionalProperties": {
                "type": "object",
                "properties": {
-                    "transportation cost": { "$ref": "#/definitions/TimeSeries" },
-                    "initial amounts": { "$ref": "#/definitions/InitialAmount" }
+                    "Transportation cost ($/km/tonne)": { "$ref": "#/definitions/TimeSeries" },
+                    "Initial amounts": { "$ref": "#/definitions/InitialAmount" }
                },
                "required": [
-                    "transportation cost"
+                    "Transportation cost ($/km/tonne)"
                ]
            }            
        }
    },
    "type": "object",
    "properties": {
-        "parameters": { "$ref": "#/definitions/Parameters" },
-        "plants": { "$ref": "#/definitions/Plant" },
-        "products": { "$ref": "#/definitions/Product" }
+        "Parameters": { "$ref": "#/definitions/Parameters" },
+        "Plants": { "$ref": "#/definitions/Plant" },
+        "Products": { "$ref": "#/definitions/Product" }
    },
    "required": [
-        "plants",
-        "products"
+        "Parameters",
+        "Plants",
+        "Products"
    ]
 }
--- a/test/model_test.jl
+++ b/test/model_test.jl
@@ -39,24 +39,23 @@ using RELOG, Cbc, JuMP, Printf, JSON, MathOptInterface.FileFormats
        dest = FileFormats.Model(format = FileFormats.FORMAT_LP)
        MOI.copy_to(dest, model.mip)
        MOI.write_to_file(dest, "model.lp")
-
    end

    @testset "solve" begin
        solution = RELOG.solve("$(pwd())/../instances/s1.json")
        JSON.print(stdout, solution, 4)
        
-        @test "costs" in keys(solution)
-        @test "fixed operating" in keys(solution["costs"])
-        @test "transportation" in keys(solution["costs"])
-        @test "variable operating" in keys(solution["costs"])
-        @test "total" in keys(solution["costs"])
+        @test "Costs" in keys(solution)
+        @test "Fixed operating (\$)" in keys(solution["Costs"])
+        @test "Transportation (\$)" in keys(solution["Costs"])
+        @test "Variable operating (\$)" in keys(solution["Costs"])
+        @test "Total (\$)" in keys(solution["Costs"])

-        @test "plants" in keys(solution)
-        @test "F1" in keys(solution["plants"])
-        @test "F2" in keys(solution["plants"])
-        @test "F3" in keys(solution["plants"])
-        @test "F4" in keys(solution["plants"])
+        @test "Plants" in keys(solution)
+        @test "F1" in keys(solution["Plants"])
+        @test "F2" in keys(solution["Plants"])
+        @test "F3" in keys(solution["Plants"])
+        @test "F4" in keys(solution["Plants"])
    end
 end
Author	SHA1	Message	Date
Alinson S Xavier	0fc64085a8	Add units to input and output files; bump version to 0.2.0	2020-06-05 15:39:01 -05:00
Alinson S Xavier	b8cf6537a0	Add marginal costs to output file	2020-05-29 17:32:25 -05:00