diff --git a/arFramework3/Advanced/arCreateDataStruct.m b/arFramework3/Advanced/arCreateDataStruct.m index 0271419f..060cd82a 100644 --- a/arFramework3/Advanced/arCreateDataStruct.m +++ b/arFramework3/Advanced/arCreateDataStruct.m @@ -161,8 +161,12 @@ D.fp = transpose(D.p); % execute substitutions from ar.model.p/ar.model.fp -[int, iA, iB] = intersect(D.fp, ar.model.p); -D.fp(iA) = ar.model.fp(iB); +% try + [int, iA, iB] = intersect(D.fp, ar.model(m).p); +% catch +% ar.model.p +% end +D.fp(iA) = ar.model(m).fp(iB); %% now replace fp which was provided as function argument: [~,ia,ib] = intersect(D.p,pold); diff --git a/arFramework3/Advanced/arFindInputs.m b/arFramework3/Advanced/arFindInputs.m index 1c8dbacb..205ef78b 100644 --- a/arFramework3/Advanced/arFindInputs.m +++ b/arFramework3/Advanced/arFindInputs.m @@ -61,7 +61,7 @@ for c = 1 : length( step1 ) ar.model(m).condition(a).fu{b}(step1(c):end); - chk = strsplit(ar.model(m).condition(a).fu{b}(step1(c):end),','); + chk = strsplit(ar.model(m).condition(a).fu{b}(step1(c):end),',') stepLocations{end+1} = chk{3}; %#ok end for c = 1 : length( step2 ) diff --git a/arFramework3/Advanced/arRecompile.m b/arFramework3/Advanced/arRecompile.m index fcb092ec..958b6129 100644 --- a/arFramework3/Advanced/arRecompile.m +++ b/arFramework3/Advanced/arRecompile.m @@ -24,6 +24,13 @@ function arRecompile(sameParameterSettings, varargin) if isfield(ar,'setup') % only available in higher verions arIn = arDeepCopy(ar); + + if(~isfield(arIn.setup,'backup_model_folder_local')) + error('arRecompile: ar.setup.backup_model_folder_local does not exist. Save first via arSave.') + end + if(~isfield(arIn.setup,'backup_data_folder')) + error('arRecompile: ar.setup.backup_data_folder does not exist. Save first via arSave.') + end try for i=1:length(arIn.setup.commands)