Changeset 12576 for branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/NKBitFlipMoveEvaluator.cs

Timestamp:

07/02/15 15:36:04 (9 years ago)

Author:

epitzer

Message:

#2306 Implement NKq and NKp landscape (and fix Seed parameter clash with Algorithm's seed)

File:

• branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/NKBitFlipMoveEvaluator.cs (modified) (3 diffs)

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/NKBitFlipMoveEvaluator.cs

@@ -61 +61 @@
       int seed = InteractionSeedParameter.ActualValue.Value;
       double moveQuality = QualityParameter.ActualValue.Value;
+      int q = QParameter.ActualValue.Value;
+      double p = PParameter.ActualValue.Value;
 
       List<int> affectedFitnessComponents = new List<int>();
@@ -71 +73 @@
       if (affectedFitnessComponents.Count * 2 > interactions.Columns) {
         double[] f_i;
-        moveQuality = NKLandscape.Evaluate(moved, interactions, weights, seed, out f_i);
+        moveQuality = NKLandscape.Evaluate(moved, interactions, weights, seed, out f_i, q, p);
       } else {
         long x = NKLandscape.Encode(binaryVector);
@@ -78 +80 @@
         double[] w = NKLandscape.Normalize(weights);
         foreach (var c in affectedFitnessComponents) {
-          moveQuality -= w[c % w.Length] * NKLandscape.F_i(x, c, g[c], seed);
-          moveQuality += w[c % w.Length] * NKLandscape.F_i(y, c, g[c], seed);
+          moveQuality -= w[c%w.Length]*NKLandscape.F_i(x, c, g[c], seed, q, p);
+          moveQuality += w[c%w.Length]*NKLandscape.F_i(y, c, g[c], seed, q, p);
         }
       }