From 69fdb38db78bede022f1f447dd1f9e58d3c41309 Mon Sep 17 00:00:00 2001 From: cmaumet Date: Mon, 27 Oct 2014 10:08:25 +0000 Subject: [PATCH 1/9] Specify if estimation is mass/local uni/multivariate... --- .../fsl/example001/fsl_nidm.provn | 1 + nidm/nidm-results/fsl/fsl_results.provn | 1 + .../example001/example001_spm_results.provn | 1 + .../example002/spm_results_2contrasts.provn | 1 + nidm/nidm-results/spm/spm_results.provn | 3 +- nidm/nidm-results/terms/nidm-results.owl | 91 ++++++++++++++++++- 6 files changed, 96 insertions(+), 2 deletions(-) diff --git a/nidm/nidm-results/fsl/example001/fsl_nidm.provn b/nidm/nidm-results/fsl/example001/fsl_nidm.provn index 903be3241..a5f4b35cb 100644 --- a/nidm/nidm-results/fsl/example001/fsl_nidm.provn +++ b/nidm/nidm-results/fsl/example001/fsl_nidm.provn @@ -316,6 +316,7 @@ document activity(niiri:model_parameters_estimation_id, [prov:type = 'nidm:ModelParametersEstimation', nidm:withEstimationMethod = 'nidm:GeneralizedLeastSquares', + nidm:voxelWiseEstimation = 'nidm:MassUnivariate', prov:label = "Model Parameters Estimation"]) activity(niiri:contrast_estimation_id_1, diff --git a/nidm/nidm-results/fsl/fsl_results.provn b/nidm/nidm-results/fsl/fsl_results.provn index 4f6ded267..e43384dce 100644 --- a/nidm/nidm-results/fsl/fsl_results.provn +++ b/nidm/nidm-results/fsl/fsl_results.provn @@ -176,6 +176,7 @@ document activity(niiri:model_pe_id, [prov:type = 'nidm:ModelParametersEstimation', nidm:withEstimationMethod = 'nidm:OrdinaryLeastSquares', + nidm:voxelWiseEstimation = 'nidm:MassUnivariate', prov:label = "Model parameters estimation"]) activity(niiri:contrast_estimation_id, diff --git a/nidm/nidm-results/spm/example001/example001_spm_results.provn b/nidm/nidm-results/spm/example001/example001_spm_results.provn index 1538e39a5..d866fac2a 100644 --- a/nidm/nidm-results/spm/example001/example001_spm_results.provn +++ b/nidm/nidm-results/spm/example001/example001_spm_results.provn @@ -183,6 +183,7 @@ document activity(niiri:model_pe_id, [prov:type = 'nidm:ModelParametersEstimation', nidm:withEstimationMethod = 'nidm:GeneralizedLeastSquares', + nidm:voxelWiseEstimation = 'nidm:MassUnivariate', prov:label = "Model parameters estimation"]) wasAssociatedWith(niiri:model_pe_id, niiri:software_id,-) used(niiri:model_pe_id, niiri:design_matrix_id,-) diff --git a/nidm/nidm-results/spm/example002/spm_results_2contrasts.provn b/nidm/nidm-results/spm/example002/spm_results_2contrasts.provn index 2ef6675e0..a5a001abf 100644 --- a/nidm/nidm-results/spm/example002/spm_results_2contrasts.provn +++ b/nidm/nidm-results/spm/example002/spm_results_2contrasts.provn @@ -168,6 +168,7 @@ document activity(niiri:model_fitting_id, [prov:type = 'nidm:ModelParametersEstimation', nidm:withEstimationMethod = 'nidm:OrdinaryLeastSquares', + nidm:voxelWiseEstimation = 'nidm:MassUnivariate', prov:label = "Model Parameters Estimation"]) wasAssociatedWith(niiri:model_fitting_id, niiri:software_id,-) used(niiri:model_fitting_id, niiri:design_matrix_id,-) diff --git a/nidm/nidm-results/spm/spm_results.provn b/nidm/nidm-results/spm/spm_results.provn index aec2cff53..e21b65244 100644 --- a/nidm/nidm-results/spm/spm_results.provn +++ b/nidm/nidm-results/spm/spm_results.provn @@ -242,7 +242,8 @@ document activity(niiri:model_pe_id, [prov:type = 'nidm:ModelParametersEstimation', prov:label = "Model parameters estimation", - nidm:withEstimationMethod = 'nidm:OrdinaryLeastSquares' + nidm:withEstimationMethod = 'nidm:OrdinaryLeastSquares', + nidm:voxelWiseEstimation = 'nidm:MassUnivariate' ]) wasAssociatedWith(niiri:model_pe_id, niiri:software_id,-) used(niiri:model_pe_id, niiri:design_matrix_id,-) diff --git a/nidm/nidm-results/terms/nidm-results.owl b/nidm/nidm-results/terms/nidm-results.owl index e4c8c8af1..7909be9b5 100644 --- a/nidm/nidm-results/terms/nidm-results.owl +++ b/nidm/nidm-results/terms/nidm-results.owl @@ -184,6 +184,30 @@ nidm:hasNoiseDistribution rdf:type owl:ObjectProperty ; +### http://www.incf.org/ns/nidash/nidm#hasPixelWiseEstimation + +nidm:hasPixelWiseEstimation rdf:type owl:ObjectProperty ; + + obo:IAO_0000114 obo:IAO_0000124 ; + + rdfs:range nidm:ElementWiseEstimation ; + + rdfs:domain nidm:ModelParametersEstimation . + + + +### http://www.incf.org/ns/nidash/nidm#hasVoxelWiseEstimation + +nidm:hasVoxelWiseEstimation rdf:type owl:ObjectProperty ; + + obo:IAO_0000114 obo:IAO_0000124 ; + + rdfs:range nidm:ElementWiseEstimation ; + + rdfs:domain nidm:ModelParametersEstimation . + + + ### http://www.incf.org/ns/nidash/nidm#inCoordinateSpace nidm:inCoordinateSpace rdf:type owl:ObjectProperty ; @@ -1669,7 +1693,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 ; @@ -1884,6 +1907,16 @@ nidm:DisplayMaskMap rdf:type owl:Class ; +### http://www.incf.org/ns/nidash/nidm#ElementWiseEstimation + +nidm:ElementWiseEstimation rdf:type owl:Class ; + + rdfs:subClassOf prov:Entity ; + + obo:IAO_0000114 obo:IAO_0000124 . + + + ### http://www.incf.org/ns/nidash/nidm#ErrorDependence nidm:ErrorDependence rdf:type owl:Class ; @@ -2127,6 +2160,20 @@ NIDM Concept ID: nidm_101. """ ; +### http://www.incf.org/ns/nidash/nidm#LocalMultivariate + +nidm:LocalMultivariate rdf:type owl:Class ; + + rdfs:subClassOf nidm:ElementWiseEstimation ; + + obo:IAO_0000115 "Multivariate model fit on a neighborhood surrounding each voxel; e.g. “searchlight analyses." ; + + obo:IAO_0000117 "TN" ; + + obo:IAO_0000114 obo:IAO_0000124 . + + + ### http://www.incf.org/ns/nidash/nidm#MNICoordinateSystem nidm:MNICoordinateSystem rdf:type owl:Class ; @@ -2187,6 +2234,34 @@ nidm:MaskMap rdf:type owl:Class ; +### http://www.incf.org/ns/nidash/nidm#MassMultivariate + +nidm:MassMultivariate rdf:type owl:Class ; + + rdfs:subClassOf nidm:ElementWiseEstimation ; + + 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_0000114 obo:IAO_0000124 . + + + +### http://www.incf.org/ns/nidash/nidm#MassUnivariate + +nidm:MassUnivariate rdf:type owl:Class ; + + rdfs:subClassOf nidm:ElementWiseEstimation ; + + obo:IAO_0000115 "Univariate model fit independently at each voxel." ; + + obo:IAO_0000117 "TN" ; + + obo:IAO_0000114 obo:IAO_0000124 . + + + ### http://www.incf.org/ns/nidash/nidm#ModelParametersEstimation nidm:ModelParametersEstimation rdf:type owl:Class ; @@ -2207,6 +2282,20 @@ nidm:ModelParametersEstimation rdf:type owl:Class ; +### http://www.incf.org/ns/nidash/nidm#Multivariate + +nidm:Multivariate rdf:type owl:Class ; + + rdfs:subClassOf nidm:ElementWiseEstimation ; + + 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_0000114 obo:IAO_0000124 . + + + ### http://www.incf.org/ns/nidash/nidm#NIDMObjectModel nidm:NIDMObjectModel rdf:type owl:Class ; From 7d501d2149775c1c1b133294a509ddcc438d0fe4 Mon Sep 17 00:00:00 2001 From: cmaumet Date: Mon, 27 Oct 2014 10:13:24 +0000 Subject: [PATCH 2/9] Add dependenceSpatialModel attribute to design matrix --- nidm/nidm-results/fsl/example001/fsl_nidm.provn | 1 + nidm/nidm-results/fsl/fsl_results.provn | 1 + nidm/nidm-results/spm/example001/example001_spm_results.provn | 1 + nidm/nidm-results/spm/example002/spm_results_2contrasts.provn | 1 + nidm/nidm-results/spm/example003/spm_results_conjunction.provn | 2 ++ nidm/nidm-results/spm/spm_results.provn | 1 + 6 files changed, 7 insertions(+) diff --git a/nidm/nidm-results/fsl/example001/fsl_nidm.provn b/nidm/nidm-results/fsl/example001/fsl_nidm.provn index a5f4b35cb..9ef02e399 100644 --- a/nidm/nidm-results/fsl/example001/fsl_nidm.provn +++ b/nidm/nidm-results/fsl/example001/fsl_nidm.provn @@ -295,6 +295,7 @@ document entity(niiri:design_matrix_id, [prov:type = 'nidm:DesignMatrix', prov:location = "file://./DesignMatrix.csv" %% xsd:anyURI, + nidm:dependenceSpatialModel = 'nidm:SpatiallyGlobalModel', prov:label = "Design Matrix" %% xsd:string]) entity(niiri:contrast_id_1, diff --git a/nidm/nidm-results/fsl/fsl_results.provn b/nidm/nidm-results/fsl/fsl_results.provn index e43384dce..534046b47 100644 --- a/nidm/nidm-results/fsl/fsl_results.provn +++ b/nidm/nidm-results/fsl/fsl_results.provn @@ -156,6 +156,7 @@ document entity(niiri:design_matrix_id, [prov:type = 'nidm:DesignMatrix', prov:location = "file:///path/to/DesignMatrix.csv" %% xsd:anyURI, + nidm:dependenceSpatialModel = 'nidm:SpatiallyGlobalModel', prov:label = "Design Matrix" %% xsd:string]) entity(niiri:contrast_id, [prov:type = 'nidm:ContrastWeights', diff --git a/nidm/nidm-results/spm/example001/example001_spm_results.provn b/nidm/nidm-results/spm/example001/example001_spm_results.provn index d866fac2a..f128672c5 100644 --- a/nidm/nidm-results/spm/example001/example001_spm_results.provn +++ b/nidm/nidm-results/spm/example001/example001_spm_results.provn @@ -155,6 +155,7 @@ document [prov:type = 'nidm:DesignMatrix', prov:location = "file://./DesignMatrix.csv" %% xsd:anyURI, nidm:filename = "DesignMatrix.csv" %% xsd:string, + nidm:dependenceSpatialModel = 'nidm:SpatiallyGlobalModel', dct:format = "text/csv" %% xsd:string, nidm:visualisation = 'niiri:design_matrix_png_id', prov:label = "Design Matrix" %% xsd:string]) diff --git a/nidm/nidm-results/spm/example002/spm_results_2contrasts.provn b/nidm/nidm-results/spm/example002/spm_results_2contrasts.provn index a5a001abf..5f84cf756 100644 --- a/nidm/nidm-results/spm/example002/spm_results_2contrasts.provn +++ b/nidm/nidm-results/spm/example002/spm_results_2contrasts.provn @@ -231,6 +231,7 @@ document entity(niiri:design_matrix_id, [prov:type = 'nidm:DesignMatrix', prov:location = "file:///path/to/DesignMatrix.csv" %% xsd:anyURI, + nidm:dependenceSpatialModel = 'nidm:SpatiallyGlobalModel', prov:label = "Design Matrix" %% xsd:string]) entity(niiri:contrast_id, [prov:type = 'nidm:ContrastWeights', diff --git a/nidm/nidm-results/spm/example003/spm_results_conjunction.provn b/nidm/nidm-results/spm/example003/spm_results_conjunction.provn index 6c5544be6..555118b55 100644 --- a/nidm/nidm-results/spm/example003/spm_results_conjunction.provn +++ b/nidm/nidm-results/spm/example003/spm_results_conjunction.provn @@ -172,6 +172,7 @@ document activity(niiri:model_fitting_id, [prov:type = 'nidm:ModelParametersEstimation', nidm:withEstimationMethod = 'nidm:OrdinaryLeastSquares', + nidm:voxelWiseEstimation = 'nidm:MassUnivariate', prov:label = "Model Parameters Estimation"]) wasAssociatedWith(niiri:model_fitting_id, niiri:software_id,-) used(niiri:model_fitting_id, niiri:design_matrix_id,-) @@ -234,6 +235,7 @@ document entity(niiri:design_matrix_id, [prov:type = 'nidm:DesignMatrix', prov:location = "file:///path/to/DesignMatrix.csv" %% xsd:anyURI, + nidm:dependenceSpatialModel = 'nidm:SpatiallyGlobalModel', prov:label = "Design Matrix" %% xsd:string]) entity(niiri:contrast_id, [prov:type = 'nidm:ContrastWeights', diff --git a/nidm/nidm-results/spm/spm_results.provn b/nidm/nidm-results/spm/spm_results.provn index e21b65244..79d3d5e7a 100644 --- a/nidm/nidm-results/spm/spm_results.provn +++ b/nidm/nidm-results/spm/spm_results.provn @@ -201,6 +201,7 @@ document prov:location = "file:///path/to/DesignMatrix.csv" %% xsd:anyURI, dct:format = "text/csv", nidm:filename = "DesignMatrix.csv", + nidm:dependenceSpatialModel = 'nidm:SpatiallyGlobalModel', nidm:visualisation = 'niiri:design_matrix_png_id', prov:label = "Design Matrix" %% xsd:string]) entity(niiri:design_matrix_png_id, From f0ce79bbcdeca6ff16b96f962c6c8f8ae1f61c4c Mon Sep 17 00:00:00 2001 From: cmaumet Date: Mon, 27 Oct 2014 10:46:36 +0000 Subject: [PATCH 3/9] Map-wise estimation methods as individuals --- nidm/nidm-results/terms/nidm-results.owl | 121 ++++++++++++----------- 1 file changed, 65 insertions(+), 56 deletions(-) diff --git a/nidm/nidm-results/terms/nidm-results.owl b/nidm/nidm-results/terms/nidm-results.owl index 7909be9b5..9fcba537c 100644 --- a/nidm/nidm-results/terms/nidm-results.owl +++ b/nidm/nidm-results/terms/nidm-results.owl @@ -200,6 +200,8 @@ nidm:hasPixelWiseEstimation rdf:type owl:ObjectProperty ; nidm:hasVoxelWiseEstimation rdf:type owl:ObjectProperty ; + obo:IAO_0000115 "" ; + obo:IAO_0000114 obo:IAO_0000124 ; rdfs:range nidm:ElementWiseEstimation ; @@ -2160,20 +2162,6 @@ NIDM Concept ID: nidm_101. """ ; -### http://www.incf.org/ns/nidash/nidm#LocalMultivariate - -nidm:LocalMultivariate rdf:type owl:Class ; - - rdfs:subClassOf nidm:ElementWiseEstimation ; - - obo:IAO_0000115 "Multivariate model fit on a neighborhood surrounding each voxel; e.g. “searchlight analyses." ; - - obo:IAO_0000117 "TN" ; - - obo:IAO_0000114 obo:IAO_0000124 . - - - ### http://www.incf.org/ns/nidash/nidm#MNICoordinateSystem nidm:MNICoordinateSystem rdf:type owl:Class ; @@ -2234,34 +2222,6 @@ nidm:MaskMap rdf:type owl:Class ; -### http://www.incf.org/ns/nidash/nidm#MassMultivariate - -nidm:MassMultivariate rdf:type owl:Class ; - - rdfs:subClassOf nidm:ElementWiseEstimation ; - - 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_0000114 obo:IAO_0000124 . - - - -### http://www.incf.org/ns/nidash/nidm#MassUnivariate - -nidm:MassUnivariate rdf:type owl:Class ; - - rdfs:subClassOf nidm:ElementWiseEstimation ; - - obo:IAO_0000115 "Univariate model fit independently at each voxel." ; - - obo:IAO_0000117 "TN" ; - - obo:IAO_0000114 obo:IAO_0000124 . - - - ### http://www.incf.org/ns/nidash/nidm#ModelParametersEstimation nidm:ModelParametersEstimation rdf:type owl:Class ; @@ -2282,20 +2242,6 @@ nidm:ModelParametersEstimation rdf:type owl:Class ; -### http://www.incf.org/ns/nidash/nidm#Multivariate - -nidm:Multivariate rdf:type owl:Class ; - - rdfs:subClassOf nidm:ElementWiseEstimation ; - - 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_0000114 obo:IAO_0000124 . - - - ### http://www.incf.org/ns/nidash/nidm#NIDMObjectModel nidm:NIDMObjectModel rdf:type owl:Class ; @@ -2983,6 +2929,45 @@ nidm:Ixi549CoordinateSystem rdf:type nidm:MNICoordinateSystem , +### http://www.incf.org/ns/nidash/nidm#LocalMultivariate + +nidm:LocalMultivariate rdf:type nidm:ElementWiseEstimation , + owl:NamedIndividual ; + + obo:IAO_0000115 "Multivariate model fit on a neighborhood surrounding each voxel; e.g. “searchlight analyses." ; + + obo:IAO_0000117 "TN" ; + + obo:IAO_0000114 obo:IAO_0000124 . + + + +### http://www.incf.org/ns/nidash/nidm#MassMultivariate + +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_0000114 obo:IAO_0000124 . + + + +### http://www.incf.org/ns/nidash/nidm#MassUnivariate + +nidm:MassUnivariate rdf:type nidm:ElementWiseEstimation , + owl:NamedIndividual ; + + obo:IAO_0000115 "Univariate model fit independently at each voxel." ; + + obo:IAO_0000117 "TN" ; + + obo:IAO_0000114 obo:IAO_0000124 . + + + ### http://www.incf.org/ns/nidash/nidm#Mni305CoordinateSystem nidm:Mni305CoordinateSystem rdf:type nidm:MNICoordinateSystem , @@ -2996,7 +2981,31 @@ nidm:Mni305CoordinateSystem rdf:type nidm:MNICoordinateSystem , +<<<<<<< HEAD ### http://www.incf.org/ns/nidash/nidm#pixel4connected +======= +### http://www.incf.org/ns/nidash/nidm#Multivariate + +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_0000114 obo:IAO_0000124 . + + + +### http://www.incf.org/ns/nidash/nidm#connected18In3D + +nidm:connected18In3D rdf:type nidm:ConnectivityCriterion3D , + owl:NamedIndividual . + + + +### http://www.incf.org/ns/nidash/nidm#connected26In3D +>>>>>>> Map-wise estimation methods as individuals nidm:pixel4connected rdf:type nidm:PixelConnectivityCriterion , owl:NamedIndividual ; From c12514c8b44fd0c4ae2cdad3c06b7cd463abdef4 Mon Sep 17 00:00:00 2001 From: cmaumet Date: Tue, 28 Oct 2014 10:35:50 +0000 Subject: [PATCH 4/9] voxelWiseEstimation -> hasVoxelWiseEstimation --- nidm/nidm-results/fsl/fsl_results.provn | 2 +- nidm/nidm-results/spm/example001/example001_spm_results.provn | 2 +- nidm/nidm-results/spm/example002/spm_results_2contrasts.provn | 2 +- nidm/nidm-results/spm/example003/spm_results_conjunction.provn | 2 +- nidm/nidm-results/spm/spm_results.provn | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nidm/nidm-results/fsl/fsl_results.provn b/nidm/nidm-results/fsl/fsl_results.provn index 534046b47..686a486e6 100644 --- a/nidm/nidm-results/fsl/fsl_results.provn +++ b/nidm/nidm-results/fsl/fsl_results.provn @@ -177,7 +177,7 @@ document activity(niiri:model_pe_id, [prov:type = 'nidm:ModelParametersEstimation', nidm:withEstimationMethod = 'nidm:OrdinaryLeastSquares', - nidm:voxelWiseEstimation = 'nidm:MassUnivariate', + nidm:hasVoxelWiseEstimation = 'nidm:MassUnivariate', prov:label = "Model parameters estimation"]) activity(niiri:contrast_estimation_id, diff --git a/nidm/nidm-results/spm/example001/example001_spm_results.provn b/nidm/nidm-results/spm/example001/example001_spm_results.provn index f128672c5..2a09ae1ac 100644 --- a/nidm/nidm-results/spm/example001/example001_spm_results.provn +++ b/nidm/nidm-results/spm/example001/example001_spm_results.provn @@ -184,7 +184,7 @@ document activity(niiri:model_pe_id, [prov:type = 'nidm:ModelParametersEstimation', nidm:withEstimationMethod = 'nidm:GeneralizedLeastSquares', - nidm:voxelWiseEstimation = 'nidm:MassUnivariate', + nidm:hasVoxelWiseEstimation = 'nidm:MassUnivariate', prov:label = "Model parameters estimation"]) wasAssociatedWith(niiri:model_pe_id, niiri:software_id,-) used(niiri:model_pe_id, niiri:design_matrix_id,-) diff --git a/nidm/nidm-results/spm/example002/spm_results_2contrasts.provn b/nidm/nidm-results/spm/example002/spm_results_2contrasts.provn index 5f84cf756..649b9d2e5 100644 --- a/nidm/nidm-results/spm/example002/spm_results_2contrasts.provn +++ b/nidm/nidm-results/spm/example002/spm_results_2contrasts.provn @@ -168,7 +168,7 @@ document activity(niiri:model_fitting_id, [prov:type = 'nidm:ModelParametersEstimation', nidm:withEstimationMethod = 'nidm:OrdinaryLeastSquares', - nidm:voxelWiseEstimation = 'nidm:MassUnivariate', + nidm:hasVoxelWiseEstimation = 'nidm:MassUnivariate', prov:label = "Model Parameters Estimation"]) wasAssociatedWith(niiri:model_fitting_id, niiri:software_id,-) used(niiri:model_fitting_id, niiri:design_matrix_id,-) diff --git a/nidm/nidm-results/spm/example003/spm_results_conjunction.provn b/nidm/nidm-results/spm/example003/spm_results_conjunction.provn index 555118b55..835be0d59 100644 --- a/nidm/nidm-results/spm/example003/spm_results_conjunction.provn +++ b/nidm/nidm-results/spm/example003/spm_results_conjunction.provn @@ -172,7 +172,7 @@ document activity(niiri:model_fitting_id, [prov:type = 'nidm:ModelParametersEstimation', nidm:withEstimationMethod = 'nidm:OrdinaryLeastSquares', - nidm:voxelWiseEstimation = 'nidm:MassUnivariate', + nidm:hasVoxelWiseEstimation = 'nidm:MassUnivariate', prov:label = "Model Parameters Estimation"]) wasAssociatedWith(niiri:model_fitting_id, niiri:software_id,-) used(niiri:model_fitting_id, niiri:design_matrix_id,-) diff --git a/nidm/nidm-results/spm/spm_results.provn b/nidm/nidm-results/spm/spm_results.provn index 79d3d5e7a..6fb68fe55 100644 --- a/nidm/nidm-results/spm/spm_results.provn +++ b/nidm/nidm-results/spm/spm_results.provn @@ -244,7 +244,7 @@ document [prov:type = 'nidm:ModelParametersEstimation', prov:label = "Model parameters estimation", nidm:withEstimationMethod = 'nidm:OrdinaryLeastSquares', - nidm:voxelWiseEstimation = 'nidm:MassUnivariate' + nidm:hasVoxelWiseEstimation = 'nidm:MassUnivariate' ]) wasAssociatedWith(niiri:model_pe_id, niiri:software_id,-) used(niiri:model_pe_id, niiri:design_matrix_id,-) From 4f8e6ac8bb6c58600f8f7a66eb52261f80f79e2a Mon Sep 17 00:00:00 2001 From: cmaumet Date: Tue, 28 Oct 2014 10:36:39 +0000 Subject: [PATCH 5/9] dependenceSpatialModel has domain DesignMatrix --- nidm/nidm-results/terms/nidm-results.owl | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/nidm/nidm-results/terms/nidm-results.owl b/nidm/nidm-results/terms/nidm-results.owl index 9fcba537c..ff602cdbd 100644 --- a/nidm/nidm-results/terms/nidm-results.owl +++ b/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 . From bcfb963d27e59653ebf566ee2789fdffb7274a56 Mon Sep 17 00:00:00 2001 From: cmaumet Date: Fri, 31 Oct 2014 09:34:39 +0000 Subject: [PATCH 6/9] Update Prov Store links --- nidm/nidm-results/fsl/README.md | 8 ++++---- nidm/nidm-results/fsl/example001/README.md | 8 ++++---- nidm/nidm-results/spm/README.md | 8 ++++---- nidm/nidm-results/spm/example001/README.md | 8 ++++---- nidm/nidm-results/spm/example002/README.md | 8 ++++---- nidm/nidm-results/spm/example003/README.md | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/nidm/nidm-results/fsl/README.md b/nidm/nidm-results/fsl/README.md index 3db946517..0e0ec35ab 100644 --- a/nidm/nidm-results/fsl/README.md +++ b/nidm/nidm-results/fsl/README.md @@ -1,9 +1,9 @@ -Prov store: https://provenance.ecs.soton.ac.uk/store/documents/31459/ +Prov store: https://provenance.ecs.soton.ac.uk/store/documents/31480/ -Alternative serialisations: [json](https://provenance.ecs.soton.ac.uk/store/documents/31459.json), [turtle](https://provenance.ecs.soton.ac.uk/store/documents/31459.ttl), -Graph: [svg](https://provenance.ecs.soton.ac.uk/store/documents/31459.svg), [PDF](https://provenance.ecs.soton.ac.uk/store/documents/31459.pdf), [png](https://provenance.ecs.soton.ac.uk/store/documents/31459.png) +Alternative serialisations: [json](https://provenance.ecs.soton.ac.uk/store/documents/31480.json), [turtle](https://provenance.ecs.soton.ac.uk/store/documents/31480.ttl), +Graph: [svg](https://provenance.ecs.soton.ac.uk/store/documents/31480.svg), [PDF](https://provenance.ecs.soton.ac.uk/store/documents/31480.pdf), [png](https://provenance.ecs.soton.ac.uk/store/documents/31480.png) -![Prov Graph](https://provenance.ecs.soton.ac.uk/store/documents/31459.png) +![Prov Graph](https://provenance.ecs.soton.ac.uk/store/documents/31480.png) \ No newline at end of file diff --git a/nidm/nidm-results/fsl/example001/README.md b/nidm/nidm-results/fsl/example001/README.md index 6dff70931..7e01a2efa 100644 --- a/nidm/nidm-results/fsl/example001/README.md +++ b/nidm/nidm-results/fsl/example001/README.md @@ -1,9 +1,9 @@ -Prov store: https://provenance.ecs.soton.ac.uk/store/documents/31458/ +Prov store: https://provenance.ecs.soton.ac.uk/store/documents/31478/ -Alternative serialisations: [json](https://provenance.ecs.soton.ac.uk/store/documents/31458.json), [turtle](https://provenance.ecs.soton.ac.uk/store/documents/31458.ttl), -Graph: [svg](https://provenance.ecs.soton.ac.uk/store/documents/31458.svg), [PDF](https://provenance.ecs.soton.ac.uk/store/documents/31458.pdf), [png](https://provenance.ecs.soton.ac.uk/store/documents/31458.png) +Alternative serialisations: [json](https://provenance.ecs.soton.ac.uk/store/documents/31478.json), [turtle](https://provenance.ecs.soton.ac.uk/store/documents/31478.ttl), +Graph: [svg](https://provenance.ecs.soton.ac.uk/store/documents/31478.svg), [PDF](https://provenance.ecs.soton.ac.uk/store/documents/31478.pdf), [png](https://provenance.ecs.soton.ac.uk/store/documents/31478.png) -![Prov Graph](https://provenance.ecs.soton.ac.uk/store/documents/31458.png) +![Prov Graph](https://provenance.ecs.soton.ac.uk/store/documents/31478.png) \ No newline at end of file diff --git a/nidm/nidm-results/spm/README.md b/nidm/nidm-results/spm/README.md index 593ddb6d0..f4e93e6fa 100644 --- a/nidm/nidm-results/spm/README.md +++ b/nidm/nidm-results/spm/README.md @@ -1,9 +1,9 @@ -Prov store: https://provenance.ecs.soton.ac.uk/store/documents/30689/ +Prov store: https://provenance.ecs.soton.ac.uk/store/documents/31476/ -Alternative serialisations: [json](https://provenance.ecs.soton.ac.uk/store/documents/30689.json), [turtle](https://provenance.ecs.soton.ac.uk/store/documents/30689.ttl), -Graph: [svg](https://provenance.ecs.soton.ac.uk/store/documents/30689.svg), [PDF](https://provenance.ecs.soton.ac.uk/store/documents/30689.pdf), [png](https://provenance.ecs.soton.ac.uk/store/documents/30689.png) +Alternative serialisations: [json](https://provenance.ecs.soton.ac.uk/store/documents/31476.json), [turtle](https://provenance.ecs.soton.ac.uk/store/documents/31476.ttl), +Graph: [svg](https://provenance.ecs.soton.ac.uk/store/documents/31476.svg), [PDF](https://provenance.ecs.soton.ac.uk/store/documents/31476.pdf), [png](https://provenance.ecs.soton.ac.uk/store/documents/31476.png) -![Prov Graph](https://provenance.ecs.soton.ac.uk/store/documents/30689.png) +![Prov Graph](https://provenance.ecs.soton.ac.uk/store/documents/31476.png) \ No newline at end of file diff --git a/nidm/nidm-results/spm/example001/README.md b/nidm/nidm-results/spm/example001/README.md index d4884e531..7d89bd21a 100644 --- a/nidm/nidm-results/spm/example001/README.md +++ b/nidm/nidm-results/spm/example001/README.md @@ -1,9 +1,9 @@ -Prov store: https://provenance.ecs.soton.ac.uk/store/documents/30693/ +Prov store: https://provenance.ecs.soton.ac.uk/store/documents/31481/ -Alternative serialisations: [json](https://provenance.ecs.soton.ac.uk/store/documents/30693.json), [turtle](https://provenance.ecs.soton.ac.uk/store/documents/30693.ttl), -Graph: [svg](https://provenance.ecs.soton.ac.uk/store/documents/30693.svg), [PDF](https://provenance.ecs.soton.ac.uk/store/documents/30693.pdf), [png](https://provenance.ecs.soton.ac.uk/store/documents/30693.png) +Alternative serialisations: [json](https://provenance.ecs.soton.ac.uk/store/documents/31481.json), [turtle](https://provenance.ecs.soton.ac.uk/store/documents/31481.ttl), +Graph: [svg](https://provenance.ecs.soton.ac.uk/store/documents/31481.svg), [PDF](https://provenance.ecs.soton.ac.uk/store/documents/31481.pdf), [png](https://provenance.ecs.soton.ac.uk/store/documents/31481.png) -![Prov Graph](https://provenance.ecs.soton.ac.uk/store/documents/30693.png) +![Prov Graph](https://provenance.ecs.soton.ac.uk/store/documents/31481.png) \ No newline at end of file diff --git a/nidm/nidm-results/spm/example002/README.md b/nidm/nidm-results/spm/example002/README.md index 2f5d15b85..4299a686a 100644 --- a/nidm/nidm-results/spm/example002/README.md +++ b/nidm/nidm-results/spm/example002/README.md @@ -1,9 +1,9 @@ -Prov store: https://provenance.ecs.soton.ac.uk/store/documents/30691/ +Prov store: https://provenance.ecs.soton.ac.uk/store/documents/31479/ -Alternative serialisations: [json](https://provenance.ecs.soton.ac.uk/store/documents/30691.json), [turtle](https://provenance.ecs.soton.ac.uk/store/documents/30691.ttl), -Graph: [svg](https://provenance.ecs.soton.ac.uk/store/documents/30691.svg), [PDF](https://provenance.ecs.soton.ac.uk/store/documents/30691.pdf), [png](https://provenance.ecs.soton.ac.uk/store/documents/30691.png) +Alternative serialisations: [json](https://provenance.ecs.soton.ac.uk/store/documents/31479.json), [turtle](https://provenance.ecs.soton.ac.uk/store/documents/31479.ttl), +Graph: [svg](https://provenance.ecs.soton.ac.uk/store/documents/31479.svg), [PDF](https://provenance.ecs.soton.ac.uk/store/documents/31479.pdf), [png](https://provenance.ecs.soton.ac.uk/store/documents/31479.png) -![Prov Graph](https://provenance.ecs.soton.ac.uk/store/documents/30691.png) +![Prov Graph](https://provenance.ecs.soton.ac.uk/store/documents/31479.png) \ No newline at end of file diff --git a/nidm/nidm-results/spm/example003/README.md b/nidm/nidm-results/spm/example003/README.md index e343ee4b1..5a8e221a5 100644 --- a/nidm/nidm-results/spm/example003/README.md +++ b/nidm/nidm-results/spm/example003/README.md @@ -1,9 +1,9 @@ -Prov store: https://provenance.ecs.soton.ac.uk/store/documents/30690/ +Prov store: https://provenance.ecs.soton.ac.uk/store/documents/31477/ -Alternative serialisations: [json](https://provenance.ecs.soton.ac.uk/store/documents/30690.json), [turtle](https://provenance.ecs.soton.ac.uk/store/documents/30690.ttl), -Graph: [svg](https://provenance.ecs.soton.ac.uk/store/documents/30690.svg), [PDF](https://provenance.ecs.soton.ac.uk/store/documents/30690.pdf), [png](https://provenance.ecs.soton.ac.uk/store/documents/30690.png) +Alternative serialisations: [json](https://provenance.ecs.soton.ac.uk/store/documents/31477.json), [turtle](https://provenance.ecs.soton.ac.uk/store/documents/31477.ttl), +Graph: [svg](https://provenance.ecs.soton.ac.uk/store/documents/31477.svg), [PDF](https://provenance.ecs.soton.ac.uk/store/documents/31477.pdf), [png](https://provenance.ecs.soton.ac.uk/store/documents/31477.png) -![Prov Graph](https://provenance.ecs.soton.ac.uk/store/documents/30690.png) +![Prov Graph](https://provenance.ecs.soton.ac.uk/store/documents/31477.png) \ No newline at end of file From 17410212abbda7a70f25c7cdb952984146da21e3 Mon Sep 17 00:00:00 2001 From: cmaumet Date: Fri, 31 Oct 2014 11:54:10 +0000 Subject: [PATCH 7/9] fix: remaining conflict in owl --- nidm/nidm-results/terms/nidm-results.owl | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/nidm/nidm-results/terms/nidm-results.owl b/nidm/nidm-results/terms/nidm-results.owl index ff602cdbd..e13d32fdc 100644 --- a/nidm/nidm-results/terms/nidm-results.owl +++ b/nidm/nidm-results/terms/nidm-results.owl @@ -2133,18 +2133,11 @@ 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 - ### http://www.incf.org/ns/nidash/nidm#InferenceMaskMap @@ -2987,9 +2980,6 @@ nidm:Mni305CoordinateSystem rdf:type nidm:MNICoordinateSystem , -<<<<<<< HEAD -### http://www.incf.org/ns/nidash/nidm#pixel4connected -======= ### http://www.incf.org/ns/nidash/nidm#Multivariate nidm:Multivariate rdf:type nidm:ElementWiseEstimation , @@ -3002,16 +2992,7 @@ nidm:Multivariate rdf:type nidm:ElementWiseEstimation , obo:IAO_0000114 obo:IAO_0000124 . - -### http://www.incf.org/ns/nidash/nidm#connected18In3D - -nidm:connected18In3D rdf:type nidm:ConnectivityCriterion3D , - owl:NamedIndividual . - - - -### http://www.incf.org/ns/nidash/nidm#connected26In3D ->>>>>>> Map-wise estimation methods as individuals +### http://www.incf.org/ns/nidash/nidm#pixel4connected nidm:pixel4connected rdf:type nidm:PixelConnectivityCriterion , owl:NamedIndividual ; From f56b547f212c460be076af3d17933106269167b7 Mon Sep 17 00:00:00 2001 From: cmaumet Date: Fri, 31 Oct 2014 11:56:40 +0000 Subject: [PATCH 8/9] voxelWiseEstimation -> hasVoxelWiseEstimation --- nidm/nidm-results/fsl/example001/README.md | 8 ++++---- nidm/nidm-results/fsl/example001/fsl_nidm.provn | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nidm/nidm-results/fsl/example001/README.md b/nidm/nidm-results/fsl/example001/README.md index 7e01a2efa..5873c3e68 100644 --- a/nidm/nidm-results/fsl/example001/README.md +++ b/nidm/nidm-results/fsl/example001/README.md @@ -1,9 +1,9 @@ -Prov store: https://provenance.ecs.soton.ac.uk/store/documents/31478/ +Prov store: https://provenance.ecs.soton.ac.uk/store/documents/31483/ -Alternative serialisations: [json](https://provenance.ecs.soton.ac.uk/store/documents/31478.json), [turtle](https://provenance.ecs.soton.ac.uk/store/documents/31478.ttl), -Graph: [svg](https://provenance.ecs.soton.ac.uk/store/documents/31478.svg), [PDF](https://provenance.ecs.soton.ac.uk/store/documents/31478.pdf), [png](https://provenance.ecs.soton.ac.uk/store/documents/31478.png) +Alternative serialisations: [json](https://provenance.ecs.soton.ac.uk/store/documents/31483.json), [turtle](https://provenance.ecs.soton.ac.uk/store/documents/31483.ttl), +Graph: [svg](https://provenance.ecs.soton.ac.uk/store/documents/31483.svg), [PDF](https://provenance.ecs.soton.ac.uk/store/documents/31483.pdf), [png](https://provenance.ecs.soton.ac.uk/store/documents/31483.png) -![Prov Graph](https://provenance.ecs.soton.ac.uk/store/documents/31478.png) +![Prov Graph](https://provenance.ecs.soton.ac.uk/store/documents/31483.png) \ No newline at end of file diff --git a/nidm/nidm-results/fsl/example001/fsl_nidm.provn b/nidm/nidm-results/fsl/example001/fsl_nidm.provn index 9ef02e399..56b38e795 100644 --- a/nidm/nidm-results/fsl/example001/fsl_nidm.provn +++ b/nidm/nidm-results/fsl/example001/fsl_nidm.provn @@ -317,7 +317,7 @@ document activity(niiri:model_parameters_estimation_id, [prov:type = 'nidm:ModelParametersEstimation', nidm:withEstimationMethod = 'nidm:GeneralizedLeastSquares', - nidm:voxelWiseEstimation = 'nidm:MassUnivariate', + nidm:hasVoxelWiseEstimation = 'nidm:MassUnivariate', prov:label = "Model Parameters Estimation"]) activity(niiri:contrast_estimation_id_1, From f344677097ac46f29c983579845c211fc8e1f451 Mon Sep 17 00:00:00 2001 From: cmaumet Date: Tue, 4 Nov 2014 08:35:51 +0000 Subject: [PATCH 9/9] Update turtle serialisations --- nidm/nidm-results/fsl/example001/fsl_nidm.ttl | 6 ++++-- nidm/nidm-results/fsl/fsl_results.ttl | 6 ++++-- nidm/nidm-results/spm/example001/example001_spm_results.ttl | 2 ++ nidm/nidm-results/spm/example002/spm_results_2contrasts.ttl | 4 +++- .../nidm-results/spm/example003/spm_results_conjunction.ttl | 4 +++- nidm/nidm-results/spm/spm_results.ttl | 2 ++ 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/nidm/nidm-results/fsl/example001/fsl_nidm.ttl b/nidm/nidm-results/fsl/example001/fsl_nidm.ttl index bdfe998fb..97b8713ab 100644 --- a/nidm/nidm-results/fsl/example001/fsl_nidm.ttl +++ b/nidm/nidm-results/fsl/example001/fsl_nidm.ttl @@ -268,7 +268,8 @@ niiri:model_parameters_estimation_id prov:used niiri:data_id . niiri:design_matrix_id a prov:Entity , nidm:DesignMatrix ; rdfs:label "Design Matrix" ; - prov:atLocation "file://./DesignMatrix.csv"^^xsd:anyURI . + prov:atLocation "file://./DesignMatrix.csv"^^xsd:anyURI ; + nidm:dependenceSpatialModel nidm:SpatiallyGlobalModel . niiri:contrast_id_1 a prov:Entity , nidm:ContrastWeights ; rdfs:label "Contrast Weights: Generation" ; @@ -286,7 +287,8 @@ niiri:error_model_id a prov:Entity , nidm:ErrorModel ; niiri:model_parameters_estimation_id prov:used niiri:error_model_id ; a prov:Activity , nidm:ModelParametersEstimation ; rdfs:label "Model Parameters Estimation" ; - nidm:withEstimationMethod nidm:GeneralizedLeastSquares . + nidm:withEstimationMethod nidm:GeneralizedLeastSquares ; + nidm:hasVoxelWiseEstimation nidm:MassUnivariate . niiri:contrast_estimation_id_1 a prov:Activity , nidm:ContrastEstimation ; rdfs:label "Contrast estimation: Generation" . diff --git a/nidm/nidm-results/fsl/fsl_results.ttl b/nidm/nidm-results/fsl/fsl_results.ttl index 859a2e961..1eb784a32 100644 --- a/nidm/nidm-results/fsl/fsl_results.ttl +++ b/nidm/nidm-results/fsl/fsl_results.ttl @@ -147,7 +147,8 @@ niiri:resels_per_voxel_map_id prov:wasGeneratedBy niiri:model_pe_id . niiri:design_matrix_id a prov:Entity , nidm:DesignMatrix ; rdfs:label "Design Matrix" ; - prov:atLocation "file:///path/to/DesignMatrix.csv"^^xsd:anyURI . + prov:atLocation "file:///path/to/DesignMatrix.csv"^^xsd:anyURI ; + nidm:dependenceSpatialModel nidm:SpatiallyGlobalModel . niiri:contrast_id a prov:Entity , nidm:ContrastWeights ; rdfs:label "Contrast weights: listening > rest" ; @@ -165,7 +166,8 @@ niiri:error_model_id a prov:Entity , nidm:ErrorModel ; niiri:model_pe_id prov:used niiri:error_model_id ; a prov:Activity , nidm:ModelParametersEstimation ; rdfs:label "Model parameters estimation" ; - nidm:withEstimationMethod nidm:OrdinaryLeastSquares . + nidm:withEstimationMethod nidm:OrdinaryLeastSquares ; + nidm:hasVoxelWiseEstimation nidm:MassUnivariate . niiri:contrast_estimation_id a prov:Activity , nidm:ContrastEstimation ; rdfs:label "Contrast estimation" . diff --git a/nidm/nidm-results/spm/example001/example001_spm_results.ttl b/nidm/nidm-results/spm/example001/example001_spm_results.ttl index a5ebeaa14..294fa1d52 100644 --- a/nidm/nidm-results/spm/example001/example001_spm_results.ttl +++ b/nidm/nidm-results/spm/example001/example001_spm_results.ttl @@ -163,6 +163,7 @@ niiri:design_matrix_id a prov:Entity , nidm:DesignMatrix ; rdfs:label "Design Matrix" ; prov:atLocation "file://./DesignMatrix.csv"^^xsd:anyURI ; nidm:filename "DesignMatrix.csv"^^xsd:string ; + nidm:dependenceSpatialModel nidm:SpatiallyGlobalModel ; dct:format "text/csv"^^xsd:string ; nidm:visualisation niiri:design_matrix_png_id . @@ -188,6 +189,7 @@ niiri:model_pe_id prov:used niiri:error_model_id ; a prov:Activity , nidm:ModelParametersEstimation ; rdfs:label "Model parameters estimation" ; nidm:withEstimationMethod nidm:GeneralizedLeastSquares ; + nidm:hasVoxelWiseEstimation nidm:MassUnivariate ; prov:wasAssociatedWith niiri:software_id ; prov:used niiri:design_matrix_id . diff --git a/nidm/nidm-results/spm/example002/spm_results_2contrasts.ttl b/nidm/nidm-results/spm/example002/spm_results_2contrasts.ttl index ec08c12ba..34aa80b08 100644 --- a/nidm/nidm-results/spm/example002/spm_results_2contrasts.ttl +++ b/nidm/nidm-results/spm/example002/spm_results_2contrasts.ttl @@ -162,6 +162,7 @@ niiri:model_fitting_id prov:used niiri:error_model_id ; a prov:Activity , nidm:ModelParametersEstimation ; rdfs:label "Model Parameters Estimation" ; nidm:withEstimationMethod nidm:OrdinaryLeastSquares ; + nidm:hasVoxelWiseEstimation nidm:MassUnivariate ; prov:wasAssociatedWith niiri:software_id ; prov:used niiri:design_matrix_id . @@ -225,7 +226,8 @@ niiri:residual_mean_squares_map_id a prov:Entity , nidm:ResidualMeanSquaresMap ; niiri:design_matrix_id a prov:Entity , nidm:DesignMatrix ; rdfs:label "Design Matrix" ; - prov:atLocation "file:///path/to/DesignMatrix.csv"^^xsd:anyURI . + prov:atLocation "file:///path/to/DesignMatrix.csv"^^xsd:anyURI ; + nidm:dependenceSpatialModel nidm:SpatiallyGlobalModel . niiri:contrast_id a prov:Entity , nidm:ContrastWeights ; rdfs:label "T Contrast weights: 1 -1 0 0" ; diff --git a/nidm/nidm-results/spm/example003/spm_results_conjunction.ttl b/nidm/nidm-results/spm/example003/spm_results_conjunction.ttl index aed9607e9..f63584b10 100644 --- a/nidm/nidm-results/spm/example003/spm_results_conjunction.ttl +++ b/nidm/nidm-results/spm/example003/spm_results_conjunction.ttl @@ -159,6 +159,7 @@ niiri:model_fitting_id prov:used niiri:error_model_id ; a prov:Activity , nidm:ModelParametersEstimation ; rdfs:label "Model Parameters Estimation" ; nidm:withEstimationMethod nidm:OrdinaryLeastSquares ; + nidm:hasVoxelWiseEstimation nidm:MassUnivariate ; prov:wasAssociatedWith niiri:software_id ; prov:used niiri:design_matrix_id . @@ -222,7 +223,8 @@ niiri:residual_mean_squares_map_id a prov:Entity , nidm:ResidualMeanSquaresMap ; niiri:design_matrix_id a prov:Entity , nidm:DesignMatrix ; rdfs:label "Design Matrix" ; - prov:atLocation "file:///path/to/DesignMatrix.csv"^^xsd:anyURI . + prov:atLocation "file:///path/to/DesignMatrix.csv"^^xsd:anyURI ; + nidm:dependenceSpatialModel nidm:SpatiallyGlobalModel . niiri:contrast_id a prov:Entity , nidm:ContrastWeights ; rdfs:label "T Contrast weights: 1 -1 0 0" ; diff --git a/nidm/nidm-results/spm/spm_results.ttl b/nidm/nidm-results/spm/spm_results.ttl index 3aee73935..a30dc4f2b 100644 --- a/nidm/nidm-results/spm/spm_results.ttl +++ b/nidm/nidm-results/spm/spm_results.ttl @@ -208,6 +208,7 @@ niiri:design_matrix_id a prov:Entity , nidm:DesignMatrix ; prov:atLocation "file:///path/to/DesignMatrix.csv"^^xsd:anyURI ; dct:format "text/csv"^^xsd:string ; nidm:filename "DesignMatrix.csv"^^xsd:string ; + nidm:dependenceSpatialModel nidm:SpatiallyGlobalModel ; nidm:visualisation niiri:design_matrix_png_id . niiri:design_matrix_png_id a prov:Entity , nidm:Image ; @@ -249,6 +250,7 @@ niiri:model_pe_id prov:used niiri:error_model_id ; a prov:Activity , nidm:ModelParametersEstimation ; rdfs:label "Model parameters estimation" ; nidm:withEstimationMethod nidm:OrdinaryLeastSquares ; + nidm:hasVoxelWiseEstimation nidm:MassUnivariate ; prov:wasAssociatedWith niiri:software_id ; prov:used niiri:design_matrix_id .