solution evaluation

Author: mackoo13

app/main.py

@@ -3,17 +3,20 @@
 from datarepresentation.server import Server
 from datarepresentation.endpoint import Endpoint
 from datarepresentation.datacenter import DataCenter
+from datarepresentation.connection import Connection
+from datarepresentation.requestinfo import RequestInfo
 
 
 def data_init():
  endpoints = [Endpoint(0, 44, 1), Endpoint(1, 11, 1)]
  movies = [Movie(0, 55), Movie(1, 99)]
  servers = [Server(0), Server(1)]
- connections = []
- requests = []
+ connections = [Connection(endpoints[0], servers[0], 11), Connection(endpoints[1], servers[1], 66)]
+ requests = [RequestInfo(0, 0, 3), RequestInfo(1, 1, 1)]
 
  return DataCenter(endpoints, movies, servers, connections, requests)
 
+
 def main():
 
  max_iter = 3
@@ -24,7 +27,8 @@ def main():
  bee = Solution(data, {data.servers[0]: [data.movies[0]], data.servers[1]: [data.movies[1]]})
  print(bee)
  print(bee.evaluate())
- print(bee.random_neighbour(1))
+ print(bee.random_neighbour(2))
+ print(bee.random_neighbour(1).evaluate())
 
 if __name__ == '__main__':
  main()

app/solution.py

@@ -1,5 +1,4 @@
 import random
-from datarepresentation.movie import Movie
 
 
 class Solution:
@@ -47,7 +46,14 @@ def evaluate(self):
  res = 0
 
  for request in self.data.requests:
- res += 1
- # print(request)
+ m = self.data.movies[request.video_id]
+ e = self.data.endpoints[request.endpoint_id]
+ best_conn = e.datacenter_latency
+
+ for c in e.connections:
+ if c.latency < best_conn and m in self.solution[c.server]:
+ best_conn = c.latency
+
+ res += best_conn * request.amount_of_requests
 
  return res

datarepresentation/connection.py

@@ -0,0 +1,6 @@
+class Connection:
+
+ def __init__(self, endpoint, server, latency):
+ self.endpoint = endpoint
+ self.server = server
+ self.latency = latency

datarepresentation/datacenter.py

@@ -6,3 +6,7 @@ def __init__(self, endpoints, movies, servers, connections, requests):
  self.servers = servers
  self.connections = connections
  self.requests = requests
+
+ for connection in connections:
+ connection.server.connections.append(connection)
+ connection.endpoint.connections.append(connection)

datarepresentation/endpoint.py

@@ -4,6 +4,7 @@ def __init__(self, endpoint_id, datacenter_latency, amount_of_caches):
  self.datacenter_latency = datacenter_latency
  self.amount_of_caches = amount_of_caches
  self.cache_server_latencies = dict()
+ self.connections = []
 
  def __str__(self):
  return self.__pretty_string_representation()

datarepresentation/requestinfo.py

@@ -1,4 +1,5 @@
 class RequestInfo:
+
  def __init__(self, video_id, endpoint_id, amount_of_requests):
  self.video_id = video_id
  self.endpoint_id = endpoint_id

datarepresentation/server.py

@@ -1,3 +1,4 @@
 class Server:
  def __init__(self, ids):
  self.ids = ids
+ self.connections = []