Changeset 14785 for branches/TSNE/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances

Timestamp:

03/27/17 15:15:23 (7 years ago)

Author:

gkronber

Message:

#2700: changes and while reviewing

File:

• branches/TSNE/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances/IndexedItemDistance.cs (moved) (moved from branches/TSNE/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances/DataPointDistance.cs) (2 diffs)

branches/TSNE/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances/IndexedItemDistance.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -26 +27 @@
 namespace HeuristicLab.Algorithms.DataAnalysis {
   [StorableClass]
-  [Item("DataPointDistance", "A distance wrapper for DataPoints")]
-  internal class DataPointDistance<T> : DistanceBase<IDataPoint<T>> where T : class {
-
-    #region properties
+  [Item("IndexedItemDistance", "A distance wrapper for indexed items")]
+  internal class IndexedItemDistance<T> : DistanceBase<IndexedItem<T>> {
     [Storable]
-    private IDistance<T> dist;
-    #endregion
+    private readonly IDistance<T> dist;
 
     #region HLConstructors & Cloning
     [StorableConstructor]
-    protected DataPointDistance(bool deserializing) : base(deserializing) { }
-    protected DataPointDistance(DataPointDistance<T> original, Cloner cloner) : base(original, cloner) {
+    protected IndexedItemDistance(bool deserializing) : base(deserializing) { }
+    protected IndexedItemDistance(IndexedItemDistance<T> original, Cloner cloner) : base(original, cloner) {
       dist = cloner.Clone(original.dist);
     }
-    public override IDeepCloneable Clone(Cloner cloner) { return new DataPointDistance<T>(this, cloner); }
-    public DataPointDistance(IDistance<T> distance) {
+    public override IDeepCloneable Clone(Cloner cloner) { return new IndexedItemDistance<T>(this, cloner); }
+    public IndexedItemDistance(IDistance<T> distance) {
       dist = distance;
     }
     #endregion
 
-    public override double Get(IDataPoint<T> a, IDataPoint<T> b) {
-      return dist.Get(a.X, b.X);
+    public override double Get(IndexedItem<T> a, IndexedItem<T> b) {
+      return dist.Get(a.Value, b.Value);
     }
   }