Merge branch 'master' into dev_partitions

Author: ArnauPrat

paramgenerator/generateparams.py

@@ -14,9 +14,23 @@
 def findNameParameters(names, amount = 100):
 	srtd = sorted(names,key=lambda x: -x[1])
 	res = []
+	hist = {}
 	for t in srtd:
-		if t[1] > 100 and t[1] < 150:
-			res.append(t[0])
+		if t[1] not in hist:
+			hist[t[1]] = []
+		hist[t[1]].append(t[0])
+	counts = sorted([i for i in hist.iterkeys()])
+
+	mid = len(counts)/2
+	i = mid
+	while counts[i] - counts[mid] < 0.1 * counts[mid]:
+		res.extend([name for name in hist[counts[i]]])
+		i += 1
+	i = mid - 1
+	while  counts[mid] - counts[i] < 0.1 * counts[mid]:
+		res.extend([name for name in hist[counts[i]]])
+		i -= 1
+
 	return res
 
 class JSONSerializer:

paramgenerator/readfactors.py

@@ -104,6 +104,11 @@ def load(factorFiles, friendFiles):
 			for i in range(nameCount):
 				line = f.readline().split(",")
 				name = line[0]
+				try:
+					name.decode('ascii')
+				except UnicodeEncodeError:
+					continue
+
 				if not name in names:
 					names[name] = 0
 				names[name] += int(line[1])