testing

seppeV2 · May 8, 2022 · c9c1bbf · c9c1bbf
1 parent 8c44ea7
commit c9c1bbf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/clients30.csv b/clients30.csv
@@ -1,12 +1,12 @@
-ClientID,ClientName,ContainerSize,Waste,ActionType,Additional,opening,closing,Place
+ClientID,ClientName,ContainerSize,Waste,ActionType,Additional,opening,closing,Place
 1,bookstore,20,general,3,0,0,600,Antwerpen
 2,bookstore,15,general,3,0,0,600,Grimbergen
 3,fish shop,20,general,4,0,0,600,Leuven
 4,restaurant,18,general,4,0,0,300,Mechelen
 5,garage,15,general,4,0,0,600,Zaventem
 6,construction,20,construction,5,0,0,600,Gent
 7,bookstore,20,general,3,0,0,600,Sint-Katelijne-Waver
-8,lab,18,dangerous,6,0,360,540,Hasselt
+8,lab,18,dangerous,6,0,481,534,Hasselt
 9,vegetables,20,general,4,0,0,600,Glain
 10,construction,20,construction,5,0,0,600,Boutersem
 11,fish shop,18,general,4,0,0,600,Boom
@@ -21,11 +21,11 @@
 20,garage,17,general,4,0,0,600,Brussel
 21,construction,20,construction,5,0,0,600,Zelzate
 22,garage,20,general,4,0,0,600,Leuven
-23,lab,18,dangerous,6,0,360,540,Aarschot
+23,lab,18,dangerous,6,0,440,576,Aarschot
 24,vegetables,20,general,2,15,0,600,Diest
 25,construction,20,construction,5,0,0,600,Tienen
 26,restaurant,18,general,4,0,0,300,Liers
 27,electronics,20,general,4,0,0,600,Geel
 28,vegetables,20,general,4,0,0,600,Kortrijk
 29,restaurant,20,general,4,0,0,300,Ieper
-30,garage,20,general,4,0,0,600,Louvain-La-Neuve
+30,garage,20,general,4,0,0,600,Louvain-La-Neuve
diff --git a/distanceMatrix.py b/distanceMatrix.py
@@ -719,5 +719,5 @@ def getServiceTime(client, cityNames, wpf):
         return round(serviceTime) 
 
 # start = time.time()
-#matrix = createDistanceMatrix('clients2.csv', 'belgian-cities-geocoded.csv', 'WPF.csv')
+matrix = createDistanceMatrix('clients30.csv', 'belgian-cities-geocoded.csv', 'WPF.csv')
 # end = time.time()