generate neighbouring solutions

Author: mackoo13

app/solution.py

@@ -1,5 +1,5 @@
 import random
-from functools import reduce
+from datarepresentation.movie import Movie
 
 
 class Solution:
@@ -13,12 +13,15 @@ def __str__(self):
  for s in self.solution:
  res += str(s.ids) + "->["
  for m in self.solution[s]:
- res += str(m)
+ res += str(m) + " "
  res += "], "
  return res
 
  def random_neighbour(self, radius):
 
+ if radius==0:
+ return self
+
  acceptable_ops = [(s, f)
  for s in self.data.servers
  for f in self.data.movies
@@ -27,7 +30,14 @@ def random_neighbour(self, radius):
  op = random.choice(acceptable_ops)
  s = op[0]
  f = op[1]
- return self.solution[s].remove(f) if f in self.solution[s] else self.solution[s].append(f)
+
+ res = Solution(self.data, self.solution)
+ if f in self.solution[s]:
+ res.solution[s].remove(f)
+ else:
+ res.solution[s].append(f)
+
+ return res.random_neighbour(radius-1)
 
  def free_space(self, server):
  return 899 - sum([f.size for f in self.solution[server]])