Skip to content

Commit 0821098

Browse files
committed
update PEtab Import/Export
1 parent f14b483 commit 0821098

File tree

7 files changed

+1011
-92
lines changed

7 files changed

+1011
-92
lines changed

arFramework3/Deprecated/arImportPEtab_old.m

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function arImportPEtab(name, doPreEq)
1+
function arImportPEtab_old(name, doPreEq)
22
% arImportPEtab(name, doPreEq)
33
% Import parameter estimation problem formulated in the PEtab standard.
44
%
@@ -73,7 +73,7 @@ function arImportPEtab(name, doPreEq)
7373
inputArgs{end+1} = out;
7474
end
7575

76-
arImportPEtab(cellfun(@(x) [yamlPath, filesep, x], [inputArgs{:}], 'UniformOutput', false),doPreEq);
76+
arImportPEtab_old(cellfun(@(x) [yamlPath, filesep, x], [inputArgs{:}], 'UniformOutput', false),doPreEq);
7777
% also check arReadPEtabYaml
7878
return
7979
end
@@ -142,6 +142,7 @@ function arImportPEtab(name, doPreEq)
142142
error('More than one pre-equiblibration condition currently not supported.')
143143
end
144144

145+
145146
for iPreEqCond = 1:size(uniquePreEqConds,1)
146147
preEqCondId = convertStringsToChars(uniquePreEqConds(iPreEqCond));
147148
preEqCond = arFindCondition(preEqCondId, 'conservative');
@@ -161,21 +162,24 @@ function arImportPEtab(name, doPreEq)
161162
% simConds
162163
arSteadyState(imodel, preEqCond, simConds, tstart);
163164
end
164-
for iSimCond = 1:length(uniqueSimConds)
165-
Tcondi = Tcond(Tcond.conditionId == uniqueSimConds(iSimCond),:);
166-
167-
% iSimCond auf richtige provozieren
168-
%iSimCondAr = ar.model(m).data(iSimCond).cLink;
169-
iSimCondAr = find(cellfun(@(x) strcmp(x, uniqueSimConds(iSimCond)), {ar.model(m).data.name}));
170-
iSimCondAr = ar.model(m).data(iSimCondAr).cLink;
171-
% alt:
172-
% iSimCondAr = find(cellfun(@(x) strcmp(x, uniqueSimConds(iSimCond)), {ar.model(m).data.name}));
173165

174-
for iCol = 1:length(Tcondi.Properties.VariableNames)
175-
idxState = find(strcmp(Tcondi.Properties.VariableNames{iCol},ar.model.xNames));
176-
if ~isempty(idxState)
177-
arAddEvent(m,iSimCondAr,0.0001,ar.model.x{idxState}, 0, Tcondi.(ar.model.xNames{idxState}));
178-
% ar = arAddEvent([ar], model, condition, timepoints, [statename], [A], [B], [sA], [sB])
166+
if numel(uniquePreEqConds) > 0
167+
for iSimCond = 1:length(uniqueSimConds)
168+
Tcondi = Tcond(Tcond.conditionId == uniqueSimConds(iSimCond),:);
169+
170+
% iSimCond auf richtige provozieren
171+
%iSimCondAr = ar.model(m).data(iSimCond).cLink;
172+
iSimCondAr = find(cellfun(@(x) strcmp(x, uniqueSimConds(iSimCond)), {ar.model(m).data.name}));
173+
iSimCondAr = ar.model(m).data(iSimCondAr).cLink;
174+
% alt:
175+
% iSimCondAr = find(cellfun(@(x) strcmp(x, uniqueSimConds(iSimCond)), {ar.model(m).data.name}));
176+
177+
for iCol = 1:length(Tcondi.Properties.VariableNames)
178+
idxState = find(strcmp(Tcondi.Properties.VariableNames{iCol},ar.model.xNames));
179+
if ~isempty(idxState)
180+
arAddEvent(m,iSimCondAr,0.0001,ar.model.x{idxState}, 0, Tcondi.(ar.model.xNames{idxState}));
181+
% ar = arAddEvent([ar], model, condition, timepoints, [statename], [A], [B], [sA], [sB])
182+
end
179183
end
180184
end
181185
end

0 commit comments

Comments
 (0)