Changeset 5352 for trunk

Timestamp:

01/21/11 22:51:59 (14 years ago)

Author:

abeham

Message:

#1333

• Removed changes to IntCounter that would make it thread-safe, if a thread-safe operator is needed a separate one should be implemented
• Moved counting of evaluated solutions out of the parallel region

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs (modified) (3 diffs)
• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithmMainLoop.cs (modified) (5 diffs)
• HeuristicLab.Operators/3.3/IntCounter.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs

@@ -135 +135 @@
     }
     private GeneticAlgorithmMainLoop GeneticAlgorithmMainLoop {
-      get { return (GeneticAlgorithmMainLoop)((Assigner)SolutionsCreator.Successor).Successor; }
+      get { return (GeneticAlgorithmMainLoop)((SubScopesCounter)SolutionsCreator.Successor).Successor; }
     }
     [Storable]
@@ -156 +156 @@
       RandomCreator randomCreator = new RandomCreator();
       SolutionsCreator solutionsCreator = new SolutionsCreator();
-      Assigner assigner = new Assigner();
+      SubScopesCounter subScopesCounter = new SubScopesCounter();
       GeneticAlgorithmMainLoop geneticAlgorithmMainLoop = new GeneticAlgorithmMainLoop();
       OperatorGraph.InitialOperator = randomCreator;
@@ -168 +168 @@
 
       solutionsCreator.NumberOfSolutionsParameter.ActualName = PopulationSizeParameter.Name;
-      solutionsCreator.Successor = assigner;
-
-      assigner.Name = "Initialize EvaluatedSolutions";
-      assigner.LeftSideParameter.ActualName = "EvaluatedSolutions";
-      assigner.RightSideParameter.ActualName = PopulationSizeParameter.Name;
-      assigner.Successor = geneticAlgorithmMainLoop;
+      solutionsCreator.Successor = subScopesCounter;
+
+      subScopesCounter.Name = "Initialize EvaluatedSolutions";
+      subScopesCounter.ValueParameter.ActualName = "EvaluatedSolutions";
+      subScopesCounter.Successor = geneticAlgorithmMainLoop;
 
       geneticAlgorithmMainLoop.SelectorParameter.ActualName = SelectorParameter.Name;

trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithmMainLoop.cs

@@ -134 +134 @@
       UniformSubScopesProcessor uniformSubScopesProcessor2 = new UniformSubScopesProcessor();
       Placeholder evaluator = new Placeholder();
-      IntCounter intCounter1 = new IntCounter();
+      SubScopesCounter subScopesCounter = new SubScopesCounter();
       SubScopesProcessor subScopesProcessor2 = new SubScopesProcessor();
       BestSelector bestSelector = new BestSelector();
       RightReducer rightReducer = new RightReducer();
       MergingReducer mergingReducer = new MergingReducer();
-      IntCounter intCounter2 = new IntCounter();
+      IntCounter intCounter = new IntCounter();
       Comparator comparator = new Comparator();
       ResultsCollector resultsCollector2 = new ResultsCollector();
@@ -175 +175 @@
       evaluator.OperatorParameter.ActualName = "Evaluator";
 
-      intCounter1.Name = "Increment EvaluatedSolutions";
-      intCounter1.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
-      intCounter1.Increment = null;
-      intCounter1.IncrementParameter.ActualName = PopulationSizeParameter.Name;
+      subScopesCounter.Name = "Increment EvaluatedSolutions";
+      subScopesCounter.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
 
       bestSelector.CopySelected = new BoolValue(false);
@@ -185 +183 @@
       bestSelector.QualityParameter.ActualName = "Quality";
 
-      intCounter2.Increment = new IntValue(1);
-      intCounter2.ValueParameter.ActualName = "Generations";
+      intCounter.Increment = new IntValue(1);
+      intCounter.ValueParameter.ActualName = "Generations";
 
       comparator.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
@@ -222 +220 @@
       subScopesRemover.Successor = null;
       uniformSubScopesProcessor2.Operator = evaluator;
-      uniformSubScopesProcessor2.Successor = intCounter1;
+      uniformSubScopesProcessor2.Successor = subScopesCounter;
       evaluator.Successor = null;
-      intCounter1.Successor = null;
+      subScopesCounter.Successor = null;
       subScopesProcessor2.Operators.Add(bestSelector);
       subScopesProcessor2.Operators.Add(new EmptyOperator());
@@ -230 +228 @@
       bestSelector.Successor = rightReducer;
       rightReducer.Successor = null;
-      mergingReducer.Successor = intCounter2;
-      intCounter2.Successor = comparator;
+      mergingReducer.Successor = intCounter;
+      intCounter.Successor = comparator;
       comparator.Successor = resultsCollector2;
       resultsCollector2.Successor = analyzer2;

trunk/sources/HeuristicLab.Operators/3.3/IntCounter.cs

@@ -33 +33 @@
   [StorableClass]
   public sealed class IntCounter : SingleSuccessorOperator {
-    private object locker = new object();
 
     public LookupParameter<IntValue> ValueParameter {
@@ -62 +61 @@
 
     public override IOperation Apply() {
-      lock (locker) {
-        if (ValueParameter.ActualValue == null) ValueParameter.ActualValue = new IntValue();
-        ValueParameter.ActualValue.Value += IncrementParameter.ActualValue.Value;
-      }
+      if (ValueParameter.ActualValue == null) ValueParameter.ActualValue = new IntValue();
+      ValueParameter.ActualValue.Value += IncrementParameter.ActualValue.Value;
       return base.Apply();
     }