Changeset 15189 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Configuration

Timestamp:

07/10/17 21:36:03 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed small issues, testet benchmark suite, added INX Expressions

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Configuration/PushConfigurationBase.cs (modified) (4 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Configuration/PushConfigurationBase.cs

@@ -48 +48 @@
       set
       {
-        var removedExpressions = enabledExpressions.ToArray();
+        var removedExpressions = enabledExpressions.ToList();
         enabledExpressions.Clear();
         enabledExpressions.AddRange(value);
@@ -68 +68 @@
         var attribute = ExpressionTable.TypeToAttributeTable[type];
 
-        expressionsPerStackCount[attribute.StackType]++;
+        if (expressionsPerStackCount.ContainsKey(attribute.StackType)) {
+          expressionsPerStackCount[attribute.StackType]++;
+        }
 
         foreach (var additionalStackType in attribute.AdditionalStackDependencies.ToValues())
@@ -150 +152 @@
 
       enabledExpressions.Add(expressionName);
-      expressionsPerStackCount[attribute.StackType]++;
-      foreach (var additionalStackType in attribute.AdditionalStackDependencies.ToValues())
+
+      if (expressionsPerStackCount.ContainsKey(attribute.StackType))
+        expressionsPerStackCount[attribute.StackType]++;
+
+      foreach (var additionalStackType in attribute.AdditionalStackDependencies.ToValues().Where(expressionsPerStackCount.ContainsKey))
         expressionsPerStackCount[additionalStackType]++;
 
@@ -172 +177 @@
 
       enabledExpressions.Remove(expressionName);
-      expressionsPerStackCount[attribute.StackType]--;
-      foreach (var additionalStackType in attribute.AdditionalStackDependencies.ToValues())
+
+      if (expressionsPerStackCount.ContainsKey(attribute.StackType))
+        expressionsPerStackCount[attribute.StackType]--;
+
+      foreach (var additionalStackType in attribute.AdditionalStackDependencies.ToValues().Where(expressionsPerStackCount.ContainsKey))
         expressionsPerStackCount[additionalStackType]--;