Changeset 8451 for branches/HeuristicLab.Mono/HeuristicLab.Algorithms.ScatterSearch

Timestamp:

08/08/12 23:59:16 (12 years ago)

Author:

ascheibe

Message:

#1861 merged changes from trunk into branch

Location:

branches/HeuristicLab.Mono

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.ScatterSearch/3.3 (modified) (1 prop)
• HeuristicLab.Algorithms.ScatterSearch/3.3/Properties (modified) (1 prop)
• HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs (modified) (1 diff)
• HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearchMainLoop.cs (modified) (2 diffs)

branches/HeuristicLab.Mono/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs

@@ -212 +212 @@
 
       uniformSubScopesProcessor.Operator = solutionImprover;
+      uniformSubScopesProcessor.ParallelParameter.Value = new BoolValue(true);
       uniformSubScopesProcessor.Successor = variableCreator;
 

branches/HeuristicLab.Mono/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearchMainLoop.cs

@@ -309 +309 @@
       uniformSubScopesProcessor2.DepthParameter.Value = new IntValue(2);
       uniformSubScopesProcessor2.Operator = solutionImprover1;
+      uniformSubScopesProcessor2.ParallelParameter.Value = new BoolValue(true);
       uniformSubScopesProcessor2.Successor = subScopesProcessor4;
 
@@ -351 +352 @@
       uniformSubScopesProcessor3.DepthParameter.Value = new IntValue(1);
       uniformSubScopesProcessor3.Operator = solutionImprover2;
+      uniformSubScopesProcessor3.ParallelParameter.Value = new BoolValue(true);
       uniformSubScopesProcessor3.Successor = dataReducer2;