update test results

Author: marqh

lib/bald/__init__.py

@@ -873,8 +873,6 @@ def load_netcdf(afilepath, baseuri=None, alias_dict=None, cache=None):
             if (len(fhandle.variables[name].dimensions) == 1 and
                 fhandle.variables[name].dimensions[0] == name and
                 len(fhandle.variables[name]) > 0):
-                sattrs['bald__array'] = name
-                sattrs['rdf__type'] = 'bald__Reference'
 
                 if not isinstance(fhandle.variables[name][0], np.ma.core.MaskedConstant):
                     sattrs['bald__first_value'] = fhandle.variables[name][0]
@@ -920,8 +918,8 @@ def load_netcdf(afilepath, baseuri=None, alias_dict=None, cache=None):
                                 edate_first = terra.datetime.EpochDateTimes(first,
                                                                             quantity,
                                                                             epoch=tog)
-
-                                sattrs['bald__first_value'] = edate_first
+                                if first is not np.ma.masked:
+                                    sattrs['bald__first_value'] = edate_first
                             if len(fhandle.variables[name]) > 1:
                                 if fhandle.variables[name][0] == fv:
                                     last = np.ma.MaskedArray(fhandle.variables[name][-1],
@@ -1017,10 +1015,6 @@ def load_netcdf(afilepath, baseuri=None, alias_dict=None, cache=None):
 
             var = file_variables[name]
             sattrs = fhandle.variables[name].__dict__.copy()
-            # netCDF coordinate variable special case
-            if (len(fhandle.variables[name].dimensions) == 1 and
-                fhandle.variables[name].dimensions[0] == name):
-                sattrs['bald__array'] = name
 
             # for sattr in sattrs:
             for sattr in (sattr for sattr in sattrs if
@@ -1078,28 +1072,10 @@ def _make_ref_entities(var, fhandle, pref, name, baseuri,
         fhandle.variables[pref].shape):
         try:
             refset = var.attrs.get('bald__references', set())
-            # cv_shape = fhandle.variables[pref].shape
-            # var_shape = fhandle.variables[name].shape
+
             identity = '{}_{}_ref'.format(name, pref)
             rattrs = {}
             rattrs['rdf__type'] = 'bald__Reference'
-            # reshape = [1 for adim in var_shape]
-            # reshape_name = [1 for adim in set(fhandle.variables[name].dimensions).union(set(fhandle.variables[pref].dimensions))]
-            # reshape_pref = [1 for adim in set(fhandle.variables[name].dimensions).union(set(fhandle.variables[pref].dimensions))]
-            # name_dims = OrderedDict(zip(fhandle.variables[name].dimensions, var_shape))
-            # pref_dims = OrderedDict(zip(fhandle.variables[pref].dimensions, cv_shape))
-            # combined_dims = OrderedDict(list(pref_dims.items())+list(name_dims.items()))
-            # reverse_combined_dims = OrderedDict(list(name_dims.items())+list(pref_dims.items()))
-            # # also
-            # # name_dims.update(pref_dims)
-            # # pref_dims.update(name_dims)
-
-            # dims = fhandle.variables[pref].dimensions
-            # for dim in dims:
-            #     cvi = fhandle.variables[name].dimensions.index(dim)
-            #     reshape[cvi] = int(fhandle.dimensions[dim].size)
-            # rattrs['bald__childBroadcast'] = reshape
-            # rattrs['bald__array'] = set((file_variables.get(pref),))
 
             reshapes = netcdf_shared_dimensions(fhandle.variables[name],
                                                 fhandle.variables[pref])

lib/bald/tests/integration/TTL/GEMS_CO2_Apr2006.ttl

@@ -53,73 +53,81 @@ this:lnsp a bald:Array ;
 
 this:co2_latitude_ref a bald:Reference,
         bald:Subject ;
-    bald:array this:latitude ;
-    bald:childBroadcast ( 1 1 181 1 ) .
+    bald:sourceShape ( 1 60 181 360 ) ;
+    bald:target this:latitude ;
+    bald:targetReshape ( 1 1 181 1 ) ;
+    bald:targetShape ( 181 ) .
 
 this:co2_levelist_ref a bald:Reference,
         bald:Subject ;
-    bald:array this:levelist ;
-    bald:childBroadcast ( 1 60 1 1 ) .
+    bald:sourceShape ( 1 60 181 360 ) ;
+    bald:target this:levelist ;
+    bald:targetReshape ( 1 60 1 1 ) ;
+    bald:targetShape ( 60 ) .
 
 this:co2_longitude_ref a bald:Reference,
         bald:Subject ;
-    bald:array this:longitude ;
-    bald:childBroadcast ( 1 1 1 360 ) .
+    bald:sourceShape ( 1 60 181 360 ) ;
+    bald:target this:longitude ;
+    bald:targetReshape ( 1 1 1 360 ) ;
+    bald:targetShape ( 360 ) .
 
 this:co2_time_ref a bald:Reference,
         bald:Subject ;
-    bald:array this:time ;
-    bald:childBroadcast ( 1 1 1 1 ) .
+    bald:sourceShape ( 1 60 181 360 ) ;
+    bald:target this:time ;
+    bald:targetReshape ( 1 1 1 1 ) ;
+    bald:targetShape ( 1 ) .
 
 this:lnsp_latitude_ref a bald:Reference,
         bald:Subject ;
-    bald:array this:latitude ;
-    bald:childBroadcast ( 1 1 181 1 ) .
+    bald:sourceShape ( 1 60 181 360 ) ;
+    bald:target this:latitude ;
+    bald:targetReshape ( 1 1 181 1 ) ;
+    bald:targetShape ( 181 ) .
 
 this:lnsp_levelist_ref a bald:Reference,
         bald:Subject ;
-    bald:array this:levelist ;
-    bald:childBroadcast ( 1 60 1 1 ) .
+    bald:sourceShape ( 1 60 181 360 ) ;
+    bald:target this:levelist ;
+    bald:targetReshape ( 1 60 1 1 ) ;
+    bald:targetShape ( 60 ) .
 
 this:lnsp_longitude_ref a bald:Reference,
         bald:Subject ;
-    bald:array this:longitude ;
-    bald:childBroadcast ( 1 1 1 360 ) .
+    bald:sourceShape ( 1 60 181 360 ) ;
+    bald:target this:longitude ;
+    bald:targetReshape ( 1 1 1 360 ) ;
+    bald:targetShape ( 360 ) .
 
 this:lnsp_time_ref a bald:Reference,
         bald:Subject ;
-    bald:array this:time ;
-    bald:childBroadcast ( 1 1 1 1 ) .
+    bald:sourceShape ( 1 60 181 360 ) ;
+    bald:target this:time ;
+    bald:targetReshape ( 1 1 1 1 ) ;
+    bald:targetShape ( 1 ) .
 
-this:latitude a bald:Array,
-        bald:Reference ;
-    bald:array this:latitude ;
+this:latitude a bald:Array ;
     bald:first_value 90.0 ;
     bald:last_value -90.0 ;
     bald:shape ( 181 ) ;
     CFTerms:standard_name <http://vocab.nerc.ac.uk/standard_name/latitude/> ;
     NetCDF:units "degrees_north" .
 
-this:levelist a bald:Array,
-        bald:Reference ;
-    bald:array this:levelist ;
+this:levelist a bald:Array ;
     bald:first_value 1 ;
     bald:last_value 60 ;
     bald:shape ( 60 ) ;
     NetCDF:long_name "model_level_number" .
 
-this:longitude a bald:Array,
-        bald:Reference ;
-    bald:array this:longitude ;
+this:longitude a bald:Array ;
     bald:first_value 0.0 ;
     bald:last_value 359.0 ;
     bald:shape ( 360 ) ;
     CFTerms:standard_name <http://vocab.nerc.ac.uk/standard_name/longitude/> ;
     NetCDF:units "degrees_east" .
 
-this:time a bald:Array,
-        bald:Reference ;
-    bald:array this:time ;
+this:time a bald:Array ;
     bald:first_value "2006-04-01T00:00:00"^^xsd:dateTime ;
     bald:shape ( 1 ) ;
     CFTerms:standard_name <http://vocab.nerc.ac.uk/standard_name/time/> ;