Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
blegat committed Jul 1, 2022
1 parent 02f83f4 commit e9dd395
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 20 deletions.
8 changes: 0 additions & 8 deletions REQUIRE

This file was deleted.

2 changes: 1 addition & 1 deletion docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"

[compat]
Documenter = "~0.19"
Documenter = "0.27"
11 changes: 4 additions & 7 deletions docs/make.jl
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
using Documenter, StructDualDynProg

makedocs(
format = :html,
sitename = "StructDualDynProg",
# See https://github.com/JuliaDocs/Documenter.jl/issues/868
format = Documenter.HTML(prettyurls = get(ENV, "CI", nothing) == "true"),
pages = [
"Home" => "index.md",
"Quick Start" => "quickstart.md",
"Tutorial" => "tutorial.md",
],
# The following ensures that we only include the docstrings from
# this module for functions define in Base that we overwrite.
modules = [StructDualDynProg]
modules = [StructDualDynProg],
)

deploydocs(
repo = "github.com/JuliaStochOpt/StructDualDynProg.jl.git",
target = "build",
osname = "linux",
julia = "1.0",
deps = nothing,
make = nothing
push_preview = true,
)
1 change: 1 addition & 0 deletions src/StructProg/nlds.jl
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,7 @@ function solve!(nlds::NLDS{S}) where S
set_objective_function(nlds.model.model, zero(AffExpr))
JuMP.optimize!(nlds.model.model)
set_objective_function(nlds.model.model, obj)
end
solution = StructJuMP.optimize(nlds.model)
nlds.prevsol = Solution(
solution.feasible ? :Optimal : :Infeasible,
Expand Down
2 changes: 1 addition & 1 deletion test/hydro_thermal_scheduling.jl
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
if s > 1
@constraint(model, x[s, ξ] <= x[s-1, 1] + r[ξ] - y[s, ξ])
else
@constraint(model, x[s, ξ] <= Compat.Statistics.mean(r) - y[s, ξ])
@constraint(model, x[s, ξ] <= Statistics.mean(r) - y[s, ξ])
end
@constraint(model, p[s, ξ] + y[s, ξ] >= d)
@objective(model, Min, C * p[s, ξ])
Expand Down
6 changes: 3 additions & 3 deletions test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using JuMP
using LinearAlgebra, Test
using CutPruners
using JuMP
using StructJuMP
using StructDualDynProg
using Compat, Compat.LinearAlgebra, Test
using StochOptInterface
const SOI = StochOptInterface
using StructDualDynProg

# solver independent tests
include("comp.jl")
Expand Down

0 comments on commit e9dd395

Please sign in to comment.