Changeset 39 for liacs/nc

Timestamp:

Dec 16, 2009, 8:37:47 PM (15 years ago)

Author:

Rick van der Zwet

Message:

Make it run properly (iterations vs fitness)

Location:

liacs/nc/low-correlation

Files:

• sa-call.m (modified) (2 diffs)
• sa-fitness.eps (modified) ( previous)
• sa.m (modified) (1 diff)

liacs/nc/low-correlation/sa-call.m

@@ -4 +4 @@
 
 %% Basic variables
-iterations = [1:10:1000];
-repetitions = 20;
+iterations = 100000;
 length = 20;
-temperature = 1000;
 
-iteration_history = [];
-fitness_history = [];
+
+% Always use the same innitial values
+s = initseq(length);
 
 % Plot the stuff
-for iteration = iterations
-    fitness = [];
-    for rep = 1:repetitions
-        fprintf('Iter:%i, Rep:%i\n',iteration,rep);
-        [new_fitness, value] =  sa(length,iteration,temperature);
-        fitness = [fitness, new_fitness];
-
-        % Little hack to display output nicely
-        % disp(rot90(value,-1));
-   end
-    iteration_history = [iteration_history,iteration];
-    fitness_history = [fitness_history,mean(fitness)];
-end
+[iteration_history, fitness_history] = sa(s,iterations);
 
 plot(iteration_history,fitness_history);
-title(sprintf('Simulated Annealing on Low-Corretation set - repetitions %i',repetitions));
+title(sprintf('Simulated Annealing on Low-Corretation set'));
 ylabel('fitness');
 xlabel('iterations');
@@ -34 +21 @@
 legend(sprintf('Length %i',length));
 print('sa-fitness.eps','-depsc2');
-

liacs/nc/low-correlation/sa.m

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