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

Timestamp:

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

Author:

abeham

Message:

#2457: worked on expert system

File:

• branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/ExpertSystem.cs (modified) (6 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();
       }