Merge branch 'bi' of https://github.com/ldbc/ldbc_snb_datagen_0.2 into bi

Author: ArnauPrat

src/main/java/ldbc/snb/datagen/serializer/snb/interactive/TurtleInvariantSerializer.java

@@ -91,35 +91,29 @@ protected void serialize(final Organization organization) {
     protected void serialize(final TagClass tagClass) {
 
         StringBuffer result = new StringBuffer(350);
+        Turtle.writeDBPData(writers[FileNames.SOCIAL_NETWORK.ordinal()],SN.getTagClassURI(tagClass.id), RDFS.label, Turtle.createLiteral(Dictionaries.tags.getClassLabel(tagClass.id)));
+        Turtle.createTripleSPO(result, SN.getTagClassURI(tagClass.id), RDF.type, SNVOC.TagClass);
+
         if (tagClass.name.equals("Thing")) {
-            Turtle.writeDBPData(writers[FileNames.SOCIAL_NETWORK.ordinal()],"<http://www.w3.org/2002/07/owl#Thing>", RDFS.label, Turtle.createLiteral(Dictionaries.tags.getClassLabel(tagClass.id)));
-            Turtle.createTripleSPO(result, "<http://www.w3.org/2002/07/owl#Thing>", RDF.type, SNVOC.TagClass);
-            Turtle.createTripleSPO(result, "<http://www.w3.org/2002/07/owl#Thing>", SNVOC.id, Long.toString(tagClass.id));
-            writers[FileNames.SOCIAL_NETWORK.ordinal()].write(result.toString());
-        } else {
-            Turtle.writeDBPData(writers[FileNames.SOCIAL_NETWORK.ordinal()],DBPOWL.prefixed(Dictionaries.tags.getClassName(tagClass.id)), RDFS.label,
-                    Turtle.createLiteral(Dictionaries.tags.getClassLabel(tagClass.id)));
-            Turtle.createTripleSPO(result, DBP.fullPrefixed(Dictionaries.tags.getClassName(tagClass.id)), RDF.type, SNVOC.TagClass);
-            Turtle.createTripleSPO(result, DBP.fullPrefixed(Dictionaries.tags.getClassName(tagClass.id)), SNVOC.id, Long.toString(tagClass.id));
-            writers[FileNames.SOCIAL_NETWORK.ordinal()].write(result.toString());
-        }
+            Turtle.createTripleSPO(result, SN.getTagClassURI(tagClass.id), SNVOC.url, "<http://www.w3.org/2002/07/owl#Thing>");	
+	} else {
+            Turtle.createTripleSPO(result, SN.getTagClassURI(tagClass.id), SNVOC.url, DBPOWL.prefixed(Dictionaries.tags.getClassName(tagClass.id)));	
+	}
+
+        Turtle.createTripleSPO(result, SN.getTagClassURI(tagClass.id), SNVOC.id, Long.toString(tagClass.id));
+        writers[FileNames.SOCIAL_NETWORK.ordinal()].write(result.toString());
+
         Integer parent = Dictionaries.tags.getClassParent(tagClass.id);
         if (parent != -1) {
-            String parentPrefix;
-            if (Dictionaries.tags.getClassName(parent).equals("Thing")) {
-                parentPrefix = "<http://www.w3.org/2002/07/owl#Thing>";
-            } else {
-                parentPrefix = DBPOWL.prefixed(Dictionaries.tags.getClassName(parent));
-            }
-            Turtle.writeDBPData(writers[FileNames.SOCIAL_NETWORK.ordinal()],DBPOWL.prefixed(Dictionaries.tags.getClassName(tagClass.id)), RDFS.subClassOf, parentPrefix);
+            Turtle.writeDBPData(writers[FileNames.SOCIAL_NETWORK.ordinal()],SN.getTagClassURI(tagClass.id), RDFS.subClassOf, SN.getTagClassURI(parent));
         }
     }
 
     protected void serialize(final Tag tag) {
         StringBuffer result = new StringBuffer(350);
         Turtle.writeDBPData(writers[FileNames.SOCIAL_NETWORK.ordinal()],DBP.fullPrefixed(tag.name), FOAF.Name, Turtle.createLiteral(tag.name));
         Integer tagClass = tag.tagClass;
-        Turtle.writeDBPData(writers[FileNames.SOCIAL_NETWORK.ordinal()],DBP.fullPrefixed(tag.name), RDF.type, DBPOWL.prefixed(Dictionaries.tags.getClassName(tagClass)));
+        Turtle.writeDBPData(writers[FileNames.SOCIAL_NETWORK.ordinal()],DBP.fullPrefixed(tag.name), RDF.type, SN.getTagClassURI(tagClass));
         Turtle.createTripleSPO(result, DBP.fullPrefixed(tag.name), SNVOC.id, Turtle.createLiteral(Long.toString(tag.id)));
         writers[FileNames.SOCIAL_NETWORK.ordinal()].write(result.toString());
     }

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

@@ -145,6 +145,10 @@ public static String getKnowsURI(long id) {
         return BLANK_NODE + "knows" + String.format("%020d", id);
     }
 
+    public static String getTagClassURI(long id) {
+        return BLANK_NODE + "tagclass" + String.format("%06d", id);
+    }
+
     public static Long formId(long id) {
         long lowMask = 0x0FFFFF;                                // This mask is used to get the lowest 20 bits.
         long lowerPart = (lowMask & id);
@@ -158,4 +162,4 @@ public static long composeId(long id, long date) {
         long idMask = ~(0xFFFFFFFFFFFFFFFFL << 33);
         return (bucket << 33) | (id & idMask);
     }
-}
+}

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

@@ -97,6 +97,7 @@ public class SNVOC {
     public static final String Tag = PREFIX + "Tag";
     public static final String TagClass = PREFIX + "TagClass";
     public static final String isPartOf = PREFIX + "isPartOf";
+    public static final String url = PREFIX + "url"; 
 
     /**
      * Gets the LDBC social network vocabulary prefix version of the input.
@@ -118,4 +119,4 @@ public static String getUrl(String string) {
     public static String fullprefixed(String string) {
         return "<" + NAMESPACE + string + ">";
     }
-}
+}