Added new parameter generation script with better selection of tags for query 6

Author: ArnauPrat

paramgenerator/discoverparams.py

@@ -160,3 +160,26 @@ def generate(factors, portion=SHARE):
 	result.extend([factors[w.start+i][0] for i in range(amount)])
 	return result
 
+def divideFactors(factors, splitPortion):
+  sortedFactors = sorted(factors, key=lambda (k,v): v, reverse=True)
+  oSum= 0
+  for l in sortedFactors:
+    oSum+=l[1]
+  splitPoint = splitPortion*oSum
+  leftFactors = []
+  rightFactors = []
+  currentSum = 0
+  for l in sortedFactors:
+    currentSum+=l[1]
+    if currentSum <= splitPoint:
+      leftFactors.append(l)
+    else:
+      rightFactors.append(l)
+  return(leftFactors,rightFactors)
+
+
+
+
+
+
+

paramgenerator/generateparams.py

@@ -185,12 +185,27 @@ def main(argv=None):
 				break
 		secondCountry.append(selectedCountryParams[3][i])
 
-	# find tag parameters for Query 6
-	print "find parameter bindings for Tags"
+	#find tag parameters for Query 6
+	#print "find parameter bindings for Tags"
+  	# old tag selection
+  	#selectedTagParams = {}
+	#for i in [6]:
+	#	selectedTagParams[i] = discoverparams.generate(tagFactors, portion=0.1)
+	#	# make sure there are as many tag paramters as person parameters
+	#	oldlen = len(selectedTagParams[i])
+	#	newlen = len(selectedPersonParams[i])
+	#	selectedTagParams[i].extend([selectedTagParams[i][random.randint(0, oldlen-1)] for j in range(newlen-oldlen)])
+
+	#print "find parameter bindings for Tags"
+	(leftTagFactors, rightTagFactors) = discoverparams.divideFactors(tagFactors, 0.7)
+	leftSize = len(leftTagFactors)
+	rightSize = len(rightTagFactors)
+	leftPortion = 0.1*(leftSize+rightSize) / (2.0*leftSize)
+	rightPortion = 0.1*(leftSize+rightSize) / (2.0*rightSize)
 	selectedTagParams = {}
 	for i in [6]:
-		selectedTagParams[i] = discoverparams.generate(tagFactors, portion=0.1)
-		# make sure there are as many tag paramters as person parameters
+		selectedTagParams[i] = discoverparams.generate(leftTagFactors, portion=leftPortion)
+		selectedTagParams[i].extend(discoverparams.generate(rightTagFactors, portion=rightPortion))
 		oldlen = len(selectedTagParams[i])
 		newlen = len(selectedPersonParams[i])
 		selectedTagParams[i].extend([selectedTagParams[i][random.randint(0, oldlen-1)] for j in range(newlen-oldlen)])

paramgenerator/readfactors.py

@@ -74,8 +74,7 @@ def load(factorFiles, friendFiles):
 				if not results.existParam(person):
 					results.addNewParam(person)
 				name = line[1]
-				if name != "null":
-					givenNames.setValue(person, name)
+				givenNames.setValue(person, name)
 				results.addValue(person, "f", int(line[2]))
 				results.addValue(person, "p", int(line[3]))
 				results.addValue(person, "pl", int(line[4]))