Update SSITMultiModel.m

Author: Munsky

src/CommandLine/SSITMultiModel.m

@@ -168,10 +168,15 @@
             % plots of the results.
             arguments
                 SMM
-                parameters
+                parameters = []
                 makeplot = false
                 fignums = [];
             end
+
+            if isempty(parameters)
+                parameters = SMM.parameters;
+            end
+            
             Nmods = length(SMM.SSITModels);
             for i = 1:Nmods
                 SMM.SSITModels{i}.parameters(SMM.SSITModels{i}.fittingOptions.modelVarsToFit,2) = ...
@@ -209,11 +214,19 @@
         end
 
         function totalLogLikelihood = computeTotalLogLikelihood(SMM,parameterGuess)
+            arguments
+                SMM
+                parameterGuess = [];
+            end
             % Method that computes the total log likeihood of all data and
             % all models for the provided parameter combination.
             Nmods = length(SMM.logLikelihoodFunctions);
             logLs = zeros(1,Nmods);
 
+            if isempty(parameterGuess)
+                parameterGuess = SMM.parameters;
+            end
+
             G = cell(1,Nmods);
             for i = 1:Nmods
                 G{i} = SMM.logLikelihoodFunctions{i};
@@ -284,6 +297,13 @@
 
             x0 = log(parGuess);
 
+            if isfield(fitOptions,'suppressExpansion')&&fitOptions.suppressExpansion==true
+                for iModel = 1:length(SMM.SSITModels)
+                    oldFspTols(iModel) = SMM.SSITModels{iModel}.fspOptions.fspTol;
+                    SMM.SSITModels{iModel}.fspOptions.fspTol = inf;
+                end
+            end
+
             objFun = @(x)-SMM.computeTotalLogLikelihood(exp(x));  % We want to MAXIMIZE the likelihood.
 
             switch fitAlgorithm
@@ -405,6 +425,12 @@
             SMM.parameters = pars;
             SMM = SMM.updateModels(pars);
 
+            if isfield(fitOptions,'suppressExpansion')&&fitOptions.suppressExpansion==true
+                for iModel = 1:length(SMM.SSITModels)
+                    SMM.SSITModels{iModel}.fspOptions.fspTol = oldFspTols(iModel);
+                end
+            end
+
         end
         function compareParameters(SMM,fignum,relative)
             % This function makes a heatmap plot to compare parameters in a