--- trunk/gadgetMerluza2015/model/optinfo.long	2017/05/08 11:58:23	27
+++ trunk/gadgetMerluza2015/model/optinfo.long	2017/07/05 12:08:06	28
@@ -1,26 +1,26 @@
 ;
 ; options for the Simulated Annealing optimisation
 ;
-[simann]
-simanniter 100000  ; number of simulated annealing iterations (default 2000)
-simanneps  1e-09 ; minimum epsilon, simann halt criteria (default 1e-04)
-t          1000   ; simulated annealing temperature (default 100)
-rt         0.85  ; temperature reduction factor (default 0.85)
-nt         2     ; number of loops before temperature adjusted (default 2)
-ns         5     ; number of loops before step length adjusted (default 5)
-vm         1     ; step length for simulated annealing (default 1)
-cstep      2     ; step length adjustment factor (default 2)
-lratio     0.3   ; lower limit for the ratio adjustment (default 0.3)
-uratio     0.7   ; upper limit for the ratio adjustment (default 0.7)
-check      4     ; number of fstar values to check (default 4)
+;[simann]
+;simanniter 100000  ; number of simulated annealing iterations (default 2000)
+;simanneps  1e-09 ; minimum epsilon, simann halt criteria (default 1e-04)
+;t          1000   ; simulated annealing temperature (default 100)
+;rt         0.85  ; temperature reduction factor (default 0.85)
+;nt         2     ; number of loops before temperature adjusted (default 2)
+;ns         5     ; number of loops before step length adjusted (default 5)
+;vm         1     ; step length for simulated annealing (default 1)
+;cstep      2     ; step length adjustment factor (default 2)
+;lratio     0.3   ; lower limit for the ratio adjustment (default 0.3)
+;uratio     0.7   ; upper limit for the ratio adjustment (default 0.7)
+;check      4     ; number of fstar values to check (default 4)
 ;
 ; options for the Hooke & Jeeves optimisation
 ;
-[hooke]
-hookeiter  100000  ; number of hooke & jeeves iterations (default 1000)
-hookeeps   1e-09 ; minimum epsilon, hooke halt criteria (default 1e-04)
-rho        0.5   ; initial value for the resizing multiplier (default 0.5)
-lambda     0     ; initial value for the step length (default 0)
+;[hooke]
+;hookeiter  100000  ; number of hooke & jeeves iterations (default 1000)
+;hookeeps   1e-09 ; minimum epsilon, hooke halt criteria (default 1e-04)
+;rho        0.5   ; initial value for the resizing multiplier (default 0.5)
+;lambda     0     ; initial value for the step length (default 0)
 ;
 ; options for the BFGS optimisation
 ;
@@ -29,3 +29,19 @@
 ;bfgseps    0.01  ; minimum epsilon, bfgs halt criteria (default 0.01)
 ;beta       0.3   ; armijo adjustment factor (default 0.3)
 ;sigma      0.01  ; armijo convergence factor factor (default 0.01)
+;
+; options for the PSO optimisation
+;
+[pso]
+goal        1e-6  ; optimization goal (error threshold)
+size        400   ; swarm size (number of particles). Must be higher that the number of parameters
+psoiter     100  ; maximum number of iterations
+c1          0.4   ; cognitive coefficient
+c2          0.6   ; social coefficient
+w_max       1     ; Maximum inertia weight value
+w_min       0.1   ; min inertia weight value
+clamp_pos   1     ; whether to keep particle position within defined bounds (TRUE) or apply periodic boundary conditions (FALSE)
+nhood_strategy 0  ; neighborhood strategy (global best topology=0, ring topology = 1, Random neighborhood topology=2)
+nhood_size  1     ; neighborhood size
+w_strategy  0     ; inertia weight strategy (constant=0, line=1)
+;;seed        1000  ; seed for the generator only for PSO optimisation