Skip to content

Commit 57e84e6

Browse files
authored
Merge pull request #12 from JuliaDecisionFocusedLearning/StoVSP
Stochastic vehicle scheduling benchmark
2 parents e10008e + f0f14b2 commit 57e84e6

35 files changed

+2273
-58
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/docs/src/index.md
33
data
44
scripts
5+
*heuristic_algorithms
56
.DS_Store
67

78
# Files generated by invoking Julia with --code-coverage

Project.toml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,51 @@ authors = ["Members of JuliaDecisionFocusedLearning"]
44
version = "0.1.0"
55

66
[deps]
7+
ConstrainedShortestPaths = "b3798467-87dc-4d99-943d-35a1bd39e395"
78
DataDeps = "124859b0-ceae-595e-8997-d05f6a7a8dfe"
89
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
910
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
1011
Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
1112
Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
1213
HiGHS = "87dc4568-4c63-4d18-b0c0-bb2238e4078b"
1314
Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
14-
InferOpt = "4846b161-c94e-4150-8dac-c7ae193c601f"
1515
Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
1616
JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
1717
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1818
Metalhead = "dbeba491-748d-5e0e-a39e-b530a07fa0cc"
1919
NPZ = "15e1cf62-19b3-5cfa-8e77-841668bca605"
2020
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
21+
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
2122
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
23+
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
24+
SCIP = "82193955-e24f-5292-bf16-6f2c5261a85f"
2225
SimpleWeightedGraphs = "47aef6b3-ad0c-573a-a1e2-d07658019622"
2326
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
27+
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
28+
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
2429

2530
[compat]
31+
ConstrainedShortestPaths = "0.6.0"
2632
DataDeps = "0.7"
2733
Distributions = "0.25"
2834
DocStringExtensions = "0.9"
2935
Flux = "0.16"
3036
Graphs = "1.11"
3137
HiGHS = "1.9"
32-
Images = "0.26"
33-
InferOpt = "0.6"
38+
Images = "0.26.1"
3439
Ipopt = "1.6"
3540
JuMP = "1.22"
3641
LinearAlgebra = "1"
37-
Metalhead = "0.9"
42+
Metalhead = "0.9.4"
3843
NPZ = "0.4"
3944
Plots = "1"
45+
Printf = "1.11.0"
4046
Random = "1"
47+
Requires = "1.3.0"
4148
SimpleWeightedGraphs = "1.4"
4249
SparseArrays = "1"
50+
Statistics = "1.11.1"
51+
StatsBase = "0.34.4"
4352
julia = "1.6"
4453

4554
[extras]

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ Currently, this package provides the following benchmark problems (many more to
1515
- `FixedSizeShortestPathBenchmark`: shortest path problem with on a graph with fixed size.
1616
- `WarcraftBenchmark`: shortest path problem on image maps
1717
- `PortfolioOptimizationBenchmark`: portfolio optimization problem.
18+
- `StochasticVehicleSchedulingBenchmark`: stochastic vehicle scheduling problem.
1819

1920
See the [documentation](https://JuliaDecisionFocusedLearning.github.io/DecisionFocusedLearningBenchmarks.jl/stable/) for more details.

docs/make.jl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ cp(joinpath(@__DIR__, "..", "README.md"), joinpath(@__DIR__, "src", "index.md");
77
md_dir = joinpath(@__DIR__, "src")
88
tutorial_dir = joinpath(@__DIR__, "src", "tutorials")
99
benchmarks_dir = joinpath(@__DIR__, "src", "benchmarks")
10+
api_dir = joinpath(@__DIR__, "src", "api")
1011

12+
api_files = map(x -> joinpath("api", x), readdir(api_dir))
1113
tutorial_files = readdir(tutorial_dir)
1214
md_tutorial_files = [split(file, ".")[1] * ".md" for file in tutorial_files]
1315
benchmark_files = readdir(benchmarks_dir)
1416
md_benchmark_files = [split(file, ".")[1] * ".md" for file in benchmark_files]
1517

16-
include_tutorial = true
18+
include_tutorial = false
1719

1820
if include_tutorial
1921
for file in tutorial_files
@@ -35,9 +37,9 @@ makedocs(;
3537
"benchmarks/fixed_size_shortest_path.md",
3638
"benchmarks/warcraft.md",
3739
"benchmarks/portfolio_optimization.md",
40+
"benchmarks/vsp.md",
3841
],
39-
"API reference" =>
40-
["api/interface.md", "api/decision_focused.md", "api/warcraft.md"],
42+
"API reference" => api_files,
4143
],
4244
)
4345

File renamed without changes.

docs/src/api/decision_focused.md

Lines changed: 0 additions & 15 deletions
This file was deleted.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Fixed-size shortest path
2+
3+
## Public
4+
5+
```@autodocs
6+
Modules = [DecisionFocusedLearningBenchmarks.FixedSizeShortestPath]
7+
Private = false
8+
```
9+
10+
## Private
11+
12+
```@autodocs
13+
Modules = [DecisionFocusedLearningBenchmarks.FixedSizeShortestPath]
14+
Public = false
15+
```
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Subset selection
2+
3+
## Public
4+
5+
```@autodocs
6+
Modules = [DecisionFocusedLearningBenchmarks.PortfolioOptimization]
7+
Private = false
8+
```
9+
10+
## Private
11+
12+
```@autodocs
13+
Modules = [DecisionFocusedLearningBenchmarks.PortfolioOptimization]
14+
Public = false
15+
```

docs/src/api/subset_selection.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Subset selection
2+
3+
## Public
4+
5+
```@autodocs
6+
Modules = [DecisionFocusedLearningBenchmarks.SubsetSelection]
7+
Private = false
8+
```
9+
10+
## Private
11+
12+
```@autodocs
13+
Modules = [DecisionFocusedLearningBenchmarks.SubsetSelection]
14+
Public = false
15+
```

docs/src/api/vsp.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Stochastic Vehicle Scheduling
2+
3+
## Public
4+
5+
```@autodocs
6+
Modules = [DecisionFocusedLearningBenchmarks.StochasticVehicleScheduling]
7+
Private = false
8+
```
9+
10+
## Private
11+
12+
```@autodocs
13+
Modules = [DecisionFocusedLearningBenchmarks.StochasticVehicleScheduling]
14+
Public = false
15+
```

0 commit comments

Comments
 (0)