Merge pull request #37 from adrigomez6/master

Assignment4

Author: dgarijo

Assignment4/Adrian_Gomez_24C026/task06.py

@@ -41,7 +41,6 @@
 
 """
 
-# TO DO
 g.add((person.Person, RDF.type, RDFS.Class))
 g.add((person.Person, RDFS.label, Literal("Person", datatype=XSD.string)))
 g.add((person.Professor, RDF.type, RDFS.Class))
@@ -66,7 +65,6 @@
 
 """**TASK 6.2: Add the 3 properties shown in slide 36. Add labels for each of them (exactly as they are in the slide, with no language tags), and their corresponding domains and ranges using RDFS. Remember adding the correct datatype (xsd:String) when appropriate. If a property has no range, make it a literal (string)**"""
 
-# TO DO
 g.add((person.hasName, RDF.type, RDF.Property))
 g.add((person.hasName, RDFS.label, Literal("hasName", datatype=XSD.string)))
 g.add((person.hasName, RDFS.domain, person.Person))
@@ -90,7 +88,6 @@
 
 """**TASK 6.3: Create the individuals shown in slide 36 under "Datos". Link them with the same relationships shown in the diagram."**"""
 
-# TO DO
 data=Namespace("http://oeg.fi.upm.es/resource/person/")
 
 g.add((data.Raul, RDF.type, person.InterimAssociateProfessor))
@@ -115,7 +112,6 @@
 
 """
 
-# TO DO
 vcard=Namespace("http://www.w3.org/2001/vcard-rdf/3.0/")
 foaf=Namespace("http://xmlns.com/foaf/0.1/")
 
@@ -131,6 +127,7 @@
 g.add((data.Oscar, vcard.Family, Literal("Corcho García")))
 g.add((data.Oscar, vcard.Given, Literal("Oscar")))
 g.add((data.Oscar, foaf.email, Literal("ocorcho@fi.upm.es")))
+
 # Visualize the results
 for s, p, o in g:
   print(s,p,o)

Assignment4/Adrian_Gomez_24C026/task07.py

@@ -33,6 +33,7 @@
 
 # Visualize the results
 result = [(c, g.value(subject=c, predicate=RDFS.subClassOf, object=None)) for c,p,o in g.triples((None, RDF.type, RDFS.Class))]
+
 for r in result:
   print(r)
 
@@ -67,6 +68,7 @@ def get_subclasses(clase):
 
 classes=get_subclasses(ns.Person)
 classes.append(ns.Person)
+
 for cl in classes:
   individuals += [per for per,p,o in g.triples((None, RDF.type, cl))]
 
@@ -116,6 +118,7 @@ def get_subclasses(clase):
   print(r.name)
 
 
+
 ## Validation: Do not remove
 report.validate_07_04(g,query)
 report.save_report("_Task_07")

Assignment4/Adrian_Gomez_24C026/validation.py

@@ -256,3 +256,4 @@ def validate_07_04(self, g, query):
                 error = True
         if not error:
             self.__add_to_report("TASK 7.4 OK")
+