Skip to content

Commit faddf1b

Browse files
committed
Merge branch 'master' into dev-nightly
Conflicts: README.md doc/install.rst
2 parents cec0e42 + 9d144b0 commit faddf1b

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# StochDynamicProgramming
22

33

4-
**WARNING:** *This package is currently in development*
4+
**WARNING:** *This package is currently in development. Any help or feedback is appreciated.*
5+
6+
7+
**Latest release:** 0.1.3
58

6-
**Latest release:** 0.1.2
79

810
[![Build Status](https://travis-ci.org/JuliaOpt/StochDynamicProgramming.jl.svg?branch=master)](https://travis-ci.org/JuliaOpt/StochDynamicProgramming.jl)
911
[![codecov.io](https://codecov.io/github/JuliaOpt/StochDynamicProgramming.jl/coverage.svg?branch=master)](https://codecov.io/github/JuliaOpt/StochDynamicProgramming.jl?branch=master)

doc/install.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ StochDynamicProgramming installation
1010

1111
To install StochDynamicProgramming::
1212

13-
julia> Pkg.add("StochDynamicProgramming.jl")
13+
julia> Pkg.add("StochDynamicProgramming")
14+
1415

1516
Once the package is installed, you can import it in the REPL::
1617

@@ -20,7 +21,9 @@ Once the package is installed, you can import it in the REPL::
2021
Install a linear programming solver
2122
-----------------------------------
2223

23-
SDDP need a linear programming solver to run. Clp is installed by default with StochDynamicProgramming.jl.
24+
SDDP need a linear programming (Clp, Gurobi, CPLEX, etc.) solver to run. To install Clp::
25+
26+
julia> Pkg.add("Clp")
2427

2528
Refer to the documentation of JuMP_ to get another solver and interface it with SDDP.
2629

0 commit comments

Comments
 (0)