Save max number of permutations in all modules

SnPM-toolbox · Apr 28, 2017 · 729a523 · 729a523
1 parent b61ff14
commit 729a523
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/snpm_cp.m b/snpm_cp.m
@@ -350,7 +350,7 @@ function snpm_cp(CWD)
 nidm_json('nidm_NonParametricNullDistribution/nidm_numberOfPermutations') = nPerm;
 nidm_json('nidm_NonParametricNullDistribution/nidm_hasResamplingScheme') = 'nidm_Permutation';
 nidm_json('nidm_NonParametricNullDistribution/nidm_hasApproximationMethod') = 'nidm_MonteCarlo';
-nidm_json('nidm_NonParametricNullDistribution/nidm_maximumNumberOfPermutations') = nPiCond_mx;
+nidm_json('nidm_NonParametricNullDistribution/nidm_maximumNumberOfPermutations') = nPerm_max;
 
 con_names = nidm_json('Contrasts').keys;
 for i = 1:numel(con_names)

diff --git a/snpm_ui.m b/snpm_ui.m
@@ -303,6 +303,17 @@ function snpm_ui(varargin)
 %-Total #observations
 nScan = size(P,1);
 
+%-Max number of possible permutations
+if exist('nPiCond_mx', 'var')
+    nPerm_max = nPiCond_mx;
+elseif exist('nPiStud_mx', 'var')
+    nPerm_max = nPiStud_mx;
+elseif exist('nPiSubj_mx', 'var')
+    nPerm_max = nPiSubj_mx;
+else
+    error('snpm:MissingMaxPerm', 'Maximum number of permutations not found')
+end
+
 %-Get general analysis & data parameters
 %=======================================================================
 
@@ -587,7 +598,7 @@ function snpm_ui(varargin)
 s_SnPMcfg_save = ['s_SnPMcfg_save H C B G HCBGnames P PiCond ',...
 	'sPiCond bhPerms sHCform iGloNorm sGloNorm GM rg GX GMscale CONT ',...
 	'THRESH MASK ImMASK TH bVarSm vFWHM sVarSm bVolm bST sDesFile sDesign ',...
-        'V pU_ST_Ut df1 nidm_json nPiCond_mx nidm_json ', ...
+        'V pU_ST_Ut df1 nidm_json nPerm_max nidm_json ', ...
 	'sDesSave ',sDesSave];
 eval(['save SnPMcfg ',s_SnPMcfg_save])