Skip to content

Commit 6e305f0

Browse files
idc9idc9
committed
up
1 parent 63276c0 commit 6e305f0

5 files changed

Lines changed: 160 additions & 181 deletions

‎docs/access_loss_plus_penalty_combo.ipynb‎

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,9 @@
1818
},
1919
{
2020
"cell_type": "code",
21-
"execution_count": 1,
21+
"execution_count": 9,
2222
"metadata": {},
23-
"outputs": [
24-
{
25-
"name": "stderr",
26-
"output_type": "stream",
27-
"text": [
28-
"In /Users/iaincarmichael/anaconda3/lib/python3.7/site-packages/matplotlib/mpl-data/stylelib/_classic_test.mplstyle: \n",
29-
"The text.latex.preview rcparam was deprecated in Matplotlib 3.3 and will be removed two minor releases later.\n",
30-
"In /Users/iaincarmichael/anaconda3/lib/python3.7/site-packages/matplotlib/mpl-data/stylelib/_classic_test.mplstyle: \n",
31-
"The mathtext.fallback_to_cm rcparam was deprecated in Matplotlib 3.3 and will be removed two minor releases later.\n",
32-
"In /Users/iaincarmichael/anaconda3/lib/python3.7/site-packages/matplotlib/mpl-data/stylelib/_classic_test.mplstyle: Support for setting the 'mathtext.fallback_to_cm' rcParam is deprecated since 3.3 and will be removed two minor releases later; use 'mathtext.fallback : 'cm' instead.\n",
33-
"In /Users/iaincarmichael/anaconda3/lib/python3.7/site-packages/matplotlib/mpl-data/stylelib/_classic_test.mplstyle: \n",
34-
"The validate_bool_maybe_none function was deprecated in Matplotlib 3.3 and will be removed two minor releases later.\n",
35-
"In /Users/iaincarmichael/anaconda3/lib/python3.7/site-packages/matplotlib/mpl-data/stylelib/_classic_test.mplstyle: \n",
36-
"The savefig.jpeg_quality rcparam was deprecated in Matplotlib 3.3 and will be removed two minor releases later.\n",
37-
"In /Users/iaincarmichael/anaconda3/lib/python3.7/site-packages/matplotlib/mpl-data/stylelib/_classic_test.mplstyle: \n",
38-
"The keymap.all_axes rcparam was deprecated in Matplotlib 3.3 and will be removed two minor releases later.\n",
39-
"In /Users/iaincarmichael/anaconda3/lib/python3.7/site-packages/matplotlib/mpl-data/stylelib/_classic_test.mplstyle: \n",
40-
"The animation.avconv_path rcparam was deprecated in Matplotlib 3.3 and will be removed two minor releases later.\n",
41-
"In /Users/iaincarmichael/anaconda3/lib/python3.7/site-packages/matplotlib/mpl-data/stylelib/_classic_test.mplstyle: \n",
42-
"The animation.avconv_args rcparam was deprecated in Matplotlib 3.3 and will be removed two minor releases later.\n"
43-
]
44-
}
45-
],
23+
"outputs": [],
4624
"source": [
4725
"import numpy as np\n",
4826
"import seaborn as sns\n",
@@ -107,8 +85,8 @@
10785
"name": "stdout",
10886
"output_type": "stream",
10987
"text": [
110-
"CPU times: user 725 ms, sys: 10.2 ms, total: 735 ms\n",
111-
"Wall time: 737 ms\n"
88+
"CPU times: user 772 ms, sys: 19.2 ms, total: 792 ms\n",
89+
"Wall time: 891 ms\n"
11290
]
11391
}
11492
],
@@ -142,8 +120,8 @@
142120
"name": "stdout",
143121
"output_type": "stream",
144122
"text": [
145-
"CPU times: user 2.09 s, sys: 39.2 ms, total: 2.13 s\n",
146-
"Wall time: 2.15 s\n"
123+
"CPU times: user 2.36 s, sys: 58.6 ms, total: 2.42 s\n",
124+
"Wall time: 2.49 s\n"
147125
]
148126
}
149127
],

