Fix some bugs

Author: emammendes

script_generate_feasible_region_brute_force.m

@@ -73,22 +73,22 @@
 disp('');
 
 
-% Obs.:  Flagc will be active in the file procedure_jianbo_esp.m 
+% Obs.:  Flagc will be active in the file procedure_orig_esp.m 
 
 %% Simulation parameters
 
 ksteps=1;fprintf('For the feasible region just %d step is needed\n',ksteps);
 
 umax=1;
-xmax=3;  % xmax=1.5;
+xmax=1.5;  % xmax=1.5;
 if flagc ==1
     fprintf('Maximum allowed control input = %g\n',umax);
 elseif flagc == 2
     fprintf('Maximum allowed control input = %g\n',umax);
     fprintf('Maximum vale for the state    = %g\n',xmax);
 end
 
-nrep=2000;fprintf('Number of replications = %d\n',nrep);
+nrep=200;fprintf('Number of replications = %d\n',nrep);
 
 
 %% Predicted Control Strategy
@@ -123,7 +123,7 @@
 %  I have just added the following in case I need to change the matrix B in
 %  the example. parb=[0.0] which is the value in the paper.
 
-parb=[0.0];% 0.4 0.45 0.46 0.47 0.475 0.476 0.477 0.478 0.478 0.479 0.48 0.49 0.5 0.6 0.7 0.8 0.9 1.0]; % values of the parameter b
+parb=[0.4];% 0.4 0.45 0.46 0.47 0.475 0.476 0.477 0.478 0.478 0.479 0.48 0.49 0.5 0.6 0.7 0.8 0.9 1.0]; % values of the parameter b
 
 %% Main Loop
 
@@ -135,11 +135,11 @@
     fprintf('Simulation for B{2,1}=[%g;1]\n',parb(iparb));
     disp(' ');
 
-    ccontrol_jianbo = zeros(nrep,1); % Total Control Cost of the original method
+    ccontrol_orig = zeros(nrep,1); % Total Control Cost of the original method
 
-    x_jianbo=[];
+    x_orig=[];
 
-    u_jianbo=[];
+    u_orig=[];
 
     mc=1;
 
@@ -159,7 +159,7 @@
 
         % Save solver info
 
-        infoSolver_jianbo{1,mc}='Initial';
+        infoSolver_orig{1,mc}='Initial';
 
         % Just to be sure that uk is not feasible and it is the replication is
         % not taken into account
@@ -201,9 +201,9 @@
         % If there is no problem with the solution do
 
         if flagfeas
