dependenceSpatialModel has domain DesignMatrix

Author: cmaumet

nidm/nidm-results/terms/nidm-results.owl

@@ -89,7 +89,8 @@ nidm:dependenceSpatialModel rdf:type owl:ObjectProperty ;
 
                             prov:definition "FIXME" ;
 
-                            rdfs:domain nidm:ErrorModel ;
+                            rdfs:domain nidm:DesignMatrix ,
+                                        nidm:ErrorModel ;
 
                             rdfs:range nidm:SpatialModel .
 
@@ -1694,7 +1695,6 @@ nidm:ConnectivityCriterion rdf:type owl:Class ;
 
                            obo:IAO_0000114 obo:IAO_0000122 .
 
-
 ###  http://www.incf.org/ns/nidash/nidm#ContrastEstimation
 
 nidm:ContrastEstimation rdf:type owl:Class ;
@@ -2133,11 +2133,17 @@ nidm:Inference rdf:type owl:Class ;
     [prov:type = 'nidm:Inference',
     prov:label = \"Inference\"])""" ;
 
+<<<<<<< HEAD
                prov:definition "Statistical inference is a process of drawing conclusions following data analysis using statistical methods (statistical tests) and evaluating whether to reject or accept null hypothesis. (definition from STATO)." ;
 
                owl:sameAs "http://purl.obolibrary.org/obo/STATO_0000299" ;
 
                obo:IAO_0000114 obo:IAO_0000122 .
+=======
+               prov:definition "The process of inferring the excursion set from a statistical map." ;
+               
+               obo:IAO_0000114 obo:IAO_0000120 .
+>>>>>>> dependenceSpatialModel has domain DesignMatrix
 
 
 
@@ -2947,10 +2953,10 @@ nidm:LocalMultivariate rdf:type nidm:ElementWiseEstimation ,
 nidm:MassMultivariate rdf:type nidm:ElementWiseEstimation ,
                                owl:NamedIndividual ;
 
-                      obo:IAO_0000117 "TN" ;
-                      
                       obo:IAO_0000115 "Multivariate model fit independently at each voxel; e.g. tensoral analyses - do tensors differ between groups" ;
 
+                      obo:IAO_0000117 "TN" ;
+                      
                       obo:IAO_0000114 obo:IAO_0000124 .
 
 
@@ -2989,10 +2995,10 @@ nidm:Mni305CoordinateSystem rdf:type nidm:MNICoordinateSystem ,
 nidm:Multivariate rdf:type nidm:ElementWiseEstimation ,
                            owl:NamedIndividual ;
 
-                  obo:IAO_0000117 "TN" ;
-                  
                   obo:IAO_0000115 "Multivariate model fit to entire brain, e.g. MLM (Multivariate Linear Model), CCA (Canonical Correlation Analysis), PLS (Partial Least Squares)." ;
 
+                  obo:IAO_0000117 "TN" ;
+                  
                   obo:IAO_0000114 obo:IAO_0000124 .