- Timestamp:
- 01/28/19 13:41:42 (5 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/2520_PersistenceReintegration (added) merged: 16451-16454,16462,16465-16468,16470-16472,16474,16476-16477,16479-16487,16529-16530,16539,16551-16555,16558-16559,16562-16564
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Algorithms.DataAnalysis
- Property svn:mergeinfo changed
/branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis (added) merged: 16452-16454,16462,16468,16470,16474,16479,16529,16539,16558-16559
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Algorithms.DataAnalysis/3.4
- Property svn:mergeinfo changed
/branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4 (added) merged: 16452-16454,16462,16468,16470,16474,16479,16529,16539,16558-16559
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances/DistanceBase.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Common; 25 25 using HeuristicLab.Core; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Algorithms.DataAnalysis { 29 [Storable Class]29 [StorableType("58D49402-2AB1-49CF-9AEF-1C599C4B71F7")] 30 30 public abstract class DistanceBase<T> : Item, IDistance<T> { 31 31 #region HLConstructors & Cloning 32 32 [StorableConstructor] 33 protected DistanceBase( bool deserializing) : base(deserializing) { }33 protected DistanceBase(StorableConstructorFlag _) : base(_) { } 34 34 protected DistanceBase(DistanceBase<T> original, Cloner cloner) : base(original, cloner) { } 35 35 protected DistanceBase() { } … … 43 43 44 44 public double Get(object x, object y) { 45 return Get((T) x, (T)y);45 return Get((T)x, (T)y); 46 46 } 47 47 48 48 public IComparer GetDistanceComparer(object item) { 49 return new DistanceComparer((T) 49 return new DistanceComparer((T)item, this); 50 50 } 51 51 52 [StorableType("35fcecb5-9209-469b-9e4e-82efd8abfddf")] 52 53 internal class DistanceComparer : IComparer<T>, IComparer { 54 [Storable] 53 55 private readonly T item; 56 [Storable] 54 57 private readonly IDistance<T> dist; 58 59 [StorableConstructor] 60 protected DistanceComparer(StorableConstructorFlag _) { 61 } 55 62 56 63 public DistanceComparer(T item, IDistance<T> dist) { … … 64 71 65 72 public int Compare(object x, object y) { 66 return Compare((T) x, (T)y);73 return Compare((T)x, (T)y); 67 74 } 68 75 }
Note: See TracChangeset
for help on using the changeset viewer.