Merge pull request #320 from ldbc/factor-tables

Factor tables

Author: dszakallas

src/main/java/ldbc/snb/datagen/generator/generators/PersonActivityGenerator.java

@@ -50,15 +50,12 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
 import ldbc.snb.datagen.generator.generators.postgenerators.UniformPostGenerator;
 import ldbc.snb.datagen.generator.generators.textgenerators.LdbcSnbTextGenerator;
 import ldbc.snb.datagen.generator.generators.textgenerators.TextGenerator;
-import ldbc.snb.datagen.util.FactorTable;
 import ldbc.snb.datagen.util.Iterators;
 import ldbc.snb.datagen.util.RandomGeneratorFarm;
 import ldbc.snb.datagen.util.Streams;
 import org.javatuples.Pair;
 import org.javatuples.Triplet;
 
-import java.io.IOException;
-import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -75,7 +72,6 @@ public class PersonActivityGenerator {
     private UniformPostGenerator uniformPostGenerator;
     private FlashmobPostGenerator flashmobPostGenerator;
     private PhotoGenerator photoGenerator;
-    private FactorTable factorTable;
 
     public PersonActivityGenerator() {
 
@@ -89,14 +85,11 @@ public PersonActivityGenerator() {
         flashmobPostGenerator = new FlashmobPostGenerator(generator, commentGenerator, likeGenerator);
         photoGenerator = new PhotoGenerator(likeGenerator);
 
-        factorTable = new FactorTable();
-
         messageIdIterator = Iterators.numbers(0);
     }
 
     private GenActivity generateActivity(Person person, List<Person> block, long blockId) throws AssertionError {
         try {
-            factorTable.extractFactors(person);
             return new GenActivity(
                     generateWall(person, blockId),
                     generateGroups(person, block, blockId),
@@ -240,16 +233,4 @@ public Stream<GenActivity> generateActivityForBlock(int blockId, List<Person> bl
         messageIdIterator = Iterators.numbers(0);
         return block.stream().map(p -> generateActivity(p, block, blockId));
     }
-
-    public void writeActivityFactors(OutputStream postsWriter, OutputStream tagClassWriter, OutputStream tagWriter, OutputStream firstNameWriter, OutputStream miscWriter) throws IOException {
-        factorTable.writeActivityFactors(postsWriter, tagClassWriter, tagWriter, firstNameWriter, miscWriter);
-    }
-
-    public void writePersonFactors(OutputStream writer) {
-        factorTable.writePersonFactors(writer);
-    }
-
-    public FactorTable getFactorTable() {
-        return factorTable;
-    }
 }

src/main/java/ldbc/snb/datagen/serializer/PersonActivityExporter.java

@@ -43,7 +43,6 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
 import ldbc.snb.datagen.entities.dynamic.relations.Like;
 import ldbc.snb.datagen.generator.generators.GenActivity;
 import ldbc.snb.datagen.generator.generators.GenWall;
-import ldbc.snb.datagen.util.FactorTable;
 import org.javatuples.Pair;
 import org.javatuples.Triplet;
 
@@ -54,11 +53,9 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
 
 public class PersonActivityExporter implements AutoCloseable {
     protected DynamicActivitySerializer dynamicActivitySerializer;
-    protected FactorTable factorTable;
 
-    public PersonActivityExporter(DynamicActivitySerializer dynamicActivitySerializer, FactorTable factorTable) {
+    public PersonActivityExporter(DynamicActivitySerializer dynamicActivitySerializer) {
         this.dynamicActivitySerializer = dynamicActivitySerializer;
-        this.factorTable = factorTable;
     }
 
     public void export(final GenActivity genActivity) {
@@ -107,27 +104,22 @@ private void exportForum(final Forum forum) throws Exception {
 
     private void exportPost(final Post post) throws IOException {
         dynamicActivitySerializer.serialize(post);
-        factorTable.extractFactors(post);
     }
 
     private void exportComment(final Comment comment) throws IOException {
         dynamicActivitySerializer.serialize(comment);
-        factorTable.extractFactors(comment);
     }
 
     private void exportPhoto(final Photo photo) throws IOException {
         dynamicActivitySerializer.serialize(photo);
-        factorTable.extractFactors(photo);
     }
 
     private void exportForumMembership(final ForumMembership member) throws IOException {
         dynamicActivitySerializer.serialize(member);
-        factorTable.extractFactors(member);
     }
 
     private void exportLike(final Like like) throws IOException {
         dynamicActivitySerializer.serialize(like);
-        factorTable.extractFactors(like);
     }
 
     @Override