Merge branch 'dev'

ArnauPrat · ArnauPrat · commit 130bdfc1a12d · 2014-07-03T17:49:03.000+02:00
diff --git a/src/main/java/ldbc/socialnet/dbgen/serializer/CSVOriginal.java b/src/main/java/ldbc/socialnet/dbgen/serializer/CSVOriginal.java
@@ -331,7 +331,7 @@ public void serialize(UserInfo info) {
         }
 
         arguments.add(Long.toString(info.user.getAccountId()));
-        arguments.add(Integer.toString(info.user.getLocationId()));
+        arguments.add(Integer.toString(info.extraInfo.getLocationId()));
         ToCSV(arguments, Files.PERSON_LOCATED_IN_PLACE.ordinal());
 
         Iterator<Integer> itInteger = info.user.getSetOfTags().iterator();

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ public void serialize(UserInfo info) {`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`arguments.add(Long.toString(info.user.getAccountId()));`
`334`		`- arguments.add(Integer.toString(info.user.getLocationId()));`
	`334`	`+ arguments.add(Integer.toString(info.extraInfo.getLocationId()));`
`335`	`335`	`ToCSV(arguments, Files.PERSON_LOCATED_IN_PLACE.ordinal());`
`336`	`336`
`337`	`337`	`Iterator<Integer> itInteger = info.user.getSetOfTags().iterator();`