Changeset 15108

Timestamp:

07/03/17 09:35:48 (7 years ago)

Author:

abeham

Message:

#2775: merged 15084 to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Core (modified) (1 prop)
• HeuristicLab.Core/3.3/Interfaces/IMultiOperator.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/MultiOperator.cs (modified) (3 diffs)
• HeuristicLab.Optimization (modified) (1 prop)
• HeuristicLab.Optimization/3.3/BasicProblems/MultiObjectiveBasicProblem.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveBasicProblem.cs (modified) (1 diff)

stable/HeuristicLab.Core/3.3/Interfaces/IMultiOperator.cs

@@ -21 +21 @@
 
 
+using System.Collections.Generic;
+
 namespace HeuristicLab.Core {
-  public interface IMultiOperator<T> : IOperator where T : class,IOperator {
-    IItemList<T> Operators { get; }
+  public interface IMultiOperator : IOperator {
+    IEnumerable<IOperator> Operators { get; }
+    bool AddOperator(IOperator op);
+    bool RemoveOperator(IOperator op);
+  }
+  public interface IMultiOperator<T> : IMultiOperator where T : class,IOperator {
+    new IItemList<T> Operators { get; }
   }
 }

stable/HeuristicLab.Operators/3.3/MultiOperator.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
@@ -52 +53 @@
       }
     }
+    
+    IEnumerable<IOperator> IMultiOperator.Operators { get { return operators.AsEnumerable(); } }
 
     [StorableConstructor]
@@ -69 +72 @@
     private void AfterDeserialization() {
       Initialize();
+    }
+
+    public virtual bool AddOperator(IOperator op) {
+      var tOp = op as T;
+      if (tOp == null) return false;
+      operators.Add(tOp);
+      return true;
+    }
+
+    public virtual bool RemoveOperator(IOperator op) {
+      var tOp = op as T;
+      if (tOp == null) return false;
+      return operators.Remove(tOp);
     }
 

stable/HeuristicLab.Optimization/3.3/BasicProblems/MultiObjectiveBasicProblem.cs

@@ -74 +74 @@
       if (encoding != null && encoding.Operators.Any(x => x is ISingleObjectiveOperator && !(x is IMultiObjectiveOperator)))
         encoding.Operators = encoding.Operators.Where(x => !(x is ISingleObjectiveOperator) || x is IMultiObjectiveOperator).ToList();
+
+      foreach (var multiOp in Encoding.Operators.OfType<IMultiOperator>()) {
+        foreach (var soOp in multiOp.Operators.Where(x => x is ISingleObjectiveOperator).ToList()) {
+          multiOp.RemoveOperator(soOp);
+        }
+      }
     }
 

stable/HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveBasicProblem.cs

@@ -100 +100 @@
       if (encoding.Operators.Any(x => x is IMultiObjectiveOperator && !(x is ISingleObjectiveOperator)))
         encoding.Operators = encoding.Operators.Where(x => !(x is IMultiObjectiveOperator) || x is ISingleObjectiveOperator).ToList();
+
+      foreach (var multiOp in Encoding.Operators.OfType<IMultiOperator>()) {
+        foreach (var moOp in multiOp.Operators.Where(x => x is IMultiObjectiveOperator).ToList()) {
+          multiOp.RemoveOperator(moOp);
+        }
+      }
     }