Remove more unused code

szarnyasg · szarnyasg · commit 221047ed9065 · 2019-10-02T10:52:59.000+02:00
diff --git a/src/main/java/ldbc/snb/datagen/dictionary/FlashmobTagDictionary.java b/src/main/java/ldbc/snb/datagen/dictionary/FlashmobTagDictionary.java
@@ -200,7 +200,4 @@ public List<FlashmobTag> generateFlashmobTags(Random rand, TreeSet<Integer> inte
         return result;
     }
 
-    public FlashmobTag[] getFlashmobTags() {
-        return flashmobTagCumDist;
-    }
 }
diff --git a/src/main/java/ldbc/snb/datagen/entities/dynamic/Forum.java b/src/main/java/ldbc/snb/datagen/entities/dynamic/Forum.java
@@ -83,10 +83,6 @@ public Person.PersonSummary moderator() {
         return moderator_;
     }
 
-    public void moderator(Person.PersonSummary moderator) {
-        moderator_.copy(moderator);
-    }
-
     public long creationDate() {
         return creationDate_;
     }
diff --git a/src/main/java/ldbc/snb/datagen/entities/dynamic/person/Person.java b/src/main/java/ldbc/snb/datagen/entities/dynamic/person/Person.java
@@ -261,7 +261,6 @@ public long maxNumKnows() {
 
     public void maxNumKnows(long maxKnows) {
         maxNumKnows_ = maxKnows;
-
     }
 
     public TreeSet<Knows> knows() {
@@ -309,10 +308,6 @@ public long wallId() {
         return wallId_;
     }
 
-    public void wallId(long wallId) {
-        wallId_ = wallId;
-    }
-
     public TreeSet<Integer> interests() {
         return interests_;
     }
@@ -408,11 +403,6 @@ public Map<Long, Long> companies() {
         return companies_;
     }
 
-    public void companies(Map<Long, Long> companies) {
-        companies.clear();
-        companies_.putAll(companies);
-    }
-
     public long classYear() {
         return classYear_;
     }
diff --git a/src/main/java/ldbc/snb/datagen/entities/dynamic/relations/Like.java b/src/main/java/ldbc/snb/datagen/entities/dynamic/relations/Like.java
@@ -41,7 +41,6 @@ public enum LikeType {
         POST,
         COMMENT,
         PHOTO
-
     }
 
     public long user;
diff --git a/src/main/java/ldbc/snb/datagen/generator/distribution/BucketedDistribution.java b/src/main/java/ldbc/snb/datagen/generator/distribution/BucketedDistribution.java
@@ -59,8 +59,6 @@ public void initialize(Configuration conf) {
         }
     }
 
-    ;
-
     public void reset(long seed) {
         Random seedRandom = new Random(53223436L + 1234567 * seed);
         for (int i = 0; i < buckets_.size(); i++) {
diff --git a/src/main/java/ldbc/snb/datagen/generator/generators/CommentGenerator.java b/src/main/java/ldbc/snb/datagen/generator/generators/CommentGenerator.java
@@ -62,7 +62,6 @@ public class CommentGenerator {
     private String[] shortComments_ = {"ok", "good", "great", "cool", "thx", "fine", "LOL", "roflol", "no way!", "I see", "right", "yes", "no", "duh", "thanks", "maybe"};
     private TextGenerator generator;
     private LikeGenerator likeGenerator_;
-    /* A set of random number generator for different purposes.*/
 
     public CommentGenerator(TextGenerator generator, LikeGenerator likeGenerator) {
         this.generator = generator;
diff --git a/src/main/java/ldbc/snb/datagen/generator/generators/ForumGenerator.java b/src/main/java/ldbc/snb/datagen/generator/generators/ForumGenerator.java
@@ -84,7 +84,6 @@ public Forum createWall(RandomGeneratorFarm randomFarm, long forumId, Person per
     public Forum createGroup(RandomGeneratorFarm randomFarm, long forumId, Person person, List<Person> persons) {
         long date = Dictionaries.dates.randomDate(randomFarm.get(RandomGeneratorFarm.Aspect.DATE), person
                 .creationDate() + DatagenParams.deltaTime);
-        //if( date > Dictionaries.dates.getEndDateTime() )  return null;
 
         int language = randomFarm.get(RandomGeneratorFarm.Aspect.LANGUAGE).nextInt(person.languages().size());
         Iterator<Integer> iter = person.interests().iterator();
@@ -128,11 +127,8 @@ public Forum createGroup(RandomGeneratorFarm randomFarm, long forumId, Person pe
                             .max(forum.creationDate(), k.creationDate() + DatagenParams.deltaTime));
                     assert forum
                             .creationDate() + DatagenParams.deltaTime <= date : "Forum creation date larger than membership date for knows based members";
-                    /*if( date < Dictionaries.dates.getEndDateTime() )*/
-                    {
-                        forum.addMember(new ForumMembership(forum.id(), date, k.to()));
-                        added.add(k.to().accountId());
-                    }
+                    forum.addMember(new ForumMembership(forum.id(), date, k.to()));
+                    added.add(k.to().accountId());
                 }
             } else {
                 int candidateIndex = randomFarm.get(RandomGeneratorFarm.Aspect.MEMBERSHIP_INDEX)
@@ -145,12 +141,10 @@ public Forum createGroup(RandomGeneratorFarm randomFarm, long forumId, Person pe
                     date = Dictionaries.dates.randomDate(random,
                                                          Math.max(forum.creationDate(), member
                                                                  .creationDate()) + DatagenParams.deltaTime);
-                    {
-                        assert forum
-                                .creationDate() + DatagenParams.deltaTime <= date : "Forum creation date larger than membership date for block based members";
-                        forum.addMember(new ForumMembership(forum.id(), date, new Person.PersonSummary(member)));
-                        added.add(member.accountId());
-                    }
+                    assert forum
+                            .creationDate() + DatagenParams.deltaTime <= date : "Forum creation date larger than membership date for block based members";
+                    forum.addMember(new ForumMembership(forum.id(), date, new Person.PersonSummary(member)));
+                    added.add(member.accountId());
                 }
             }
             numLoop++;
@@ -161,7 +155,6 @@ public Forum createGroup(RandomGeneratorFarm randomFarm, long forumId, Person pe
     public Forum createAlbum(RandomGeneratorFarm randomFarm, long forumId, Person person, int numAlbum) {
         long date = Dictionaries.dates.randomDate(randomFarm.get(RandomGeneratorFarm.Aspect.DATE), person
                 .creationDate() + DatagenParams.deltaTime);
-        //if( date > Dictionaries.dates.getEndDateTime() )  return null;
         int language = randomFarm.get(RandomGeneratorFarm.Aspect.LANGUAGE).nextInt(person.languages().size());
         Forum forum = new Forum(SN.formId(SN.composeId(forumId, date)),
                                 date,
diff --git a/src/main/java/ldbc/snb/datagen/generator/generators/knowsgenerators/ClusteringKnowsGenerator.java b/src/main/java/ldbc/snb/datagen/generator/generators/knowsgenerators/ClusteringKnowsGenerator.java
@@ -311,8 +311,6 @@ private void estimateCCCommunity(ClusteringInfo cInfo, Community c, float prob)
             if (pI.degree_ > 1) {
                 cInfo.clustering_coefficient_
                         .set(pI.index_, (double) pI.degree_ * (pI.degree_ - 1) * prob / (pI.original_degree_ * (pI.original_degree_ - 1)));
-                //cInfo.clustering_coefficient_.set(pI.index_, (double)prob);
-                //cInfo.clustering_coefficient_.set(pI.index_, 0.0);
             }
         }
 
@@ -471,8 +469,6 @@ private void createEdgesCommunityCore(List<Person> persons, Community c) {
     }
 
     private void createEdgesCommunityPeriphery(ClusteringInfo cInfo, List<Person> persons, Community c) {
-
-        //long start = System.currentTimeMillis();
         long[] peripheryBudget = new long[c.periphery_.size()];
         int index = 0;
         for (PersonInfo pI : c.periphery_) {
@@ -500,8 +496,6 @@ private void createEdgesCommunityPeriphery(ClusteringInfo cInfo, List<Person> pe
                 System.out.println("ERROR");
             }
         }
-        //long end = System.currentTimeMillis();
-        //System.out.println("Time to create core-periphery edges: "+(end-start));
     }
 
     private void fillGraphWithRemainingEdges(List<Community> communities, List<Person> persons) {
@@ -582,8 +576,7 @@ public void generateKnows(List<Person> persons, int seed, List<Float> percentage
 
         start = System.currentTimeMillis();
         for (Community c : communities) {
-            c.p_ = 0.5f;//rand.nextFloat();
-            //c.p_ = rand.nextFloat();
+            c.p_ = 0.5f;
             estimateCCCommunity(cInfo, c, c.p_);
         }
         end = System.currentTimeMillis();
@@ -626,7 +619,6 @@ public void generateKnows(List<Person> persons, int seed, List<Float> percentage
                 i++;
             }
             finalCC /= persons.size();
-            //double finalCC = GraphUtils.clusteringCoefficient(graph);
 
             System.out.println("Clustering coefficient of the generated graph: " + finalCC);
             double delta = targetCC - finalCC;
@@ -659,7 +651,6 @@ public void generateKnows(List<Person> persons, int seed, List<Float> percentage
                     sumMore += -target + p.knows().size();
                     countMore++;
                 } else if (p.knows().size() < target) {
-                    //System.out.println(p.knows().size()+" "+target);
                     sumLess += target - p.knows().size();
                     countLess++;
                 }
diff --git a/src/main/java/ldbc/snb/datagen/generator/generators/postgenerators/FlashmobPostGenerator.java b/src/main/java/ldbc/snb/datagen/generator/generators/postgenerators/FlashmobPostGenerator.java
@@ -160,7 +160,6 @@ protected PostGenerator.PostInfo generatePostInfo(Random randomTag, Random rando
         }
         double prob = dateDistribution_.nextDouble(randomDate);
         postInfo.date = flashmobTag.date - flashmobSpan_ / 2 + (long) (prob * flashmobSpan_);
-        //if( postInfo.date > Dictionaries.dates.getEndDateTime() ) return null;
         return postInfo;
     }
 }
diff --git a/src/main/java/ldbc/snb/datagen/generator/generators/textgenerators/TextGenerator.java b/src/main/java/ldbc/snb/datagen/generator/generators/textgenerators/TextGenerator.java
@@ -64,7 +64,6 @@ public TextGenerator(Random random, TagDictionary tagDic) {
     /**
      * @brief Generates a text given a set of tags.
      */
-    //info extra
     public abstract String generateText(Person.PersonSummary person, TreeSet<Integer> tags, Properties prop);
 
 }
diff --git a/src/main/java/ldbc/snb/datagen/generator/tools/GraphUtils.java b/src/main/java/ldbc/snb/datagen/generator/tools/GraphUtils.java
@@ -43,24 +43,6 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
 
 public class GraphUtils {
 
-    public static double clusteringCoefficient(PersonGraph graph) {
-        double CC = 0.0;
-        for (Long l : graph.persons()) {
-            int triangles = 0;
-            Set<Long> neighbors = graph.neighbors(l);
-            for (Long n : neighbors) {
-                Set<Long> neighbors2 = graph.neighbors(n);
-                Set<Long> aux = new HashSet<>(neighbors);
-                aux.retainAll(neighbors2);
-                triangles += aux.size();
-            }
-            int degree = neighbors.size();
-            if (degree > 1)
-                CC += triangles / (double) (degree * (degree - 1));
-        }
-        return CC / graph.persons().size();
-    }
-
     public static List<Double> clusteringCoefficientList(PersonGraph graph) {
         List<Double> CC = new ArrayList<>();
         for (Long l : graph.persons()) {
diff --git a/src/main/java/ldbc/snb/datagen/generator/tools/MinHash.java b/src/main/java/ldbc/snb/datagen/generator/tools/MinHash.java
diff --git a/src/main/java/ldbc/snb/datagen/hadoop/generator/HadoopPersonGenerator.java b/src/main/java/ldbc/snb/datagen/hadoop/generator/HadoopPersonGenerator.java
@@ -151,7 +151,7 @@ private static void writeToOutputFile(String filename, int numMaps, Configuratio
      */
     public void run(String outputFileName, String postKeySetterName) throws Exception {
 
-        String hadoopDir = new String(conf.get("ldbc.snb.datagen.serializer.hadoopDir"));
+        String hadoopDir = conf.get("ldbc.snb.datagen.serializer.hadoopDir");
         String tempFile = hadoopDir + "/mrInputFile";
 
         FileSystem dfs = FileSystem.get(conf);
diff --git a/src/main/java/ldbc/snb/datagen/hadoop/serializer/HadoopPersonSerializer.java b/src/main/java/ldbc/snb/datagen/hadoop/serializer/HadoopPersonSerializer.java
@@ -133,40 +133,27 @@ public void run(String inputFileName) throws Exception {
 
         FileSystem fs = FileSystem.get(conf);
 
-		/*String rankedFileName = conf.get("ldbc.snb.datagen.serializer.hadoopDir") + "/ranked";
-        HadoopFileRanker hadoopFileRanker = new HadoopFileRanker( conf, TupleKey.class, Person.class, null );
-        hadoopFileRanker.run(inputFileName,rankedFileName);*/
-
         int numThreads = Integer.parseInt(conf.get("ldbc.snb.datagen.generator.numThreads"));
         Job job = Job.getInstance(conf, "Person Serializer");
-        //job.setMapOutputKeyClass(BlockKey.class);
         job.setMapOutputKeyClass(TupleKey.class);
         job.setMapOutputValueClass(Person.class);
         job.setOutputKeyClass(LongWritable.class);
         job.setOutputValueClass(Person.class);
         job.setJarByClass(HadoopBlockMapper.class);
-        //job.setMapperClass(HadoopBlockMapper.class);
         job.setReducerClass(HadoopDynamicPersonSerializerReducer.class);
         job.setNumReduceTasks(numThreads);
         job.setInputFormatClass(SequenceFileInputFormat.class);
         job.setOutputFormatClass(SequenceFileOutputFormat.class);
 
         job.setPartitionerClass(HadoopTuplePartitioner.class);
 
-		/*job.setSortComparatorClass(BlockKeyComparator.class);
-		job.setGroupingComparatorClass(BlockKeyGroupComparator.class);
-		job.setPartitionerClass(HadoopBlockPartitioner.class);*/
-
-        //FileInputFormat.setInputPaths(job, new Path(rankedFileName));
         FileInputFormat.setInputPaths(job, new Path(inputFileName));
         FileOutputFormat.setOutputPath(job, new Path(conf.get("ldbc.snb.datagen.serializer.hadoopDir") + "/aux"));
         if (!job.waitForCompletion(true)) {
             throw new Exception();
         }
 
-
         try {
-            //fs.delete(new Path(rankedFileName), true);
             fs.delete(new Path(conf.get("ldbc.snb.datagen.serializer.hadoopDir") + "/aux"), true);
         } catch (IOException e) {
             System.err.println(e.getMessage());

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,4 @@ public List<FlashmobTag> generateFlashmobTags(Random rand, TreeSet<Integer> inte`
`200`	`200`	`return result;`
`201`	`201`	`}`
`202`	`202`
`203`		`- public FlashmobTag[] getFlashmobTags() {`
`204`		`- return flashmobTagCumDist;`
`205`		`- }`
`206`	`203`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,10 +83,6 @@ public Person.PersonSummary moderator() {`
`83`	`83`	`return moderator_;`
`84`	`84`	`}`
`85`	`85`
`86`		`- public void moderator(Person.PersonSummary moderator) {`
`87`		`- moderator_.copy(moderator);`
`88`		`- }`
`89`		`-`
`90`	`86`	`public long creationDate() {`
`91`	`87`	`return creationDate_;`
`92`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,6 @@ public long maxNumKnows() {`
`261`	`261`
`262`	`262`	`public void maxNumKnows(long maxKnows) {`
`263`	`263`	`maxNumKnows_ = maxKnows;`
`264`		`-`
`265`	`264`	`}`
`266`	`265`
`267`	`266`	`public TreeSet<Knows> knows() {`
`@@ -309,10 +308,6 @@ public long wallId() {`
`309`	`308`	`return wallId_;`
`310`	`309`	`}`
`311`	`310`
`312`		`- public void wallId(long wallId) {`
`313`		`- wallId_ = wallId;`
`314`		`- }`
`315`		`-`
`316`	`311`	`public TreeSet<Integer> interests() {`
`317`	`312`	`return interests_;`
`318`	`313`	`}`
`@@ -408,11 +403,6 @@ public Map<Long, Long> companies() {`
`408`	`403`	`return companies_;`
`409`	`404`	`}`
`410`	`405`
`411`		`- public void companies(Map<Long, Long> companies) {`
`412`		`- companies.clear();`
`413`		`- companies_.putAll(companies);`
`414`		`- }`
`415`		`-`
`416`	`406`	`public long classYear() {`
`417`	`407`	`return classYear_;`
`418`	`408`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ public enum LikeType {`
`41`	`41`	`POST,`
`42`	`42`	`COMMENT,`
`43`	`43`	`PHOTO`
`44`		`-`
`45`	`44`	`}`
`46`	`45`
`47`	`46`	`public long user;`
Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,6 @@ public void initialize(Configuration conf) {`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`		`- ;`
`63`		`-`
`64`	`62`	`public void reset(long seed) {`
`65`	`63`	`Random seedRandom = new Random(53223436L + 1234567 * seed);`
`66`	`64`	`for (int i = 0; i < buckets_.size(); i++) {`
Original file line number	Diff line number	Diff line change
`@@ -311,8 +311,6 @@ private void estimateCCCommunity(ClusteringInfo cInfo, Community c, float prob)`
`311`	`311`	`if (pI.degree_ > 1) {`
`312`	`312`	`cInfo.clustering_coefficient_`
`313`	`313`	`.set(pI.index_, (double) pI.degree_ * (pI.degree_ - 1) * prob / (pI.original_degree_ * (pI.original_degree_ - 1)));`
`314`		`- //cInfo.clustering_coefficient_.set(pI.index_, (double)prob);`
`315`		`- //cInfo.clustering_coefficient_.set(pI.index_, 0.0);`
`316`	`314`	`}`
`317`	`315`	`}`
`318`	`316`
`@@ -471,8 +469,6 @@ private void createEdgesCommunityCore(List<Person> persons, Community c) {`
`471`	`469`	`}`
`472`	`470`
`473`	`471`	`private void createEdgesCommunityPeriphery(ClusteringInfo cInfo, List<Person> persons, Community c) {`
`474`		`-`
`475`		`- //long start = System.currentTimeMillis();`
`476`	`472`	`long[] peripheryBudget = new long[c.periphery_.size()];`
`477`	`473`	`int index = 0;`
`478`	`474`	`for (PersonInfo pI : c.periphery_) {`
`@@ -500,8 +496,6 @@ private void createEdgesCommunityPeriphery(ClusteringInfo cInfo, List<Person> pe`
`500`	`496`	`System.out.println("ERROR");`
`501`	`497`	`}`
`502`	`498`	`}`
`503`		`- //long end = System.currentTimeMillis();`
`504`		`- //System.out.println("Time to create core-periphery edges: "+(end-start));`
`505`	`499`	`}`
`506`	`500`
`507`	`501`	`private void fillGraphWithRemainingEdges(List<Community> communities, List<Person> persons) {`
`@@ -582,8 +576,7 @@ public void generateKnows(List<Person> persons, int seed, List<Float> percentage`
`582`	`576`
`583`	`577`	`start = System.currentTimeMillis();`
`584`	`578`	`for (Community c : communities) {`
`585`		`- c.p_ = 0.5f;//rand.nextFloat();`
`586`		`- //c.p_ = rand.nextFloat();`
	`579`	`+ c.p_ = 0.5f;`
`587`	`580`	`estimateCCCommunity(cInfo, c, c.p_);`
`588`	`581`	`}`
`589`	`582`	`end = System.currentTimeMillis();`
`@@ -626,7 +619,6 @@ public void generateKnows(List<Person> persons, int seed, List<Float> percentage`
`626`	`619`	`i++;`
`627`	`620`	`}`
`628`	`621`	`finalCC /= persons.size();`
`629`		`- //double finalCC = GraphUtils.clusteringCoefficient(graph);`
`630`	`622`
`631`	`623`	`System.out.println("Clustering coefficient of the generated graph: " + finalCC);`
`632`	`624`	`double delta = targetCC - finalCC;`
`@@ -659,7 +651,6 @@ public void generateKnows(List<Person> persons, int seed, List<Float> percentage`
`659`	`651`	`sumMore += -target + p.knows().size();`
`660`	`652`	`countMore++;`
`661`	`653`	`} else if (p.knows().size() < target) {`
`662`		`- //System.out.println(p.knows().size()+" "+target);`
`663`	`654`	`sumLess += target - p.knows().size();`
`664`	`655`	`countLess++;`
`665`	`656`	`}`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,6 @@ protected PostGenerator.PostInfo generatePostInfo(Random randomTag, Random rando`
`160`	`160`	`}`
`161`	`161`	`double prob = dateDistribution_.nextDouble(randomDate);`
`162`	`162`	`postInfo.date = flashmobTag.date - flashmobSpan_ / 2 + (long) (prob * flashmobSpan_);`
`163`		`- //if( postInfo.date > Dictionaries.dates.getEndDateTime() ) return null;`
`164`	`163`	`return postInfo;`
`165`	`164`	`}`
`166`	`165`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,6 @@ public TextGenerator(Random random, TagDictionary tagDic) {`
`64`	`64`	`/**`
`65`	`65`	`* @brief Generates a text given a set of tags.`
`66`	`66`	`*/`
`67`		`- //info extra`
`68`	`67`	`public abstract String generateText(Person.PersonSummary person, TreeSet<Integer> tags, Properties prop);`
`69`	`68`
`70`	`69`	`}`