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

Timestamp:

03/07/16 21:29:00 (8 years ago)

Author:

abeham

Message:

#2457: worked on expert system

Location:

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3

Files:

• ExpertSystem.cs (modified) (6 diffs)
• HeuristicLab.OptimizationExpertSystem.Common-3.3.csproj (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/HeuristicLab.OptimizationExpertSystem-3.3.csproj) (1 diff)
• Plugin.cs.frame (modified) (2 diffs)

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

@@ -41 +41 @@
 using SingleObjectiveOKBProblem = HeuristicLab.Clients.OKB.RunCreation.SingleObjectiveOKBProblem;
 
-namespace HeuristicLab.OptimizationExpertSystem {
+namespace HeuristicLab.OptimizationExpertSystem.Common {
   [Item("Expert-System", "Currently in experimental phase, an expert system that makes algorithm suggestions based on fitness landscape analysis features and an optimization knowledge base.")]
   [StorableClass]
@@ -123 +123 @@
     }
 
+    [Storable(Name = "solutionPool")]
+    private ItemList<IScope> oldBackwardsCompatible;
+    [Storable(Name = "newSolutionPool")]
+    private CheckedItemList<IScope> solutionPool;
+    public CheckedItemList<IScope> SolutionPool {
+      get { return solutionPool; }
+      set {
+        if (solutionPool == value) return;
+        solutionPool = value;
+        OnPropertyChanged("SolutionPool");
+      }
+    }
+    
     [Storable]
     private BidirectionalLookup<long, IRun> algorithmId2RunMapping;
@@ -155 +168 @@
         algorithmId2AlgorithmInstanceMapping.Add(kvp.Key, cloner.Clone(kvp.Value));
       }
+      currentResult = cloner.Clone(original.currentResult);
+      solutionPool = cloner.Clone(original.solutionPool);
       currentInstance = cloner.Clone(original.currentInstance);
       RegisterEventHandlers();
@@ -167 +182 @@
       problemInstances = new RunCollection();
       problem = new SingleObjectiveOKBProblem();
+      solutionPool = new CheckedItemList<IScope>();
       algorithmId2RunMapping = new BidirectionalLookup<long, IRun>();
       algorithmId2AlgorithmInstanceMapping = new BidirectionalDictionary<long, IAlgorithm>();
@@ -183 +199 @@
     private void AfterDeserialization() {
       readOnlySuggestedInstances = suggestedInstances.AsReadOnly();
+      // BackwardsCompatibility3.3
+      #region Backwards compatible code, remove with trunk integration
+      if (oldBackwardsCompatible != null) solutionPool = new CheckedItemList<IScope>(solutionPool);
+      else if (solutionPool == null) solutionPool = new CheckedItemList<IScope>();
+      #endregion
       RegisterEventHandlers();
     }
@@ -395 +416 @@
         alg.ExceptionOccurred -= AlgorithmOnExceptionOccurred;
         alg.ExecutionTimeChanged -= AlgorithmOnExecutionTimeChanged;
+        foreach (var solution in alg.Results.Where(x => x.Name.ToLower().Contains("solution")).Select(x => x.Value).OfType<IScope>()) {
+          solutionPool.Add(solution);
+        }
+        Runs.Add(alg.Runs.Last());
         if (algWh != null) algWh.Set();
       }

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/HeuristicLab.OptimizationExpertSystem.Common-3.3.csproj

@@ -8 +8 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HeuristicLab.OptimizationExpertSystem</RootNamespace>
-    <AssemblyName>HeuristicLab.OptimizationExpertSystem-3.3</AssemblyName>
+    <RootNamespace>HeuristicLab.OptimizationExpertSystem.Common</RootNamespace>
+    <AssemblyName>HeuristicLab.OptimizationExpertSystem.Common-3.3</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -22 +22 @@
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.OptimizationExpertSystem {
+namespace HeuristicLab.OptimizationExpertSystem.Common {
   /// <summary>
   /// Plugin class for HeuristicLab.OptimizationExpertSystem plugin.
   /// </summary>
-  [Plugin("HeuristicLab.OptimizationExpertSystem", "3.3.12.$WCREV$")]
-  [PluginFile("HeuristicLab.OptimizationExpertSystem-3.3.dll", PluginFileType.Assembly)]
+  [Plugin("HeuristicLab.OptimizationExpertSystem.Common", "3.3.12.$WCREV$")]
+  [PluginFile("HeuristicLab.OptimizationExpertSystem.Common-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]