Changeset 16530

Timestamp:

01/10/19 15:45:49 (6 years ago)

Author:

gkronber

Message:

#2520: made the necessary changes for the new Persistence for types which have been added in the trunk

Location:

branches/2520_PersistenceReintegration

Files:

• HeuristicLab.Analysis/3.3/DataVisualization/Interfaces/IDataRow.cs (modified) (1 diff)
• HeuristicLab.Analysis/3.3/DataVisualization/Interfaces/IDataTable.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/PearsonRSquaredAverageSimilarityEvaluator.cs (modified) (2 diffs)

branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/Interfaces/IDataRow.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Analysis {
+  [StorableType("9D660768-24A2-4C74-9434-42FDB3AA3ED2")]
   public interface IDataRow : INamedItem {
     DataRowVisualProperties VisualProperties { get; set; }

branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/Interfaces/IDataTable.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Analysis {
+  [StorableType("DB6B8542-8A0D-43C1-B5EE-C4D2E8983CDF")]
   public interface IDataTable<TDataRow> : INamedItem where TDataRow : class, IDataRow {
     DataTableVisualProperties VisualProperties { get; set; }

branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/PearsonRSquaredAverageSimilarityEvaluator.cs

@@ -29 +29 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
   [Item("Pearson R² & Average Similarity Evaluator", "Calculates the Pearson R² and the average similarity of a symbolic regression solution candidate.")]
-  [StorableClass]
+  [StorableType("FE514989-E619-48B8-AC8E-9A2202708F65")]
   public class PearsonRSquaredAverageSimilarityEvaluator : SymbolicRegressionMultiObjectiveEvaluator {
     private const string StrictSimilarityParameterName = "StrictSimilarity";
@@ -48 +48 @@
 
     [StorableConstructor]
-    protected PearsonRSquaredAverageSimilarityEvaluator(bool deserializing) : base(deserializing) { }
+    protected PearsonRSquaredAverageSimilarityEvaluator(StorableConstructorFlag _) : base(_) { }
     protected PearsonRSquaredAverageSimilarityEvaluator(PearsonRSquaredAverageSimilarityEvaluator original, Cloner cloner)
       : base(original, cloner) {