Disable the display of the log while building the documentation 18/10318/2
Sylvestre Ledru [Sat, 26 Jan 2013 09:49:05 +0000 (10:49 +0100)]
Change-Id: I6c909910a65bd198977aceffccf4faedc8c8a68e

scilab/modules/simulated_annealing/help/en_US/algorithms/optim_sa.xml

index 119eda8..fffff07 100644 (file)
@@ -301,24 +301,24 @@ t = 1:length(sa_mean_list);
 plot(t,sa_mean_list,"r",t,sa_var_list,"g");
  ]]></programlisting>
         <scilab:image>
-function y = rastrigin(x)
-  y = x(1)^2+x(2)^2-cos(12*x(1))-cos(18*x(2));
-endfunction
-    
-x0          = [2 2];
-Proba_start = 0.7;
-It_Pre      = 100;
-It_extern   = 100;
-It_intern   = 1000;
-x_test = neigh_func_default(x0);
-
-T0 = compute_initial_temp(x0, rastrigin, Proba_start, It_Pre);
-
-Log = %T;
-[x_opt, f_opt, sa_mean_list, sa_var_list] = optim_sa(x0, rastrigin, It_extern, It_intern, T0, Log);
-
-t = 1:length(sa_mean_list);
-plot(t,sa_mean_list,"r",t,sa_var_list,"g");
+            function y = rastrigin(x)
+            y = x(1)^2+x(2)^2-cos(12*x(1))-cos(18*x(2));
+            endfunction
+            
+            x0          = [2 2];
+            Proba_start = 0.7;
+            It_Pre      = 100;
+            It_extern   = 100;
+            It_intern   = 1000;
+            x_test = neigh_func_default(x0);
+            
+            T0 = compute_initial_temp(x0, rastrigin, Proba_start, It_Pre);
+            
+            Log = %f;
+            [x_opt, f_opt, sa_mean_list, sa_var_list] = optim_sa(x0, rastrigin, It_extern, It_intern, T0, Log);
+            
+            t = 1:length(sa_mean_list);
+            plot(t,sa_mean_list,"r",t,sa_var_list,"g");
         </scilab:image>
     </refsection>
     <refsection>
@@ -364,7 +364,7 @@ saparams = add_param(saparams,"neigh_func", myneigh_func);
 T0 = compute_initial_temp(x0, quad, Proba_start, It_Pre, saparams);
 Log = %f;
 // This should produce x_opt = [4 3]
-[x_opt, f_opt] = optim_sa(x0, quad, It_extern, It_intern, T0, Log,saparams)
+[x_opt, f_opt] = optim_sa(x0, quad, It_extern, It_intern, T0, Log, saparams)
  ]]></programlisting>
     </refsection>
     <refsection>