Changeset 15084 for trunk/sources/HeuristicLab.Optimization

Timestamp:

06/28/17 22:55:27 (7 years ago)

Author:

abeham

Message:

#2775:

• All single-objective operators inside IMultiOperators are now removed by the multi-objective problem
• All multi-objective operators inside IMultiOperators are now removed by the single-objective problem

Location:

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems

Files:

• MultiObjectiveBasicProblem.cs (modified) (1 diff)
• SingleObjectiveBasicProblem.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/MultiObjectiveBasicProblem.cs

@@ -76 +76 @@
       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);
+        }
+      }
     }
 

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveBasicProblem.cs

@@ -110 +110 @@
       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);
+        }
+      }
     }