Changeset 15338 for branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/InfillCriteria/NeighbourDistance.cs

Timestamp:

08/22/17 15:01:46 (7 years ago)

Author:

bwerth

Message:

#2745 fixed bug concerning new Start and StartAsync methods; passed CancellationToken to sub algorithms

File:

• branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/InfillCriteria/NeighbourDistance.cs (modified) (2 diffs)

branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/InfillCriteria/NeighbourDistance.cs

@@ -36 +36 @@
   public class NeighbourDistance : InfillCriterionBase {
 
-    private IVantagePointTree<IEnumerable<double>> Points;
+    private VantagePointTree<IEnumerable<double>> Points;
     #region Constructors, Serialization and Cloning 
     [StorableConstructor]
     protected NeighbourDistance(bool deserializing) : base(deserializing) { }
-
-    protected NeighbourDistance(NeighbourDistance original, Cloner cloner) : base(original, cloner) {
-    }
+    protected NeighbourDistance(NeighbourDistance original, Cloner cloner) : base(original, cloner) { }
     public NeighbourDistance() { }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new NeighbourDistance(this, cloner);
-    }
+    public override IDeepCloneable Clone(Cloner cloner) { return new NeighbourDistance(this, cloner); }
     #endregion
 
@@ -55 +51 @@
       Points.Search(vector, 1, out neighbours, out distances);
       return distances[0];
-      //return RegressionSolution.ProblemData.AllIndices.Min(i => DistanceToSample(vector, i));
     }
 
     public override void Initialize() {
       Points = CreateTree();
-    }
-
-    private double DistanceToSample(RealVector vector, int i) {
-      throw new NotImplementedException();
     }