Ekdohibs
/
tsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix subG

master
Ekdohibs 2016-12-30 08:36:42 +01:00
parent 0dc65f09b2
commit e369ccbf19
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
min_cut.py
View File

@ -42,7 +42,7 @@ def stoer_wagner(adj):
take[best] = True
return best_cut_weight, best_cut
def stoer_wagner_nx(graph, weight = 'weight', heap = None):
def stoer_wagner_nx(graph, weight = 'weight'):
nodes = graph.nodes()
d = {}
for i in range(len(nodes)):

6
separation.py
View File

@ -37,8 +37,7 @@ def subG(G, x, extToEdge):
subG = nx.Graph()
for (d, a) in G.edges():
if(x[ extToEdge[(d, a)] ] != 0):
subG.add_edge(d, a, weight = G[d][a]['weight'] * x[ extToEdge[(d, a)] ])
subG.add_edge(d, a, weight = max(0.,x[ extToEdge[(d, a)] ]))
return subG
def addSubTour(A_ub, b_ub, G, cut, extToEdge):
@ -105,7 +104,7 @@ def separation(Adj):
else:
cutV, cut = stoer_wagner_nx(sG)
print(cutV, cut)
if(cutV >= 2):
if(cutV >= 2-eps):
break
addSubTour(A_ub, b_ub, G, cut, extToEdge)
@ -114,5 +113,4 @@ def separation(Adj):
n += 1
return x, res.fun

4
separation_dual.py
View File

@ -35,7 +35,7 @@ def subG(G, x, extToEdge):
for (d, a) in G.edges():
if (d,a) in extToEdge:
if(x[ extToEdge[(d, a)] ] != 0):
subG.add_edge(d, a, weight = G[d][a]['weight'] * x[ extToEdge[(d, a)] ])
subG.add_edge(d, a, weight = x[ extToEdge[(d, a)] ])
return subG
@ -206,7 +206,7 @@ class LinearDualTSP(object):
else:
cutV, cut = stoer_wagner_nx(sG)
print(cutV, cut)
if(cutV >= 2):
if(cutV >= 2-eps):
break
self.add_cut(cut)
n += 1