Changeset 37

Timestamp:

Dec 16, 2009, 5:06:53 PM (15 years ago)

Author:

Rick van der Zwet

Message:

Working under matlab

File:

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

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

@@ -48 +48 @@
 
 idle_counter = 0;
-start_time = time();
+tic();
 
 % Code not optimised for performance, but for readablility
@@ -84 +84 @@
     % Stop conditions
     if idle_counter == iteration_break 
-        printf("Caught by idle_counter\n");
-        break;
+        fprintf('Caught by idle_counter\n');
+        return;
     end
-    if time - start_time > max_time
-        printf("Caught by max_time used \n");
-        break;
+    if toc > max_time
+        fprintf('Caught by max_time used \n');
+        return;
     end
     
 
-    printf("%i : %.15f\n", i, g_fitness);
+    fprintf('%i : %.15f\n', i, g_fitness);
     fitness_iterations = [fitness_iterations, i];
     fitness_history = [fitness_history, g_fitness];
@@ -104 +104 @@
     for s = 1:local_swarms
         for p = 1:local_swarm_size
-            flock_v(:,p,s) = flock_v(:,p,s) * wander;
-            flock_v(:,p,s) = flock_v(:,p,s) + (g_best - flock_p(:,p,s)) * (c_cognitive * r_cognitive);
-            flock_v(:,p,s) = flock_v(:,p,s) + (n_best(:,s) - flock_p(:,p,s)) * (c_social * r_social);
-            flock_v(:,p,s) = flock_v(:,p,s) + (l_best(:,p,s) - flock_p(:,p,s)) * (c_ego * r_ego);
+            flock_v(:,p,s) = flock_v(:,p,s) * wander + ...
+              (g_best - flock_p(:,p,s)) * (c_cognitive * r_cognitive) + ...
+              (n_best(:,s) - flock_p(:,p,s)) * (c_social * r_social) + ...
+              (l_best(:,p,s) - flock_p(:,p,s)) * (c_ego * r_ego);
             flock_p(:,p,s) = flock_p(:,p,s) + flock_v(:,p,s);
         end
@@ -120 +120 @@
 grid on;
 legend(sprintf('Parameters %i',parameters));
-print("pso-fitness.eps","-depsc2");
-
+print('pso-fitness.eps','-depsc2');