Made edge generation configurable by means of the params.ini file

Author: ArnauPrat

src/main/java/ldbc/snb/datagen/generator/LDBCDatagen.java

@@ -93,7 +93,7 @@ public int runGenerateJob(Configuration conf) throws Exception {
                                                                         "ldbc.snb.datagen.hadoop.RandomKeySetter",
                                                                         percentages,
                                                                         0,
-                                                                        "ldbc.snb.datagen.generator.ClusteringKnowsGenerator");
+                                                                        conf.get("ldbc.snb.datagen.generator.knowsGenerator"));
 
         knowsGenerator.run(hadoopPrefix+"/persons",hadoopPrefix+"/universityEdges");
         long endUniversity = System.currentTimeMillis();
@@ -107,7 +107,7 @@ public int runGenerateJob(Configuration conf) throws Exception {
                                                     "ldbc.snb.datagen.hadoop.RandomKeySetter",
                                                     percentages,
                                                     1,
-                                                    "ldbc.snb.datagen.generator.ClusteringKnowsGenerator");
+                                                    conf.get("ldbc.snb.datagen.generator.knowsGenerator"));
 
         knowsGenerator.run(hadoopPrefix+"/persons",hadoopPrefix+"/interestEdges");
         long endInterest = System.currentTimeMillis();

src/main/java/ldbc/snb/datagen/util/ConfigParser.java

@@ -36,6 +36,7 @@ public static Configuration initialize() {
         conf.set("ldbc.snb.datagen.serializer.invariantSerializer", "ldbc.snb.datagen.serializer.snb.interactive.CSVInvariantSerializer");
         conf.set("ldbc.snb.datagen.serializer.personActivitySerializer", "ldbc.snb.datagen.serializer.snb.interactive.CSVPersonActivitySerializer");
         conf.set("ldbc.snb.datagen.generator.distribution.degreeDistribution", "ldbc.snb.datagen.generator.distribution.FacebookDegreeDistribution");
+        conf.set("ldbc.snb.datagen.generator.knowsGenerator", "ldbc.snb.datagen.generator.DistanceKnowsGenerator");
         conf.set("ldbc.snb.datagen.serializer.compressed", Boolean.toString(false));
         conf.set("ldbc.snb.datagen.serializer.updateStreams", Boolean.toString(true));
         conf.set("ldbc.snb.datagen.serializer.numPartitions", "1");

src/main/resources/scale_factors.xml

@@ -133,6 +133,33 @@
         </property>
     </scale_factor>
 
+    <scale_factor name="graphalytics.1" >
+        <property>
+            <name>ldbc.snb.datagen.generator.numPersons</name>
+            <value>36000</value>
+        </property>
+        <property>
+            <name>ldbc.snb.datagen.generator.startYear</name>
+            <value>2010</value>
+        </property>
+        <property>
+            <name>ldbc.snb.datagen.generator.numYears</name>
+            <value>1</value>
+        </property>
+        <property>
+            <name>ldbc.snb.datagen.generator.distribution.degreeDistribution</name>
+            <value>ldbc.snb.datagen.generator.distribution.FacebookDegreeDistribution</value>
+        </property>
+        <property>
+            <name>ldbc.snb.datagen.generator.activity</name>
+            <value>false</value>
+        </property>
+        <property>
+            <name>ldbc.snb.datagen.serializer.updateStreams</name>
+            <value>false</value>
+        </property>
+    </scale_factor>
+
     <scale_factor name="graphalytics.10" >
         <property>
             <name>ldbc.snb.datagen.generator.numPersons</name>
@@ -271,7 +298,7 @@
     <scale_factor name="graphalytics.3000" >
         <property>
             <name>ldbc.snb.datagen.generator.numPersons</name>
-            <value>32500000</value>
+            <value>34835000</value>
         </property>
         <property>
             <name>ldbc.snb.datagen.generator.startYear</name>