‎docs/concave_penalties_compare_initializations.ipynb‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
{
1818
"cell_type": "code",
19-
"execution_count": 5,
19+
"execution_count": 6,
2020
"metadata": {},
2121
"outputs": [],
2222
"source": [
@@ -37,7 +37,7 @@
3737
},
3838
{
3939
"cell_type": "code",
40-
"execution_count": 6,
40+
"execution_count": 2,
4141
"metadata": {},
4242
"outputs": [],
4343
"source": [
@@ -49,7 +49,7 @@
4949
},
5050
{
5151
"cell_type": "code",
52-
"execution_count": 7,
52+
"execution_count": 3,
5353
"metadata": {},
5454
"outputs": [],
5555
"source": [
@@ -84,7 +84,7 @@
8484
},
8585
{
8686
"cell_type": "code",
87-
"execution_count": 8,
87+
"execution_count": 4,
8888
"metadata": {},
8989
"outputs": [],
9090
"source": [
@@ -96,47 +96,47 @@
9696
},
9797
{
9898
"cell_type": "code",
99-
"execution_count": 9,
99+
"execution_count": 5,
100100
"metadata": {},
101101
"outputs": [
102102
{
103103
"name": "stdout",
104104
"output_type": "stream",
105105
"text": [
106-
"CPU times: user 158 ms, sys: 75.3 ms, total: 233 ms\n",
107-
"Wall time: 3.57 s\n",
106+
"CPU times: user 152 ms, sys: 81.5 ms, total: 233 ms\n",
107+
"Wall time: 3.7 s\n",
108108
"Lasso L2 to truth 0.5399115512254988 \n",
109109
"\n",
110-
"CPU times: user 163 ms, sys: 120 ms, total: 283 ms\n",
111-
"Wall time: 951 ms\n",
110+
"CPU times: user 246 ms, sys: 84 ms, total: 330 ms\n",
111+
"Wall time: 1.08 s\n",
112112
"Ridge L2 to truth 1.4667162260738444 \n",
113113
"\n",
114-
"CPU times: user 862 ms, sys: 46.1 ms, total: 908 ms\n",
115-
"Wall time: 15.4 s\n",
114+
"CPU times: user 1.02 s, sys: 77.9 ms, total: 1.1 s\n",
115+
"Wall time: 18.1 s\n",
116116
"ENet L2 to truth 0.5399115512254988 \n",
117117
"\n",
118-
"CPU times: user 1.66 s, sys: 185 ms, total: 1.84 s\n",
119-
"Wall time: 5.33 s\n",
118+
"CPU times: user 1.92 s, sys: 221 ms, total: 2.14 s\n",
119+
"Wall time: 6.35 s\n",
120120
"FCP, lasso init, one step L2 to truth 0.2934270519442212 \n",
121121
"\n",
122-
"CPU times: user 1.88 s, sys: 191 ms, total: 2.07 s\n",
123-
"Wall time: 9.17 s\n",
122+
"CPU times: user 2.01 s, sys: 205 ms, total: 2.21 s\n",
123+
"Wall time: 11.1 s\n",
124124
"FCP, ridge init, one step L2 to truth 0.3433528089934003 \n",
125125
"\n",
126-
"CPU times: user 2.67 s, sys: 192 ms, total: 2.86 s\n",
127-
"Wall time: 21.9 s\n",
126+
"CPU times: user 2.65 s, sys: 196 ms, total: 2.85 s\n",
127+
"Wall time: 21.1 s\n",
128128
"FCP, enet init, one step L2 to truth 0.2934270519442212 \n",
129129
"\n",
130-
"CPU times: user 2.61 s, sys: 256 ms, total: 2.87 s\n",
130+
"CPU times: user 2.59 s, sys: 218 ms, total: 2.81 s\n",
131131
"Wall time: 18.4 s\n",
132132
"FCP, lasso init, many steps L2 to truth 0.2964122567536647 \n",
133133
"\n",
134-
"CPU times: user 2.6 s, sys: 249 ms, total: 2.85 s\n",
135-
"Wall time: 18 s\n",
134+
"CPU times: user 2.56 s, sys: 265 ms, total: 2.83 s\n",
135+
"Wall time: 19.7 s\n",
136136
"FCP, ridge init, many steps L2 to truth 0.2964122567536647 \n",
137137
"\n",
138-
"CPU times: user 2.49 s, sys: 181 ms, total: 2.67 s\n",
139-
"Wall time: 20.9 s\n",
138+
"CPU times: user 2.85 s, sys: 201 ms, total: 3.05 s\n",
139+
"Wall time: 28.5 s\n",
140140
"FCP, enet init, many steps L2 to truth 0.2964122567536647 \n",
141141
"\n"
142142
]

‎docs/concave_penalty_two_stage_estimators.ipynb‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
{
1919
"cell_type": "code",
20-
"execution_count": 14,
20+
"execution_count": 1,
2121
"metadata": {},
2222
"outputs": [],
2323
"source": [
@@ -47,7 +47,7 @@
4747
},
4848
{
4949
"cell_type": "code",
50-
"execution_count": 4,
50+
"execution_count": 3,
5151
"metadata": {},
5252
"outputs": [
5353
{
@@ -56,7 +56,7 @@
5656
"<function ya_glm.fcp.GlmFcp.GlmFcpFitLLA.__init__(self, lla_n_steps=1, lla_kws={}, fit_intercept=True, standardize=False, opt_kws={}, pen_val=1, pen_func='scad', pen_func_kws={}, init='default')>"
5757
]
5858
},
59-
"execution_count": 4,
59+
"execution_count": 3,
6060
"metadata": {},
6161
"output_type": "execute_result"
6262
}
@@ -74,7 +74,7 @@
7474
},
7575
{
7676
"cell_type": "code",
77-
"execution_count": 8,
77+
"execution_count": 4,
7878
"metadata": {},
7979
"outputs": [],
8080
"source": [
@@ -90,7 +90,7 @@
9090
},
9191
{
9292
"cell_type": "code",
93-
"execution_count": 32,
93+
"execution_count": 5,
9494
"metadata": {},
9595
"outputs": [
9696
{
@@ -99,7 +99,7 @@
9999
"FcpLLA(lla_n_steps=1000)"
100100
]
101101
},
102-
"execution_count": 32,
102+
"execution_count": 5,
103103
"metadata": {},
104104
"output_type": "execute_result"
105105
}
@@ -120,7 +120,7 @@
120120
},
121121
{
122122
"cell_type": "code",
123-
"execution_count": 12,
123+
"execution_count": 6,
124124
"metadata": {},
125125
"outputs": [],
126126
"source": [
@@ -133,7 +133,7 @@
133133
},
134134
{
135135
"cell_type": "code",
136-
"execution_count": 30,
136+
"execution_count": 7,
137137
"metadata": {},
138138
"outputs": [
139139
{
@@ -144,7 +144,7 @@
144144
" 0.00000000e+00, 0.00000000e+00])"
145145
]
146146
},
147-
"execution_count": 30,
147+
"execution_count": 7,
148148
"metadata": {},
149149
"output_type": "execute_result"
150150
}

0 commit comments

Comments
 (0)