Move contents of if else statement that was improperly nested

MunskyGroup · Oct 24, 2024 · 4f91c5f · 4f91c5f
1 parent 1271d32
commit 4f91c5f
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/WorkSpace/EricModel/a0_Fit_GR_and_DUSP1_models.m b/WorkSpace/EricModel/a0_Fit_GR_and_DUSP1_models.m
@@ -10,7 +10,7 @@
 clear
 addpath(genpath('../../src'));
 
-loadPrevious = false;
+loadPrevious = true;
 savedWorkspace = 'workspaceJuly24';
 addpath('tmpPropensityFunctions');
 
@@ -36,6 +36,9 @@
             ModelGRfit{i} = ModelGRfit{i}.formPropensitiesGeneral('GR_Model');
         end
     end
+    fitIters = 1;
+    load('EricModel_MMDex','GRpars')
+    ModelGR.parameters(5:12,2) = num2cell([GRpars]);
 else
     fitOptions = optimset('Display','iter','MaxIter',300);
     %% STEP 0.B.1. -- Create Base Model for GR Only
@@ -74,15 +77,8 @@
     [FSPGrSoln,ModelGR.fspOptions.bounds] = ModelGR.solve;
     [FSPGrSoln,ModelGR.fspOptions.bounds] = ModelGR.solve(FSPGrSoln.stateSpace);
     %% STEP 0.B.2. -- Load previously fit parameter values (optional)
-    if loadPrevious
-        fitIters = 1;
-        load('EricModel_MMDex','GRpars')
-        ModelGR.parameters(5:12,2) = num2cell([GRpars]);
-    else
-        GRpars = cell2mat(ModelGR.parameters(5:12,2));
-        fitIters = 3;
-        GRpars = cell2mat(ModelGR.parameters(5:12,2))';
-    end    
+    fitIters = 3;
+    GRpars = cell2mat(ModelGR.parameters(5:12,2))';   
 
     %% STEP 0.B.3. -- Associate GR Data with Different Instances of Model (10,100nm Dex)
     GRfitCases = {'1','1',101,'GR Fit (1nM Dex)';...