-            ccontrol_jianbo(mc)=cc_jianbo;
-            x_jianbo=[x_jianbo x'];
-            u_jianbo=[u_jianbo u'];
+            ccontrol_orig(mc)=cc_orig;
+            x_orig=[x_orig x'];
+            u_orig=[u_orig u'];
             mc=mc+1;
         else
             mc_failure=[mc_failure mcseed];
@@ -217,33 +217,33 @@
 
     %% Mean and Standard deviation for the states
 
-    x_jianbo_mean=[];
+    x_orig_mean=[];
 
-    x_jianbo_std=[];
+    x_orig_std=[];
 
     for i=1:nx
-        x_jianbo_mean=[x_jianbo_mean mean(x_jianbo(:,i:nx:size(x_jianbo,2)),2)];
-        x_jianbo_std=[x_jianbo_std 2*std(x_jianbo(:,i:nx:size(x_jianbo,2))')'];
+        x_orig_mean=[x_orig_mean mean(x_orig(:,i:nx:size(x_orig,2)),2)];
+        x_orig_std=[x_orig_std 2*std(x_orig(:,i:nx:size(x_orig,2))')'];
     end
 
     %% Mean and Standard deviation for the input
 
-    u_jianbo_mean=mean(u_jianbo,2);
-    u_jianbo_std=2*std(u_jianbo')';
+    u_orig_mean=mean(u_orig,2);
+    u_orig_std=2*std(u_orig')';
 
     %% Save the results of the simulation
 
-    fcost_jianbo{iparb}=mean(ccontrol_jianbo);
+    fcost_orig{iparb}=mean(ccontrol_orig);
 
-    finfoSolver_jianbo{iparb}=infoSolver_jianbo;
+    finfoSolver_orig{iparb}=infoSolver_orig;
 
-    fx_jianbo_mean{iparb}=x_jianbo_mean;
+    fx_orig_mean{iparb}=x_orig_mean;
 
-    fx_jianbo_std{iparb}=x_jianbo_std;
+    fx_orig_std{iparb}=x_orig_std;
 
-    fu_jianbo_mean{iparb}=u_jianbo_mean;
+    fu_orig_mean{iparb}=u_orig_mean;
 
-    fu_jianbo_std{iparb}=u_jianbo_std;
+    fu_orig_std{iparb}=u_orig_std;
 
 end
 
@@ -259,7 +259,7 @@
 if flagx > 0
     tfig=tfig+1;
     figure(tfig);
-    plot(x_jianbo(1,1:nx:end),x_jianbo(1,2:nx:end),'*');
+    plot(x_orig(1,1:nx:end),x_orig(1,2:nx:end),'*');
     if flagc == 1
         title(sprintf('Valid initial conditions over %g replications for N = %d - Input constraint',nrep,N));
     else
@@ -278,21 +278,21 @@
 for i=1:tfig
     if flagc == 1
         if flagx 
-            s=sprintf('images/feasreg_jianbo_%d_u_constraint_N_%d_nrep_%d_random.png',i,N,nrep);
+            s=sprintf('images/feasreg_orig_%d_u_constraint_N_%d_nrep_%d_random.png',i,N,nrep);
         else
-            s=sprintf('images/feasreg_jianbo_%d_u_constraint_N_%d_nrep_%d.png',i,N,nrep);
+            s=sprintf('images/feasreg_orig_%d_u_constraint_N_%d_nrep_%d.png',i,N,nrep);
         end
     elseif flagc == 2
         if flagx 
-            s=sprintf('images/feasreg_jianbo_%d_u_and_x_constraints_N_%d_nrep_%d_random.png',i,N,nrep);
+            s=sprintf('images/feasreg_orig_%d_u_and_x_constraints_N_%d_nrep_%d_random.png',i,N,nrep);
         else
-            s=sprintf('images/feasreg_jianbo_%d_u_and_x_constraints_N_%d_nrep_%d.png',i,N,nrep);
+            s=sprintf('images/feasreg_orig_%d_u_and_x_constraints_N_%d_nrep_%d.png',i,N,nrep);
         end
     else
         if flagx 
-            s=sprintf('images/feasreg_jianbo_%d_no_constraints_N_%d_nrep_%d_random.png',i,N,nrep);
+            s=sprintf('images/feasreg_orig_%d_no_constraints_N_%d_nrep_%d_random.png',i,N,nrep);
         else
-            s=sprintf('images/feasreg_jianbo_%d_no_constraints_N_%d_nrep_%d.png',i,N,nrep);
+            s=sprintf('images/feasreg_orig_%d_no_constraints_N_%d_nrep_%d.png',i,N,nrep);
         end
     end
     figure(i);
@@ -307,21 +307,21 @@
 
 if flagc == 1
     if flagx
-        s=sprintf('data/feasreg_jianbo_%d_u_constraint_N_%d_nrep_%d_random.mat',i,N,nrep);
+        s=sprintf('data/feasreg_orig_%d_u_constraint_N_%d_nrep_%d_random.mat',i,N,nrep);
     else
-        s=sprintf('data/feasreg_jianbo_%d_u_constraint_N_%d_nrep_%d.mat',i,N,nrep);
+        s=sprintf('data/feasreg_orig_%d_u_constraint_N_%d_nrep_%d.mat',i,N,nrep);
     end
 elseif flagc == 2
     if flagx
-        s=sprintf('data/feasreg_jianbo_%d_u_and_x_constraints_N_%d_nrep_%d_random.mat',i,N,nrep);
+        s=sprintf('data/feasreg_orig_%d_u_and_x_constraints_N_%d_nrep_%d_random.mat',i,N,nrep);
     else
-        s=sprintf('data/feasreg_jianbo_%d_u_and_x_constraints_N_%d_nrep_%d.mat',i,N,nrep);
+        s=sprintf('data/feasreg_orig_%d_u_and_x_constraints_N_%d_nrep_%d.mat',i,N,nrep);
     end
 else
     if flagx
-        s=sprintf('data/feasreg_jianbo_%d_no_constraints_N_%d_nrep_%d_random.mat',i,N,nrep);
+        s=sprintf('data/feasreg_orig_%d_no_constraints_N_%d_nrep_%d_random.mat',i,N,nrep);
     else
-        s=sprintf('data/feasreg_jianbo_%d_no_constraints_N_%d_nrep_%d.mat',i,N,nrep);
+        s=sprintf('data/feasreg_orig_%d_no_constraints_N_%d_nrep_%d.mat',i,N,nrep);
     end
 end