Skip to content

Commit 44d7f14

Browse files
committed
removed remaining HashSets
1 parent c831e86 commit 44d7f14

File tree

13 files changed

+209
-174
lines changed

13 files changed

+209
-174
lines changed

ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/dictionary/TagMatrix.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
import java.io.BufferedReader;
4040
import java.io.InputStreamReader;
41-
import java.util.HashSet;
41+
import java.util.TreeSet;
4242
import java.util.Vector;
4343
import java.util.Random;
4444

@@ -89,8 +89,8 @@ public void initMatrix() {
8989
}
9090

9191
// Combine the main tag and related tags
92-
public HashSet<Integer> getSetofTags(int celebrityId, int numTags){
93-
HashSet<Integer> resultTags = new HashSet<Integer>();
92+
public TreeSet<Integer> getSetofTags(int celebrityId, int numTags){
93+
TreeSet<Integer> resultTags = new TreeSet<Integer>();
9494
resultTags.add(celebrityId);
9595

9696
while (resultTags.size() < numTags) {

ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/dictionary/TagTextDictionary.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import java.io.InputStreamReader;
4141
import java.util.ArrayList;
4242
import java.util.HashMap;
43-
import java.util.HashSet;
43+
import java.util.TreeSet;
4444
import java.util.Iterator;
4545
import java.util.Random;
4646

@@ -116,7 +116,7 @@ public String getTagText(int id) {
116116
return tagText.get(id);
117117
}
118118

119-
public String getRandomText(HashSet<Integer> tags) {
119+
public String getRandomText(TreeSet<Integer> tags) {
120120

121121
int textSize;
122122
int startingPos;
@@ -218,7 +218,7 @@ public Post createPost(ReducedUserProfile user, int maxNumberOfLikes,
218218
post.setIpAddress(ipAddDic.getIP(user.getIpAddress(), user.isFrequentChange(), post.getCreatedDate()));
219219
post.setBrowserIdx(browserDic.getPostBrowserId(user.getBrowserIdx()));
220220

221-
HashSet<Integer> tags = new HashSet<Integer>();
221+
TreeSet<Integer> tags = new TreeSet<Integer>();
222222
Iterator<Integer> it = user.getSetOfTags().iterator();
223223
while (it.hasNext()) {
224224
Integer value = it.next();
@@ -263,7 +263,7 @@ public Post createPost(Group group, int maxNumberOfLikes,
263263
post.setIpAddress(ipAddDic.getIP(memberShip.getIP(), memberShip.isFrequentChange(), post.getCreatedDate()));
264264
post.setBrowserIdx(browserDic.getPostBrowserId(memberShip.getBrowserIdx()));
265265

266-
HashSet<Integer> tags = new HashSet<Integer>();
266+
TreeSet<Integer> tags = new TreeSet<Integer>();
267267
for (int i = 0; i < group.getTags().length; i++) {
268268
tags.add(group.getTags()[i]);
269269
}

ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/generator/GPSGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*/
3737
package ldbc.socialnet.dbgen.generator;
3838

39-
import java.util.HashSet;
39+
import java.util.TreeSet;
4040
import java.util.Iterator;
4141
import java.util.Random;
4242
import java.util.Vector;
@@ -123,7 +123,7 @@ public void generateAllGPSForAllEvents(StreamStoreManager storeMng){
123123
for (int i = 0; i < eventSet.size(); i++){
124124
int numAttendedUsers = randNumUser.nextInt(100) + 20;
125125
//int lastUserId = 0;
126-
HashSet<Integer> attendedUsers = new HashSet<Integer>(numAttendedUsers);
126+
TreeSet<Integer> attendedUsers = new TreeSet<Integer>(numAttendedUsers);
127127
while (attendedUsers.size() < numAttendedUsers){
128128
//int step = randNumUser.nextInt(totalNumUsers - numAttendedUsers- lastUserId + j);
129129
//lastUserId = lastUserId + step + j;

ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/generator/GroupGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*/
3737
package ldbc.socialnet.dbgen.generator;
3838

39-
import java.util.HashSet;
39+
import java.util.TreeSet;
4040
import java.util.Iterator;
4141
import java.util.Random;
4242
import java.util.Vector;
@@ -87,7 +87,7 @@ public Group createGroup(ReducedUserProfile user){
8787
//Use the user location for group locationIdx
8888
group.setLocationIdx(user.getLocationIdx());
8989

90-
HashSet<Integer> tagSet = user.getSetOfTags();
90+
TreeSet<Integer> tagSet = user.getSetOfTags();
9191
Iterator<Integer> iter = tagSet.iterator();
9292
int idx = randGroupInterest.nextInt(tagSet.size());
9393
for (int i = 0; i < idx; i++){

ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/generator/MRGenerateUsers.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void map(LongWritable key, Text value, Context context)
102102
// Generate user information
103103
generator.mrGenerateUserInfo(pass, context, fileIdx);
104104

105-
System.out.println("Total friendship number from " + fileIdx + " : " + generator.friendshipNo);
105+
System.out.println("Total friendship number from " + fileIdx + " : " + generator.friendshipNum);
106106
}
107107

108108
}
@@ -150,7 +150,7 @@ protected void cleanup(Context context){
150150
System.out.println("Summary for " + attempTaskId);
151151
System.out.println("Number of user profile read " + friendGenerator.numUserProfilesRead);
152152
System.out.println("Number of exact user profile out " + friendGenerator.exactOutput);
153-
System.out.println("Number of exact friend added " + friendGenerator.friendshipNo);
153+
System.out.println("Number of exact friend added " + friendGenerator.friendshipNum);
154154
}
155155
}
156156

@@ -230,7 +230,7 @@ protected void cleanup(Context context){
230230
System.out.println("Summary for " + attempTaskId);
231231
System.out.println("Number of user profile read " + friendGenerator.numUserProfilesRead);
232232
System.out.println("Number of exact user profile out " + friendGenerator.exactOutput);
233-
System.out.println("Number of exact friend added " + friendGenerator.friendshipNo);
233+
System.out.println("Number of exact friend added " + friendGenerator.friendshipNum);
234234
}
235235
}
236236

ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/generator/PhotoGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*/
3737
package ldbc.socialnet.dbgen.generator;
3838

39-
import java.util.HashSet;
39+
import java.util.TreeSet;
4040
import java.util.Random;
4141

4242
import ldbc.socialnet.dbgen.dictionary.LocationDictionary;
@@ -121,7 +121,7 @@ public Photo generatePhoto(ReducedUserProfile user, Group album,
121121
//Assume that the photo are created one by one after 1 second from the creation of the album
122122
photo.setTakenTime(album.getCreatedDate() + 1000*(idxInAlbum+1));
123123

124-
HashSet<Integer> tags = new HashSet<Integer>();
124+
TreeSet<Integer> tags = new TreeSet<Integer>();
125125
// Iterator<Integer> it = user.getSetOfTags().iterator();
126126
// while (it.hasNext()) {
127127
// Integer value = it.next();

0 commit comments

Comments
 (0)