From d838a5f9e6523265578b322527ddf4a2764cb880 Mon Sep 17 00:00:00 2001 From: cmaumet Date: Fri, 3 Oct 2014 10:44:02 +0100 Subject: [PATCH] noiseVarianceHomogeneous -> errorVarianceHomogeneous + definition --- .../fsl/example001/fsl_nidm.provn | 2 +- nidm/nidm-results/fsl/fsl_results.provn | 2 +- .../example001/example001_spm_results.provn | 2 +- .../example002/spm_results_2contrasts.provn | 2 +- .../example003/spm_results_conjunction.provn | 2 +- nidm/nidm-results/spm/spm_results.provn | 2 +- nidm/nidm-results/terms/nidm-results.owl | 70 ++++++++++--------- 7 files changed, 42 insertions(+), 40 deletions(-) diff --git a/nidm/nidm-results/fsl/example001/fsl_nidm.provn b/nidm/nidm-results/fsl/example001/fsl_nidm.provn index 53ca43f00..a1201b689 100644 --- 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:NoiseModel', nidm:hasNoiseDistribution = 'nidm:GaussianDistribution', - nidm:noiseVarianceHomogeneous = "true" %%xsd:boolean, + nidm:errorVarianceHomogeneous = "true" %%xsd:boolean, nidm:varianceSpatialModel = 'nidm:SpatiallyLocal', nidm:hasNoiseDependence = 'nidm:IndependentNoise', nidm:dependenceSpatialModel = 'nidm:SpatiallyLocal']) diff --git a/nidm/nidm-results/fsl/fsl_results.provn b/nidm/nidm-results/fsl/fsl_results.provn index 588b174fc..05f2f2fbf 100644 --- 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:NoiseModel', nidm:hasNoiseDistribution = 'nidm:GaussianDistribution', - nidm:noiseVarianceHomogeneous = "true" %%xsd:boolean, + nidm:errorVarianceHomogeneous = "true" %%xsd:boolean, nidm:varianceSpatialModel = 'nidm:SpatiallyLocal', nidm:hasNoiseDependence = 'nidm:IndependentNoise', nidm:dependenceSpatialModel = 'nidm:SpatiallyLocal']) diff --git a/nidm/nidm-results/spm/example001/example001_spm_results.provn b/nidm/nidm-results/spm/example001/example001_spm_results.provn index 81de19d00..f95ce71cd 100644 --- 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:NoiseModel', nidm:hasNoiseDistribution = 'nidm:GaussianDistribution', - nidm:noiseVarianceHomogeneous = "true" %%xsd:boolean, + nidm:errorVarianceHomogeneous = "true" %%xsd:boolean, nidm:varianceSpatialModel = 'nidm:SpatiallyLocal', nidm:hasNoiseDependence = 'nidm:IndependentNoise', 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 index 2909d1c72..56b4296f8 100644 --- 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:NoiseModel', nidm:hasNoiseDistribution = 'nidm:GaussianDistribution', - nidm:noiseVarianceHomogeneous = "true" %%xsd:boolean, + nidm:errorVarianceHomogeneous = "true" %%xsd:boolean, nidm:varianceSpatialModel = 'nidm:SpatiallyLocal', nidm:hasNoiseDependence = 'nidm:IndependentNoise', 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 index bd3e42c93..dc9026a8b 100644 --- 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:NoiseModel', nidm:hasNoiseDistribution = 'nidm:GaussianDistribution', - nidm:noiseVarianceHomogeneous = "true" %%xsd:boolean, + nidm:errorVarianceHomogeneous = "true" %%xsd:boolean, nidm:varianceSpatialModel = 'nidm:SpatiallyLocal', nidm:hasNoiseDependence = 'nidm:IndependentNoise', nidm:dependenceSpatialModel = 'nidm:SpatiallyLocal']) diff --git a/nidm/nidm-results/spm/spm_results.provn b/nidm/nidm-results/spm/spm_results.provn index f45b7cb2a..139e5e0d5 100644 --- 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:NoiseModel', nidm:hasNoiseDistribution = 'nidm:GaussianDistribution', - nidm:noiseVarianceHomogeneous = "true" %%xsd:boolean, + nidm:errorVarianceHomogeneous = "true" %%xsd:boolean, nidm:varianceSpatialModel = 'nidm:SpatiallyLocal', nidm:hasNoiseDependence = 'nidm:IndependentNoise', nidm:dependenceSpatialModel = 'nidm:SpatiallyLocal']) diff --git a/nidm/nidm-results/terms/nidm-results.owl b/nidm/nidm-results/terms/nidm-results.owl index dcc3d26d4..1e78e4bde 100644 --- a/nidm/nidm-results/terms/nidm-results.owl +++ b/nidm/nidm-results/terms/nidm-results.owl @@ -661,6 +661,20 @@ nidm:errorDegreesOfFreedom rdf:type owl:DatatypeProperty ; +### http://www.incf.org/ns/nidash/nidm#errorVarianceHomogeneous + +nidm:errorVarianceHomogeneous rdf:type owl:DatatypeProperty ; + + prov:definition "A boolean value regarding 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." ; + + nidm:curationStatus "nidm:PendingFinalVetting" ; + + rdfs:domain nidm:NoiseModel ; + + rdfs:range xsd:boolean . + + + ### http://www.incf.org/ns/nidash/nidm#filename nidm:filename rdf:type owl:DatatypeProperty ; @@ -755,18 +769,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:NoiseModel ; - - rdfs:range xsd:boolean . - - - ### http://www.incf.org/ns/nidash/nidm#numberOfClusters nidm:numberOfClusters rdf:type owl:DatatypeProperty ; @@ -2424,16 +2426,6 @@ nidm:Peak rdf:type owl:Class ; -### http://www.incf.org/ns/nidash/nidm#PoissonDistribution - -nidm:PoissonDistribution rdf:type owl:Class ; - - rdfs:subClassOf nidm:NoiseDistribution ; - - owl:sameAs "http://purl.obolibrary.org/obo/STATO_0000051"^^xsd:anyURI . - - - ### http://www.incf.org/ns/nidash/nidm#PendingFinalVetting nidm:PendingFinalVetting rdf:type owl:Class ; @@ -2446,6 +2438,16 @@ nidm:PendingFinalVetting rdf:type owl:Class ; +### http://www.incf.org/ns/nidash/nidm#PoissonDistribution + +nidm:PoissonDistribution rdf:type owl:Class ; + + rdfs:subClassOf nidm:NoiseDistribution ; + + owl:sameAs "http://purl.obolibrary.org/obo/STATO_0000051"^^xsd:anyURI . + + + ### http://www.incf.org/ns/nidash/nidm#ReadyForRelease nidm:ReadyForRelease rdf:type owl:Class ; @@ -2755,18 +2757,6 @@ nidm:TwoTailedTest rdf:type owl:Class ; -### http://www.incf.org/ns/nidash/nidm#WeightedLeastSquares - -nidm:WeightedLeastSquares rdf:type owl:Class ; - - rdfs:subClassOf nidm:EstimationMethod ; - - rdfs:comment "WLS (heteroscedasticity accounted for, but no dependence)" ; - - prov:definition "FIXME" . - - - ### http://www.incf.org/ns/nidash/nidm#Uncurated nidm:Uncurated rdf:type owl:Class ; @@ -2779,6 +2769,18 @@ nidm:Uncurated rdf:type owl:Class ; +### http://www.incf.org/ns/nidash/nidm#WeightedLeastSquares + +nidm:WeightedLeastSquares rdf:type owl:Class ; + + rdfs:subClassOf nidm:EstimationMethod ; + + rdfs:comment "WLS (heteroscedasticity accounted for, but no dependence)" ; + + prov:definition "FIXME" . + + + ### http://www.incf.org/ns/nidash/nidm#WorldCoordinateSystem nidm:WorldCoordinateSystem rdf:type owl:Class ;