Changeset 11646 for branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/TypeCoherentExpressionGrammar.cs
- Timestamp:
- 12/04/14 11:09:44 (9 years ago)
- Location:
- branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
-
branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/TypeCoherentExpressionGrammar.cs
r9992 r11646 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 93 93 var or = new Or(); 94 94 var not = new Not(); 95 var xor = new Xor(); 95 96 var variableCondition = new VariableCondition(); 96 97 … … 120 121 var conditionSymbols = new GroupSymbol(ConditionsName, new List<ISymbol> { @if, variableCondition }); 121 122 var comparisonSymbols = new GroupSymbol(ComparisonsName, new List<ISymbol> { gt, lt }); 122 var booleanOperationSymbols = new GroupSymbol(BooleanOperatorsName, new List<ISymbol> { and, or, not });123 var booleanOperationSymbols = new GroupSymbol(BooleanOperatorsName, new List<ISymbol> { and, or, not, xor }); 123 124 var conditionalSymbols = new GroupSymbol(ConditionalSymbolsName, new List<ISymbol> { conditionSymbols, comparisonSymbols, booleanOperationSymbols }); 124 125 … … 148 149 SetSubtreeCount(or, 2, 2); 149 150 SetSubtreeCount(not, 1, 1); 151 SetSubtreeCount(xor, 2, 2); 150 152 151 153 SetSubtreeCount(timeLag, 1, 1); … … 237 239 Symbols.First(s => s is Average).Enabled = false; 238 240 Symbols.First(s => s is VariableCondition).Enabled = false; 241 Symbols.First(s => s is Xor).Enabled = false; 239 242 Symbols.First(s => s.Name == TrigonometricFunctionsName).Enabled = false; 240 243 Symbols.First(s => s.Name == ExponentialFunctionsName).Enabled = false;
Note: See TracChangeset
for help on using the changeset viewer.