Changeset 42

Timestamp:

Dec 17, 2009, 10:18:08 PM (15 years ago)

Author:

Rick van der Zwet

Message:

Make files look pretty and neat on display

Location:

liacs/nc/low-correlation

Files:

• Makefile (modified) (1 diff)
• initseq.m (modified) (1 diff, 1 prop)
• mcs-call.m (modified) (2 diffs, 1 prop)
• mcs.m (modified) (2 diffs, 1 prop)
• mutation.m (modified) (1 diff, 1 prop)
• randint.m (modified) (1 diff, 1 prop)
• sa-call.m (modified) (1 diff, 1 prop)
• sa.m (modified) (1 prop)

liacs/nc/low-correlation/Makefile

@@ -2 +2 @@
 CFLAGS=-lm
 
+SOURCE=autocorrelation.m.tex initseq.m.tex  mcs-call.m.tex \
+       mcs.m.tex  mutation.m.tex  randint.m.tex  sa-call.m.tex  sa.m.tex
+
+include latex.mk
+
 mcs: mcs.m
         @octave --silent mcs.m
+
+
+%.m.tex: %.m
+        highlight --linenumbers --no-doc --latex --input $< --output $@

liacs/nc/low-correlation/initseq.m

@@ -2 +2 @@
 % BSDLicence
 % Rick van der Zwet - 0433373 - <hvdzwet@liacs.nl>
+% $Id$
 
 function s = initseq(n)
-    % Generate a random column s={-1,1}^n
-    s = rand(n,1);
-    s = round(s);
-    s = s - (s == 0);
+  % Generate a random column s={-1,1}^n
+  s = rand(n,1);
+  s = round(s);
+  s = s - (s == 0);
 end

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

@@ -2 +2 @@
 % BSDLicence
 % Rick van der Zwet - 0433373 - <hvdzwet@liacs.nl>
+% $Id$
 
 % Brute-force result of length 20
@@ -14 +15 @@
 fitnesses = [];
 for iteration = iterations
-    fitness = [];
-    for rep = 1:repetitions
-        fprintf('Iter:%i, Rep:%i\n',iteration,rep);
-        [new_fitness, value] =  mcs(length,iteration);
-        fitness = [fitness, new_fitness];
+  fitness = [];
+  for rep = 1:repetitions
+    fprintf('Iter:%i, Rep:%i\n',iteration,rep);
+    [new_fitness, value] =  mcs(length,iteration);
+    fitness = [fitness, new_fitness];
 
-        % Little hack to display output nicely
-        % disp(rot90(value,-1));
-    end
-    fitnesses = [fitnesses,mean(fitness)];
+    % Little hack to display output nicely
+    % disp(rot90(value,-1));
+  end
+  fitnesses = [fitnesses,mean(fitness)];
 end
 

liacs/nc/low-correlation/mcs.m

@@ -2 +2 @@
 % BSDLicence
 % Rick van der Zwet - 0433373 - <hvdzwet@liacs.nl>
+% $Id$
 
 % Brute-force result of length 20
@@ -8 +9 @@
 
 function [fitness,value] = mcs(length, iterations)
-    best_fitness = 0;
-    for i = 1:iterations
-        % Generate a random column s={-1,1}^n
-        n = length;
-        s = rand(n,1);
-        s = round(s);
-        s = s - (s == 0);
-    
-        % Find whether we are better than everything else
-        fitness = autocorrelation(s);
-        if (fitness > best_fitness)
-            best_value = s;
-            best_fitness = fitness;
-        end
+  best_fitness = 0;
+  for i = 1:iterations
+    % Generate a random column s={-1,1}^n
+    n = length;
+    s = rand(n,1);
+    s = round(s);
+    s = s - (s == 0);
+  
+    % Find whether we are better than everything else
+    fitness = autocorrelation(s);
+    if (fitness > best_fitness)
+      best_value = s;
+      best_fitness = fitness;
     end
-    fitness = best_fitness;
-    value = best_value;
+  end
+  fitness = best_fitness;
+  value = best_value;
 end

liacs/nc/low-correlation/mutation.m

@@ -2 +2 @@
 % BSDLicence
 % Rick van der Zwet - 0433373 - <hvdzwet@liacs.nl>
+% $Id$
 
 function new = mutation(old)
-    loc = randint(1,length(old));
-    old(loc) = old(loc) * -1;
-    new = old;
+  loc = randint(1,length(old));
+  old(loc) = old(loc) * -1;
+  new = old;
 end

liacs/nc/low-correlation/randint.m

@@ -2 +2 @@
 % BSDLicence
 % Rick van der Zwet - 0433373 - <hvdzwet@liacs.nl>
+% $Id$
 
 function number = randint(low,high)
-    number = round(rand() * (high - low)) + low;
+  number = round(rand() * (high - low)) + low;
 end

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

@@ -2 +2 @@
 % BSDLicence
 % Rick van der Zwet - 0433373 - <hvdzwet@liacs.nl>
+% $Id$
 
 %% Basic variables