-
Notifications
You must be signed in to change notification settings - Fork 0
/
ameliorations.py
446 lines (359 loc) · 13 KB
/
ameliorations.py
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
from graphe import *
from fragilite import *
from random import *
import argparse
def charger_donnees(graphe, fichier):
file = open('données/' + fichier, mode = 'r', encoding = 'utf-8-sig')
lines = file.readlines()
file.close()
for line in lines:
array = line.split(':')
if len(array) == 2:
nom = array[1].split("\n")
graphe.nom_dict[int(array[0])] = nom[0]
array = line.split('/')
if len(array) == 3:
#print(array)
nom = fichier.split(".txt")
poid = array[2].split("\n")
graphe.ajouter_arete(int(array[0]), int(array[1]), int(poid[0]), nom[0])
pass
def numerotations(G):
debut = dict()
parent = dict()
ancetre = dict()
for sommet in G.sommets():
debut[sommet] = 0
parent[sommet] = None
ancetre[sommet] = 100000000
instant = 0
def numerotationRecursive(s):
nonlocal instant, debut, parent, ancetre
instant = instant + 1
ancetre[s] = instant
debut[s] = ancetre[s]
for t in G.voisins(s):
t = t[0]
if debut[t] != 0:
if parent[s] != t:
ancetre[s] = min(ancetre[s],debut[t])
else:
parent[t] = s
numerotationRecursive(t)
ancetre[s] = min(ancetre[s], ancetre[t])
for v in G.sommets():
if debut[v] == 0:
numerotationRecursive(v)
return (debut, parent, ancetre)
def points_articulation(G : Graphe):
tuple = numerotations(G)
debut = tuple[0]
parent = tuple[1]
ancetre = tuple[2]
articulations = []
racines = []
for v in G.sommets():
if parent[v] == None:
racines.append(v)
for depart in racines:
count = 0
for i in parent:
if parent[i] != None and depart == parent[i]:
count += 1
if count >= 2:
articulations.append(depart)
racines.append(None)
for v in G.sommets():
#print(articulations)
if parent[v] not in racines and ancetre[v] >= debut[parent[v]] and parent[v] not in articulations:
articulations.append(parent[v])
retSomm = []
for i in articulations:
retSomm.append(i)
return retSomm
pass
def ponts(G : Graphe):
tuple = numerotations(G)
debut = tuple[0]
parent = tuple[1]
ancetre = tuple[2]
res = []
for arete in G.aretes():
u = arete[0]
v = arete[1]
if ancetre[v] > debut[u]:
res.append([u,v])
elif ancetre[u] > debut[v]:
res.append([u,v])
return res
def parcour_profondeur(G : Graphe,s ,exept):
dejaVisite = []
def parcour(som):
nonlocal dejaVisite
dejaVisite.append(som)
for voisin in G.voisins(som):
voisin = voisin[0]
if voisin not in dejaVisite and voisin not in exept:
parcour(voisin)
parcour(s)
retVisite = []
for i in dejaVisite:
retVisite.append(i)
return sorted(retVisite)
pass
def amelioration_ponts(G : Graphe):
retArr = []
pon = []
pon = sorted(map(sorted,ponts(G)))
index = 0
def amelioration(C,u,v):
nonlocal pon, retArr
exept = []
parc = []
for i in pon:
exept.append(v)
parc = parcour_profondeur(C,u,exept)
ran = randint(0,len(parc) -1)
c = 0
while parc[ran] == u:
ran = randint(0,len(parc) -1)
if c > 3:
break
c = c + 1
C.ajouter_arete(v,parc[ran],None,'')
retArr.append([v,parc[ran]])
pon = sorted(map(sorted,ponts(C)))
pass
def copie_graphe(G : Graphe):
C = Graphe()
C.ajouter_sommets(G.sommets())
C.ajouter_aretes(G.aretes())
return C
def tour_boucle():
nonlocal pon, index, G, retArr
C = copie_graphe(G)
for p in pon:
for j in p:
if(len(pon) != 0):
if index == 0:
amelioration(C,p[0],p[1])
index = 1
else:
amelioration(C,p[1],p[0])
index = 0
tour_boucle()
counter = 0
lastArr = []
for i in retArr:
lastArr.append(i)
while counter <= 10:
if len(retArr) < len(lastArr):
lastArr = []
for i in retArr:
lastArr.append(i)
retArr = []
pon = sorted(map(sorted,ponts(G)))
random()
tour_boucle()
counter = counter + 1
return lastArr
pass
def amelioration_points_aux(G : Graphe):
tuple = numerotations(G)
debut = tuple[0]
parent = tuple[1]
ancetre = tuple[2]
articulation = points_articulation(G)
def sort_articulation(debut,articulation):
dic = dict()
listRet = []
for ar in articulation:
dic[debut[ar]] = ar
sortList = sorted(dic)
retList = []
for i in sortList:
retList.append(dic[i])
return retList
sort = list(reversed(sort_articulation(debut,articulation)))
articulation = sort
eliminerPointRacine = []
relierARacine = []
descRacine = []
def trouver_racine(parent):
for p in parent:
if parent[p] == None:
return p
return None
racine = trouver_racine(parent)
#print("La racine trouve: ", racine)
for art in articulation:
#Gestion de la racine
if art in parent:
if parent[art] == None:
for p in parent:
if parent[p] == art:
descRacine.append(p)
#print("Descendants de la racine: ",descRacine)
if len(descRacine) >= 2:
eliminerPointRacine.append([descRacine[0],descRacine[1]])
#print("Arete rajouter pour elimine le point de la racine: ", descRacine[0], ",", descRacine[1])
#Gestion des autres points
for p in parent:
par = parent[p]
fils = p
if par == art and fils not in articulation: # Si un sommet est le fils du point
ancetreFils = ancetre[fils]
if ancetreFils != ancetre[par]:
relierARacine.append(fils)
else: #On regarde si il y a de la concurence
desc = []
for f in parent:
if parent[f] == par:
desc.append(f)
if len(desc) == 1:
relierARacine.append(desc[0])
#On enleve les descandant de la racine des sommet a relier a racine
for d in descRacine:
if d in relierARacine:
relierARacine.pop(relierARacine.index(d))
ret = []
for s in relierARacine:
ret.append([s,racine])
for a in eliminerPointRacine:
ret.append(a)
#print("Sommets a rajouter a la racine: ", relierARacine)
return ret
pass
def amelioration_points_articulation(G : Graphe):
C = Graphe()
C.ajouter_sommets(G.sommets())
C.ajouter_aretes(G.aretes())
amelioreList = []
while len(amelioration_points_aux(C)) != 0:
res = amelioration_points_aux(C)
#print(res)
if(len(res) >= 1):
u = res[0][0]
v = res[0][1]
amelioreList.append([u,v])
C.ajouter_arete(u,v,None)
return amelioreList
pass
def main():
parser = argparse.ArgumentParser()
parser.add_argument("--metro",nargs="*")
parser.add_argument("--rer",nargs="*")
parser.add_argument("--liste-stations",action="store_true")
parser.add_argument("--ponts",action="store_true")
parser.add_argument("--articulations",action="store_true")
parser.add_argument("--ameliorer-ponts",action="store_true")
parser.add_argument("--ameliorer-articulations",action="store_true")
args = parser.parse_args()
#print(args)
reseau = Graphe()
if args.metro != None and len(args.metro) != 0:
for metro in args.metro:
nomDuFichier = "METRO_" + metro + ".txt"
charger_donnees(reseau,nomDuFichier)
elif args.metro != None:
metros = ['1','2','3','3b','4','5','6','7','7b','8','9','10','11','12','13','14']
for metro in metros:
nomDuFichier = "METRO_" + metro + ".txt"
charger_donnees(reseau,nomDuFichier)
if args.rer != None and len(args.rer) != 0 :
for rer in args.rer:
nomDuFichier = "RER_" + rer + ".txt"
charger_donnees(reseau,nomDuFichier)
elif args.rer != None:
rers = ['A','B']
for rer in rers:
nomDuFichier = "RER_" + rer + ".txt"
charger_donnees(reseau,nomDuFichier)
if args.liste_stations == True:
print("\nLe reseau contient les ", len(reseau.sommets()), " stations suivantes:\n")
stations = sorted(map(reseau.nom_sommet, reseau.sommets()))
for s in stations:
print(s)
if args.ponts == True:
p = sorted(ponts(reseau))
print("\nLe reseau contient les ",len(p)," ponts suivants:")
for u,v in p:
print("- ",reseau.nom_sommet(u)," -- ",reseau.nom_sommet(v))
if args.articulations == True:
a = sorted(points_articulation(reseau))
print("\nLe reseau contient les ",len(a)," points d'articulation suivants:")
count = 1
for s in a:
print(count," : ",reseau.nom_sommet(s))
count = count + 1
if args.ameliorer_ponts == True:
ap = sorted(amelioration_ponts(reseau))
print("\nOn peut eliminer tous les ponts du reseau en rajoutant les ",len(ap), " aretes suivantes:")
for u,v in ap:
print("- ",reseau.nom_sommet(u)," -- ", reseau.nom_sommet(v))
if args.ameliorer_articulations == True:
ar = sorted(amelioration_points_articulation(reseau))
print("\nOn peut eliminer tous les points d'articulation du reseau en rajoutant les ",len(ar), " aretes suivantes:")
for u,v in ar:
print("- ",reseau.nom_sommet(u)," -- ", reseau.nom_sommet(v))
# reseau = Graphe()
# charger_donnees(reseau, "METRO_14.txt")
# print(sorted(reseau.sommets()))
# print(sorted(map(reseau.nom_sommet, reseau.sommets())))
# print(sorted(reseau.aretes()))
# charger_donnees(reseau, "METRO_3b.txt")
# print(reseau.aretes())
#doctest.testfile("tests/doctest_charger_donnees.txt")
# G = Graphe()
# G.ajouter_sommets(zip('abcdefghijkl', [None] * 12))
# G.ajouter_aretes(
# [('a', 'b', None), ('b', 'c', None), ('c', 'a', None), ('c', 'd', None), ('d', 'e', None),
# ('e', 'f', None), ('f', 'd', None), ('a', 'g', None), ('g', 'h', None), ('h', 'a', None),
# ('h', 'i', None), ('i', 'j', None), ('j', 'h', None), ('j', 'k', None), ('k', 'i', None),
# ('i', 'l', None), ('k', 'h', None)])
# print(G.sommets())
#print(G.aretes())
#print("Dico",G.dictionnaire)
# # zipo = zip('abcdefghijkl', [None] * 12)
# # print(tuple(zipo))
# numer = numerotations(G)
# print("Debut:\n",numer[0],"\n")
# print("Parent:\n",numer[1],"\n")
# print("Ancetre:\n",numer[2],"\n")
# print("Articulations:\n",sorted(points_articulation(G)))
# print("\n")
#print("Ponts:",ponts(G))
# print("Ponts:",sorted(map(sorted,ponts(G))))
# res = amelioration_ponts(G)
# print("Aretes a rajouter",res)
# for u, v in res:
# G.ajouter_arete(u, v, None)
# print("Pont restant:",sorted(map(sorted,ponts(G))))
# res = amelioration_points_articulation(G)
# print("\n")
# print("Aretes a rajouter pour eliminer les points:",res)
# for u, v in res:
# G.ajouter_arete(u, v, None)
# print("Points d'articulation restants: ",len(points_articulation(G)))
# print(points_articulation(G))
# tabTest = amelioration_points_articulation(G)
# print("Points a supprimer:",points_articulation(G))
# print("Aretes a rajouter:",tabTest)
# for u, v in tabTest:
# G.ajouter_arete(u, v, None)
# print("Points articulation restant:",len(points_articulation(G)))
# reseau = Graphe()
# charger_donnees(reseau, "METRO_14.txt")
# print("Ponts du metro:",ponts(reseau))
# print("Aretes a rajouter:",amelioration_ponts(reseau))
# for u,v in amelioration_ponts(reseau):
# reseau.ajouter_arete(u,v, None,"METRO_14")
#print("Ponts du metro apres amelioration:",ponts(reseau))
# print("Articulation du metro:",points_articulation(reseau))
# print("Aretes a rajouter:",amelioration_points_articulation(reseau))
# for u,v in amelioration_points_articulation(reseau):
# reseau.ajouter_arete(u,v, None,"METRO_14")
#print("Articulation du metro apres amelioration:",points_articulation(reseau))
pass
if __name__ == "__main__":
main()