Fix Branch cut model

RK900 · Nov 22, 2019 · d4bc705 · d4bc705
1 parent 734d903
commit d4bc705
Show file tree

Hide file tree

Showing 42 changed files with 25 additions and 220 deletions.
diff --git a/branch_cased_lp_solver.py b/branch_cased_lp_solver.py
@@ -7,23 +7,31 @@
 
 
 class SubTourCutGenerator(ConstrsGenerator):
-	def __init__(self, graph):
+	def __init__(self, graph, list_locations, starting_loc):
 		self.graph = graph
+		self.list_locations = list_locations
+		self.starting_loc = starting_loc
 
 	def generate_constrs(self, model: Model):
 		G = nx.DiGraph()
 		r = [(v, v.x) for v in model.vars if v.name.startswith('car_taken')]
 		U = [v.name.split('(')[1].split(',')[0] for v, f in r]
-		V = [v.name.split(')')[0].split(',')[1]  for v, f in r]
+		V = [v.name.split(')')[0].split(',')[1] for v, f in r]
 
 		cp = CutPool()
 		for i in range(len(U)):
-			G.add_edge(U[i], V[i], capacity=r[i][1])
-
-		for (u, v) in self.graph.edges():
-			if u not in U or v not in V:
+			if r[i][1] >= 1:
+				G.add_edge(U[i], V[i], capacity=r[i][1])
+		pos = nx.spring_layout(G)
+		labels = nx.get_edge_attributes(G, 'weight')
+		# nx.draw_networkx(G)
+		nx.draw(G, pos)
+		nx.draw_networkx_edge_labels(G, pos, edge_labels=labels)
+		# plt.show()
+		for loc in self.list_locations:
+			if loc == self.starting_loc:
 				continue
-			val, (S, NS) = nx.minimum_cut(G, u, v)
+			val, (S, NS) = nx.minimum_cut(G, loc, self.starting_loc)
 			if val <= 0.99:
 				arcsInS = [(v, f) for i, (v, f) in enumerate(r)
 						   if U[i] in S and V[i] in S]
@@ -35,7 +43,7 @@ def generate_constrs(self, model: Model):
 					if len(cp.cuts) > 256:
 						for cut in cp.cuts:
 							model += cut
-						return
+
 		for cut in cp.cuts:
 			model += cut
 		return
@@ -108,9 +116,9 @@ def solve(graph, list_locations, list_houses, starting_car_location):
 
 	ta_travel = 1 * xsum(xsum(T[(house, loc)] * shortest_path_all_pairs_dic[loc][house]
 							  for loc in list_locations) for house in list_houses)
-	m.constrs_generator = SubTourCutGenerator(graph)
+	m.constrs_generator = SubTourCutGenerator(graph, list_locations, starting_car_location)
 	m.constrs_generator.lazy_constraints = True
-	m.lazy_constrs_generator = SubTourCutGenerator(graph)
+	m.lazy_constrs_generator = SubTourCutGenerator(graph, list_locations, starting_car_location)
 
 	m.objective = car_travel + ta_travel
 

diff --git a/.../02:56AM on November 22, 20195demll6w.out → .../01:12PM on November 22, 2019kk5d3wsa.out b/.../02:56AM on November 22, 20195demll6w.out → .../01:12PM on November 22, 2019kk5d3wsa.out
@@ -1,4 +1,4 @@
-Soda Camp Soda
+Soda Camp RSF Barrows Camp Wheeler Cory Camp Soda
 4
 Wheeler Wheeler
 Cory Cory

