diff --git a/Project.toml b/Project.toml index baacbfd..f747367 100644 --- a/Project.toml +++ b/Project.toml @@ -20,6 +20,7 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee" NearestNeighbors = "b8a86587-4115-5ab1-83bc-aa920d37bbce" OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" +Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" ProgressBars = "49802e3a-d2f1-5c88-81d8-b72133a6f568" Shapefile = "8e980c4a-a4fe-5da2-b3a7-4b4b0353a2f4" @@ -40,9 +41,9 @@ JSON = "0.21" JSONSchema = "1" JuMP = "1" MathOptInterface = "1" +NearestNeighbors = "0.4" OrderedCollections = "1" ProgressBars = "1" Shapefile = "0.8" ZipFile = "0.10" julia = "1" -NearestNeighbors = "0.4" diff --git a/src/RELOG.jl b/src/RELOG.jl index 0f39e32..7d553b7 100644 --- a/src/RELOG.jl +++ b/src/RELOG.jl @@ -4,6 +4,10 @@ module RELOG +using Pkg + +version() = Pkg.dependencies()[Base.UUID("a2afcdf7-cf04-4913-85f9-c0d81ddf2008")].version + include("instance/structs.jl") include("graph/structs.jl") @@ -25,4 +29,5 @@ include("reports/products.jl") include("reports/tr_emissions.jl") include("reports/tr.jl") include("reports/write.jl") + end diff --git a/src/model/solve.jl b/src/model/solve.jl index d517c12..1adfc46 100644 --- a/src/model/solve.jl +++ b/src/model/solve.jl @@ -14,14 +14,14 @@ end function _print_graph_stats(instance::Instance, graph::Graph)::Nothing - @info @sprintf(" %12d time periods", instance.time) - @info @sprintf(" %12d process nodes", length(graph.process_nodes)) - @info @sprintf(" %12d shipping nodes (plant)", length(graph.plant_shipping_nodes)) + @info @sprintf("%12d time periods", instance.time) + @info @sprintf("%12d process nodes", length(graph.process_nodes)) + @info @sprintf("%12d shipping nodes (plant)", length(graph.plant_shipping_nodes)) @info @sprintf( - " %12d shipping nodes (collection)", + "%12d shipping nodes (collection)", length(graph.collection_shipping_nodes) ) - @info @sprintf(" %12d arcs", length(graph.arcs)) + @info @sprintf("%12d arcs", length(graph.arcs)) return end