Context Navigation

Encodings

Timestamp:

01/03/11 00:46:55 (14 years ago)

Author:

swagner

Message:

Merged ParallelEngine branch back into trunk (#1333)

Location:

trunk/sources

Files:

trunk/sources
- Property svn:mergeinfo changed
  /branches/ParallelEngine (added) merged: 5175-5178,5183,5185,5187-5188
trunk/sources/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
  /branches/ParallelEngine/HeuristicLab.Problems.VehicleRouting (added) merged: 5177-5178,5185

r4722	r5193
54	54	IAtomicOperation op = this.ExecutionContext.CreateOperation(
55	55	InnerCrossoverParameter.ActualValue, this.ExecutionContext.Scope);
56		op.Operator.Execute((IExecutionContext)op);
	56	op.Operator.Execute((IExecutionContext)op, CancellationToken);
57	57
58	58	string childName = InnerCrossoverParameter.ActualValue.ChildParameter.ActualName;

r4722	r5193
51	51	IAtomicOperation op = this.ExecutionContext.CreateOperation(
52	52	InnerManipulatorParameter.ActualValue, this.ExecutionContext.Scope);
53		op.Operator.Execute((IExecutionContext)op);
	53	op.Operator.Execute((IExecutionContext)op, CancellationToken);
54	54	}
55	55	}

r4722	r5193
46	46	PermutationMoveOperatorParameter.PermutationParameter.ActualName = VRPToursParameter.ActualName;
47	47	IAtomicOperation op = this.ExecutionContext.CreateChildOperation(PermutationMoveOperatorParameter);
48		op.Operator.Execute((IExecutionContext)op);
	48	op.Operator.Execute((IExecutionContext)op, CancellationToken);
49	49
50	50	return next;

r5129	r5193
68	68	moveMaker.PermutationParameter.ActualName = VRPToursParameter.ActualName;
69	69	IAtomicOperation op = this.ExecutionContext.CreateChildOperation(moveMaker);
70		op.Operator.Execute((IExecutionContext)op);
	70	op.Operator.Execute((IExecutionContext)op, CancellationToken);
71	71
72	72	return next;

-                      r4722
+                      r5193
   [Item("PrinsPermutationCrossover", "An operator which crosses two VRP representations using a standard permutation operator.  It is implemented as described in Prins, C. (2004). A simple and effective evolutionary algorithm for the vehicle routing problem. Computers & Operations Research, 12:1985-2002.")]
   [StorableClass]
   public sealed class PrinsPermutationCrossover : PrinsCrossover, IPrinsOperator {
+  public sealed class PrinsPermutationCrossover : PrinsCrossover, IPrinsOperator {
     public IValueLookupParameter<IPermutationCrossover> InnerCrossoverParameter {
       get { return (IValueLookupParameter<IPermutationCrossover>)Parameters["InnerCrossover"]; }
 …
       IAtomicOperation op = this.ExecutionContext.CreateOperation(
         InnerCrossoverParameter.ActualValue, this.ExecutionContext.Scope);
       op.Operator.Execute((IExecutionContext)op);
+      op.Operator.Execute((IExecutionContext)op, CancellationToken);
       string childName = InnerCrossoverParameter.ActualValue.ChildParameter.ActualName;

r4722	r5193
42	42	public PrinsPermutationManipulator()
43	43	: base() {
44		Parameters.Add(new ValueLookupParameter<IPermutationManipulator>("InnerManipulator", "The permutation manipulator.", new TranslocationManipulator()));
	44	Parameters.Add(new ValueLookupParameter<IPermutationManipulator>("InnerManipulator", "The permutation manipulator.", new TranslocationManipulator()));
45	45	}
46	46
…	…
50	50	IAtomicOperation op = this.ExecutionContext.CreateOperation(
51	51	InnerManipulatorParameter.ActualValue, this.ExecutionContext.Scope);
52		op.Operator.Execute((IExecutionContext)op);
	52	op.Operator.Execute((IExecutionContext)op, CancellationToken);
53	53	}
54	54	}

r4722	r5193
54	54	IAtomicOperation op = this.ExecutionContext.CreateOperation(
55	55	InnerCrossoverParameter.ActualValue, this.ExecutionContext.Scope);
56		op.Operator.Execute((IExecutionContext)op);
	56	op.Operator.Execute((IExecutionContext)op, CancellationToken);
57	57
58	58	string childName = InnerCrossoverParameter.ActualValue.ChildParameter.ActualName;

r4722	r5193
52	52	IAtomicOperation op = this.ExecutionContext.CreateOperation(
53	53	InnerManipulatorParameter.ActualValue, this.ExecutionContext.Scope);
54		op.Operator.Execute((IExecutionContext)op);
	54	op.Operator.Execute((IExecutionContext)op, CancellationToken);
55	55	}
56	56	}

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