Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/12/17 14:11:43 (7 years ago)
Author:
pkimmesw
Message:

#2665 Fixed bias 0 issue, PushExpressionFrequencyAnalyzer, Fixed probability for ERC settings, Fixed enable/disable instructions, Added expression descriptions

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/ExpressionTable.cs

    r15017 r15032  
    6060        if (attribute.IsHidden) continue;
    6161
    62         indexToNameTable.Add(indexToNameTable.Keys.Count, attribute.ExpressionName);
    63         typeToNameTable.Add(type, attribute.ExpressionName);
    64         nameToTypeTable.Add(attribute.ExpressionName, type);
     62        indexToNameTable.Add(indexToNameTable.Keys.Count, attribute.Name);
     63        typeToNameTable.Add(type, attribute.Name);
     64        nameToTypeTable.Add(attribute.Name, type);
    6565
    6666        if (!stackTypeToNamesTable.ContainsKey(attribute.StackType)) {
    … …  
    6868        }
    6969
    70         stackTypeToNamesTable[attribute.StackType].Add(attribute.ExpressionName);
     70        stackTypeToNamesTable[attribute.StackType].Add(attribute.Name);
    7171
    7272        var dependencies = attribute.StackType | attribute.AdditionalStackDependencies;
    … …  
    7575        }
    7676
    77         stackDependencyToNamesTable[dependencies].Add(attribute.ExpressionName);
     77        stackDependencyToNamesTable[dependencies].Add(attribute.Name);
    7878      }
    7979
    … …  
    9898        if (attribute.IsHidden) continue;
    9999
    100         indexToNameTable.Add(indexToNameTable.Keys.Count, attribute.ExpressionName);
    101         typeToNameTable.Add(type, attribute.ExpressionName);
    102         nameToTypeTable.Add(attribute.ExpressionName, type);
     100        indexToNameTable.Add(indexToNameTable.Keys.Count, attribute.Name);
     101        typeToNameTable.Add(type, attribute.Name);
     102        nameToTypeTable.Add(attribute.Name, type);
    103103
    104104        if (!stackTypeToNamesTable.ContainsKey(attribute.StackType)) {
    … …  
    106106        }
    107107
    108         stackTypeToNamesTable[attribute.StackType].Add(attribute.ExpressionName);
     108        stackTypeToNamesTable[attribute.StackType].Add(attribute.Name);
    109109
    110110        var dependencies = attribute.StackType | attribute.AdditionalStackDependencies;
    … …  
    113113        }
    114114
    115         stackDependencyToNamesTable[dependencies].Add(attribute.ExpressionName);
     115        stackDependencyToNamesTable[dependencies].Add(attribute.Name);
    116116      }
    117117
Note: See TracChangeset for help on using the changeset viewer.