fminalgo=5 minor improve

Author: robertdkirkby

HeterogeneousAgent/FHorz/HeteroAgentStationaryEqm_Case1_FHorz.m

@@ -326,16 +326,16 @@
         [p_eqm_vec,GeneralEqmConditions,counteval,stopflag,out,bestever] = cmaes_vfitoolkit(GeneralEqmConditionsFnOpt,p0,heteroagentoptions.insigma,heteroagentoptions.inopts); % ,varargin);
     elseif heteroagentoptions.fminalgo==5
         % Update based on rules in heteroagentoptions.fminalgo5.howtoupdate
-        GeneralEqmEqnsNames=fieldnames(GeneralEqmEqns);
-        GeneralEqmConditions=Inf;
         % Get initial prices, p
         p=nan(1,length(GEPriceParamNames));
         for ii=1:length(GEPriceParamNames)
             p(ii)=Parameters.(GEPriceParamNames{ii});
         end
         % Given current prices solve the model to get the general equilibrium conditions as a structure
+        itercounter=0;
         p_change=Inf;
-        while any(p_change>heteroagentoptions.heteroagentoptions.toleranceGEprices) || GeneralEqmConditions>heteroagentoptions.toleranceGEcondns
+        GeneralEqmConditions=Inf;
+        while (any(p_change>heteroagentoptions.toleranceGEprices) || GeneralEqmConditions>heteroagentoptions.toleranceGEcondns) && itercounter<heteroagentoptions.maxiter
 
             p_i=GeneralEqmConditionsFnOpt(p); % using heteroagentoptions.outputGEform=1, so this is a vector (note the transpose)
 
@@ -365,6 +365,7 @@
             % p_percentchange(p==0)=abs(p_new(p==0)); %-p(p==0)); but this is just zero anyway
             % Update p for next iteration
             p=p_new;
+            itercounter=itercounter+1; % increment iteration counter
         end
         p_eqm_vec=p_new; % Need to put it in p_eqm_vec so that it can be used to create the final output
     elseif heteroagentoptions.fminalgo==6

HeterogeneousAgent/FHorz/PType/HeteroAgentStationaryEqm_Case1_FHorz_PType.m

@@ -634,17 +634,16 @@
         [p_eqm_vec,GeneralEqmConditions,counteval,stopflag,out,bestever] = cmaes_vfitoolkit(GeneralEqmConditionsFnOpt,p0,heteroagentoptions.insigma,heteroagentoptions.inopts); % ,varargin);
     elseif heteroagentoptions.fminalgo==5
         % Update based on rules in heteroagentoptions.fminalgo5.howtoupdate
-        GeneralEqmEqnsNames=fieldnames(GeneralEqmEqns);
-        GeneralEqmConditions=Inf;
         % Get initial prices, p
         p=nan(1,length(GEPriceParamNames));
         for ii=1:length(GEPriceParamNames)
             p(ii)=Parameters.(GEPriceParamNames{ii});
         end
         % Given current prices solve the model to get the general equilibrium conditions as a structure
-        itercount=0;
+        itercounter=0;
         p_change=Inf;
-        while any(p_change>heteroagentoptions.heteroagentoptions.toleranceGEprices) || GeneralEqmConditions>heteroagentoptions.toleranceGEcondns
+        GeneralEqmConditions=Inf;
+        while (any(p_change>heteroagentoptions.toleranceGEprices) || GeneralEqmConditions>heteroagentoptions.toleranceGEcondns) && itercounter<heteroagentoptions.maxiter
 
             p_i=GeneralEqmConditionsFnOpt(p); % using heteroagentoptions.outputGEform=1, so this is a vector
 
@@ -673,6 +672,7 @@
             % p_percentchange(p==0)=abs(p_new(p==0)); %-p(p==0)); but this is just zero anyway
             % Update p for next iteration
             p=p_new;
+            itercounter=itercounter+1; % increment iteration counter
         end
         p_eqm_vec=p_new; % Need to put it in p_eqm_vec so that it can be used to create the final output
     elseif heteroagentoptions.fminalgo==6