diff --git a/outputs/6/12:04PM on November 22, 2019ekjcarpr.out b/outputs/6/12:04PM on November 22, 2019ekjcarpr.out
diff --git a/outputs/6/12:07PM on November 22, 2019_2tblqov.out b/outputs/6/12:07PM on November 22, 2019_2tblqov.out
diff --git a/outputs/6/12:07PM on November 22, 2019rhsvd_wo.out b/outputs/6/12:07PM on November 22, 2019rhsvd_wo.out
diff --git a/outputs/6/12:08PM on November 22, 2019lcs17skc.out b/outputs/6/12:08PM on November 22, 2019lcs17skc.out
diff --git a/outputs/6/12:09PM on November 22, 2019nh8nys31.out b/outputs/6/12:09PM on November 22, 2019nh8nys31.out
diff --git a/outputs/6/12:09PM on November 22, 2019sdwbcgwy.out b/outputs/6/12:09PM on November 22, 2019sdwbcgwy.out
diff --git a/outputs/6/12:10PM on November 22, 20198mnj4p50.out b/outputs/6/12:10PM on November 22, 20198mnj4p50.out
diff --git a/outputs/6/12:11PM on November 22, 2019y_eqgmab.out b/outputs/6/12:11PM on November 22, 2019y_eqgmab.out
diff --git a/outputs/6/12:11PM on November 22, 2019yvy3ul4z.out b/outputs/6/12:11PM on November 22, 2019yvy3ul4z.out
diff --git a/outputs/6/12:13PM on November 22, 20199bdykinu.out b/outputs/6/12:13PM on November 22, 20199bdykinu.out
diff --git a/outputs/6/12:13PM on November 22, 2019jorcjmtz.out b/outputs/6/12:13PM on November 22, 2019jorcjmtz.out
diff --git a/outputs/6/12:14PM on November 22, 2019338fc2sn.out b/outputs/6/12:14PM on November 22, 2019338fc2sn.out
diff --git a/outputs/6/12:17PM on November 22, 2019i_hi231s.out b/outputs/6/12:17PM on November 22, 2019i_hi231s.out
diff --git a/outputs/6/12:18PM on November 22, 2019punica3c.out b/outputs/6/12:18PM on November 22, 2019punica3c.out
diff --git a/outputs/6/12:19PM on November 22, 20195igu1jm_.out b/outputs/6/12:19PM on November 22, 20195igu1jm_.out
diff --git a/outputs/6/12:20PM on November 22, 20195ruy42sy.out b/outputs/6/12:20PM on November 22, 20195ruy42sy.out
diff --git a/outputs/6/12:20PM on November 22, 20198p2jc0sw.out b/outputs/6/12:20PM on November 22, 20198p2jc0sw.out
diff --git a/outputs/6/12:20PM on November 22, 2019k3khocqg.out b/outputs/6/12:20PM on November 22, 2019k3khocqg.out
diff --git a/outputs/6/12:20PM on November 22, 2019weac3ly4.out b/outputs/6/12:20PM on November 22, 2019weac3ly4.out
diff --git a/outputs/6/12:21PM on November 22, 2019bm1r76i5.out b/outputs/6/12:21PM on November 22, 2019bm1r76i5.out
diff --git a/outputs/6/12:21PM on November 22, 2019j5tjji97.out b/outputs/6/12:21PM on November 22, 2019j5tjji97.out
diff --git a/outputs/6/12:22PM on November 22, 2019b_6004l4.out b/outputs/6/12:22PM on November 22, 2019b_6004l4.out
diff --git a/outputs/6/12:23PM on November 22, 2019a5w0lm1y.out b/outputs/6/12:23PM on November 22, 2019a5w0lm1y.out
diff --git a/outputs/6/12:25PM on November 22, 20196c8n0euu.out b/outputs/6/12:25PM on November 22, 20196c8n0euu.out
diff --git a/outputs/6/12:25PM on November 22, 2019_d20r3h5.out b/outputs/6/12:25PM on November 22, 2019_d20r3h5.out
diff --git a/outputs/6/12:25PM on November 22, 2019a4p5wsf_.out b/outputs/6/12:25PM on November 22, 2019a4p5wsf_.out
diff --git a/outputs/6/12:26PM on November 22, 201909jpgkz4.out b/outputs/6/12:26PM on November 22, 201909jpgkz4.out
diff --git a/outputs/6/12:26PM on November 22, 201981tl3s8s.out b/outputs/6/12:26PM on November 22, 201981tl3s8s.out
diff --git a/outputs/6/12:27PM on November 22, 2019ne0oy0oe.out b/outputs/6/12:27PM on November 22, 2019ne0oy0oe.out
diff --git a/outputs/6/12:28PM on November 22, 2019m6nk9enl.out b/outputs/6/12:28PM on November 22, 2019m6nk9enl.out
diff --git a/outputs/6/12:29PM on November 22, 20198knajros.out b/outputs/6/12:29PM on November 22, 20198knajros.out
diff --git a/outputs/6/12:29PM on November 22, 2019ifwv6f35.out b/outputs/6/12:29PM on November 22, 2019ifwv6f35.out
diff --git a/outputs/6/12:29PM on November 22, 2019omcrpb02.out b/outputs/6/12:29PM on November 22, 2019omcrpb02.out
diff --git a/outputs/6/12:30PM on November 22, 2019uiegicl4.out b/outputs/6/12:30PM on November 22, 2019uiegicl4.out
diff --git a/outputs/6/12:38PM on November 22, 2019xljzxncb.out b/outputs/6/12:38PM on November 22, 2019xljzxncb.out
diff --git a/outputs/6/12:47PM on November 22, 2019rwx36ya6.out b/outputs/6/12:47PM on November 22, 2019rwx36ya6.out
diff --git a/outputs/6/12:48PM on November 22, 2019ayj3nxp5.out b/outputs/6/12:48PM on November 22, 2019ayj3nxp5.out
diff --git a/outputs/6/12:48PM on November 22, 2019csxqkrxa.out b/outputs/6/12:48PM on November 22, 2019csxqkrxa.out
diff --git a/outputs/7/01:07PM on November 22, 20195e0vnks5.out b/outputs/7/01:07PM on November 22, 20195e0vnks5.out
@@ -0,0 +1,3 @@
+Soda Campanile Soda
+1
+Campanile Wheeler Campanile Cory RSF
diff --git a/outputs/7/01:08PM on November 22, 20190t_8223g.out b/outputs/7/01:08PM on November 22, 20190t_8223g.out
@@ -0,0 +1,3 @@
+Soda Campanile Soda
+1
+Campanile Wheeler Campanile Cory RSF