Full refactored generator package

Author: miratepuffin

src/main/java/ldbc/snb/datagen/generator/DatagenParams.java renamed to src/main/java/ldbc/snb/datagen/DatagenParams.java

@@ -36,7 +36,6 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
 package ldbc.snb.datagen;
 
 import ldbc.snb.datagen.dictionary.Dictionaries;
-import ldbc.snb.datagen.generator.DatagenParams;
 import ldbc.snb.datagen.hadoop.*;
 import ldbc.snb.datagen.objects.Person;
 import ldbc.snb.datagen.util.ConfigParser;
@@ -129,7 +128,7 @@ public int runGenerateJob(Configuration conf) throws Exception {
                                                   "ldbc.snb.datagen.hadoop.RandomKeySetter",
                                                   percentages,
                                                   2,
-                                                  "ldbc.snb.datagen.generator.RandomKnowsGenerator");
+                                                  "ldbc.snb.datagen.generator.generators.knowsgenerators.RandomKnowsGenerator");
 
         knowsGenerator.run(hadoopPrefix + "/persons", hadoopPrefix + "/randomEdges");
         long endRandom = System.currentTimeMillis();

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

@@ -35,7 +35,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.*/
 package ldbc.snb.datagen.dictionary;
 
-import ldbc.snb.datagen.generator.DatagenParams;
+import ldbc.snb.datagen.DatagenParams;
 
 import java.io.BufferedReader;
 import java.io.IOException;

src/main/java/ldbc/snb/datagen/dictionary/BrowserDictionary.java

@@ -35,7 +35,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.*/
 package ldbc.snb.datagen.dictionary;
 
-import ldbc.snb.datagen.generator.DatagenParams;
+import ldbc.snb.datagen.DatagenParams;
 import ldbc.snb.datagen.util.RandomGeneratorFarm;
 
 import java.io.BufferedReader;

src/main/java/ldbc/snb/datagen/dictionary/CompanyDictionary.java

@@ -35,8 +35,8 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.*/
 package ldbc.snb.datagen.dictionary;
 
-import ldbc.snb.datagen.generator.DatagenParams;
-import ldbc.snb.datagen.generator.DateGenerator;
+import ldbc.snb.datagen.DatagenParams;
+import ldbc.snb.datagen.util.DateUtils;
 import org.apache.hadoop.conf.Configuration;
 
 import java.util.GregorianCalendar;
@@ -48,7 +48,7 @@ public class Dictionaries {
 
     public static BrowserDictionary browsers = null;
     public static CompanyDictionary companies = null;
-    public static DateGenerator dates = null;
+    public static DateUtils dates = null;
     public static EmailDictionary emails = null;
     public static IPAddressDictionary ips = null;
     public static LanguageDictionary languages = null;
@@ -66,7 +66,7 @@ public static void loadDictionaries(Configuration conf) {
 
         browsers = new BrowserDictionary(DatagenParams.probAnotherBrowser);
 
-        dates = new DateGenerator(conf, new GregorianCalendar(DatagenParams.startYear,
+        dates = new DateUtils(conf, new GregorianCalendar(DatagenParams.startYear,
                                                               DatagenParams.startMonth,
                                                               DatagenParams.startDate),
                                   new GregorianCalendar(DatagenParams.endYear,

src/main/java/ldbc/snb/datagen/dictionary/Dictionaries.java

@@ -35,7 +35,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.*/
 package ldbc.snb.datagen.dictionary;
 
-import ldbc.snb.datagen.generator.DatagenParams;
+import ldbc.snb.datagen.DatagenParams;
 
 import java.io.BufferedReader;
 import java.io.IOException;

src/main/java/ldbc/snb/datagen/dictionary/EmailDictionary.java

@@ -35,19 +35,19 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.*/
 package ldbc.snb.datagen.dictionary;
 
-import ldbc.snb.datagen.generator.DateGenerator;
-import ldbc.snb.datagen.generator.PowerDistGenerator;
+import ldbc.snb.datagen.util.DateUtils;
+import ldbc.snb.datagen.generator.tools.PowerDistribution;
 import ldbc.snb.datagen.objects.FlashmobTag;
 
 import java.util.*;
 
 public class FlashmobTagDictionary {
 
-    private DateGenerator dateGen;
+    private DateUtils dateGen;
     /**
      * < @brief The date generator used to generate dates.
      */
-    private PowerDistGenerator levelGenerator;
+    private PowerDistribution levelGenerator;
     /**
      * < @brief The powerlaw distribution generator used to generate the levels.
      */
@@ -82,7 +82,7 @@ public class FlashmobTagDictionary {
      */
 
     public FlashmobTagDictionary(TagDictionary tagDictionary,
-                                 DateGenerator dateGen,
+                                 DateUtils dateGen,
                                  int flashmobTagsPerMonth,
                                  double probInterestFlashmobTag,
                                  double probRandomPerLevel,
@@ -92,7 +92,7 @@ public FlashmobTagDictionary(TagDictionary tagDictionary,
 
         this.tagDictionary = tagDictionary;
         this.dateGen = dateGen;
-        this.levelGenerator = new PowerDistGenerator(flashmobTagMinLevel, flashmobTagMaxLevel, flashmobTagDistExp);
+        this.levelGenerator = new PowerDistribution(flashmobTagMinLevel, flashmobTagMaxLevel, flashmobTagDistExp);
         this.random = new Random(0);
         this.flashmobTags = new HashMap<Integer, ArrayList<FlashmobTag>>();
         this.flashmobTagsPerMonth = flashmobTagsPerMonth;

src/main/java/ldbc/snb/datagen/dictionary/FlashmobTagDictionary.java

@@ -35,7 +35,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.*/
 package ldbc.snb.datagen.dictionary;
 
-import ldbc.snb.datagen.generator.DatagenParams;
+import ldbc.snb.datagen.DatagenParams;
 import ldbc.snb.datagen.objects.IP;
 
 import java.io.BufferedReader;

src/main/java/ldbc/snb/datagen/dictionary/IPAddressDictionary.java

@@ -35,7 +35,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.*/
 package ldbc.snb.datagen.dictionary;
 
-import ldbc.snb.datagen.generator.DatagenParams;
+import ldbc.snb.datagen.DatagenParams;
 
 import java.io.BufferedReader;
 import java.io.IOException;

src/main/java/ldbc/snb/datagen/dictionary/LanguageDictionary.java

@@ -35,7 +35,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.*/
 package ldbc.snb.datagen.dictionary;
 
-import ldbc.snb.datagen.generator.DatagenParams;
+import ldbc.snb.datagen.DatagenParams;
 import umontreal.iro.lecuyer.probdist.GeometricDist;
 
 import java.io.BufferedReader;