Merge pull request #192 from cmaumet/errorVarianceHomogeneous

Definition of "noiseVarianceHomogeneous" -> "errorVarianceHomogeneous"
incf-nidash · Oct 6, 2014 · c3ec889 · c3ec889
2 parents c045fd3 + 5815b29
commit c3ec889
Show file tree

Hide file tree

Showing 9 changed files with 493 additions and 38 deletions.
diff --git a/nidm/nidm-results/fsl/example001/fsl_nidm.provn b/nidm/nidm-results/fsl/example001/fsl_nidm.provn
@@ -279,7 +279,7 @@ document
     entity(niiri:noise_model_id,
       [prov:type = 'nidm:ErrorModel',
       nidm:hasNoiseDistribution = 'nidm:GaussianDistribution',
-      nidm:noiseVarianceHomogeneous = "true" %%xsd:boolean,
+      nidm:errorVarianceHomogeneous = "true" %%xsd:boolean,
       nidm:varianceSpatialModel = 'nidm:SpatiallyLocal',
       nidm:hasErrorDependence = 'nidm:IndependentError',
       nidm:dependenceSpatialModel = 'nidm:SpatiallyLocal'])

diff --git a/nidm/nidm-results/fsl/fsl_results.provn b/nidm/nidm-results/fsl/fsl_results.provn
@@ -167,7 +167,7 @@ document
     entity(niiri:noise_model_id,
       [prov:type = 'nidm:ErrorModel',
       nidm:hasNoiseDistribution = 'nidm:GaussianDistribution',
-      nidm:noiseVarianceHomogeneous = "true" %%xsd:boolean,
+      nidm:errorVarianceHomogeneous = "true" %%xsd:boolean,
       nidm:varianceSpatialModel = 'nidm:SpatiallyLocal',
       nidm:hasErrorDependence = 'nidm:IndependentError',
       nidm:dependenceSpatialModel = 'nidm:SpatiallyLocal'])

