Changeset 12847 for branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3

Timestamp:

08/12/15 10:29:01 (9 years ago)

Author:

abeham

Message:

#2457: Added view

Location:

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3

Files:

• ExpertSystemOptimizer.cs (modified) (4 diffs)
• Plugin.cs.frame (modified) (1 diff)

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystemOptimizer.cs

@@ -41 +41 @@
     public static new Image StaticItemImage {
       get { return VSImageLibrary.Library; }
+    }
+
+    [Storable]
+    private int maximumEvaluations;
+    public int MaximumEvaluations {
+      get { return maximumEvaluations; }
+      set {
+        if (maximumEvaluations == value) return;
+        maximumEvaluations = value;
+        OnPropertyChanged("MaximumEvaluations");
+      }
     }
 
@@ -104 +115 @@
     }
 
+    [Storable]
+    private ItemList<IAlgorithm> suggestedInstances;
+    private ReadOnlyItemList<IAlgorithm> readOnlySuggestedInstances;
+    public ReadOnlyItemList<IAlgorithm> SuggestedInstances {
+      get { return readOnlySuggestedInstances; }
+    }
+
     public IEnumerable<IOptimizer> NestedOptimizers {
-      get { yield break; }
+      get { return SuggestedInstances; }
     }
 
@@ -117 +135 @@
       knowledgeBase = cloner.Clone(original.knowledgeBase);
       problem = cloner.Clone(original.problem);
+      suggestedInstances = cloner.Clone(original.suggestedInstances);
+      readOnlySuggestedInstances = suggestedInstances.AsReadOnly();
     }
     public ExpertSystemOptimizer() {
       Runs = new RunCollection();
+      KnowledgeBase = new RunCollection();
+      suggestedInstances = new ItemList<IAlgorithm>();
+      readOnlySuggestedInstances = suggestedInstances.AsReadOnly();
       ExecutionState = ExecutionState.Stopped;
       ExecutionTime = TimeSpan.Zero;
@@ -126 +149 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       return new ExpertSystemOptimizer(this, cloner);
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      readOnlySuggestedInstances = suggestedInstances.AsReadOnly();
     }
 

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Plugin.cs.frame

@@ -28 +28 @@
   [Plugin("HeuristicLab.OptimizationExpertSystem", "3.3.12.$WCREV$")]
   [PluginFile("HeuristicLab.OptimizationExpertSystem-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Analysis", "3.7.0")]
+  [PluginDependency("HeuristicLab.Analysis", "3.3")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]