Merge branch 'master' of https://github.com/ldbc/ldbc_snb_datagen

Author: Hadoop user

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

@@ -556,7 +556,7 @@ public void generateKnows( ArrayList<Person> persons, int seed, ArrayList<Float>
         float fakeTargetCC = targetCC;
         int numIterations = 0;
         do {
-            System.out.println("Starting refinement iteration");
+            System.out.println("****** STARTING REFINEMENT ITERATION ******");
             iterate = false;
             start = System.currentTimeMillis();
             refineCommunities(cInfo, communities, fakeTargetCC);
@@ -596,12 +596,16 @@ public void generateKnows( ArrayList<Person> persons, int seed, ArrayList<Float>
                 for(Person person: persons) {
                     person.knows().clear();
                 }
-                fakeTargetCC +=  delta*0.8f;
+                if(delta > 0)
+                    fakeTargetCC += Math.abs(delta)*0.5f;
+                else
+                    fakeTargetCC /=  2;
                 System.out.println("New Fake targetCC: "+fakeTargetCC );
                 iterate = true;
             }
             numIterations++;
-        }while( iterate );
+            System.out.println("****** FINISHED REFINEMENT ITERATION ******");
+        }while( iterate && numIterations < 10 );
 
         int countMore = 0;
         int countLess = 0;

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

@@ -34,7 +34,7 @@ public static Configuration initialize() {
         conf.set("ldbc.snb.datagen.generator.startYear","2010");
         conf.set("ldbc.snb.datagen.generator.numYears","3");
         conf.set("ldbc.snb.datagen.generator.numThreads", Integer.toString(1));
-        conf.set("ldbc.snb.datagen.serializer.personSerializer", "ldbc.snb.datagen.serializer.snb.interactive.CSVPersonSerializerWithWeights");
+        conf.set("ldbc.snb.datagen.serializer.personSerializer", "ldbc.snb.datagen.serializer.snb.interactive.CSVPersonSerializer");
         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");