Changeset 8172 for branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK

Timestamp:

07/01/12 14:36:47 (12 years ago)

Author:

gkronber

Message:

#1797: adapted return type of ConstrainedValueParameter properties in FLA branch.

Location:

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK

Files:

• InteractionInitializers/SortedRandomInteractionsInitializer.cs (modified) (6 diffs)
• NKLandscape.cs (modified) (2 diffs)

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/InteractionInitializers/SortedRandomInteractionsInitializer.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Parameters;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
 
@@ -17 +14 @@
   public class SortedRandomInteractionsInitializer : ParameterizedNamedItem, IInteractionInitializer {
 
-    public ConstrainedValueParameter<IBinaryVectorComparer> ComparerParameter {
-      get { return (ConstrainedValueParameter<IBinaryVectorComparer>)Parameters["Comparer"]; }
+    public IConstrainedValueParameter<IBinaryVectorComparer> ComparerParameter {
+      get { return (IConstrainedValueParameter<IBinaryVectorComparer>)Parameters["Comparer"]; }
     }
 
@@ -24 +21 @@
       get { return ComparerParameter.Value; }
     }
-    
+
     [StorableConstructor]
     protected SortedRandomInteractionsInitializer(bool serializing) : base(serializing) { }
@@ -47 +44 @@
       try {
         IBinaryVectorComparer comparer = Comparer;
-      } catch {
+      }
+      catch {
         Parameters.Remove("Comparer");
         AddComparerParameter();
@@ -60 +58 @@
         if (indices.Count > c) {
           indices.RemoveAt(c);
-          components[c][c] = true;          
+          components[c][c] = true;
         }
         while (indices.Count > nInteractions) {
@@ -66 +64 @@
         }
         foreach (var i in indices) {
-          components[c][i] = true;          
+          components[c][i] = true;
         }
       }
       BoolMatrix m = new BoolMatrix(length, nComponents);
-      foreach (var c in components.OrderBy(v => v, Comparer).Select((v, j) => new {v, j})) {
-        for (int i = 0; i<c.v.Length; i++) {
+      foreach (var c in components.OrderBy(v => v, Comparer).Select((v, j) => new { v, j })) {
+        for (int i = 0; i < c.v.Length; i++) {
           m[i, c.j] = c.v[i];
-        }    
+        }
       }
       return m;

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

@@ -41 +41 @@
       get { return (ValueParameter<DoubleArray>)Parameters["Weights"]; }
     }
-    public OptionalConstrainedValueParameter<IInteractionInitializer> InteractionInitializerParameter {
-      get { return (OptionalConstrainedValueParameter<IInteractionInitializer>)Parameters["InteractionInitializer"]; }
-    }
-    public OptionalConstrainedValueParameter<IWeightsInitializer> WeightsInitializerParameter {
-      get { return (OptionalConstrainedValueParameter<IWeightsInitializer>)Parameters["WeightsInitializer"]; }
+    public IConstrainedValueParameter<IInteractionInitializer> InteractionInitializerParameter {
+      get { return (IConstrainedValueParameter<IInteractionInitializer>)Parameters["InteractionInitializer"]; }
+    }
+    public IConstrainedValueParameter<IWeightsInitializer> WeightsInitializerParameter {
+      get { return (IConstrainedValueParameter<IWeightsInitializer>)Parameters["WeightsInitializer"]; }
     }
     #endregion
@@ -60 +60 @@
     private List<IOperator> operators {
       set {
-       Operators.AddRange(value);
-      }
-    } 
+        Operators.AddRange(value);
+      }
+    }
     #endregion