Skip to content

Commit 91032b4

Browse files
committed
Move utils
1 parent 5617cbb commit 91032b4

File tree

15 files changed

+87
-65
lines changed

15 files changed

+87
-65
lines changed

Experiments.ipynb

Lines changed: 20 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,12 @@
1616
},
1717
{
1818
"cell_type": "code",
19-
"execution_count": null,
19+
"execution_count": 2,
2020
"metadata": {},
2121
"outputs": [],
2222
"source": [
2323
"import config\n",
24-
"from utils import print_verbose"
25-
]
26-
},
27-
{
28-
"cell_type": "code",
29-
"execution_count": null,
30-
"metadata": {},
31-
"outputs": [],
32-
"source": [
33-
"config.time = '04 December 2019 14:50:55'"
24+
"from utils.utils import print_verbose"
3425
]
3526
},
3627
{
@@ -42,17 +33,17 @@
4233
},
4334
{
4435
"cell_type": "code",
45-
"execution_count": null,
36+
"execution_count": 12,
4637
"metadata": {},
4738
"outputs": [],
4839
"source": [
4940
"# Configuration computation\n",
50-
"from fold import createFold, readFold, computedFold"
41+
"from utils.fold import createFold, readFold, computedFold"
5142
]
5243
},
5344
{
5445
"cell_type": "code",
55-
"execution_count": null,
46+
"execution_count": 13,
5647
"metadata": {},
5748
"outputs": [],
5849
"source": [
@@ -62,18 +53,18 @@
6253
},
6354
{
6455
"cell_type": "code",
65-
"execution_count": null,
56+
"execution_count": 14,
6657
"metadata": {},
6758
"outputs": [],
6859
"source": [
6960
"# Constraint methods\n",
7061
"from scipy.sparse import find\n",
71-
"from constraint import random_indices, generate_constraint, completion_constraint"
62+
"from utils.constraint import random_indices, generate_constraint, completion_constraint"
7263
]
7364
},
7465
{
7566
"cell_type": "code",
76-
"execution_count": null,
67+
"execution_count": 15,
7768
"metadata": {},
7869
"outputs": [],
7970
"source": [
@@ -83,7 +74,7 @@
8374
},
8475
{
8576
"cell_type": "code",
86-
"execution_count": null,
77+
"execution_count": 16,
8778
"metadata": {},
8879
"outputs": [],
8980
"source": [
@@ -95,7 +86,7 @@
9586
},
9687
{
9788
"cell_type": "code",
98-
"execution_count": null,
89+
"execution_count": 22,
9990
"metadata": {},
10091
"outputs": [],
10192
"source": [
@@ -134,17 +125,17 @@
134125
},
135126
{
136127
"cell_type": "code",
137-
"execution_count": null,
128+
"execution_count": 28,
138129
"metadata": {},
139130
"outputs": [],
140131
"source": [
141132
"# Evaluation methods\n",
142-
"from metrics import evalSplit"
133+
"from utils.metrics import evalSplit"
143134
]
144135
},
145136
{
146137
"cell_type": "code",
147-
"execution_count": null,
138+
"execution_count": 25,
148139
"metadata": {},
149140
"outputs": [],
150141
"source": [
@@ -155,7 +146,7 @@
155146
},
156147
{
157148
"cell_type": "code",
158-
"execution_count": null,
149+
"execution_count": 26,
159150
"metadata": {},
160151
"outputs": [],
161152
"source": [
@@ -166,7 +157,7 @@
166157
},
167158
{
168159
"cell_type": "code",
169-
"execution_count": null,
160+
"execution_count": 27,
170161
"metadata": {},
171162
"outputs": [],
172163
"source": [
@@ -176,7 +167,7 @@
176167
},
177168
{
178169
"cell_type": "code",
179-
"execution_count": null,
170+
"execution_count": 29,
180171
"metadata": {},
181172
"outputs": [],
182173
"source": [
@@ -200,7 +191,7 @@
200191
},
201192
{
202193
"cell_type": "code",
203-
"execution_count": null,
194+
"execution_count": 30,
204195
"metadata": {},
205196
"outputs": [],
206197
"source": [
@@ -225,7 +216,7 @@
225216
},
226217
{
227218
"cell_type": "code",
228-
"execution_count": null,
219+
"execution_count": 31,
229220
"metadata": {},
230221
"outputs": [],
231222
"source": [
@@ -599,7 +590,8 @@
599590
"mimetype": "text/x-python",
600591
"name": "python",
601592
"nbconvert_exporter": "python",
602-
"pygments_lexer": "ipython3"
593+
"pygments_lexer": "ipython3",
594+
"version": "3.7.6"
603595
}
604596
},
605597
"nbformat": 4,

Visualization.ipynb

Lines changed: 52 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
{
1111
"cell_type": "code",
12-
"execution_count": null,
12+
"execution_count": 2,
1313
"metadata": {},
1414
"outputs": [],
1515
"source": [
@@ -18,16 +18,7 @@
1818
},
1919
{
2020
"cell_type": "code",
21-
"execution_count": null,
22-
"metadata": {},
23-
"outputs": [],
24-
"source": [
25-
"from fold import computedFold"
26-
]
27-
},
28-
{
29-
"cell_type": "code",
30-
"execution_count": null,
21+
"execution_count": 5,
3122
"metadata": {},
3223
"outputs": [],
3324
"source": [
@@ -37,14 +28,14 @@
3728
"import pandas as pd\n",
3829
"import seaborn as sns\n",
3930
"from tqdm import tqdm\n",
40-
"from fold import readFold\n",
31+
"from utils.fold import readFold, computedFold\n",
4132
"import matplotlib.pyplot as plt\n",
4233
"from pmlb import classification_dataset_names"
4334
]
4435
},
4536
{
4637
"cell_type": "code",
47-
"execution_count": null,
38+
"execution_count": 6,
4839
"metadata": {},
4940
"outputs": [],
5041
"source": [
@@ -68,7 +59,7 @@
6859
},
6960
{
7061
"cell_type": "code",
71-
"execution_count": null,
62+
"execution_count": 7,
7263
"metadata": {},
7364
"outputs": [],
7465
"source": [
@@ -135,7 +126,7 @@
135126
},
136127
{
137128
"cell_type": "code",
138-
"execution_count": null,
129+
"execution_count": 8,
139130
"metadata": {},
140131
"outputs": [],
141132
"source": [
@@ -145,28 +136,66 @@
145136
},
146137
{
147138
"cell_type": "code",
148-
"execution_count": null,
139+
"execution_count": 9,
149140
"metadata": {},
150-
"outputs": [],
141+
"outputs": [
142+
{
143+
"ename": "FileNotFoundError",
144+
"evalue": "[Errno 2] No such file or directory: '/home/vincent/Bureau/CMU/Project/ConstrainedClustering/result/30 August 2019 15:02:09'",
145+
"output_type": "error",
146+
"traceback": [
147+
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
148+
"\u001b[0;31mFileNotFoundError\u001b[0m Traceback (most recent call last)",
149+
"\u001b[0;32m<ipython-input-9-b6d2eb82be2d>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0mscores\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0massignation\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mconstraints\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0minfo\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mopenFiles\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mdates\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;36m1\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 2\u001b[0m \u001b[0mprint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"Open {} result files\"\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mformat\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mlen\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mscores\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
150+
"\u001b[0;32m<ipython-input-7-89a8e2e0a155>\u001b[0m in \u001b[0;36mopenFiles\u001b[0;34m(dates, subfolder_detection, join)\u001b[0m\n\u001b[1;32m 17\u001b[0m \"\"\"\n\u001b[1;32m 18\u001b[0m \u001b[0;32mif\u001b[0m \u001b[0msubfolder_detection\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 19\u001b[0;31m \u001b[0mdates\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0;34m[\u001b[0m\u001b[0mos\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mpath\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mjoin\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mdate\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mmethod\u001b[0m\u001b[0;34m)\u001b[0m \u001b[0;32mfor\u001b[0m \u001b[0mdate\u001b[0m \u001b[0;32min\u001b[0m \u001b[0mdates\u001b[0m \u001b[0;32mfor\u001b[0m \u001b[0mmethod\u001b[0m \u001b[0;32min\u001b[0m \u001b[0mos\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mlistdir\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mos\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mpath\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mjoin\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mconfig\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mresult\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mdate\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m)\u001b[0m \u001b[0;34m]\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 20\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 21\u001b[0m \u001b[0mscores\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0massignation\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mconstraints\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0minfo\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0;34m[\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m[\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m[\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m{\u001b[0m\u001b[0;34m}\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
151+
"\u001b[0;32m<ipython-input-7-89a8e2e0a155>\u001b[0m in \u001b[0;36m<listcomp>\u001b[0;34m(.0)\u001b[0m\n\u001b[1;32m 17\u001b[0m \"\"\"\n\u001b[1;32m 18\u001b[0m \u001b[0;32mif\u001b[0m \u001b[0msubfolder_detection\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 19\u001b[0;31m \u001b[0mdates\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0;34m[\u001b[0m\u001b[0mos\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mpath\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mjoin\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mdate\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mmethod\u001b[0m\u001b[0;34m)\u001b[0m \u001b[0;32mfor\u001b[0m \u001b[0mdate\u001b[0m \u001b[0;32min\u001b[0m \u001b[0mdates\u001b[0m \u001b[0;32mfor\u001b[0m \u001b[0mmethod\u001b[0m \u001b[0;32min\u001b[0m \u001b[0mos\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mlistdir\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mos\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mpath\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mjoin\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mconfig\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mresult\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mdate\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m)\u001b[0m \u001b[0;34m]\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 20\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 21\u001b[0m \u001b[0mscores\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0massignation\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mconstraints\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0minfo\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0;34m[\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m[\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m[\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m{\u001b[0m\u001b[0;34m}\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
152+
"\u001b[0;31mFileNotFoundError\u001b[0m: [Errno 2] No such file or directory: '/home/vincent/Bureau/CMU/Project/ConstrainedClustering/result/30 August 2019 15:02:09'"
153+
]
154+
}
155+
],
151156
"source": [
152157
"scores, assignation, constraints, info = openFiles(dates, 1)\n",
153158
"print(\"Open {} result files\".format(len(scores)))"
154159
]
155160
},
156161
{
157162
"cell_type": "code",
158-
"execution_count": null,
163+
"execution_count": 10,
159164
"metadata": {},
160-
"outputs": [],
165+
"outputs": [
166+
{
167+
"ename": "NameError",
168+
"evalue": "name 'scores' is not defined",
169+
"output_type": "error",
170+
"traceback": [
171+
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
172+
"\u001b[0;31mNameError\u001b[0m Traceback (most recent call last)",
173+
"\u001b[0;32m<ipython-input-10-f0a87aa57cee>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0mscores\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mhead\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
174+
"\u001b[0;31mNameError\u001b[0m: name 'scores' is not defined"
175+
]
176+
}
177+
],
161178
"source": [
162179
"scores.head()"
163180
]
164181
},
165182
{
166183
"cell_type": "code",
167-
"execution_count": null,
184+
"execution_count": 11,
168185
"metadata": {},
169-
"outputs": [],
186+
"outputs": [
187+
{
188+
"ename": "NameError",
189+
"evalue": "name 'assignation' is not defined",
190+
"output_type": "error",
191+
"traceback": [
192+
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
193+
"\u001b[0;31mNameError\u001b[0m Traceback (most recent call last)",
194+
"\u001b[0;32m<ipython-input-11-96862a353fc4>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0massignation\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mhead\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
195+
"\u001b[0;31mNameError\u001b[0m: name 'assignation' is not defined"
196+
]
197+
}
198+
],
170199
"source": [
171200
"assignation.head()"
172201
]
@@ -821,7 +850,8 @@
821850
"mimetype": "text/x-python",
822851
"name": "python",
823852
"nbconvert_exporter": "python",
824-
"pygments_lexer": "ipython3"
853+
"pygments_lexer": "ipython3",
854+
"version": "3.7.6"
825855
}
826856
},
827857
"nbformat": 4,

kernels/features.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from os import mkdir, remove
77
from os.path import isdir, isfile, join
88
from multiprocessing import Pool
9-
from utils import print_verbose
9+
from utils.utils import print_verbose
1010
from kernels.data import get_transformation
1111
import numpy as np
1212
from scipy.stats import binom

models/cosine_bayes_opt.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import numpy as np
2-
from utils import print_verbose
2+
from utils.utils import print_verbose
33
from GPyOpt.methods import BayesianOptimization
44
from sklearn.metrics.pairwise import cosine_similarity
5-
import constraint
5+
import utils.constraint
66
from models.kkmeans import kernelKmeans
77
from KernelConstrainedKmeans.initialization import Initialization
88

models/cross_validation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import constraint
1+
import utils.constraint
22
import numpy as np
33
from models.kkmeans import kernelKmeans
44
from KernelConstrainedKmeans.initialization import Initialization

models/hmrf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
from utils import print_verbose
1+
from utils.utils import print_verbose
22
from KernelConstrainedKmeans.initialization import Initialization, Euclidean_Initialization
33

44
from sklearn.metrics.pairwise import pairwise_kernels, euclidean_distances
55
from sklearn.preprocessing import normalize
6-
from constraint import indices_constraint_violated
6+
from utils.constraint import indices_constraint_violated
77
from scipy.optimize import minimize
88
import numpy as np
99

models/kernel_opt.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
With Baysian optimization and agreement of observed constraints
44
"""
55
import numpy as np
6-
import constraint
7-
from utils import print_verbose
6+
import utils.constraint
7+
from utils.utils import print_verbose
88
from sklearn.cluster import KMeans
99
from models.kkmeans import kernelKmeans
10-
from optimizer import CombinationKernelOptimizer
10+
from utils.optimizer import CombinationKernelOptimizer
1111
from KernelConstrainedKmeans.wksckmeans import weightedKernelSoftConstrainedKmeans
1212
from KernelConstrainedKmeans.initialization import Initialization, InitializationScale
1313

models/kkmeans.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
and a farthest first optimization
44
"""
55
import numpy as np
6-
from utils import print_verbose
6+
from utils.utils import print_verbose
77

88
def kernelKmeans(kernel, assignation, max_iteration = 100, verbose = 0):
99
"""

models/mahalanobis.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import constraint
1+
import utils.constraint
22
import numpy as np
3-
from utils import print_verbose
3+
from utils.utils import print_verbose
44
from hyperopt import hp, tpe, fmin
55
from sklearn.cluster import KMeans
66
from models.kkmeans import kernelKmeans

utils/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)