Skip to content

Commit 25eeda4

Browse files
authored
Update docs.yml (#422)
* Update docs.yml * revert docs bump, remove latexstrings * bump version and NEWS * try without explicit `display`
1 parent e6b8551 commit 25eeda4

File tree

4 files changed

+21
-23
lines changed

4 files changed

+21
-23
lines changed

NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Changes in v0.14.2
2+
3+
* added lasso, ridge, and elastic net regression examples ([420](https://github.com/jump-dev/Convex.jl/pull/420)). Thanks to @PaulSoderlind!
4+
15
# Changes in v0.14.1
26

37
* there was a bug causing `conj` to act in-place (reported in [#416](https://github.com/jump-dev/Convex.jl/issues/416)), which has been fixed ([#417](https://github.com/jump-dev/Convex.jl/pull/417)). This bug appears to have existed since the introduction of `conj` in Convex.jl v0.5.0.

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "Convex"
22
uuid = "f65535da-76fb-5f13-bab9-19810c17039a"
3-
version = "0.14.1"
3+
version = "0.14.2"
44

55
[deps]
66
AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"

docs/Project.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
88
ECOS = "e2685f51-7e38-5353-a97d-a921fd2c8199"
99
GLPK = "60bf3e95-4087-53dc-ae20-288a0d20c6a6"
1010
Interact = "c601a237-2ae4-5e1e-952c-7a85b0c7eef1"
11-
LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
1211
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1312
Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
1413
MAT = "23992714-dd62-5051-b70f-ba57cb901cac"

docs/examples_literate/general_examples/lasso_regression.jl

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
# ## Load Packages and Extra Functions
88

9-
using DelimitedFiles, LinearAlgebra, Statistics, Plots, LaTeXStrings, Convex, SCS
9+
using DelimitedFiles, LinearAlgebra, Statistics, Plots, Convex, SCS
1010

1111
import MathOptInterface
1212
const MOI = MathOptInterface
@@ -102,12 +102,11 @@ end
102102

103103
#-
104104

105-
p1 = plot( log.(γM),bLasso',
106-
title = "Lasso regression coefficients",
107-
xlabel = L"\log(\gamma)",
108-
label = permutedims(xNames),
109-
size = (600,400) )
110-
display(p1)
105+
plot(log.(γM),bLasso',
106+
title = "Lasso regression coefficients",
107+
xlabel = "log(γ)",
108+
label = permutedims(xNames),
109+
size = (600,400))
111110

112111
# # Ridge Regression
113112
#
@@ -123,12 +122,11 @@ end
123122

124123
#-
125124

126-
p2 = plot( log.(λM),bRidge',
127-
title = "Ridge regression coefficients",
128-
xlabel = L"\log(\lambda)",
129-
label = permutedims(xNames),
130-
size = (600,400) )
131-
display(p2)
125+
plot(log.(λM),bRidge',
126+
title = "Ridge regression coefficients",
127+
xlabel = "log(λ)",
128+
label = permutedims(xNames),
129+
size = (600,400))
132130

133131
# # Elastic Net Regression
134132

@@ -142,12 +140,9 @@ end
142140

143141
#-
144142

145-
p3 = plot( log.(γM),bEN',
146-
title = "Elastic Net regression coefficients",
147-
xlabel = L"\log(\gamma)",
148-
label = permutedims(xNames),
149-
size = (600,400) )
150-
display(p3)
143+
plot(log.(γM),bEN',
144+
title = "Elastic Net regression coefficients",
145+
xlabel = "log(γ)",
146+
label = permutedims(xNames),
147+
size = (600,400))
151148
#-
152-
153-

0 commit comments

Comments
 (0)