Skip to content

Commit 4f91c5f

Browse files
committed
Move contents of if else statement that was improperly nested
1 parent 1271d32 commit 4f91c5f

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

WorkSpace/EricModel/a0_Fit_GR_and_DUSP1_models.m

+6-10
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
clear
1111
addpath(genpath('../../src'));
1212

13-
loadPrevious = false;
13+
loadPrevious = true;
1414
savedWorkspace = 'workspaceJuly24';
1515
addpath('tmpPropensityFunctions');
1616

@@ -36,6 +36,9 @@
3636
ModelGRfit{i} = ModelGRfit{i}.formPropensitiesGeneral('GR_Model');
3737
end
3838
end
39+
fitIters = 1;
40+
load('EricModel_MMDex','GRpars')
41+
ModelGR.parameters(5:12,2) = num2cell([GRpars]);
3942
else
4043
fitOptions = optimset('Display','iter','MaxIter',300);
4144
%% STEP 0.B.1. -- Create Base Model for GR Only
@@ -74,15 +77,8 @@
7477
[FSPGrSoln,ModelGR.fspOptions.bounds] = ModelGR.solve;
7578
[FSPGrSoln,ModelGR.fspOptions.bounds] = ModelGR.solve(FSPGrSoln.stateSpace);
7679
%% STEP 0.B.2. -- Load previously fit parameter values (optional)
77-
if loadPrevious
78-
fitIters = 1;
79-
load('EricModel_MMDex','GRpars')
80-
ModelGR.parameters(5:12,2) = num2cell([GRpars]);
81-
else
82-
GRpars = cell2mat(ModelGR.parameters(5:12,2));
83-
fitIters = 3;
84-
GRpars = cell2mat(ModelGR.parameters(5:12,2))';
85-
end
80+
fitIters = 3;
81+
GRpars = cell2mat(ModelGR.parameters(5:12,2))';
8682

8783
%% STEP 0.B.3. -- Associate GR Data with Different Instances of Model (10,100nm Dex)
8884
GRfitCases = {'1','1',101,'GR Fit (1nM Dex)';...

0 commit comments

Comments
 (0)