Changeset 16842 for branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/kMeans

Timestamp:

04/19/19 11:05:52 (6 years ago)

Author:

gkronber

Message:

#2847: merged r16565:16796 from trunk/HeuristicLab.Algorithms.DataAnalysis to branch

Location:

branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis

Files:

• . (modified) (1 prop)
• 3.4 (modified) (1 prop)
• 3.4/kMeans/KMeansClustering.cs (modified) (4 diffs)
• 3.4/kMeans/KMeansClusteringModel.cs (modified) (4 diffs)
• 3.4/kMeans/KMeansClusteringSolution.cs (modified) (4 diffs)
• 3.4/kMeans/KMeansClusteringUtil.cs (modified) (1 diff)

branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/kMeans/KMeansClustering.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -29 +29 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Problems.DataAnalysis;
 
@@ -38 +38 @@
   [Item("k-Means", "The k-Means clustering algorithm (wrapper for ALGLIB).")]
   [Creatable(CreatableAttribute.Categories.DataAnalysis, Priority = 10)]
-  [StorableClass]
+  [StorableType("84FAF4ED-0679-40BA-B3DD-83809095F8CF")]
   public sealed class KMeansClustering : FixedDataAnalysisAlgorithm<IClusteringProblem> {
     private const string KParameterName = "k";
@@ -60 +60 @@
     #endregion
     [StorableConstructor]
-    private KMeansClustering(bool deserializing) : base(deserializing) { }
+    private KMeansClustering(StorableConstructorFlag _) : base(_) { }
     private KMeansClustering(KMeansClustering original, Cloner cloner)
       : base(original, cloner) {

branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/kMeans/KMeansClusteringModel.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Problems.DataAnalysis;
 
@@ -33 +33 @@
   /// Represents a k-Means clustering model.
   /// </summary>
-  [StorableClass]
+  [StorableType("61D987AC-A142-433B-901C-B124E12A1C55")]
   [Item("KMeansClusteringModel", "Represents a k-Means clustering model.")]
   public sealed class KMeansClusteringModel : DataAnalysisModel, IClusteringModel {
@@ -57 +57 @@
     }
     [StorableConstructor]
-    private KMeansClusteringModel(bool deserializing) : base(deserializing) { }
+    private KMeansClusteringModel(StorableConstructorFlag _) : base(_) { }
     private KMeansClusteringModel(KMeansClusteringModel original, Cloner cloner)
       : base(original, cloner) {

branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/kMeans/KMeansClusteringSolution.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Optimization;
@@ -32 +32 @@
   /// </summary>
   [Item("k-Means clustering solution", "Represents a k-Means solution for a clustering problem which can be visualized in the GUI.")]
-  [StorableClass]
+  [StorableType("E46AD906-04C4-4BEB-977D-BBC80E97C874")]
   public sealed class KMeansClusteringSolution : ClusteringSolution {
     private const string TrainingIntraClusterSumOfSquaresResultName = "Intra-cluster sum of squares (training)";
@@ -42 +42 @@
 
     [StorableConstructor]
-    private KMeansClusteringSolution(bool deserializing) : base(deserializing) { }
+    private KMeansClusteringSolution(StorableConstructorFlag _) : base(_) { }
     private KMeansClusteringSolution(KMeansClusteringSolution original, Cloner cloner)
       : base(original, cloner) {

branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/kMeans/KMeansClusteringUtil.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.