Changeset 14929 for branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Timestamp:

05/04/17 19:06:54 (8 years ago)

Author:

gkronber

Message:

#2520 fixed unit tests for new persistence: loading & storing all samples

Location:

branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces

Files:

• IReadOnlySymbol.cs (modified) (2 diffs)
• ISymbol.cs (modified) (1 diff)
• ISymbolicExpressionGrammar.cs (modified) (1 diff)
• ISymbolicExpressionGrammarBase.cs (modified) (1 diff)
• ISymbolicExpressionTree.cs (modified) (1 diff)
• ISymbolicExpressionTreeGrammar.cs (modified) (1 diff)
• ISymbolicExpressionTreeNode.cs (modified) (1 diff)
• ISymbolicExpressionTreeNodeComparer.cs (modified) (1 diff)
• ISymbolicExpressionTreeNodeSimilarityComparer.cs (modified) (1 diff)
• ISymbolicExpressionTreeStringFormatter.cs (modified) (1 diff)
• Operators/ISymbolicExpressionTreeAnalyzer.cs (modified) (2 diffs)
• Operators/ISymbolicExpressionTreeArchitectureAlteringOperator.cs (modified) (1 diff)
• Operators/ISymbolicExpressionTreeArchitectureManipulator.cs (modified) (2 diffs)
• Operators/ISymbolicExpressionTreeCreator.cs (modified) (2 diffs)
• Operators/ISymbolicExpressionTreeCrossover.cs (modified) (2 diffs)
• Operators/ISymbolicExpressionTreeGrammarBasedOperator.cs (modified) (2 diffs)
• Operators/ISymbolicExpressionTreeManipulator.cs (modified) (2 diffs)
• Operators/ISymbolicExpressionTreeOperator.cs (modified) (2 diffs)
• Operators/ISymbolicExpressionTreeSizeConstraintOperator.cs (modified) (1 diff)

branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/IReadOnlySymbol.cs

@@ -1 @@
-#region License Information
+using HeuristicLab.Persistence;
+#region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -20 +21 @@
 #endregion
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
+  [StorableType("1d6fb65a-f5f1-486d-aeac-3ef9cf98bffa")]
   public interface IReadOnlySymbol : ISymbol {
   }

branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbol.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Core;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
+  [StorableType("867db489-3308-405b-9104-e3d98c063f8f")]
   public interface ISymbol : INamedItem {
     ISymbolicExpressionTreeNode CreateTreeNode();

branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionGrammar.cs

@@ -23 +23 @@
 using System;
 using HeuristicLab.Core;
+using HeuristicLab.Persistence;
+
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
+  [StorableType("9cb59dfa-130c-4457-b17d-8f2606c6ce25")]
   public interface ISymbolicExpressionGrammar : ISymbolicExpressionGrammarBase, IStatefulItem {
     ISymbol ProgramRootSymbol { get; }

branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionGrammarBase.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Core;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
+  [StorableType("c5476035-fdc7-49c6-a5d3-64388aff686a")]
   public interface ISymbolicExpressionGrammarBase : INamedItem {
     IEnumerable<ISymbol> Symbols { get; }

branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTree.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Core;
+using HeuristicLab.Persistence;
+
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
+  [StorableType("7d6125e9-98a2-4ac8-a4d6-84355e7625be")]
   public interface ISymbolicExpressionTree : IItem {
     ISymbolicExpressionTreeNode Root { get; set; }

branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTreeGrammar.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using HeuristicLab.Persistence;
+
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
+  [StorableType("a4f1c44a-a9b9-4e9d-b259-5b824e48cad7")]
   public interface ISymbolicExpressionTreeGrammar : ISymbolicExpressionGrammarBase {
     IEnumerable<ISymbol> ModifyableSymbols { get; }

branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTreeNode.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Persistence;
+
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
+  [StorableType("d57d50f4-f175-4851-9ed7-ae1585f1ef15")]
   public interface ISymbolicExpressionTreeNode : IDeepCloneable {
     ISymbolicExpressionTreeGrammar Grammar { get; }

branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTreeNodeComparer.cs

@@ -1 +1 @@
 using System.Collections.Generic;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
+  [StorableType("92217826-de61-479e-beda-aaa1ae47d6cd")]
   public interface ISymbolicExpressionTreeNodeComparer : IComparer<ISymbolicExpressionTreeNode> { }
 }

branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTreeNodeSimilarityComparer.cs

@@ -1 +1 @@
 using System.Collections.Generic;
 using HeuristicLab.Core;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
+  [StorableType("c11389e3-4a11-41b4-9143-701d0f53e446")]
   public interface ISymbolicExpressionTreeNodeSimilarityComparer : IEqualityComparer<ISymbolicExpressionTreeNode>, IItem {
     bool MatchConstantValues { get; set; }

branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTreeStringFormatter.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
+  [StorableType("6fe51bbc-6c74-418c-93fc-7c011546dd49")]
   public interface ISymbolicExpressionTreeStringFormatter : INamedItem {
     string Format(ISymbolicExpressionTree symbolicExpressionTree);

branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeAnalyzer.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
@@ -27 +28 @@
   /// Interface for analyzers that can be applied to symbolic expression trees.
   /// </summary>
+  [StorableType("ed4757ce-f656-4ef9-ba47-45d1f1711bc7")]
   public interface ISymbolicExpressionTreeAnalyzer : IAnalyzer {
     IScopeTreeLookupParameter<ISymbolicExpressionTree> SymbolicExpressionTreeParameter { get; }

branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeArchitectureAlteringOperator.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
+  [StorableType("46df10b7-488e-4390-9c6b-b40ade25e4fb")]
   public interface ISymbolicExpressionTreeArchitectureAlteringOperator : ISymbolicExpressionTreeOperator {
     IValueLookupParameter<IntValue> MaximumFunctionDefinitionsParameter { get; }

branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeArchitectureManipulator.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
@@ -27 +28 @@
   /// Interface for operators that manipulate symbolic expression trees.
   /// </summary>
+  [StorableType("5df8ae85-b166-481c-b703-ca2d7df88b80")]
   public interface ISymbolicExpressionTreeArchitectureManipulator : ISymbolicExpressionTreeManipulator, ISymbolicExpressionTreeArchitectureAlteringOperator {
   }

branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeCreator.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
@@ -27 +28 @@
   /// Interface for operators that create symbolic expression trees.
   /// </summary>
+  [StorableType("528fb9be-1501-473f-ab3d-3df15dc759c4")]
   public interface ISymbolicExpressionTreeCreator : ISolutionCreator, ISymbolicExpressionTreeSizeConstraintOperator, ISymbolicExpressionTreeGrammarBasedOperator {
     ISymbolicExpressionTree CreateTree(IRandom random, ISymbolicExpressionGrammar grammar, int maxTreeLength, int maxTreeDepth);

branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeCrossover.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
@@ -27 +28 @@
   /// Interface for crossover operators that can be applied to symbolic expression trees.
   /// </summary>
+  [StorableType("efc2ccf3-6742-4871-ad8c-84ce7adf7139")]
   public interface ISymbolicExpressionTreeCrossover : ISymbolicExpressionTreeOperator, ICrossover {
     ILookupParameter<ItemArray<ISymbolicExpressionTree>> ParentsParameter { get; }

branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeGrammarBasedOperator.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
@@ -26 +27 @@
   /// Interface for operators that can be applied to symbolic expression trees.
   /// </summary>
+  [StorableType("fb9a2dcd-095b-489c-bf66-51a066db845a")]
   public interface ISymbolicExpressionTreeGrammarBasedOperator : ISymbolicExpressionTreeOperator {
     IValueLookupParameter<ISymbolicExpressionGrammar> SymbolicExpressionTreeGrammarParameter { get; }

branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeManipulator.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
@@ -27 +28 @@
   /// Interface for operators that manipulate symbolic expression trees.
   /// </summary>
+  [StorableType("ff6c86da-99de-43c3-af34-ae56f2ad5219")]
   public interface ISymbolicExpressionTreeManipulator : ISymbolicExpressionTreeOperator, IManipulator {
   }

branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeOperator.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
@@ -26 +27 @@
   /// Interface for operators that can be applied to symbolic expression trees.
   /// </summary>
+  [StorableType("10c1c5d6-6b19-4791-9cbd-0bc3222ebf47")]
   public interface ISymbolicExpressionTreeOperator : IOperator {
     ILookupParameter<ISymbolicExpressionTree> SymbolicExpressionTreeParameter { get; }

branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeSizeConstraintOperator.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
+  [StorableType("73a6950a-82d6-4433-9f64-c970087ad972")]
   public interface ISymbolicExpressionTreeSizeConstraintOperator : ISymbolicExpressionTreeOperator {
     IValueLookupParameter<IntValue> MaximumSymbolicExpressionTreeDepthParameter { get; }