Added dictionary citiesByCountry.

Fixed som minor bugs in order to improve robustness.

Author: ArnauPrat

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

@@ -56,7 +56,7 @@ public class LocationDictionary {
 
     public static final int INVALID_LOCATION = -1;
     private static final String SEPARATOR = " ";
-    private static final String SEPARATOR_CITY = "  ";
+    private static final String SEPARATOR_CITY = " ";
 
 	int numUsers;
 	int curLocationIdx;
@@ -195,7 +195,9 @@ public int getRandomCity(int countryId) {
         }
 
         if (citiesFromCountry.get(countryId).size() == 0) {
-            System.err.println("Country with no known cities");
+            Location location = locations.get(countryId);
+            String countryName = location.getName(); 
+            System.err.println("Country with no known cities: "+countryName);
             return INVALID_LOCATION;
         }
 
@@ -235,12 +237,13 @@ private void readCities() {
             String line;
             while ((line = dictionary.readLine()) != null){
                 String data[] = line.split(SEPARATOR_CITY);
+//                System.err.println(data[0]);
                 if (countryNames.containsKey(data[0])) {
                     Integer countryId = countryNames.get(data[0]);
-                    if (!cityNames.containsKey(data[2])) {
+                    if (!cityNames.containsKey(data[1])) {
                         Location location = new Location(); 
                         location.setId(locations.size());
-                        location.setName(data[2]);
+                        location.setName(data[1]);
                         location.setLatt(locations.get(countryId).getLatt());
                         location.setLongt(locations.get(countryId).getLongt());
                         location.setPopulation(-1);
@@ -250,7 +253,7 @@ private void readCities() {
                         isPartOf.put(location.getId(), countryId);
                         citiesFromCountry.get(countryId).add(location.getId());
 
-                        cityNames.put(data[2], location.getId());
+                        cityNames.put(data[1], location.getId());
 
                         cities++;
                     }

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

@@ -102,16 +102,19 @@ public void extractOrganizationNames() {
 				String data[] = line.split(SEPARATOR);
 				String locationName = data[0];
 				if (locationName.compareTo(lastLocationName) != 0) {
-					if (locationDic.getCountryId(locationName) != LocationDictionary.INVALID_LOCATION) {
+					if (locationDic.getCountryId(locationName) != LocationDictionary.INVALID_LOCATION &&
+					    locationDic.getCityId(data[2]) != LocationDictionary.INVALID_LOCATION ) {
 						lastLocationName = locationName;
 						curLocationId = locationDic.getCountryId(locationName); 
 						String organizationName = data[1].trim();
 						organizationsByLocations.get(curLocationId).add(organizationName);
 						Integer cityId = locationDic.getCityId(data[2]);
 						organizationToLocation.put(organizationName, cityId);
 						totalNumOrganizations++;
-					}
-				} else{
+					} /*else {
+						System.err.println("ERROR:Invalid country or city of organization: "+locationName+" "+data[2]);
+					}*/
+				} else if( locationDic.getCityId(data[2]) != LocationDictionary.INVALID_LOCATION ) {
 				    String organizationName = data[1].trim();
 					organizationsByLocations.get(curLocationId).add(organizationName);
 					Integer cityId = locationDic.getCityId(data[2]);
@@ -128,9 +131,8 @@ public void extractOrganizationNames() {
 
 	// 90% of people go to top-10 universities
 	// 10% go to remaining universities
-	public int getRandomOrganization(int countryId) {
+	public int getRandomOrganization(int locationId) {
 
-		int locationId = countryId;
 		double prob = randUnRelatedOrganization.nextDouble();
 
 		Vector<Integer> countries = locationDic.getCountries();

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

@@ -164,7 +164,8 @@ public enum OrganisationType {
     private static final String   emailDicFile           = DICTIONARY_DIRECTORY + "email.txt";
     private static final String   givennamesDicFile      = DICTIONARY_DIRECTORY + "givennameByCountryBirthPlace.txt.freq.full";
     private static final String   organizationsDicFile   = DICTIONARY_DIRECTORY + "institutesCityByCountry.txt";
-    private static final String   cityDicFile            = DICTIONARY_DIRECTORY + "institutesCityByCountry.txt";
+//    private static final String   cityDicFile            = DICTIONARY_DIRECTORY + "institutesCityByCountry.txt";
+    private static final String   cityDicFile            = DICTIONARY_DIRECTORY + "citiesByCountry.txt";
     private static final String   languageDicFile        = DICTIONARY_DIRECTORY + "languagesByCountry.txt";
     private static final String   popularPlacesDicFile   = DICTIONARY_DIRECTORY + "popularPlacesByCountry.txt";
     private static final String   agentFile              = DICTIONARY_DIRECTORY + "smartPhonesProviders.txt";