Changeset 39 for liacs/nc/low-correlation/sa.m

Timestamp:

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

Author:

Rick van der Zwet

Message:

Make it run properly (iterations vs fitness)

File:

• liacs/nc/low-correlation/sa.m (modified) (1 diff)

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