graph diagram ordering, type validation

Author: marqh

lib/bald/__init__.py

@@ -184,7 +184,6 @@ def _network_js():
      var cell = new aclass({ 
          source: { id: source.id },
          target: { id: target.id },
-         labels: [{ position: .5, attrs: { text: { text: label || '', 'font-weight': 'bold' } } }],
 
          router: { 
                 name: 'manhattan', 
@@ -399,6 +398,8 @@ def viewgraph(self):
         """
 
         instances, links = self.graph_elems()
+        links.sort()
+        instances.sort()
         ascript = '\n'.join([_network_js(), '\n'.join(instances), '\n'.join(links),  _network_js_close()])
 
         html = jinja2.Environment().from_string(_graph_html()).render(title='agraph', script=ascript)
@@ -627,24 +628,26 @@ def validate_hdf5(afilepath):
     root_container = load_hdf5(afilepath)
     return validate(root_container)
 
-def validate(root_container):
+def validate(root_container, sval=None):
     """
     Validate a Container with respect to binary-array-linked-data.
     Returns a :class:`bald.validation.Validation`
 
     """
-    sval = bv.StoredValidation()
+    if sval is None:
+        sval = bv.StoredValidation()
 
     root_val = bv.ContainerValidation(subject=root_container)
     sval.stored_exceptions += root_val.exceptions()
     for subject in root_container.attrs.get('bald__contains', []):
-        
-        # a dataset's attribute collection inherits from and
-        # specialises it's container's attrbiute collection
-        # this only helps with prefixes, afaik, hence:
-        # #
-        array_val = bv.ArrayValidation(subject)
-        sval.stored_exceptions += array_val.exceptions()
+        if isinstance(subject, Array):
+            array_val = bv.ArrayValidation(subject)
+            sval.stored_exceptions += array_val.exceptions()
+        elif isinstance(subject, Container):
+            sval = validate(subject, sval=sval)
+        elif isinstance(subject, Subject):
+            subject_val = bv.SubjectValidation(subject)
+            sval.stored_exceptions += subject_val.exceptions()
 
     return sval
 

lib/bald/tests/integration/HTML/array_reference.html

@@ -160,7 +160,6 @@
      var cell = new aclass({ 
          source: { id: source.id },
          target: { id: target.id },
-         labels: [{ position: .5, attrs: { text: { text: label || '', 'font-weight': 'bold' } } }],
 
          router: { 
                 name: 'manhattan', 
@@ -175,13 +174,13 @@
      return cell;
 };
 
-var root = instance('root:<a xlink:href="http://binary-array-ld.net/latest/Container" xlink:show=new text-decoration="underline">bald__Container</a>', ['<a xlink:href="http://binary-array-ld.net/latest/contains" xlink:show=new text-decoration="underline">bald__contains</a>: |'], '#878800');
-var parent_variable = instance('parent_variable:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>', ['<a xlink:href="http://binary-array-ld.net/latest/references" xlink:show=new text-decoration="underline">bald__references</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: 11, 17'], '#878800');
 var child_variable = instance('child_variable:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>, <a xlink:href="http://binary-array-ld.net/latest/Reference" xlink:show=new text-decoration="underline">bald__Reference</a>', ['<a xlink:href="http://binary-array-ld.net/latest/array" xlink:show=new text-decoration="underline">bald__array</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: 11, 17'], '#878800');
-link(parent_variable, child_variable, 'bald__references');
-link(root, parent_variable, 'bald__contains', 'top', true);
+var parent_variable = instance('parent_variable:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>', ['<a xlink:href="http://binary-array-ld.net/latest/references" xlink:show=new text-decoration="underline">bald__references</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: 11, 17'], '#878800');
+var root = instance('root:<a xlink:href="http://binary-array-ld.net/latest/Container" xlink:show=new text-decoration="underline">bald__Container</a>', ['<a xlink:href="http://binary-array-ld.net/latest/contains" xlink:show=new text-decoration="underline">bald__contains</a>: |'], '#878800');
 link(child_variable, child_variable, 'bald__array', 'bottom');
+link(parent_variable, child_variable, 'bald__references');
 link(root, child_variable, 'bald__contains', 'top', true);
+link(root, parent_variable, 'bald__contains', 'top', true);
     joint.layout.DirectedGraph.layout(graph, { setLinkVertices: false,
                                                nodeSep: 150, rankSep: 100,
                                                marginX: 100, marginY: 100,

lib/bald/tests/integration/HTML/hdf_container_nest.html

@@ -160,7 +160,6 @@
      var cell = new aclass({ 
          source: { id: source.id },
          target: { id: target.id },
-         labels: [{ position: .5, attrs: { text: { text: label || '', 'font-weight': 'bold' } } }],
 
          router: { 
                 name: 'manhattan', 
@@ -175,33 +174,33 @@
      return cell;
 };
 
-var root = instance('root:<a xlink:href="http://binary-array-ld.net/latest/Container" xlink:show=new text-decoration="underline">bald__Container</a>', ['<a xlink:href="http://binary-array-ld.net/latest/contains" xlink:show=new text-decoration="underline">bald__contains</a>: |'], '#878800');
 var alocation = instance('alocation:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>, <a xlink:href="http://binary-array-ld.net/latest/Reference" xlink:show=new text-decoration="underline">bald__Reference</a>', ['<a xlink:href="http://binary-array-ld.net/latest/references" xlink:show=new text-decoration="underline">bald__references</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/array" xlink:show=new text-decoration="underline">bald__array</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: 11, 17'], '#878800');
-var data = instance('data:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>', ['<a xlink:href="http://binary-array-ld.net/latest/references" xlink:show=new text-decoration="underline">bald__references</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: 11, 17'], '#878800');
-var discovery = instance('discovery:<a xlink:href="http://binary-array-ld.net/latest/Container" xlink:show=new text-decoration="underline">bald__Container</a>', ['<a xlink:href="http://binary-array-ld.net/latest/contains" xlink:show=new text-decoration="underline">bald__contains</a>: |'], '#878800');
 var anotherpair = instance('anotherpair:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>, <a xlink:href="http://binary-array-ld.net/latest/Reference" xlink:show=new text-decoration="underline">bald__Reference</a>', ['<a xlink:href="http://binary-array-ld.net/latest/array" xlink:show=new text-decoration="underline">bald__array</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: 2'], '#878800');
 var apair = instance('apair:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>', ['<a xlink:href="http://binary-array-ld.net/latest/references" xlink:show=new text-decoration="underline">bald__references</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: 2'], '#878800');
-var source = instance('source:<a xlink:href="http://binary-array-ld.net/latest/Container" xlink:show=new text-decoration="underline">bald__Container</a>', ['<a xlink:href="http://binary-array-ld.net/latest/contains" xlink:show=new text-decoration="underline">bald__contains</a>: |'], '#878800');
+var data = instance('data:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>', ['<a xlink:href="http://binary-array-ld.net/latest/references" xlink:show=new text-decoration="underline">bald__references</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: 11, 17'], '#878800');
+var discovery = instance('discovery:<a xlink:href="http://binary-array-ld.net/latest/Container" xlink:show=new text-decoration="underline">bald__Container</a>', ['<a xlink:href="http://binary-array-ld.net/latest/contains" xlink:show=new text-decoration="underline">bald__contains</a>: |'], '#878800');
 var institution = instance('institution:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>', ['<a xlink:href="http://www.w3.org/2004/02/skos/core#prefLabel" xlink:show=new text-decoration="underline">skos__prefLabel</a>: a quality establishment', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: |'], '#878800');
-var referencing = instance('referencing:<a xlink:href="http://binary-array-ld.net/latest/Container" xlink:show=new text-decoration="underline">bald__Container</a>', ['<a xlink:href="http://binary-array-ld.net/latest/contains" xlink:show=new text-decoration="underline">bald__contains</a>: |'], '#878800');
 var locref = instance('locref:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>', ['<a xlink:href="http://www.w3.org/2004/02/skos/core#prefLabel" xlink:show=new text-decoration="underline">skos__prefLabel</a>: for locational purposes', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: |'], '#878800');
 var locref2 = instance('locref2:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>', ['<a xlink:href="http://www.w3.org/2004/02/skos/core#prefLabel" xlink:show=new text-decoration="underline">skos__prefLabel</a>: for more locational purposes', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: |'], '#878800');
-link(alocation, locref2, 'bald__references');
-link(alocation, locref, 'bald__references');
+var referencing = instance('referencing:<a xlink:href="http://binary-array-ld.net/latest/Container" xlink:show=new text-decoration="underline">bald__Container</a>', ['<a xlink:href="http://binary-array-ld.net/latest/contains" xlink:show=new text-decoration="underline">bald__contains</a>: |'], '#878800');
+var root = instance('root:<a xlink:href="http://binary-array-ld.net/latest/Container" xlink:show=new text-decoration="underline">bald__Container</a>', ['<a xlink:href="http://binary-array-ld.net/latest/contains" xlink:show=new text-decoration="underline">bald__contains</a>: |'], '#878800');
+var source = instance('source:<a xlink:href="http://binary-array-ld.net/latest/Container" xlink:show=new text-decoration="underline">bald__Container</a>', ['<a xlink:href="http://binary-array-ld.net/latest/contains" xlink:show=new text-decoration="underline">bald__contains</a>: |'], '#878800');
 link(alocation, alocation, 'bald__array', 'bottom');
-link(root, alocation, 'bald__contains', 'top', true);
-link(data, alocation, 'bald__references');
-link(root, data, 'bald__contains', 'top', true);
+link(alocation, locref, 'bald__references');
+link(alocation, locref2, 'bald__references');
 link(anotherpair, anotherpair, 'bald__array', 'bottom');
-link(discovery, anotherpair, 'bald__contains', 'top', true);
 link(apair, anotherpair, 'bald__references');
+link(data, alocation, 'bald__references');
+link(discovery, anotherpair, 'bald__contains', 'top', true);
 link(discovery, apair, 'bald__contains', 'top', true);
-link(source, institution, 'bald__contains', 'top', true);
 link(discovery, source, 'bald__contains', 'top', true);
-link(root, discovery, 'bald__contains', 'top', true);
 link(referencing, locref, 'bald__contains', 'top', true);
 link(referencing, locref2, 'bald__contains', 'top', true);
+link(root, alocation, 'bald__contains', 'top', true);
+link(root, data, 'bald__contains', 'top', true);
+link(root, discovery, 'bald__contains', 'top', true);
 link(root, referencing, 'bald__contains', 'top', true);
+link(source, institution, 'bald__contains', 'top', true);
     joint.layout.DirectedGraph.layout(graph, { setLinkVertices: false,
                                                nodeSep: 150, rankSep: 100,
                                                marginX: 100, marginY: 100,