Changeset 14929 for branches/PersistenceReintegration/HeuristicLab.Core

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.Core/3.3

Files:

• Constraints/IConstraint.cs (modified) (1 diff)
• ExecutionState.cs (modified) (2 diffs)
• Interfaces/DirectedGraph/IArc.cs (modified) (2 diffs)
• Interfaces/DirectedGraph/IDirectedGraph.cs (modified) (1 diff)
• Interfaces/DirectedGraph/IVertex.cs (modified) (2 diffs)
• Interfaces/IAtomicOperation.cs (modified) (2 diffs)
• Interfaces/ICheckedItemCollection.cs (modified) (1 diff)
• Interfaces/ICheckedItemList.cs (modified) (1 diff)
• Interfaces/ICheckedMultiOperator.cs (modified) (2 diffs)
• Interfaces/IConstrainedValueParameter.cs (modified) (1 diff)
• Interfaces/IEngine.cs (modified) (2 diffs)
• Interfaces/IExecutable.cs (modified) (1 diff)
• Interfaces/IExecutionContext.cs (modified) (2 diffs)
• Interfaces/IFixedValueParameter.cs (modified) (3 diffs)
• Interfaces/IItemArray.cs (modified) (1 diff)
• Interfaces/IItemCollection.cs (modified) (1 diff)
• Interfaces/IItemDictionary.cs (modified) (1 diff)
• Interfaces/IItemList.cs (modified) (1 diff)
• Interfaces/IItemSet.cs (modified) (1 diff)
• Interfaces/IKeyedItemCollection.cs (modified) (1 diff)
• Interfaces/ILog.cs (modified) (1 diff)
• Interfaces/ILookupParameter.cs (modified) (2 diffs)
• Interfaces/IMultiOperator.cs (modified) (2 diffs)
• Interfaces/IOperation.cs (modified) (2 diffs)
• Interfaces/IOperatorGraphOperator.cs (modified) (2 diffs)
• Interfaces/IParameter.cs (modified) (1 diff)
• Interfaces/IProgrammableItem.cs (modified) (2 diffs)
• Interfaces/IRandom.cs (modified) (2 diffs)
• Interfaces/IScope.cs (modified) (2 diffs)
• Interfaces/IScopeTreeLookupParameter.cs (modified) (2 diffs)
• Interfaces/IStatefulItem.cs (modified) (2 diffs)
• Interfaces/IValueLookupParameter.cs (modified) (2 diffs)
• Interfaces/IValueParameter.cs (modified) (2 diffs)
• Interfaces/IVariable.cs (modified) (2 diffs)

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Constraints/IConstraint.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
+  [StorableType("6145ebe3-c59b-4bd9-8f17-f4ffdf0bf0ac")]
   public interface IConstraint : IItem {
     bool Active { get; set; }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/ExecutionState.cs

@@ +1 @@
+using HeuristicLab.Persistence;
 #region License Information
 /* HeuristicLab
@@ -21 +22 @@
 
 namespace HeuristicLab.Core {
+  [StorableType("78cfa365-611e-4269-af22-4e558644c4a6")]
   public enum ExecutionState {
     Prepared,

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/DirectedGraph/IArc.cs

@@ -22 +22 @@
 using System;
 using HeuristicLab.Common;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
+  [StorableType("bb99e419-45fb-4c73-bf76-e4a37b154ca6")]
   public interface IArc : IItem {
     IVertex Source { get; }
@@ -33 +35 @@
   }
 
+  [StorableType("ae2ee002-878b-4fd4-8ef4-0a97397bf1dd")]
   public interface IArc<T> : IArc where T : class, IDeepCloneable {
     T Data { get; set; }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/DirectedGraph/IDirectedGraph.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Common;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
+  [StorableType("4cb3d3c3-30f2-4695-a5f5-3411b236c724")]
   public interface IDirectedGraph : IItem {
     IEnumerable<IVertex> Vertices { get; }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/DirectedGraph/IVertex.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Common;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
+  [StorableType("3eb07777-cf55-4e4e-b682-72e7ed0a56d3")]
   public interface IVertex : IItem {
     IEnumerable<IArc> InArcs { get; }
@@ -44 +46 @@
   }
 
+  [StorableType("db0f22db-d909-48ef-8030-74d9549edd1c")]
   public interface IVertex<T> : IVertex where T : class, IDeepCloneable {
     T Data { get; set; }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IAtomicOperation.cs

@@ +1 @@
+using HeuristicLab.Persistence;
 #region License Information
 /* HeuristicLab
@@ -24 +25 @@
   /// Interface which represents an atomic operation.
   /// </summary>
+  [StorableType("441b7c2e-0c6e-4f92-a970-f15c4b7cb99c")]
   public interface IAtomicOperation : IOperation {
     IOperator Operator { get; }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/ICheckedItemCollection.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using HeuristicLab.Collections;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
+  [StorableType("5b7be247-ee39-4b06-827b-ff27993d6f06")]
   public interface ICheckedItemCollection<T> : IItemCollection<T> where T : class, IItem {
     event CollectionItemsChangedEventHandler<T> CheckedItemsChanged;

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/ICheckedItemList.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using HeuristicLab.Collections;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
+  [StorableType("49c1897a-41d8-4943-bb11-467d472ea8ce")]
   public interface ICheckedItemList<T> : IItemList<T> where T : class, IItem {
     event CollectionItemsChangedEventHandler<IndexedItem<T>> CheckedItemsChanged;

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/ICheckedMultiOperator.cs

@@ -1 @@
-#region License Information
+using HeuristicLab.Persistence;
+#region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -22 +23 @@
 
 namespace HeuristicLab.Core {
+  [StorableType("4559740d-4add-4799-9304-e8ffedd95724")]
   public interface ICheckedMultiOperator<T> : IMultiOperator<T> where T : class, IOperator {
     new ICheckedItemList<T> Operators { get; }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IConstrainedValueParameter.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
+  [StorableType("1622f4a5-72ba-4eef-96a7-ff62859002a6")]
   public interface IConstrainedValueParameter<T> : IValueParameter<T> where T : class, IItem {
     IItemSet<T> ValidValues { get; }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IEngine.cs

@@ +1 @@
+using HeuristicLab.Persistence;
 #region License Information
 /* HeuristicLab
@@ -21 +22 @@
 
 namespace HeuristicLab.Core {
+  [StorableType("9ef9b0f8-0b3f-437a-acb4-d45133c065d0")]
   public interface IEngine : IExecutable {
     ILog Log { get; }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IExecutable.cs

@@ -22 +22 @@
 using System;
 using HeuristicLab.Common;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
+  [StorableType("81695755-bae2-4237-b10c-f9984c5b770e")]
   public interface IExecutable : IItem {
     ExecutionState ExecutionState { get; }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IExecutionContext.cs

@@ -21 +21 @@
 
 using HeuristicLab.Common;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
@@ -26 +27 @@
   /// Interface which represents an execution context.
   /// </summary>
+  [StorableType("45a272d1-312f-44a1-ac5a-6fb149c1f759")]
   public interface IExecutionContext : IDeepCloneable {
     IExecutionContext Parent { get; }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IFixedValueParameter.cs

@@ -1 @@
-#region License Information
+using HeuristicLab.Persistence;
+#region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -21 +22 @@
 
 namespace HeuristicLab.Core {
+  [StorableType("159d53f6-7a3c-4d0a-aa80-9b4bc834987c")]
   public interface IFixedValueParameter : IValueParameter {
     new IItem Value { get; }
@@ -26 +28 @@
   }
 
+  [StorableType("45cd49d2-9efc-42e6-8e38-95a2ce303edb")]
   public interface IFixedValueParameter<T> : IFixedValueParameter, IValueParameter<T> where T : class, IItem {
     new T Value { get; }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IItemArray.cs

@@ -21 +21 @@
 
 using HeuristicLab.Collections;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
+  [StorableType("e965adf9-0995-478c-ba0d-4a1ce4f76e8f")]
   public interface IItemArray<T> : IObservableArray<T>, IItem where T : class, IItem { }
 }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IItemCollection.cs

@@ -21 +21 @@
 
 using HeuristicLab.Collections;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
+  [StorableType("d96bd1ee-5d3b-446d-9ab7-584f60c1640d")]
   public interface IItemCollection<T> : IObservableCollection<T>, IItem where T : class, IItem { }
 }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IItemDictionary.cs

@@ -21 +21 @@
 
 using HeuristicLab.Collections;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
+  [StorableType("91c09102-8a26-462f-992a-186468b486ec")]
   public interface IItemDictionary<TKey, TValue> : IObservableDictionary<TKey, TValue>, IItem
     where TKey : class, IItem

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IItemList.cs

@@ -21 +21 @@
 
 using HeuristicLab.Collections;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
+  [StorableType("18656cac-f7bd-4db8-be86-8dfb0575b12d")]
   public interface IItemList<T> : IObservableList<T>, IItemCollection<T>, IItem where T : class, IItem { }
 }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IItemSet.cs

@@ -21 +21 @@
 
 using HeuristicLab.Collections;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
+  [StorableType("13bf729c-c054-49b0-9978-3b41ad903d08")]
   public interface IItemSet<T> : IObservableSet<T>, IItemCollection<T>, IItem where T : class, IItem { }
 }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IKeyedItemCollection.cs

@@ -21 +21 @@
 
 using HeuristicLab.Collections;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
+  [StorableType("d7058cb9-4702-4783-8d9b-05111e33f671")]
   public interface IKeyedItemCollection<TKey, TItem> : IObservableKeyedCollection<TKey, TItem>, IItemCollection<TItem>, IItem where TItem : class, IItem { }
 }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/ILog.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Common;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
+  [StorableType("563ef474-fb16-453c-8b31-3b62073bc296")]
   public interface ILog : IItem {
     IEnumerable<string> Messages { get; }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/ILookupParameter.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
+  [StorableType("ec8395c5-8dcd-49ae-a9c8-74128415496b")]
   public interface ILookupParameter : IParameter {
     string ActualName { get; set; }
@@ -30 +32 @@
   }
 
+  [StorableType("52910af7-0773-407a-93a0-6fc2164cc569")]
   public interface ILookupParameter<T> : ILookupParameter where T : class, IItem {
     new T ActualValue { get; set; }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IMultiOperator.cs

@@ -1 @@
-#region License Information
+using HeuristicLab.Persistence;
+#region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -22 +23 @@
 
 namespace HeuristicLab.Core {
+  [StorableType("e285b907-7b34-44a5-8b8a-e93649401921")]
   public interface IMultiOperator<T> : IOperator where T : class, IOperator {
     IItemList<T> Operators { get; }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IOperation.cs

@@ -21 +21 @@
 
 using HeuristicLab.Common;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
@@ -26 +27 @@
   /// Interface which represents an operation.
   /// </summary>
+  [StorableType("3192e8f2-8cb5-412f-a1bc-bd686404b9c0")]
   public interface IOperation : IDeepCloneable { }
 }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IOperatorGraphOperator.cs

@@ -1 @@
-#region License Information
+using HeuristicLab.Persistence;
+#region License Information
 
 /* HeuristicLab
@@ -23 +24 @@
 
 namespace HeuristicLab.Core {
+  [StorableType("9dfc2860-631a-4b1f-aad4-17049643821d")]
   public interface IOperatorGraphOperator : IOperator {
     OperatorGraph OperatorGraph { get; }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IParameter.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
+  [StorableType("2924627c-9292-45bc-bce5-fd37399ac5a9")]
   public interface IParameter : INamedItem {
     Type DataType { get; }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IProgrammableItem.cs

@@ -1 @@
-#region License Information
+using HeuristicLab.Persistence;
+#region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -21 +22 @@
 
 namespace HeuristicLab.Core {
+  [StorableType("d8d0c438-d8f3-4286-9c28-06bbb229b511")]
   public interface IProgrammableItem { }
 }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IRandom.cs

@@ +1 @@
+using HeuristicLab.Persistence;
 #region License Information
 /* HeuristicLab
@@ -24 +25 @@
   /// Represents an interface for random number generators.
   /// </summary>
+  [StorableType("494faf35-0bdd-4565-a4c4-c86c0db09423")]
   public interface IRandom : IItem {
     /// <summary>

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IScope.cs

@@ +1 @@
+using HeuristicLab.Persistence;
 #region License Information
 /* HeuristicLab
@@ -24 +25 @@
   /// Hierarchical container of variables (and of subscopes).
   /// </summary>
+  [StorableType("3e077b2f-21e1-4d3c-b14a-d2940835ac63")]
   public interface IScope : INamedItem {
     IScope Parent { get; set; }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IScopeTreeLookupParameter.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
+  [StorableType("4edbfb7e-492b-4d0a-ba51-3303ff9cada2")]
   public interface IScopeTreeLookupParameter : ILookupParameter {
     int Depth { get; set; }
@@ -28 +30 @@
   }
 
+  [StorableType("996dfcff-2f6d-4c04-97a2-e5d46f825bc4")]
   public interface IScopeTreeLookupParameter<T> : IScopeTreeLookupParameter, ILookupParameter<ItemArray<T>> where T : class, IItem { }
 }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IStatefulItem.cs

@@ -1 @@
-#region License Information
+using HeuristicLab.Persistence;
+#region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -21 +22 @@
 
 namespace HeuristicLab.Core {
+  [StorableType("5b6b8dfa-a99b-4482-92b4-e416d3558397")]
   public interface IStatefulItem : IItem {
     void InitializeState();

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IValueLookupParameter.cs

@@ +1 @@
+using HeuristicLab.Persistence;
 #region License Information
 /* HeuristicLab
@@ -21 +22 @@
 
 namespace HeuristicLab.Core {
+  [StorableType("d89e7368-1633-44d7-8f80-010b462f6ac8")]
   public interface IValueLookupParameter : IValueParameter, ILookupParameter { }
 
+  [StorableType("d59ec862-0f86-4d9b-802f-d3548bd51ac1")]
   public interface IValueLookupParameter<T> : IValueLookupParameter, IValueParameter<T>, ILookupParameter<T> where T : class, IItem { }
 }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IValueParameter.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
+  [StorableType("86ae090c-45bc-4903-ae3f-5602a5df86d2")]
   public interface IValueParameter : IParameter {
     IItem Value { get; set; }
@@ -30 +32 @@
   }
 
+  [StorableType("e4f4fc38-d362-4c3f-9344-ec637d502b39")]
   public interface IValueParameter<T> : IValueParameter where T : class, IItem {
     new T Value { get; set; }

branches/PersistenceReintegration/HeuristicLab.Core/3.3/Interfaces/IVariable.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Core {
@@ -26 +27 @@
   /// Represents a variable which has a name and holds an IItem.
   /// </summary>
+  [StorableType("a863d1d5-8e66-4feb-bc76-d08939f8d008")]
   public interface IVariable : INamedItem {
     IItem Value { get; set; }