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

mirkospasic · mirkospasic · commit 39eeb9df90a8 · 2013-10-22T10:27:16.000+02:00
diff --git a/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/dictionary/LanguageDictionary.java b/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/dictionary/LanguageDictionary.java
@@ -47,7 +47,7 @@
 import java.lang.reflect.Array;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.TreeSet;
 import java.util.Iterator;
 import java.util.Random;
 import java.util.Vector;
diff --git a/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/dictionary/TagMatrix.java b/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/dictionary/TagMatrix.java
@@ -44,7 +44,7 @@
 import java.io.OutputStreamWriter;
 import java.io.RandomAccessFile;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.TreeSet;
 import java.util.Iterator;
 import java.util.Map.Entry;
 import java.util.Vector;
@@ -97,8 +97,8 @@ public void initMatrix() {
     
     // Combine the main tag and related tags
     
-    public HashSet<Integer> getSetofTags(int _celebrityId, int numTags){
-        HashSet<Integer> resultTags = new HashSet<Integer>();
+    public TreeSet<Integer> getSetofTags(int _celebrityId, int numTags){
+        TreeSet<Integer> resultTags = new TreeSet<Integer>();
         resultTags.add(_celebrityId);
         
         while (resultTags.size() < numTags) {
diff --git a/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/dictionary/TagTextDictionary.java b/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/dictionary/TagTextDictionary.java
@@ -40,7 +40,7 @@
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.TreeSet;
 import java.util.Iterator;
 import java.util.Random;
 
@@ -114,7 +114,7 @@ public String getTagText(int id) {
 	    return tagText.get(id);
 	}
 	
-	public String getRandomText(HashSet<Integer> tags) {
+	public String getRandomText(TreeSet<Integer> tags) {
 
         int textSize;
         int startingPos;
@@ -216,7 +216,7 @@ public Post createPost(ReducedUserProfile user, int maxNumberOfLikes,
         ipAddDic.setPostIPAdress(user.isFrequentChange(), user.getIpAddress(), post);
         post.setBrowserIdx(browserDic.getPostBrowserId(user.getBrowserIdx()));
         
-        HashSet<Integer> tags = new HashSet<Integer>();
+        TreeSet<Integer> tags = new TreeSet<Integer>();
         Iterator<Integer> it = user.getSetOfTags().iterator();
         while (it.hasNext()) {
             Integer value = it.next();
@@ -261,7 +261,7 @@ public Post createPost(Group group, int maxNumberOfLikes,
         ipAddDic.setPostIPAdress(memberShip.isFrequentChange(), memberShip.getIP(), post);
         post.setBrowserIdx(browserDic.getPostBrowserId(memberShip.getBrowserIdx()));
         
-        HashSet<Integer> tags = new HashSet<Integer>();
+        TreeSet<Integer> tags = new TreeSet<Integer>();
         for (int i = 0; i < group.getTags().length; i++) {
             tags.add(group.getTags()[i]);
         }
diff --git a/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/generator/GPSGenerator.java b/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/generator/GPSGenerator.java
@@ -36,7 +36,7 @@
  */
 package ldbc.socialnet.dbgen.generator;
 
-import java.util.HashSet;
+import java.util.TreeSet;
 import java.util.Iterator;
 import java.util.Random;
 import java.util.Vector;
@@ -123,7 +123,7 @@ public void generateAllGPSForAllEvents(StreamStoreManager storeMng){
 		for (int i = 0; i < eventSet.size(); i++){
 			int numAttendedUsers = randNumUser.nextInt(100) + 20;
 			//int lastUserId = 0;
-			HashSet<Integer> attendedUsers = new HashSet<Integer>(numAttendedUsers);
+			TreeSet<Integer> attendedUsers = new TreeSet<Integer>();
 			while (attendedUsers.size() < numAttendedUsers){
 				//int step = randNumUser.nextInt(totalNumUsers - numAttendedUsers- lastUserId + j);
 				//lastUserId = lastUserId + step + j;
diff --git a/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/generator/GroupGenerator.java b/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/generator/GroupGenerator.java
@@ -36,7 +36,7 @@
  */
 package ldbc.socialnet.dbgen.generator;
 
-import java.util.HashSet;
+import java.util.TreeSet;
 import java.util.Iterator;
 import java.util.Random;
 
@@ -85,7 +85,7 @@ public Group createGroup(ReducedUserProfile user){
 		//Use the user location for group locationIdx
 		group.setLocationIdx(user.getLocationIdx());
 				
-		HashSet<Integer> tagSet = user.getSetOfTags();
+		TreeSet<Integer> tagSet = user.getSetOfTags();
 		Iterator<Integer> iter = tagSet.iterator();
         int idx = randGroupInterest.nextInt(tagSet.size());
         for (int i = 0; i < idx; i++){
diff --git a/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/generator/PhotoGenerator.java b/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/generator/PhotoGenerator.java
@@ -36,7 +36,7 @@
  */
 package ldbc.socialnet.dbgen.generator;
 
-import java.util.HashSet;
+import java.util.TreeSet;
 import java.util.Iterator;
 import java.util.Random;
 import java.util.Vector;
@@ -129,7 +129,7 @@ public Photo generatePhoto(ReducedUserProfile user, Group album,
 		//Assume that the photo are created one by one after 1 second from the creation of the album
 		photo.setTakenTime(album.getCreatedDate() + 1000*(idxInAlbum+1));	
 		
-		HashSet<Integer> tags = new HashSet<Integer>();
+		TreeSet<Integer> tags = new TreeSet<Integer>();
 //        Iterator<Integer> it = user.getSetOfTags().iterator();
 //        while (it.hasNext()) {
 //            Integer value = it.next();
diff --git a/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/generator/ScalableGenerator.java b/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/generator/ScalableGenerator.java
@@ -47,7 +47,7 @@
 import java.io.ObjectOutputStream;
 import java.io.Writer;
 import java.util.GregorianCalendar;
-import java.util.HashSet;
+import java.util.TreeSet;
 import java.util.Properties;
 import java.util.Random;
 import java.util.Vector;
@@ -267,7 +267,7 @@ public enum OrganisationType {
 	int                     numCellRead    = 0;
 	int 					numCellPerfile;
 	int 					numCellInLastFile;
-	HashSet<Integer> 		selectedFileIdx;
+	TreeSet<Integer> 		selectedFileIdx;
 	
 	// For friendship generation
 	int 				friendshipNo;
@@ -1169,7 +1169,7 @@ public void createGroupForUser(ReducedUserProfile user,
 
 		Group group = groupGenerator.createGroup(user);
 
-		HashSet<Integer> memberIds = new HashSet<Integer>();
+		TreeSet<Integer> memberIds = new TreeSet<Integer>();
 
 		int numGroupMember = randNumberUserPerGroup.nextInt(maxNumMemberGroup);
 		group.initAllMemberships(numGroupMember);
diff --git a/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/objects/Photo.java b/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/objects/Photo.java
@@ -36,7 +36,7 @@
  */
 package ldbc.socialnet.dbgen.objects;
 
-import java.util.HashSet;
+import java.util.TreeSet;
 
 public class Photo {
     long photoId; 
@@ -48,7 +48,7 @@ public class Photo {
     double latt; 
     double longt; 
     long takenTime; 
-    HashSet<Integer> tags;
+    TreeSet<Integer> tags;
     int[] interestedUserAccs;
     long[] interestedUserAccsTimestamp;
 
@@ -114,10 +114,10 @@ public long getTakenTime() {
     public void setTakenTime(long takenTime) {
         this.takenTime = takenTime;
     }
-    public HashSet<Integer>  getTags() {
+    public TreeSet<Integer>  getTags() {
         return tags;
     }
-    public void setTags(HashSet<Integer> tags) {
+    public void setTags(TreeSet<Integer> tags) {
         this.tags = tags;
     }
     public double getLatt() {
diff --git a/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/objects/PhotoStream.java b/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/objects/PhotoStream.java
@@ -37,7 +37,7 @@
 package ldbc.socialnet.dbgen.objects;
 
 import java.io.Serializable;
-import java.util.HashSet;
+import java.util.TreeSet;
 
 public class PhotoStream implements Serializable{
 	boolean isPhoto = true; 
@@ -51,7 +51,7 @@ public class PhotoStream implements Serializable{
 	double latt; 
 	double longt; 
 	//long takenTime;    // Replaced by createdDate
-	HashSet<Integer> tags;
+	TreeSet<Integer> tags;
 	int[] interestedUserAccs;
 	
 	IP ipAddress; 
@@ -154,10 +154,10 @@ public double getLongt() {
 	public void setLongt(double longt) {
 		this.longt = longt;
 	}
-	public HashSet<Integer> getTags() {
+	public TreeSet<Integer> getTags() {
 		return tags;
 	}
-	public void setTags(HashSet<Integer>  tags) {
+	public void setTags(TreeSet<Integer>  tags) {
 		this.tags = tags;
 	}
 	public int[] getInterestedUserAccs() {
diff --git a/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/objects/Post.java b/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/objects/Post.java
@@ -36,7 +36,7 @@
  */
 package ldbc.socialnet.dbgen.objects;
 
-import java.util.HashSet;
+import java.util.TreeSet;
 
 public class Post {
     long postId; 
@@ -50,7 +50,7 @@ public class Post {
     int articleIdx;					// Index of articles in the set of same region/interest article  					
     int interestIdx;				// Index of one interest in user's interests
 
-    HashSet<Integer> tags; 
+    TreeSet<Integer> tags; 
     int interestedUserAccs[];		//List of users who are interested in the post  
     long interestedUserAccsTimestamp[];
 
@@ -73,10 +73,10 @@ public void setInterestIdx(int interestIdx) {
         this.interestIdx = interestIdx;
     }
 
-    public HashSet<Integer> getTags() {
+    public TreeSet<Integer> getTags() {
         return tags;
     }
-    public void setTags(HashSet<Integer> tags) {
+    public void setTags(TreeSet<Integer> tags) {
         this.tags = tags;
     }
     public int[] getInterestedUserAccs() {
diff --git a/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/objects/PostStream.java b/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/objects/PostStream.java
@@ -37,7 +37,7 @@
 package ldbc.socialnet.dbgen.objects;
 
 import java.io.Serializable;
-import java.util.HashSet;
+import java.util.TreeSet;
 
 public class PostStream  implements Serializable{
 	boolean isaPost = true; 
@@ -52,7 +52,7 @@ public class PostStream  implements Serializable{
 	int articleIdx;					// Index of articles in the set of same region/interest article  					
 	int interestIdx;				// Index of one interest in user's interests
 	
-	HashSet<Integer> tags; 
+	TreeSet<Integer> tags; 
 	int interestedUserAccs[];		//List of users who are interested in the post 
 	long interestedUserAccsTimestamp[];
 	
@@ -160,10 +160,10 @@ public String getContent() {
 	public void setContent(String content) {
 		this.content = content;
 	}
-	public HashSet<Integer> getTags() {
+	public TreeSet<Integer> getTags() {
 		return tags;
 	}
-	public void setTags(HashSet<Integer> tags) {
+	public void setTags(TreeSet<Integer> tags) {
 		this.tags = tags;
 	}
 	public int[] getInterestedUserAccs() {
diff --git a/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/objects/ReducedUserProfile.java b/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/objects/ReducedUserProfile.java
@@ -42,7 +42,7 @@
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.GregorianCalendar;
-import java.util.HashSet;
+import java.util.TreeSet;
 import java.util.Iterator;
 
 import org.apache.hadoop.io.Writable;
@@ -61,7 +61,7 @@ public class ReducedUserProfile implements Serializable, Writable{
 	
 
 	Friend 				friendList[];
-	HashSet<Integer>	friendIds; 		// Use a hashset for checking the existence
+	TreeSet<Integer>	friendIds; 		// Use a hashset for checking the existence
 	
 
 	int					dicElementIds[];	// Id of an element in a dictionary, e.g., locationId
@@ -82,7 +82,7 @@ public class ReducedUserProfile implements Serializable, Writable{
 	int                 cityIdx;
 	int 				forumWallId; 
 	int 				forumStatusId;
-	HashSet<Integer> 	setOfTags;
+	TreeSet<Integer> 	setOfTags;
 	
 	short				popularPlaceIds[]; 
 	byte				numPopularPlace;
@@ -122,7 +122,7 @@ private void readObject(java.io.ObjectInputStream stream)
 				numPassFriendsAdded[i] = stream.readShort();
 			}
 			friendList = new Friend[numFriends];
-			friendIds = new HashSet<Integer>(numFriends);
+			friendIds = new TreeSet<Integer>();
 			for (int i = 0; i < numFriendsAdded; i++){
 				Friend fr = new Friend(); 
 				fr.readFields(stream);
@@ -155,7 +155,7 @@ private void readObject(java.io.ObjectInputStream stream)
 			forumStatusId = stream.readInt();
 			
 			byte numOfTags = stream.readByte();
-			setOfTags = new HashSet<Integer>(numOfTags);
+			setOfTags = new TreeSet<Integer>();
 			for (byte i = 0; i < numOfTags;i++){
 				setOfTags.add(stream.readInt());
 			}
@@ -248,7 +248,7 @@ public void readFields(DataInput arg0) throws IOException {
 			numPassFriendsAdded[i] = arg0.readShort();
 		}
 		friendList = new Friend[numFriends];
-		friendIds = new HashSet<Integer>(numFriends);
+		friendIds = new TreeSet<Integer>();
 		for (int i = 0; i < numFriendsAdded; i++){
 			Friend fr = new Friend(); 
 			fr.readFields(arg0);
@@ -281,7 +281,7 @@ public void readFields(DataInput arg0) throws IOException {
 		forumStatusId = arg0.readInt();
 		
 		byte numTags = arg0.readByte(); 
-		setOfTags = new HashSet<Integer>(numTags);
+		setOfTags = new TreeSet<Integer>();
 		for (byte i = 0; i < numTags;i++){
 			setOfTags.add(arg0.readInt());
 		}
@@ -506,7 +506,7 @@ public void setNumFriendsAdded(short numFriendsAdded) {
 	
 	public void allocateFriendListMemory(){
 		friendList = new Friend[numFriends];
-		friendIds = new HashSet<Integer>(numFriends);
+		friendIds = new TreeSet<Integer>();
 	}
 
 	public Friend[] getFriendList() {
@@ -607,10 +607,10 @@ public int getForumStatusId() {
 	public void setForumStatusId(int forumStatusId) {
 		this.forumStatusId = forumStatusId;
 	}
-	public HashSet<Integer> getSetOfTags() {
+	public TreeSet<Integer> getSetOfTags() {
 		return setOfTags;
 	}
-	public void setSetOfTags(HashSet<Integer> setOfTags) {
+	public void setSetOfTags(TreeSet<Integer> setOfTags) {
 		this.setOfTags = setOfTags;
 	}
 	public byte getNumPopularPlace() {
@@ -645,7 +645,7 @@ public short[] getNumPassFriendsAdded() {
 	public void setNumPassFriendsAdded(short[] numPassFriendsAdded) {
 		this.numPassFriendsAdded = numPassFriendsAdded;
 	}
-	public HashSet<Integer> getFriendIds() {
+	public TreeSet<Integer> getFriendIds() {
 		return friendIds;
 	}
 	public int[] getDicElementIds() {
@@ -673,4 +673,4 @@ public long getBirthDay() {
 	public void setBirthDay(long birthDay) {
 		this.birthDay = birthDay;
 	}
-}
+}
diff --git a/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/objects/UserExtraInfo.java b/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/objects/UserExtraInfo.java
diff --git a/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/objects/UserProfile.java b/ldbc_socialnet_dbgen/src/main/java/ldbc/socialnet/dbgen/objects/UserProfile.java
