Changeset 47

Timestamp:

Dec 19, 2009, 1:36:02 PM (15 years ago)

Author:

Rick van der Zwet

Message:

It's MAX not minimum :-)

File:

• liacs/nc/laser-pulse-shaping/pso.m (modified) (8 diffs)

liacs/nc/laser-pulse-shaping/pso.m

@@ -10 +10 @@
 iteration_break = 5;
 max_iterations = 1000;
-max_time = 5 * 60; % in sec
+max_time = 10 * 60; % in sec
 
 % Flock properties 
@@ -38 +38 @@
 
 % Global best placeholder
-g_best = zeros(parameters,1);
-g_fitness = 1;
+g_best = ones(parameters,1) .* 9;
+g_fitness = 0;
 % at (:,x) lives the neighbor best of local_swarm 'x'
-n_best = zeros(parameters,local_swarms);
-n_fitness = ones(parameters,local_swarms);
+n_best = ones(parameters,local_swarms) .* 9;
+n_fitness = zeros(parameters,local_swarms);
 % at (:,p,x) leves the local best of particle 'p' in local_swarm 'x'
-l_best = zeros(parameters,local_swarm_size,local_swarms);
-l_fitness = ones(local_swarm_size, local_swarms);
+l_best = ones(parameters,local_swarm_size,local_swarms) .* 9;
+l_fitness = zeros(local_swarm_size, local_swarms);
 
 idle_counter = 0;
@@ -56 +56 @@
         % See if we got any better local optimum
         for p = 1:local_swarm_size
-            if fitness(p) < l_fitness(p,s)
+            if fitness(p) > l_fitness(p,s)
                 l_fitness(p,s) = fitness(p);
                 l_best(:,p,s) = flock_p(:,p,s);
@@ -64 +64 @@
         % See if we got any better neighbor optimum
         for p = 1:local_swarm_size
-            if l_fitness(p,s) < n_fitness(s)
+            if l_fitness(p,s) > n_fitness(s)
                 n_fitness(s) = l_fitness(p,s);
                 n_best(:,s) = l_best(:,p,s);
@@ -75 +75 @@
     % See wether we have a new global optimum
     for s = 1:local_swarms
-        if n_fitness(s) < g_fitness
+        if n_fitness(s) > g_fitness
           g_fitness = n_fitness(s);
           g_best = n_best(:,s);
@@ -85 +85 @@
     if idle_counter == iteration_break 
         fprintf('Caught by idle_counter\n');
-        return;
+        break;
     end
     if toc > max_time
         fprintf('Caught by max_time used \n');
-        return;
+        break;
     end
     
 
-    fprintf('%i : %.15f\n', i, g_fitness);
+    fprintf('%04i : %.15f\n', i, g_fitness);
     fitness_iterations = [fitness_iterations, i];
     fitness_history = [fitness_history, g_fitness];
@@ -113 +113 @@
 end
 
+g_best
 
 plot(fitness_iterations,fitness_history);
@@ -120 +121 @@
 grid on;
 legend(sprintf('Parameters %i',parameters));
-print('pso-fitness.eps','-depsc2');
+print(sprintf('pso-fitness-%f.eps', max(fitness_history)),'-depsc2');