Fixed test command

Changed entity id generation to better use the available bits

Author: ArnauPrat

src/main/java/ldbc/snb/datagen/generator/PersonGenerator.java

@@ -41,10 +41,9 @@ public PersonGenerator( Configuration conf, String degreeDistribution ) {
     }
 
     private long composeUserId(long id, long date) {
-        long idMask = ~(0xFFFFFFFFFFFFFFFFL << 40);
-        //long bucket = (long) (256 * (date - Dictionaries.dates.getStartDateTime()) / (double) Dictionaries.dates.getMaxDateTime());
+        long idMask = ~(0xFFFFFFFFFFFFFFFFL << 41);
         long bucket = (long) (256 * (date - Dictionaries.dates.getStartDateTime()) / (double) Dictionaries.dates.getEndDateTime());
-        return (bucket << 40) | ((id & idMask));
+        return (bucket << 41) | ((id & idMask));
     }
 
     /** Tells if a person is a large poster or not.

src/main/java/ldbc/snb/datagen/vocabulary/SN.java

@@ -58,11 +58,10 @@ public class SN {
      */
 
     public static void initialize() {
-	minDate = Dictionaries.dates.getStartDateTime();
-	//maxDate = Dictionaries.dates.getMaxDateTime();
+        minDate = Dictionaries.dates.getStartDateTime();
         maxDate = Dictionaries.dates.getEndDateTime();
         numBits = (int) Math.ceil(Math.log10(Math.ceil(DatagenParams.numPersons/(double)DatagenParams.blockSize)) / Math.log10(2));
-        if (numBits > 14) System.out.print("WARNING: Possible id overlapp");
+        if (numBits > 20) System.out.print("WARNING: Possible id overlapp");
     }
 
     /**
@@ -168,7 +167,7 @@ public static Long formId(long id) {
 
     public static long composeId(long id, long date) {
         long bucket = (long) (256 * (date - minDate) / (double) maxDate);
-        long idMask = ~(0xFFFFFFFFFFFFFFFFL << 33);
-        return (bucket << 33) | (id & idMask);
+        long idMask = ~(0xFFFFFFFFFFFFFFFFL << 36);
+        return (bucket << 36) | (id & idMask);
     }
 }

src/test/java/ldbc/snb/datagen/test/LDBCDatagenTest.java

@@ -25,7 +25,7 @@ public class LDBCDatagenTest {
 
     @BeforeClass
     public static void generateData() {
-        ProcessBuilder pb = new ProcessBuilder("java", "-ea","-cp","target/ldbc_snb_datagen-0.2.5.jar","ldbc.snb.datagen.generator.LDBCDatagen","./test_params.ini");
+        ProcessBuilder pb = new ProcessBuilder("java", "-ea","-cp","target/ldbc_snb_datagen-0.2.5-jar-with-dependencies.jar","ldbc.snb.datagen.generator.LDBCDatagen","./test_params.ini");
         pb.directory(new File("./"));
         File log = new File("test_log");
         pb.redirectErrorStream(true);