ANL-CEEESA/RELOG
1
0
Fork 0
mirror of https://github.com/ANL-CEEESA/RELOG.git synced 2025-12-05 23:38:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix formatting

Browse Source
This commit is contained in:
Alinson S. Xavier
2023-02-15 13:47:00 -06:00
parent 1aa01b7b2b
commit 7bce105428
3 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/model/solve.jl
View File

@@ -41,7 +41,7 @@ function solve(
else
# If only MIP optimizer is provided, use it as
# LP solver too.
lp_optimizer = optimizer
lp_optimizer = optimizer
end
end
@@ -103,7 +103,7 @@ function solve(filename::AbstractString; heuristic = false, kwargs...)
return_model = true,
output = nothing,
marginal_costs = false,
kwargs...
kwargs...,
)
@info "Filtering candidate locations..."
selected_pairs = []

43
src/web/run.jl
View File

@@ -14,27 +14,21 @@ function solve(root, filename)
)
ref_solution, ref_model = RELOG.solve(
ref_file,
heuristic=true,
optimizer=optimizer,
lp_optimizer=HiGHS.Optimizer,
return_model=true,
marginal_costs=true,
heuristic = true,
optimizer = optimizer,
lp_optimizer = HiGHS.Optimizer,
return_model = true,
marginal_costs = true,
)
Libc.flush_cstdio()
flush(stdout)
sleep(1)
if length(ref_solution) == 0
return
end
RELOG.write_products_report(
ref_solution,
replace(ref_file, ".json" => "_products.csv"),
)
RELOG.write_plants_report(
ref_solution,
replace(ref_file, ".json" => "_plants.csv"),
)
RELOG.write_products_report(ref_solution, replace(ref_file, ".json" => "_products.csv"))
RELOG.write_plants_report(ref_solution, replace(ref_file, ".json" => "_plants.csv"))
RELOG.write_plant_outputs_report(
ref_solution,
replace(ref_file, ".json" => "_plant_outputs.csv"),
@@ -43,10 +37,7 @@ function solve(root, filename)
ref_solution,
replace(ref_file, ".json" => "_plant_emissions.csv"),
)
RELOG.write_transportation_report(
ref_solution,
replace(ref_file, ".json" => "_tr.csv"),
)
RELOG.write_transportation_report(ref_solution, replace(ref_file, ".json" => "_tr.csv"))
RELOG.write_transportation_emissions_report(
ref_solution,
replace(ref_file, ".json" => "_tr_emissions.csv"),
@@ -60,16 +51,13 @@ function solve(root, filename)
sc_solution = RELOG.resolve(
ref_model,
scenario,
optimizer=optimizer,
lp_optimizer=HiGHS.Optimizer,
optimizer = optimizer,
lp_optimizer = HiGHS.Optimizer,
)
if length(sc_solution) == 0
return
end
RELOG.write_plants_report(
sc_solution,
replace(scenario, ".json" => "_plants.csv"),
)
RELOG.write_plants_report(sc_solution, replace(scenario, ".json" => "_plants.csv"))
RELOG.write_products_report(
sc_solution,
replace(scenario, ".json" => "_products.csv"),
@@ -114,10 +102,7 @@ function solve_recursive(path)
endswith(filename, "_plants.csv") || continue
push!(
results,
joinpath(
replace(root, path => ""),
replace(filename, "_plants.csv" => ""),
),
joinpath(replace(root, path => ""), replace(filename, "_plants.csv" => "")),
)
end
end
@@ -128,4 +113,4 @@ function solve_recursive(path)
run(`zip -r output.zip .`)
end
solve_recursive(ARGS[1])
solve_recursive(ARGS[1])

9
src/web/web.jl
View File

@@ -32,11 +32,11 @@ function submit(req::HTTP.Request)
end
# Run job
run(`bash -c "(julia --project=$PROJECT_DIR $PROJECT_DIR/src/web/run.jl $job_path 2>&1 | tee $job_path/solve.log) >/dev/null 2>&1 &"`)
response = Dict(
"job_id" => job_id,
run(
`bash -c "(julia --project=$PROJECT_DIR $PROJECT_DIR/src/web/run.jl $job_path 2>&1 | tee $job_path/solve.log) >/dev/null 2>&1 &"`,
)
response = Dict("job_id" => job_id)
return HTTP.Response(200, body = JSON.json(response))
end
@@ -63,4 +63,3 @@ function web(host = "127.0.0.1", port = 8080)
HTTP.serve(ROUTER, host, port)
Base.exit_on_sigint(true)
end