Context Navigation

Changeset 5178 for branches/ParallelEngine/HeuristicLab.Selection/3.3

Timestamp:

12/28/10 01:44:33 (14 years ago)

Author:

swagner

Message:

Revoked changes of r5177 (#1333)

Location:

branches/ParallelEngine/HeuristicLab.Selection/3.3

Files:

-                      r5177
+                      r5178
     /// <exception cref="InvalidOperationException">Thrown when <see cref="NumberOfSelectedSubScopesParameter"/> returns an odd number.</exception>
     /// <returns>Returns Apply of <see cref="AlgorithmOperator"/>.</returns>
     public override IOperation Apply(IExecutionContext context) {
+    public override IOperation Apply() {
       int count = NumberOfSelectedSubScopesParameter.ActualValue.Value;
       if (count % 2 > 0) throw new InvalidOperationException(Name + ": There must be an equal number of sub-scopes to be selected.");
       FemaleSelector.NumberOfSelectedSubScopesParameter.Value = new IntValue(count / 2);
       MaleSelector.NumberOfSelectedSubScopesParameter.Value = new IntValue(count / 2);
       return base.Apply(context);
+      return base.Apply();
+    }

-                      r5177
+                      r5178
+    }
     public override IOperation Apply(IExecutionContext context) {
+    public override IOperation Apply() {
       double maxSelPress = MaximumSelectionPressureParameter.ActualValue.Value;
       double successRatio = SuccessRatioParameter.ActualValue.Value;
       IScope scope = context.Scope;
+      IScope scope = ExecutionContext.Scope;
       IScope parents = scope.SubScopes[0];
       IScope offspring = scope.SubScopes[1];
 …
         IOperator moreOffspring = OffspringCreatorParameter.ActualValue as IOperator;
         if (moreOffspring == null) throw new InvalidOperationException(Name + ": More offspring are required, but no operator specified for creating them.");
         return context.CreateOperation(moreOffspring);
+        return ExecutionContext.CreateOperation(moreOffspring);
       } else {
         // enough children generated
 …
         scope.Variables.Remove(OffspringPopulationParameter.TranslatedName);
         scope.Variables.Remove(OffspringPopulationWinnersParameter.TranslatedName);
         return base.Apply(context);
+        return base.Apply();
+      }
+    }

-                      r5177
+                      r5178
+    }
     public sealed override IOperation Apply(IExecutionContext context) {
+    public sealed override IOperation Apply() {
       List<IScope> scopes = new List<IScope>(CurrentScope.SubScopes);
       List<IScope> reduced = Reduce(scopes);
 …
       CurrentScope.SubScopes.AddRange(reduced);
       return base.Apply(context);
+      return base.Apply();
+    }

r5177	r5178
75	75	}
76	76
77		public override IOperation Apply(~~IExecutionContext context~~) {
78		if (context.Scope.SubScopes.Count != 2) throw new InvalidOperationException(Name + ": There must be two sub-scopes which should be replaced/merged.");
79		int remaining = context.Scope.SubScopes[0].SubScopes.Count;
80		int selected = context.Scope.SubScopes[1].SubScopes.Count;
	77	public override IOperation Apply() {
	78	if (ExecutionContext.Scope.SubScopes.Count != 2) throw new InvalidOperationException(Name + ": There must be two sub-scopes which should be replaced/merged.");
	79	int remaining = ExecutionContext.Scope.SubScopes[0].SubScopes.Count;
	80	int selected = ExecutionContext.Scope.SubScopes[1].SubScopes.Count;
81	81
82	82	ISelector replacedSelector = ReplacedSelectorParameter.ActualValue;
…	…
92	92	}
93	93
94		return base.Apply(~~context~~);
	94	return base.Apply();
95	95	}
96	96	}

-                      r5177
+                      r5178
+    }
     public sealed override IOperation Apply(IExecutionContext context) {
+    public sealed override IOperation Apply() {
       List<IScope> scopes = new List<IScope>(CurrentScope.SubScopes);
       IScope[] selected = Select(scopes);
 …
       CurrentScope.SubScopes.Add(selectedScope);
       return base.Apply(context);
+      return base.Apply();
+    }

Note: See TracChangeset for help on using the changeset viewer.