Changeset 8172 for branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/NeutralSelector.cs

Timestamp:

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

Author:

gkronber

Message:

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

File:

• branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/NeutralSelector.cs (modified) (7 diffs)

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/NeutralSelector.cs

@@ -1 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Analysis.FitnessLandscape.DistanceCalculators;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Selection;
 using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Operators;
-using System;
-using HeuristicLab.Analysis.FitnessLandscape.DistanceCalculators;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
@@ -50 +49 @@
       get { return (ILookupParameter<ItemArray<IItem>>)Parameters["Solution"]; }
     }
-    public ConstrainedValueParameter<IItemDistanceCalculator> SolutionDistanceCalculatorParameter {
-      get { return (ConstrainedValueParameter<IItemDistanceCalculator>)Parameters["SolutionDistanceCalculator"]; }
+    public IConstrainedValueParameter<IItemDistanceCalculator> SolutionDistanceCalculatorParameter {
+      get { return (IConstrainedValueParameter<IItemDistanceCalculator>)Parameters["SolutionDistanceCalculator"]; }
     }
     public ValueLookupParameter<DoubleValue> EpsilonParameter {
@@ -57 +56 @@
     }
     public ILookupParameter<DoubleValue> CurrentFractionOfNeutralNeighborsParameter {
-      get { return (LookupParameter<DoubleValue>) Parameters["CurrentFractionOfNeutralNeighbors"]; }
-    } 
+      get { return (LookupParameter<DoubleValue>)Parameters["CurrentFractionOfNeutralNeighbors"]; }
+    }
     public LookupParameter<DoubleValue> CurrentNeutralDistanceParameter {
       get { return (LookupParameter<DoubleValue>)Parameters["CurrentNeutralDistance"]; }
@@ -78 +77 @@
       set {
         if (CurrentNeutralDistanceParameter.ActualValue == null)
-          CurrentNeutralDistanceParameter.ActualValue= new DoubleValue(value);
-        else 
+          CurrentNeutralDistanceParameter.ActualValue = new DoubleValue(value);
+        else
           CurrentNeutralDistanceParameter.ActualValue.Value = value;
       }
-      
+
     }
     protected double CurrentFractionOfNeutralNeighbors {
@@ -165 +164 @@
 
       var neighbors = QualityParameter.ActualValue
-        .Zip(items, (q, i) => new { Quality=q.Value, Item=i })
+        .Zip(items, (q, i) => new { Quality = q.Value, Item = i })
         .Select((p, i) => new {
-          Idx=i,
-          Diff=Squash(Math.Abs(baseQuality-p.Quality), eps),
-          StartDist=calc.Distance(startingPoint, p.Item),
-          BaseDist=calc.Distance(baseSolution, p.Item)
-        })        
+          Idx = i,
+          Diff = Squash(Math.Abs(baseQuality - p.Quality), eps),
+          StartDist = calc.Distance(startingPoint, p.Item),
+          BaseDist = calc.Distance(baseSolution, p.Item)
+        })
         .Where(n => n.BaseDist > 0)
         .ToList();
@@ -181 +180 @@
         if (mostDistantNeutralNeighbor != null && mostDistantNeutralNeighbor.StartDist > currentNeutralDistance) {
           if (currentNeutralDistance == 0) {
-            StartingPointParameter.ActualValue = (IItem) baseSolution.Clone();
+            StartingPointParameter.ActualValue = (IItem)baseSolution.Clone();
             CurrentNeutralDistance = mostDistantNeutralNeighbor.BaseDist;
           } else {
@@ -199 +198 @@
           CurrentNeutralDistance = 0;
         }
-        CurrentFractionOfNeutralNeighbors = 1.0*neighbors.Count(n => n.Diff == 0)/neighbors.Count;
+        CurrentFractionOfNeutralNeighbors = 1.0 * neighbors.Count(n => n.Diff == 0) / neighbors.Count;
       }
       return base.Apply();
-    }    
+    }
 
     private void Select(int i) {