Merge ceeabb7 into 7e926c6

jump-dev · Dec 5, 2019 · ffb9e1a · ffb9e1a
2 parents 7e926c6 + ceeabb7
commit ffb9e1a
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 5 deletions.
diff --git a/...es_literate/mixed_integer/aux/antidiag.jl → ...erate/mixed_integer/aux_files/antidiag.jl b/...es_literate/mixed_integer/aux/antidiag.jl → ...erate/mixed_integer/aux_files/antidiag.jl
diff --git a/...amples_literate/mixed_integer/aux/data.jl → ..._literate/mixed_integer/aux_files/data.jl b/...amples_literate/mixed_integer/aux/data.jl → ..._literate/mixed_integer/aux_files/data.jl
diff --git a/docs/examples_literate/mixed_integer/n_queens.jl b/docs/examples_literate/mixed_integer/n_queens.jl
@@ -1,7 +1,7 @@
 # # N queens
 
 using Convex, GLPK, LinearAlgebra, SparseArrays, Test
-aux(str) = joinpath(@__DIR__, "aux", str) # path to auxiliary files
+aux(str) = joinpath(@__DIR__, "aux_files", str) # path to auxiliary files
 include(aux("antidiag.jl"))
 
 n = 8

diff --git a/docs/examples_literate/mixed_integer/section_allocation.jl b/docs/examples_literate/mixed_integer/section_allocation.jl
@@ -10,7 +10,7 @@
 # student $i$ is assigned to section $j$ and $0$ otherwise. 
 
 using Convex, GLPK
-aux(str) = joinpath(@__DIR__, "aux", str) # path to auxiliary files
+aux(str) = joinpath(@__DIR__, "aux_files", str) # path to auxiliary files
 
 # Load our preference matrix, `P`
 include(aux("data.jl"))

diff --git a/...ation_with_complex_variables/aux/Data.mat → ...with_complex_variables/aux_files/Data.mat b/...ation_with_complex_variables/aux/Data.mat → ...with_complex_variables/aux_files/Data.mat
diff --git a/docs/examples_literate/optimization_with_complex_variables/power_flow_optimization.jl b/docs/examples_literate/optimization_with_complex_variables/power_flow_optimization.jl
@@ -4,7 +4,7 @@
 using Convex, SCS
 using Test
 using MAT   #Pkg.add("MAT")
-aux(str) = joinpath(@__DIR__, "aux", str) # path to auxiliary files
+aux(str) = joinpath(@__DIR__, "aux_files", str) # path to auxiliary files
 
 TOL = 1e-2;
 input = matopen(aux("Data.mat"))

diff --git a/...erate/time_series/aux/melbourne_temps.txt → ...time_series/aux_files/melbourne_temps.txt b/...erate/time_series/aux/melbourne_temps.txt → ...time_series/aux_files/melbourne_temps.txt
diff --git a/docs/examples_literate/time_series/time_series.jl b/docs/examples_literate/time_series/time_series.jl
@@ -2,7 +2,7 @@
 # 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:
 
 using Plots, Convex, ECOS, DelimitedFiles
-aux(str) = joinpath(@__DIR__, "aux", str) # path to auxiliary files
+aux(str) = joinpath(@__DIR__, "aux_files", str) # path to auxiliary files
 
 temps = readdlm(aux("melbourne_temps.txt"), ',')
 n = size(temps, 1)

diff --git a/...erate/tomography/aux/tux_sparse_lines.txt → ...tomography/aux_files/tux_sparse_lines.txt b/...erate/tomography/aux/tux_sparse_lines.txt → ...tomography/aux_files/tux_sparse_lines.txt
diff --git a/...iterate/tomography/aux/tux_sparse_val.txt → ...e/tomography/aux_files/tux_sparse_val.txt b/...iterate/tomography/aux/tux_sparse_val.txt → ...e/tomography/aux_files/tux_sparse_val.txt
diff --git a/..._literate/tomography/aux/tux_sparse_x.txt → ...ate/tomography/aux_files/tux_sparse_x.txt b/..._literate/tomography/aux/tux_sparse_x.txt → ...ate/tomography/aux_files/tux_sparse_x.txt
diff --git a/..._literate/tomography/aux/tux_sparse_y.txt → ...ate/tomography/aux_files/tux_sparse_y.txt b/..._literate/tomography/aux/tux_sparse_y.txt → ...ate/tomography/aux_files/tux_sparse_y.txt
diff --git a/docs/examples_literate/tomography/tomography.jl b/docs/examples_literate/tomography/tomography.jl
@@ -27,7 +27,7 @@
 # This is simply an unconstrained least squares problem; something we can readily solve!
 
 using Convex, ECOS, DelimitedFiles, SparseArrays
-aux(str) = joinpath(@__DIR__, "aux", str) # path to auxiliary files
+aux(str) = joinpath(@__DIR__, "aux_files", str) # path to auxiliary files
 line_mat_x = readdlm(aux("tux_sparse_x.txt"))
 summary(line_mat_x)