Changeset 17257 for branches/2521_ProblemRefactoring/HeuristicLab.Parameters/3.3/ContextLookupParameter.cs

Timestamp:

09/17/19 14:05:47 (5 years ago)

Author:

abeham

Message:

#2521: Refactored ContextLookupParameter with suggestions from mkommend

• Add StorableType attribute to some types

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Parameters/3.3/ContextLookupParameter.cs (modified) (6 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Parameters/3.3/ContextLookupParameter.cs

@@ -1 +1 @@
 using System;
-using System.Threading;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -8 +7 @@
   [Item("ContextLookupParameter", "A parameter that looks up contexts by type.")]
   [StorableType("4ac189c8-6cf3-48fd-bf79-392d35a872db")]
-  public class ContextLookupParameter<T> : Parameter, IContextLookupParameter<T>, IStatefulItem
+  public class ContextLookupParameter<T> : ContextParameter, IContextLookupParameter<T>
       where T : class, IParameterizedItem {
 
@@ -15 +14 @@
     }
 
-    private Lazy<ThreadLocal<IItem>> cachedActualValues;
-    protected IItem CachedActualValue {
-      get { return cachedActualValues.Value.Value; }
-      set { cachedActualValues.Value.Value = value; }
-    }
-
-    private Lazy<ThreadLocal<IExecutionContext>> executionContexts;
-    public IExecutionContext ExecutionContext {
-      get { return executionContexts.Value.Value; }
-      set {
-        if (value != executionContexts.Value.Value) {
-          executionContexts.Value.Value = value;
-          cachedActualValues.Value.Value = null;
-        }
-      }
-    }
-
     [StorableConstructor]
-    protected ContextLookupParameter(StorableConstructorFlag _) : base(_) {
-      cachedActualValues = new Lazy<ThreadLocal<IItem>>(() => { return new ThreadLocal<IItem>(); }, LazyThreadSafetyMode.ExecutionAndPublication);
-      executionContexts = new Lazy<ThreadLocal<IExecutionContext>>(() => { return new ThreadLocal<IExecutionContext>(); }, LazyThreadSafetyMode.ExecutionAndPublication);
-    }
-    protected ContextLookupParameter(ContextLookupParameter<T> original, Cloner cloner)
-      : base(original, cloner) {
-      cachedActualValues = new Lazy<ThreadLocal<IItem>>(() => { return new ThreadLocal<IItem>(); }, LazyThreadSafetyMode.ExecutionAndPublication);
-      executionContexts = new Lazy<ThreadLocal<IExecutionContext>>(() => { return new ThreadLocal<IExecutionContext>(); }, LazyThreadSafetyMode.ExecutionAndPublication);
-    }
-    public ContextLookupParameter() : this("Anonymous") { }
-    public ContextLookupParameter(string name, string description = null)
-      : base(name, description, typeof(T)) {
-      cachedActualValues = new Lazy<ThreadLocal<IItem>>(() => { return new ThreadLocal<IItem>(); }, LazyThreadSafetyMode.ExecutionAndPublication);
-      executionContexts = new Lazy<ThreadLocal<IExecutionContext>>(() => { return new ThreadLocal<IExecutionContext>(); }, LazyThreadSafetyMode.ExecutionAndPublication);
+    protected ContextLookupParameter(StorableConstructorFlag _) : base(_) { }
+    protected ContextLookupParameter(ContextLookupParameter<T> original, Cloner cloner) : base(original, cloner) { }
+    public ContextLookupParameter() : base("ContextLookup." + typeof(T).Name, string.Empty, typeof(T)) {
+      Hidden = true;
     }
 
@@ -53 +25 @@
     }
 
-    protected override IItem GetActualValue() {
-      if (CachedActualValue != null) return CachedActualValue;
-
+    protected override IItem GetActualValueFromContext() {
       IItem item = null;
       var context = ExecutionContext;
@@ -65 +35 @@
         context = context.Parent;
       }
-      CachedActualValue = item;
       return item;
     }
@@ -72 +41 @@
       throw new NotSupportedException("The context lookup parameter may not be used to set an item.");
     }
-
-    public virtual void InitializeState() {
-    }
-    public virtual void ClearState() {
-      if (cachedActualValues.IsValueCreated) {
-        cachedActualValues.Value.Dispose();
-        cachedActualValues = new Lazy<ThreadLocal<IItem>>(() => { return new ThreadLocal<IItem>(); }, LazyThreadSafetyMode.ExecutionAndPublication);
-      }
-      if (executionContexts.IsValueCreated) {
-        executionContexts.Value.Dispose();
-        executionContexts = new Lazy<ThreadLocal<IExecutionContext>>(() => { return new ThreadLocal<IExecutionContext>(); }, LazyThreadSafetyMode.ExecutionAndPublication);
-      }
-    }
   }
 }