Changeset 16640 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Clustering

Timestamp:

02/28/19 17:42:10 (6 years ago)

Author:

gkronber

Message:

#2971: merged r16565:16631 from trunk/HeuristicLab.Problems.DataAnalysis to branch/HeuristicLab.Problems.DataAnalysis (resolving all conflicts)

Location:

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis

Files:

• . (modified) (1 prop)
• 3.4 (modified) (1 prop)
• 3.4/Interfaces/Clustering/IClusteringModel.cs (modified) (2 diffs)
• 3.4/Interfaces/Clustering/IClusteringProblem.cs (modified) (2 diffs)
• 3.4/Interfaces/Clustering/IClusteringProblemData.cs (modified) (2 diffs)
• 3.4/Interfaces/Clustering/IClusteringSolution.cs (modified) (2 diffs)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Clustering/IClusteringModel.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.
@@ -24 +24 @@
 
 namespace HeuristicLab.Problems.DataAnalysis {
-  [StorableType("42B664EE-FB1A-4A2C-9067-6650C790DFCC")]
+  [StorableType("1aab7e19-317f-47e0-acc7-b0538e572d8e")]
   public interface IClusteringModel : IDataAnalysisModel {
     IEnumerable<int> GetClusterValues(IDataset dataset, IEnumerable<int> rows);

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Clustering/IClusteringProblem.cs

@@ -2 +2 @@
 #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 @@
 
 namespace HeuristicLab.Problems.DataAnalysis {
-  [StorableType("4C6FB508-146E-4252-826B-0BD386AAD6BB")]
+  [StorableType("fc7456d2-3892-4a7b-a77a-b7a0828d2530")]
   public interface IClusteringProblem : IDataAnalysisProblem<IClusteringProblemData> {
   }

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Clustering/IClusteringProblemData.cs

@@ -2 +2 @@
 #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 @@
 
 namespace HeuristicLab.Problems.DataAnalysis {
-  [StorableType("9B74FB18-0B3E-4251-BE43-024708970E77")]
+  [StorableType("e39aa6c0-d6c6-491d-88cc-de05c6503314")]
   public interface IClusteringProblemData : IDataAnalysisProblemData {
   }

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Clustering/IClusteringSolution.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.
@@ -24 +24 @@
 
 namespace HeuristicLab.Problems.DataAnalysis {
-  [StorableType("45FB42B8-490B-465E-8887-CF0ED01329B2")]
+  [StorableType("dbb9226f-312d-4ee2-a6cc-b74cc6ab5cc0")]
   public interface IClusteringSolution : IDataAnalysisSolution {
     new IClusteringModel Model { get; }