Changeset 44

Timestamp:

Dec 17, 2009, 10:23:16 PM (15 years ago)

Author:

Rick van der Zwet

Message:

Make it cute

Location:

liacs/nc/low-correlation

Files:

• autocorrelation.m (modified) (2 diffs)
• sa.m (modified) (1 diff)

liacs/nc/low-correlation/autocorrelation.m

@@ -3 +3 @@
 %-----------------------------------------------------------------------
 function [f] = autocorrelation(pop)
-% Given a population of binary sequences, this function calculates 
-% the merit function according to the formula specified in the exercise description.
-% The input pop is the given matrix.
+% Given a population of binary sequences, this function calculates the merit
+% function according to the formula specified in the exercise description.  The
+% input pop is the given matrix.
 % The output f is the merit factor calculated (row vector).
 
@@ -13 +13 @@
 
 % Calculated efficiently in a matrix-notation; auxilary matrices - Y1,Y2 - are
-% initialized in every iteration. They are shifted form of the original y vectors. 
-% The diaganol of the dot-squared Y2*Y1 matrix is exactly the inner sum of merit function.
+% initialized in every iteration. They are shifted form of the original y
+% vectors. The diagonal of the dot-squared Y2*Y1 matrix is exactly the inner
+% sum of merit function.
 for k=1:n-1
     Y1=pop(1:n-k,:);

liacs/nc/low-correlation/sa.m

@@ -2 +2 @@
 % BSDLicence
 % Rick van der Zwet - 0433373 - <hvdzwet@liacs.nl>
+% $Id$
 
 function [iteration_history,fitness_history] = sa(seq, stopLimit)
-    fitness = 0;
-    temperature = stopLimit;
+  fitness = 0;
+  temperature = stopLimit;
 
-    iteration_history = [];
-    fitness_history = [];
+  iteration_history = [];
+  fitness_history = [];
 
-    for iteration = 1:stopLimit
-        % Generate new mutation
-        newseq = mutation(seq);
+  for iteration = 1:stopLimit
+    % Generate new mutation
+    newseq = mutation(seq);
 
-        new_fitness = autocorrelation(newseq);
+    new_fitness = autocorrelation(newseq);
 
-        % Better is always accept
-        if (new_fitness > fitness)
-            fitness = new_fitness;
-            % disp(rot90(newseq,-1));
-            temperature = temperature - 10;
-        else
-            % Make the next 'move' less atractive
-            temperature = temperature + 1;
+    % Better is always accept
+    if (new_fitness > fitness)
+      fitness = new_fitness;
+      % disp(rot90(newseq,-1));
+      temperature = temperature - 10;
+    else
+      % Make the next 'move' less atractive
+      temperature = temperature + 1;
 
-            % Accept on an certain probability
-            if (temperature < 1)
-                break;
-            else 
-                % XXX: Some more cleaver cooling would be great
-                if( exp(1)^((fitness - new_fitness) / temperature) > rand())
-                    seq = newseq;
-               end
-           end
-        end
-        iteration_history = [ iteration_history, iteration ];
-        fitness_history = [ fitness_history, fitness ]; 
+      % Accept on an certain probability
+      if (temperature < 1)
+        break;
+      else 
+        % XXX: Some more cleaver cooling would be great
+        if( exp(1)^((fitness - new_fitness) / temperature) > rand())
+          seq = newseq;
+         end
+       end
     end
+    iteration_history = [ iteration_history, iteration ];
+    fitness_history = [ fitness_history, fitness ]; 
+  end
 end