ANL-CEEESA
/
RELOG
mirror of https://github.com/ANL-CEEESA/RELOG.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Accelerate tests with Revise.jl

Browse Source
feature/stochastic
Alinson S. Xavier 3 years ago
parent dde0d40282
commit 4b0fc7327c
Signed by: isoron
GPG Key ID: 0DA8E4B9E1109DCA
13 changed files with 322 additions and 297 deletions
Show Stats Download Patch File Download Diff File

1
Project.toml
Unescape View File

@ -21,6 +21,7 @@ OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
PackageCompiler = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d" PackageCompiler = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d"
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
ProgressBars = "49802e3a-d2f1-5c88-81d8-b72133a6f568" ProgressBars = "49802e3a-d2f1-5c88-81d8-b72133a6f568"
Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
Shapefile = "8e980c4a-a4fe-5da2-b3a7-4b4b0353a2f4" Shapefile = "8e980c4a-a4fe-5da2-b3a7-4b4b0353a2f4"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
StochasticPrograms = "8b8459f2-c380-502b-8633-9aed2d6c2b35" StochasticPrograms = "8b8459f2-c380-502b-8633-9aed2d6c2b35"

11
instances/solutions/s1.log
Unescape View File

@ -1,11 +0,0 @@
[ Info: Reading s1.json...
[ Info: Building graph...
[ Info: 2 time periods
[ Info: 6 process nodes
[ Info: 8 shipping nodes (plant)
[ Info: 10 shipping nodes (collection)
[ Info: 38 arcs
[ Info: Building optimization model...
[ Info: Optimizing MILP...
[ Info: Re-optimizing with integer variables fixed...
[ Info: Extracting solution...

0
instances/s1.json → test/fixtures/instances/s1.json vendored
Unescape View File

0
instances/s2.json → test/fixtures/instances/s2.json vendored
Unescape View File

0
instances/solutions/s1.json → test/fixtures/instances/solutions/s1.json vendored
Unescape View File

7
test/graph/build_test.jl
Unescape View File

@ -3,9 +3,9 @@
using RELOG using RELOG
@testset "build_graph" begin function graph_build_test()
basedir = dirname(@__FILE__) @testset "build_graph" begin
instance = RELOG.parsefile("$basedir/../../instances/s1.json") instance = RELOG.parsefile(fixture("instances/s1.json"))
graph = RELOG.build_graph(instance) graph = RELOG.build_graph(instance)
process_node_by_location_name = process_node_by_location_name =
Dict(n.location.location_name => n for n in graph.process_nodes) Dict(n.location.location_name => n for n in graph.process_nodes)
@ -36,4 +36,5 @@ using RELOG
@test length(node.outgoing_arcs) == 2 @test length(node.outgoing_arcs) == 2
@test length(graph.arcs) == 38 @test length(graph.arcs) == 38
end
end end

7
test/instance/compress_test.jl
Unescape View File

@ -3,9 +3,9 @@
using RELOG using RELOG
@testset "compress" begin function compress_test()
basedir = dirname(@__FILE__) @testset "compress" begin
instance = RELOG.parsefile("$basedir/../../instances/s1.json") instance = RELOG.parsefile(fixture("instances/s1.json"))
compressed = RELOG._compress(instance) compressed = RELOG._compress(instance)
product_name_to_product = Dict(p.name => p for p in compressed.products) product_name_to_product = Dict(p.name => p for p in compressed.products)
@ -50,4 +50,5 @@ using RELOG
@test l1.disposal_limit[p3] ≈ [2.0] @test l1.disposal_limit[p3] ≈ [2.0]
@test l1.disposal_cost[p2] ≈ [-10.0] @test l1.disposal_cost[p2] ≈ [-10.0]
@test l1.disposal_cost[p3] ≈ [-10.0] @test l1.disposal_cost[p3] ≈ [-10.0]
end
end end

18
test/instance/geodb_test.jl
Unescape View File

@ -4,22 +4,24 @@
using RELOG using RELOG
@testset "geodb_query (2018-us-county)" begin function geodb_test()
@testset "geodb_query (2018-us-county)" begin
region = RELOG.geodb_query("2018-us-county:17043") region = RELOG.geodb_query("2018-us-county:17043")
@test region.centroid.lat == 41.83956 @test region.centroid.lat == 41.83956
@test region.centroid.lon == -88.08857 @test region.centroid.lon == -88.08857
@test region.population == 922_921 @test region.population == 922_921
end end
# @testset "geodb_query (2018-us-zcta)" begin # @testset "geodb_query (2018-us-zcta)" begin
# region = RELOG.geodb_query("2018-us-zcta:60439") # region = RELOG.geodb_query("2018-us-zcta:60439")
# @test region.centroid.lat == 41.68241 # @test region.centroid.lat == 41.68241
# @test region.centroid.lon == -87.98954 # @test region.centroid.lon == -87.98954
# end # end
@testset "geodb_query (us-state)" begin @testset "geodb_query (us-state)" begin
region = RELOG.geodb_query("us-state:IL") region = RELOG.geodb_query("us-state:IL")
@test region.centroid.lat == 39.73939 @test region.centroid.lat == 39.73939
@test region.centroid.lon == -89.50414 @test region.centroid.lon == -89.50414
@test region.population == 12_671_821 @test region.population == 12_671_821
end
end end

23
test/instance/parse_test.jl
Unescape View File

@ -3,9 +3,9 @@
using RELOG using RELOG
@testset "parse" begin function parse_test()
basedir = dirname(@__FILE__) @testset "parse" begin
instance = RELOG.parsefile("$basedir/../../instances/s1.json") instance = RELOG.parsefile(fixture("instances/s1.json"))
centers = instance.collection_centers centers = instance.collection_centers
plants = instance.plants plants = instance.plants
@ -75,19 +75,18 @@ using RELOG
@test plant.output[p4] == 0.8 @test plant.output[p4] == 0.8
@test plant.disposal_limit[p3] == [1e8, 1e8] @test plant.disposal_limit[p3] == [1e8, 1e8]
@test plant.disposal_limit[p4] == [0, 0] @test plant.disposal_limit[p4] == [0, 0]
end end
@testset "parse (geodb)" begin @testset "parse (geodb)" begin
basedir = dirname(@__FILE__) instance = RELOG.parsefile(fixture("instances/s2.json"))
instance = RELOG.parsefile("$basedir/../../instances/s2.json")
centers = instance.collection_centers centers = instance.collection_centers
@test centers[1].name == "C1" @test centers[1].name == "C1"
@test centers[1].latitude == 41.83956 @test centers[1].latitude == 41.83956
@test centers[1].longitude == -88.08857 @test centers[1].longitude == -88.08857
end end
# @testset "parse (invalid)" begin # @testset "parse (invalid)" begin
# basedir = dirname(@__FILE__) # @test_throws ErrorException RELOG.parsefile(fixture("s1-wrong-length.json"))
# @test_throws ErrorException RELOG.parsefile("$basedir/../fixtures/s1-wrong-length.json") # end
# end end

7
test/model/build_test.jl
Unescape View File

@ -3,9 +3,9 @@
using RELOG, HiGHS, JuMP, Printf, JSON, MathOptInterface.FileFormats using RELOG, HiGHS, JuMP, Printf, JSON, MathOptInterface.FileFormats
@testset "build" begin function model_build_test()
basedir = dirname(@__FILE__) @testset "build" begin
instance = RELOG.parsefile("$basedir/../../instances/s1.json") instance = RELOG.parsefile(fixture("instances/s1.json"))
graph = RELOG.build_graph(instance) graph = RELOG.build_graph(instance)
model = RELOG.build_model(instance, graph, HiGHS.Optimizer) model = RELOG.build_model(instance, graph, HiGHS.Optimizer)
@ -34,4 +34,5 @@ using RELOG, HiGHS, JuMP, Printf, JSON, MathOptInterface.FileFormats
# v = model[2, :plant_dispose][shipping_node_by_loc_and_prod_names["L1", "P2"].index, 1] # v = model[2, :plant_dispose][shipping_node_by_loc_and_prod_names["L1", "P2"].index, 1]
# @test lower_bound(v) == 0.0 # @test lower_bound(v) == 0.0
# @test upper_bound(v) == 1.0 # @test upper_bound(v) == 1.0
end
end end

22
test/model/solve_test.jl
Unescape View File

@ -5,8 +5,9 @@ using RELOG, JuMP, Printf, JSON, MathOptInterface.FileFormats
basedir = dirname(@__FILE__) basedir = dirname(@__FILE__)
@testset "solve (exact)" begin function model_solve_test()
solution = RELOG.solve("$basedir/../../instances/s1.json") @testset "solve (exact)" begin
solution = RELOG.solve(fixture("instances/s1.json"))
solution_filename = tempname() solution_filename = tempname()
RELOG.write(solution, solution_filename) RELOG.write(solution, solution_filename)
@ -32,22 +33,22 @@ basedir = dirname(@__FILE__)
total_disposal = total_disposal =
sum([loc["Dispose (tonne)"] for loc in values(solution["Products"]["P1"])]) sum([loc["Dispose (tonne)"] for loc in values(solution["Products"]["P1"])])
@test total_disposal == [1.0, 1.0] @test total_disposal == [1.0, 1.0]
end end
@testset "solve (heuristic)" begin @testset "solve (heuristic)" begin
# Should not crash # Should not crash
solution = RELOG.solve("$basedir/../../instances/s1.json", heuristic = true) solution = RELOG.solve(fixture("instances/s1.json"), heuristic = true)
end end
@testset "solve (infeasible)" begin @testset "solve (infeasible)" begin
json = JSON.parsefile("$basedir/../../instances/s1.json") json = JSON.parsefile(fixture("instances/s1.json"))
for (location_name, location_dict) in json["products"]["P1"]["initial amounts"] for (location_name, location_dict) in json["products"]["P1"]["initial amounts"]
location_dict["amount (tonne)"] *= 1000 location_dict["amount (tonne)"] *= 1000
end end
@test_throws ErrorException("No solution available") RELOG.solve(RELOG.parse(json)) @test_throws ErrorException("No solution available") RELOG.solve(RELOG.parse(json))
end end
@testset "solve (with storage)" begin @testset "solve (with storage)" begin
basedir = dirname(@__FILE__) basedir = dirname(@__FILE__)
filename = "$basedir/../fixtures/storage.json" filename = "$basedir/../fixtures/storage.json"
instance = RELOG.parsefile(filename) instance = RELOG.parsefile(filename)
@ -64,4 +65,5 @@ end
@test solution["Costs"]["Variable operating (\$)"] == [500.0, 0.0, 100.0] @test solution["Costs"]["Variable operating (\$)"] == [500.0, 0.0, 100.0]
@test solution["Costs"]["Storage (\$)"] == [100.0, 75.0, 0.0] @test solution["Costs"]["Storage (\$)"] == [100.0, 75.0, 0.0]
@test solution["Costs"]["Total (\$)"] == [600.0, 75.0, 100.0] @test solution["Costs"]["Total (\$)"] == [600.0, 75.0, 100.0]
end
end end

6
test/reports_test.jl
Unescape View File

@ -6,9 +6,10 @@ using RELOG, JSON, GZip
basedir = @__DIR__ basedir = @__DIR__
@testset "Reports" begin function reports_test()
@testset "Reports" begin
@testset "from solve" begin @testset "from solve" begin
solution = RELOG.solve("$basedir/../instances/s1.json") solution = RELOG.solve(fixture("instances/s1.json"))
tmp_filename = tempname() tmp_filename = tempname()
# The following should not crash # The following should not crash
RELOG.write_plant_emissions_report(solution, tmp_filename) RELOG.write_plant_emissions_report(solution, tmp_filename)
@ -18,4 +19,5 @@ basedir = @__DIR__
RELOG.write_transportation_emissions_report(solution, tmp_filename) RELOG.write_transportation_emissions_report(solution, tmp_filename)
RELOG.write_transportation_report(solution, tmp_filename) RELOG.write_transportation_report(solution, tmp_filename)
end end
end
end end

43
test/runtests.jl
Unescape View File

@ -2,19 +2,46 @@
# Written by Alinson Santos Xavier <axavier@anl.gov> # Written by Alinson Santos Xavier <axavier@anl.gov>
using Test using Test
using RELOG
using Revise
@testset "RELOG" begin includet("instance/compress_test.jl")
includet("instance/geodb_test.jl")
includet("instance/parse_test.jl")
includet("graph/build_test.jl")
includet("model/build_test.jl")
includet("model/solve_test.jl")
includet("reports_test.jl")
function fixture(path)
for candidate in [
"fixtures/$path",
"test/fixtures/$path"
]
if isfile(candidate)
return candidate
end
end
error("Fixture not found: $path")
end
function runtests()
@testset "RELOG" begin
@testset "Instance" begin @testset "Instance" begin
include("instance/compress_test.jl") compress_test()
include("instance/geodb_test.jl") geodb_test()
include("instance/parse_test.jl") parse_test()
end end
@testset "Graph" begin @testset "Graph" begin
include("graph/build_test.jl") graph_build_test()
end end
@testset "Model" begin @testset "Model" begin
include("model/build_test.jl") model_build_test()
include("model/solve_test.jl") model_solve_test()
end
reports_test()
end end
include("reports_test.jl") return
end end
runtests()

Write Preview
Loading…
Cancel
Save