Merge branch 'bi'

Author: ArnauPrat

.gitignore

@@ -4,6 +4,7 @@
 *.jar
 *.war
 *.ear
+*.pyc
 
 # IntelliJ stuff
 .idea
@@ -13,7 +14,8 @@ ldbc_socialnet_dbgen.iml
 target/
 .m0factors.txt.crc
 .m0friendList0.csv.crc
-paramgenerator/.pyc
 substitution_parameters/
 target/
 *.pyc
+scripts/
+*.iml

.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ldbc_snb_datagen</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

:

@@ -0,0 +1,7 @@
+Merge branch 'bi' of github.com:ldbc/ldbc_snb_datagen into bi
+
+# Please enter a commit message to explain why this merge is necessary,
+# especially if it merges an updated upstream into a topic branch.
+#
+# Lines starting with '#' will be ignored, and an empty message aborts
+# the commit.

paramgenerator/generateparams.py

@@ -34,8 +34,6 @@ def findNameParameters(names, amount = 100):
 		i -= 1
 	return res
 
-
-
 class CSVSerializer:
 	def __init__(self):
 		self.handlers = []
@@ -130,19 +128,23 @@ def main(argv=None):
 		return 1
 
 	indir = argv[1]+"/"
-	factorFiles=[]
+	activityFactorFiles=[]
+	personFactorFiles=[]
 	friendsFiles = []
 	outdir = argv[2]+"/"
 	random.seed(SEED)
 
+
 	for file in os.listdir(indir):
-		if file.endswith("factors.txt"):
-			factorFiles.append(indir+file)
+		if file.endswith("activityFactors.txt"):
+			activityFactorFiles.append(indir+file)
+		if file.endswith("personFactors.txt"):
+			personFactorFiles.append(indir+file)
 		if file.startswith("m0friendList"):
 			friendsFiles.append(indir+file)
 
 	# read precomputed counts from files	
-	(personFactors, countryFactors, tagFactors, tagClassFactors, nameFactors, givenNames,  ts) = readfactors.load(factorFiles, friendsFiles)
+	(personFactors, countryFactors, tagFactors, tagClassFactors, nameFactors, givenNames,  ts, postHisto) = readfactors.load(personFactorFiles, activityFactorFiles, friendsFiles)
 
 	# find person parameters
 	print "find parameter bindings for Persons"
@@ -234,7 +236,7 @@ def main(argv=None):
 	}
 
 	print "find parameter bindings for Timestamps"
-	selectedTimeParams = findTimeParams(timeSelectionInput, factorFiles, friendsFiles, ts[1])
+	selectedTimeParams = findTimeParams(timeSelectionInput, personFactorFiles, activityFactorFiles, friendsFiles, ts[1])
 	# Query 11 takes WorksFrom timestamp
 	selectedTimeParams[11] = [random.randint(ts[2], ts[3]) for j in range(len(selectedPersonParams[11]))]