Skip to content

Commit fb7098c

Browse files
authored
Merge pull request #350 from JuliaOpt/eph/fix-aux
Move aux -> aux_files and exclude test
2 parents 7e926c6 + 36f8178 commit fb7098c

File tree

14 files changed

+9
-8
lines changed

14 files changed

+9
-8
lines changed

docs/examples_literate/mixed_integer/n_queens.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# # N queens
22

33
using Convex, GLPK, LinearAlgebra, SparseArrays, Test
4-
aux(str) = joinpath(@__DIR__, "aux", str) # path to auxiliary files
4+
aux(str) = joinpath(@__DIR__, "aux_files", str) # path to auxiliary files
55
include(aux("antidiag.jl"))
66

77
n = 8

docs/examples_literate/mixed_integer/section_allocation.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# student $i$ is assigned to section $j$ and $0$ otherwise.
1111

1212
using Convex, GLPK
13-
aux(str) = joinpath(@__DIR__, "aux", str) # path to auxiliary files
13+
aux(str) = joinpath(@__DIR__, "aux_files", str) # path to auxiliary files
1414

1515
# Load our preference matrix, `P`
1616
include(aux("data.jl"))

docs/examples_literate/optimization_with_complex_variables/power_flow_optimization.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using Convex, SCS
55
using Test
66
using MAT #Pkg.add("MAT")
7-
aux(str) = joinpath(@__DIR__, "aux", str) # path to auxiliary files
7+
aux(str) = joinpath(@__DIR__, "aux_files", str) # path to auxiliary files
88

99
TOL = 1e-2;
1010
input = matopen(aux("Data.mat"))

docs/examples_literate/time_series/time_series.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# A time series is a sequence of data points, each associated with a time. In our example, we will work with a time series of daily temperatures in the city of Melbourne, Australia over a period of a few years. Let $x$ be the vector of the time series, and $x_i$ denote the temperature in Melbourne on day $i$. Here is a picture of the time series:
33

44
using Plots, Convex, ECOS, DelimitedFiles
5-
aux(str) = joinpath(@__DIR__, "aux", str) # path to auxiliary files
5+
aux(str) = joinpath(@__DIR__, "aux_files", str) # path to auxiliary files
66

77
temps = readdlm(aux("melbourne_temps.txt"), ',')
88
n = size(temps, 1)

0 commit comments

Comments
 (0)