Changeset 16479 for branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis

Timestamp:

01/02/19 15:03:37 (6 years ago)

Author:

gkronber

Message:

#2520: checked and added StorableType attribute projects included in HeuristicLab 3.3.sln

Location:

branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4

Files:

• GradientBoostedTrees/RegressionTreeModel.cs (modified) (1 diff)
• TSNE/Distances/DistanceBase.cs (modified) (2 diffs)

branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/RegressionTreeModel.cs

@@ -29 +29 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HEAL.Fossil;
 using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Problems.DataAnalysis.Symbolic;

branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/Distances/DistanceBase.cs

@@ -25 +25 @@
 using HeuristicLab.Core;
 using HEAL.Fossil;
-using HEAL.Fossil;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
@@ -44 +43 @@
 
     public double Get(object x, object y) {
-      return Get((T) x, (T) y);
+      return Get((T)x, (T)y);
     }
 
     public IComparer GetDistanceComparer(object item) {
-      return new DistanceComparer((T) item, this);
+      return new DistanceComparer((T)item, this);
     }
 
     [StorableType("35fcecb5-9209-469b-9e4e-82efd8abfddf")]
     internal class DistanceComparer : IComparer<T>, IComparer {
+      [Storable]
       private readonly T item;
+      [Storable]
       private readonly IDistance<T> dist;
+
+      [StorableConstructor]
+      protected DistanceComparer(StorableConstructorFlag _) {
+      }
 
       public DistanceComparer(T item, IDistance<T> dist) {