Fixed bug with deltaTime

Author: ArnauPrat

src/main/java/ldbc/socialnet/dbgen/generator/ScalableGenerator.java

@@ -1517,7 +1517,7 @@ private DataExporter getSerializer(String type, String outputFileName) {
             return null;
         }
         return new DataExporter(format,sibOutputDir, threadId, dateThreshold,
-                exportText,enableCompression,conf.getInt("numUpdatePartitions",1),deltaTime,tagDictionary,browserDictonry,companiesDictionary,
+                exportText,enableCompression,conf.getInt("numUpdatePartitions",1),deltaTime,conf.getBoolean("activity",true),tagDictionary,browserDictonry,companiesDictionary,
                 unversityDictionary,ipAddDictionary,locationDictionary,languageDictionary, configFile, factorTable, startMonth, startYear, stats);
     }
 

src/main/java/ldbc/socialnet/dbgen/serializer/CSVOriginal.java

@@ -78,6 +78,7 @@ public class CSVOriginal implements Serializer {
     private TagDictionary tagDic;
     private IPAddressDictionary ipDic;
     private boolean exportText;
+    private boolean activity = true;
 
     /**
      * Used to avoid serialize more than once the same data.
@@ -220,7 +221,7 @@ enum Files {
 	public CSVOriginal(String file, int reducerID,
             TagDictionary tagDic, BrowserDictionary browsers, 
             CompanyDictionary companyDic, UniversityDictionary universityDictionary,
-            IPAddressDictionary ipDic, LocationDictionary locationDic, LanguageDictionary languageDic, boolean exportText, boolean compressed) {
+            IPAddressDictionary ipDic, LocationDictionary locationDic, LanguageDictionary languageDic, boolean exportText, boolean compressed, boolean activity) {
 
         this.tagDic = tagDic;
         this.browserDic = browsers;
@@ -230,6 +231,7 @@ public CSVOriginal(String file, int reducerID,
         this.universityDic = universityDictionary;
         this.ipDic = ipDic;
         this.exportText = exportText;
+        this.activity = activity;
         csvRows = 0l;
         date = new GregorianCalendar();
 		locations = new Vector<Integer>();
@@ -350,8 +352,10 @@ public void serialize(Friend friend) {
         if (friend != null && friend.getCreatedTime() != -1){
             arguments.add(Long.toString(friend.getUserAcc()));
             arguments.add(Long.toString(friend.getFriendAcc()));
-            date.setTimeInMillis(friend.getCreatedTime());
-            arguments.add(DateGenerator.formatDateDetail(date));
+            if(activity) {
+                date.setTimeInMillis(friend.getCreatedTime());
+                arguments.add(DateGenerator.formatDateDetail(date));
+            }
             ToCSV(arguments,Files.PERSON_KNOWS_PERSON.ordinal());
         }
     }

src/main/java/ldbc/socialnet/dbgen/serializer/DataExporter.java

@@ -81,6 +81,7 @@ public DataExporter( DataFormat format,
                          boolean compressed,
                          int numPartitions,
                          long deltaTime,
+                         boolean activity,
                          TagDictionary tagDic,
                          BrowserDictionary browsers,
                          CompanyDictionary companyDic,
@@ -105,7 +106,7 @@ public DataExporter( DataFormat format,
         this.startYear = startYear;
         this.c = new GregorianCalendar();
         if( format == DataFormat.CSV ) {
-            staticSerializer = new CSVOriginal(directory,reducerId,tagDic,browsers,companyDic,universityDic,ipDic,locationDic,languageDic,exportText,compressed);
+            staticSerializer = new CSVOriginal(directory,reducerId,tagDic,browsers,companyDic,universityDic,ipDic,locationDic,languageDic,exportText,compressed,activity);
         } else if( format == DataFormat.CSV_MERGE_FOREIGN ) {
             staticSerializer = new CSVMergeForeign(directory,reducerId,tagDic,browsers,companyDic,universityDic,ipDic,locationDic,languageDic,exportText,compressed);
         } else if( format == DataFormat.TURTLE ) {