From 2a6c8f9cac756f6ed2e5762a7b72e5d13cdb9b88 Mon Sep 17 00:00:00 2001
From: Les De Ridder <les@lesderid.net>
Date: Thu, 23 Feb 2017 19:55:41 +0100
Subject: [PATCH] Input data: part 3

---
 input.py | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/input.py b/input.py
index ef59eb2..0d40646 100755
--- a/input.py
+++ b/input.py
@@ -9,39 +9,38 @@ with open(filename) as file:
 
 tokenised = [line.strip().split() for line in text]
 
-videoCount = tokenised[0][0]
-endpointCount = tokenised[0][1]
-requestDescriptionCount = tokenised[0][2]
-cacheCount = tokenised[0][3]
-cacheSize = tokenised[0][4]
+videoCount = int(tokenised[0][0])
+endpointCount = int(tokenised[0][1])
+requestDescriptionCount = int(tokenised[0][2])
+cacheCount = int(tokenised[0][3])
+cacheSize = int(tokenised[0][4])
 
 videoSizes = tokenised[1]
 
 endpointDatacenterLatencies = []
 endpointCacheLatencies = []
 i = 2
-for endpoint in range(0, int(endpointCount)):
-    endpointDatacenterLatencies.append(tokenised[endpoint + i][0])
+for endpoint in range(0, endpointCount):
+    datacenterLatency = int(tokenised[endpoint + i][0])
+    endpointDatacenterLatencies.append(datacenterLatency)
 
     endpointCacheLatencies.append({})
-    endpointCacheCount = tokenised[endpoint + i][1]
-    for cache in range(0, int(endpointCacheCount)):
-        cacheId = tokenised[endpoint + 1 + cache + i][0]
-        cacheLatency = tokenised[endpoint + 1 + cache + i][1]
+    endpointCacheCount = int(tokenised[endpoint + i][1])
+    for cache in range(0, endpointCacheCount):
+        cacheId = int(tokenised[endpoint + 1 + cache + i][0])
+        cacheLatency = int(tokenised[endpoint + 1 + cache + i][1])
         endpointCacheLatencies[endpoint][cacheId] = cacheLatency
-    i += int(endpointCacheCount)
+    i += endpointCacheCount
 
 
-i += int(endpointCount)
+i += endpointCount
 
 requestDescriptions = []
-for video in range(0, int(videoCount)):
+for video in range(0, videoCount):
     requestDescriptions.append({})
 
-for requestDescription in range(0, int(requestDescriptionCount)):
+for requestDescription in range(0, requestDescriptionCount):
     video = int(tokenised[i + requestDescription][0])
     endpoint = int(tokenised[i + requestDescription][1])
     requestCount = int(tokenised[i + requestDescription][2])
     requestDescriptions[video][endpoint] = requestCount
-
-print(requestDescriptions)