HeterogeneousAgent/HeteroAgentStationaryEqm_Case1.m

@@ -299,15 +299,16 @@
         [p_eqm_vec,GeneralEqmConditions,counteval,stopflag,out,bestever] = cmaes_vfitoolkit(GeneralEqmConditionsFnOpt,p0,heteroagentoptions.insigma,heteroagentoptions.inopts); % ,varargin);
     elseif heteroagentoptions.fminalgo==5
         % Update based on rules in heteroagentoptions.fminalgo5.howtoupdate
-        GeneralEqmConditions=Inf;
         % Get initial prices, p
         p=nan(1,length(GEPriceParamNames));
         for ii=1:length(GEPriceParamNames)
             p(ii)=Parameters.(GEPriceParamNames{ii});
         end
         % Given current prices solve the model to get the general equilibrium conditions as a structure
+        itercounter=0;
         p_change=Inf;
-        while any(p_change>heteroagentoptions.heteroagentoptions.toleranceGEprices) || GeneralEqmConditions>heteroagentoptions.toleranceGEcondns
+        GeneralEqmConditions=Inf;
+        while (any(p_change>heteroagentoptions.toleranceGEprices) || GeneralEqmConditions>heteroagentoptions.toleranceGEcondns) && itercounter<heteroagentoptions.maxiter
 
             p_i=GeneralEqmConditionsFnOpt(p); % using heteroagentoptions.outputGEform=1, so this is a vector (note the transpose)
 
@@ -337,6 +338,7 @@
             % p_percentchange(p==0)=abs(p_new(p==0)); %-p(p==0)); but this is just zero anyway
             % Update p for next iteration
             p=p_new;
+            itercounter=itercounter+1; % increment iteration counter
         end
         p_eqm_vec=p_new; % Need to put it in p_eqm_vec so that it can be used to create the final output
     elseif heteroagentoptions.fminalgo==7 % Matlab fsolve()

HeterogeneousAgent/PType/HeteroAgentStationaryEqm_Case1_PType.m

@@ -568,16 +568,16 @@
         [p_eqm_vec,GeneralEqmConditions,counteval,stopflag,out,bestever] = cmaes_vfitoolkit(GeneralEqmConditionsFnOpt,p0,heteroagentoptions.insigma,heteroagentoptions.inopts); % ,varargin);
     elseif heteroagentoptions.fminalgo==5
         % Update based on rules in heteroagentoptions.fminalgo5.howtoupdate
-        GeneralEqmEqnsNames=fieldnames(GeneralEqmEqns);
-        GeneralEqmConditions=Inf;
         % Get initial prices, p
         p=nan(1,length(GEPriceParamNames));
         for ii=1:length(GEPriceParamNames)
             p(ii)=Parameters.(GEPriceParamNames{ii});
         end
         % Given current prices solve the model to get the general equilibrium conditions as a structure
+        itercounter=0;
         p_change=Inf;
-        while any(p_change>heteroagentoptions.heteroagentoptions.toleranceGEprices) || GeneralEqmConditions>heteroagentoptions.toleranceGEcondns
+        GeneralEqmConditions=Inf;
+        while (any(p_change>heteroagentoptions.toleranceGEprices) || GeneralEqmConditions>heteroagentoptions.toleranceGEcondns) && itercounter<heteroagentoptions.maxiter
 
             p_i=GeneralEqmConditionsFnOpt(p); % using heteroagentoptions.outputGEform=1, so this is a vector
 
@@ -606,6 +606,7 @@
             % p_percentchange(p==0)=abs(p_new(p==0)); %-p(p==0)); but this is just zero anyway
             % Update p for next iteration
             p=p_new;
+            itercounter=itercounter+1; % increment iteration counter
         end
         p_eqm_vec=p_new; % Need to put it in p_eqm_vec so that it can be used to create the final output
     elseif heteroagentoptions.fminalgo==6