Changeset 10974 for branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Mappers

Timestamp:

06/11/14 12:07:15 (11 years ago)

Author:

gkronber

Message:

#2109: minor code cleanup

Location:

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Mappers

Files:

• GenotypeToPhenotypeMapper.cs (modified) (2 diffs)
• PIGEMapper.cs (modified) (3 diffs)

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Mappers/GenotypeToPhenotypeMapper.cs

@@ -34 +34 @@
 namespace HeuristicLab.Problems.GrammaticalEvolution {
   /// <summary>
-  /// GenotypeToPhenotypeMapper
+  /// Abstract base class for GenotypeToPhenotypeMappers
   /// </summary>
   public abstract class GenotypeToPhenotypeMapper : IntegerVectorOperator, IGenotypeToPhenotypeMapper {
@@ -66 +66 @@
 
       // no terminal node exists for the given parent node
-      if (possibleSymbolsList.Count() < 1) return null;
+      if (!possibleSymbolsList.Any()) return null;
 
       var newNode = possibleSymbolsList.SelectRandom(random).CreateTreeNode();

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Mappers/PIGEMapper.cs

@@ -71 +71 @@
   public class PIGEMapper : GenotypeToPhenotypeMapper {
 
+    private object nontVectorLocker = new object();
     private IntegerVector nontVector;
 
@@ -78 +79 @@
     }
 
-    private IntegerVector GetNontVector(IRandom random, IntMatrix bounds, int length) {
+    private static IntegerVector GetNontVector(IRandom random, IntMatrix bounds, int length) {
       IntegerVector v = new IntegerVector(length);
       v.Randomize(random, bounds);
@@ -114 +115 @@
       tree.Root = rootNode;
 
-      if (NontVector == null) {
-        NontVector = GetNontVector(random, bounds, length);
+      // Map can be called simultaniously on multiple threads
+      lock (nontVectorLocker) {
+        if (NontVector == null) {
+          NontVector = GetNontVector(random, bounds, length);
+        }
       }