Changeset 35 for liacs/nc

Timestamp:

Dec 16, 2009, 3:22:18 PM (15 years ago)

Author:

Rick van der Zwet

Message:

Make it work under MatLab

Location:

liacs/nc/laser-pulse-shaping

Files:

• SHGa.m (added)
• pso.m (modified) (6 diffs)

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

@@ -3 +3 @@
 % Rick van der Zwet - 0433373 - <hvdzwet@liacs.nl>
 % Modeled after http://en.wikipedia.org/wiki/Particle_swarm_optimization
-
-function number = randint(low,high)
-    number = round(rand() * (high - low)) + low;
-endfunction
-
-function new = mutation(old)
-    loc = randint(1,length(old));
-    old(loc) = old(loc) * -1;
-    new = old;
-endfunction
-
-function s = initseq(n)
-    % Generate a random column s={-1,1}^n
-    s = rand(n,1);
-    s = round(s);
-    s = s - (s == 0);
-endfunction
-
-% Iterate on multiple vectors
-function fitness = SHGa(v)
-    for i = 1:length(v(1,:))
-        fitness(i) = SHG(v(:,i));
-    endfor
-endfunction
 
 % Parameters
@@ -46 +22 @@
 flock_p = rand(parameters,local_swarm_size,local_swarms) .* (2 * pi);
 flock_v = zeros(size(flock_p));
-    
+
 
 % Global best placeholder
@@ -68 +44 @@
                 l_fitness(p,s) = fitness(p);
                 l_best(:,p,s) = flock_p(:,p,s);
-            endif
-        endfor
+            end
+        end
 
         % See if we got any better neighbor optimum
@@ -76 +52 @@
                 n_fitness(s) = l_fitness(p,s);
                 n_best(:,s) = l_best(:,p,s);
-            endif
-        endfor
-    endfor
+            end
+        end
+    end
 
     % See wether we have a new global optimum
@@ -85 +61 @@
           g_fitness = n_fitness(s);
           g_best = n_best(s);
-        endif
-    endfor
+        end
+    end
 
     % Update particles to new value
@@ -94 +70 @@
     for s = 1:local_swarms
         for p = 1:local_swarm_size
-            flock_v(:,p,s) = (flock_v(:,p,s) .* wander) + \
-                (g_best .* (c_cognitive * r_cognitive)) + \
-                (n_best(s) .* (c_social *r_social)) + \
-                (l_best(p,s) .* (c_ego *r_ego));
-            s
-            p
-            flock_p(:,p,s)
-            flock_p(:,p,s) += flock_v(:,p,s);
-            flock_p(:,p,s)
-        endfor
-    endfor
-endfor
-
-
-
-%plot(iterations,fitnesses);
+            flock_v(:,p,s) = flock_v(:,p,s) * wander;
+            flock_v(:,p,s) =+ g_best * (c_cognitive * r_cognitive);
+            flock_v(:,p,s) =+ n_best(s) * (c_social * r_social);
+            flock_v(:,p,s) =+ l_best(p,s) .* (c_ego *r_ego);
+            flock_p(:,p,s) =+ flock_v(:,p,s);
+        end
+    end
+end
+i = 1:10;
+y = i;
+plot(i,y);
+print -deps pso-fitness.eps;
 %title(sprintf('Particle Swarm Optimalisation on Laser-Pulse shaping problem - repetitions %i',repetitions));
 %ylabel('fitness');