diff --git a/nidm/nidm-results/scripts/UpdateTermReadme.py b/nidm/nidm-results/scripts/UpdateTermReadme.py
@@ -127,12 +127,15 @@ def create_term_row(self, term_name, definition, editor, color, range_value=None
 
         range_domain = ""
         if range_value is not None:
-            range_domain = "<td>"+domain+"</td>"+"<td>"+range_value+"</td>"
-
-        term_row = "<tr>"+\
-                        "<td>"+img_color+"</td>"\
-                        "<td><b>"+term_name+": </b>"+\
-                        definition+editor+"</td>"+range_domain+"</tr>"
+            range_domain = """
+    <td>"""+domain+"""</td>
+    <td>"""+range_value+"""</td>"""
+
+        term_row = """
+<tr>
+    <td>"""+img_color+"""</td>
+    <td><b>"""+term_name+""": </b>"""+definition+editor+"""</td>"""+range_domain+"""
+</tr>"""
         return term_row
 
     def create_curation_legend(self, order):

diff --git a/nidm/nidm-results/spm/example001/example001_spm_results.provn b/nidm/nidm-results/spm/example001/example001_spm_results.provn
@@ -174,7 +174,7 @@ document
     entity(niiri:noise_model_id,
       [prov:type = 'nidm:ErrorModel',
       nidm:hasNoiseDistribution = 'nidm:GaussianDistribution',
-      nidm:noiseVarianceHomogeneous = "true" %%xsd:boolean,
+      nidm:errorVarianceHomogeneous = "true" %%xsd:boolean,
       nidm:varianceSpatialModel = 'nidm:SpatiallyLocal',
       nidm:hasErrorDependence = 'nidm:IndependentError',
       nidm:dependenceSpatialModel = 'nidm:SpatiallyLocal'])

diff --git a/nidm/nidm-results/spm/example002/spm_results_2contrasts.provn b/nidm/nidm-results/spm/example002/spm_results_2contrasts.provn
@@ -159,7 +159,7 @@ document
   entity(niiri:noise_model_id,
       [prov:type = 'nidm:ErrorModel',
       nidm:hasNoiseDistribution = 'nidm:GaussianDistribution',
-      nidm:noiseVarianceHomogeneous = "true" %%xsd:boolean,
+      nidm:errorVarianceHomogeneous = "true" %%xsd:boolean,
       nidm:varianceSpatialModel = 'nidm:SpatiallyLocal',
       nidm:hasErrorDependence = 'nidm:IndependentError',
       nidm:dependenceSpatialModel = 'nidm:SpatiallyLocal'])

diff --git a/nidm/nidm-results/spm/example003/spm_results_conjunction.provn b/nidm/nidm-results/spm/example003/spm_results_conjunction.provn
@@ -163,7 +163,7 @@ document
   entity(niiri:noise_model_id,
       [prov:type = 'nidm:ErrorModel',
       nidm:hasNoiseDistribution = 'nidm:GaussianDistribution',
-      nidm:noiseVarianceHomogeneous = "true" %%xsd:boolean,
+      nidm:errorVarianceHomogeneous = "true" %%xsd:boolean,
       nidm:varianceSpatialModel = 'nidm:SpatiallyLocal',
       nidm:hasErrorDependence = 'nidm:IndependentError',
       nidm:dependenceSpatialModel = 'nidm:SpatiallyLocal'])

diff --git a/nidm/nidm-results/spm/spm_results.provn b/nidm/nidm-results/spm/spm_results.provn
@@ -233,7 +233,7 @@ document
     entity(niiri:noise_model_id,
       [prov:type = 'nidm:ErrorModel',
       nidm:hasNoiseDistribution = 'nidm:GaussianDistribution',
-      nidm:noiseVarianceHomogeneous = "true" %%xsd:boolean,
+      nidm:errorVarianceHomogeneous = "true" %%xsd:boolean,
       nidm:varianceSpatialModel = 'nidm:SpatiallyLocal',
       nidm:hasErrorDependence = 'nidm:IndependentError',
       nidm:dependenceSpatialModel = 'nidm:SpatiallyLocal'])

diff --git a/nidm/nidm-results/terms/README.md b/nidm/nidm-results/terms/README.md
diff --git a/nidm/nidm-results/terms/nidm-results.owl b/nidm/nidm-results/terms/nidm-results.owl
@@ -663,6 +663,20 @@ nidm:errorDegreesOfFreedom rdf:type owl:DatatypeProperty ;
 
 
 
+###  http://www.incf.org/ns/nidash/nidm#errorVarianceHomogeneous
+
+nidm:errorVarianceHomogeneous rdf:type owl:DatatypeProperty ;
+
+                              nidm:curationStatus "nidm:ReadyForRelease" ;
+
+                              prov:definition "A boolean value reflecting how the variance of the error is modelled during parameter estimation; TRUE for constant variance over all observations in the model, FALSE for heterogeneous variance." ;
+
+                              rdfs:domain nidm:ErrorModel ;
+
+                              rdfs:range xsd:boolean .
+
+
+
 ###  http://www.incf.org/ns/nidash/nidm#filename
 
 nidm:filename rdf:type owl:DatatypeProperty ;
@@ -781,18 +795,6 @@ nidm:noiseFWHM rdf:type owl:DatatypeProperty ;
 
 
 
-###  http://www.incf.org/ns/nidash/nidm#noiseVarianceHomogeneous
-
-nidm:noiseVarianceHomogeneous rdf:type owl:DatatypeProperty ;
-
-                              prov:definition "FIXME" ;
-
-                              rdfs:domain nidm:ErrorModel ;
-
-                              rdfs:range xsd:boolean .
-
-
-
 ###  http://www.incf.org/ns/nidash/nidm#numberOfClusters
 
 nidm:numberOfClusters rdf:type owl:DatatypeProperty ;
@@ -841,9 +843,9 @@ http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl#P-Value""" ;
 
             rdfs:range [ rdf:type rdfs:Datatype ;
                          owl:onDatatype xsd:float ;
-                         owl:withRestrictions ( [ xsd:minInclusive "0.0"^^xsd:float
+                         owl:withRestrictions ( [ xsd:maxInclusive "1.0"^^xsd:float
                                                 ]
-                                                [ xsd:maxInclusive "1.0"^^xsd:float
+                                                [ xsd:minInclusive "0.0"^^xsd:float
                                                 ]
                                               )
                        ] .
@@ -871,9 +873,9 @@ nidm:pValueFWER rdf:type owl:DatatypeProperty ;
 
                 rdfs:range [ rdf:type rdfs:Datatype ;
                              owl:onDatatype xsd:float ;
-                             owl:withRestrictions ( [ xsd:minInclusive "0.0"^^xsd:float
+                             owl:withRestrictions ( [ xsd:maxInclusive "1.0"^^xsd:float
                                                     ]
-                                                    [ xsd:maxInclusive "1.0"^^xsd:float
+                                                    [ xsd:minInclusive "0.0"^^xsd:float
                                                     ]
                                                   )
                            ] .
@@ -899,9 +901,9 @@ nidm:pValueUncorrected rdf:type owl:DatatypeProperty ;
 
                        rdfs:range [ rdf:type rdfs:Datatype ;
                                     owl:onDatatype xsd:float ;
-                                    owl:withRestrictions ( [ xsd:minInclusive "0.0"^^xsd:float
+                                    owl:withRestrictions ( [ xsd:maxInclusive "1.0"^^xsd:float
                                                            ]
-                                                           [ xsd:maxInclusive "1.0"^^xsd:float
+                                                           [ xsd:minInclusive "0.0"^^xsd:float
                                                            ]
                                                          )
                                   ] .
@@ -927,9 +929,9 @@ nidm:qValueFDR rdf:type owl:DatatypeProperty ;
 
                rdfs:range [ rdf:type rdfs:Datatype ;
                             owl:onDatatype xsd:float ;
-                            owl:withRestrictions ( [ xsd:minInclusive "0.0"^^xsd:float
+                            owl:withRestrictions ( [ xsd:maxInclusive "1.0"^^xsd:float
                                                    ]
-                                                   [ xsd:maxInclusive "1.0"^^xsd:float
+                                                   [ xsd:minInclusive "0.0"^^xsd:float
                                                    ]
                                                  )
                           ] .