Changeset 9241 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars
- Timestamp:
- 02/21/13 16:55:07 (11 years ago)
- Location:
- branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Problems.DataAnalysis.Symbolic
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
-
branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4
- Property svn:ignore
-
old new 1 *.user 2 Plugin.cs 1 3 bin 2 *.user3 HeuristicLabProblemsDataAnalysisSymbolicPlugin.cs4 4 obj 5 *.vs10x6 Plugin.cs
-
- Property svn:ignore
-
branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/FullFunctionalExpressionGrammar.cs
r7707 r9241 116 116 var laggedVariable = new LaggedVariable(); 117 117 laggedVariable.InitialFrequency = 0.0; 118 var autoregressiveVariable = new AutoregressiveTargetVariable(); 119 autoregressiveVariable.InitialFrequency = 0.0; 120 autoregressiveVariable.Enabled = false; 118 121 119 122 var allSymbols = new List<Symbol>() { add, sub, mul, div, mean, sin, cos, tan, log, square, pow, sqrt, root, exp, 120 123 airyA, airyB, bessel, cosineIntegral, dawson, erf, expIntegralEi, fresnelCosineIntegral, fresnelSineIntegral, gamma, hypCosineIntegral, hypSineIntegral, norm, psi, sineIntegral, 121 @if, gt, lt, and, or, not, timeLag, integral, derivative, constant, variableSymbol, laggedVariable, variableCondition };124 @if, gt, lt, and, or, not, timeLag, integral, derivative, constant, variableSymbol, laggedVariable,autoregressiveVariable, variableCondition }; 122 125 var unaryFunctionSymbols = new List<Symbol>() { square, sqrt, sin, cos, tan, log, exp, not, timeLag, integral, derivative, 123 126 airyA, airyB, bessel, cosineIntegral, dawson, erf, expIntegralEi, fresnelCosineIntegral, fresnelSineIntegral, gamma, hypCosineIntegral, hypSineIntegral, norm, psi, sineIntegral … … 126 129 var binaryFunctionSymbols = new List<Symbol>() { pow, root, gt, lt, variableCondition }; 127 130 var ternarySymbols = new List<Symbol>() { add, sub, mul, div, mean, and, or }; 128 var terminalSymbols = new List<Symbol>() { variableSymbol, constant, laggedVariable };131 var terminalSymbols = new List<Symbol>() { variableSymbol, constant, laggedVariable, autoregressiveVariable }; 129 132 130 133 foreach (var symb in allSymbols) -
branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/TypeCoherentExpressionGrammar.cs
r7696 r9241 102 102 constant.MinValue = -20; 103 103 constant.MaxValue = 20; 104 // var integerConstant = new IntegerConstant { MinValue = 0, MaxValue = 10; } 104 105 var variableSymbol = new Variable(); 105 106 var laggedVariable = new LaggedVariable(); 107 var autoregressiveVariable = new AutoregressiveTargetVariable(); 106 108 #endregion 107 109 … … 122 124 var conditionalSymbols = new GroupSymbol(ConditionalSymbolsName, new List<ISymbol> { conditionSymbols, comparisonSymbols, booleanOperationSymbols }); 123 125 124 var timeSeriesSymbols = new GroupSymbol(TimeSeriesSymbolsName, new List<ISymbol> { timeLag, integral, derivative, laggedVariable });126 var timeSeriesSymbols = new GroupSymbol(TimeSeriesSymbolsName, new List<ISymbol> { timeLag, integral, derivative, laggedVariable, autoregressiveVariable }); 125 127 #endregion 126 128 … … 152 154 SetSubtreeCount(derivative, 1, 1); 153 155 SetSubtreeCount(laggedVariable, 0, 0); 156 SetSubtreeCount(autoregressiveVariable, 0, 0); 154 157 #endregion 155 158 … … 225 228 Symbols.First(s => s.Name == TimeSeriesSymbolsName).Enabled = false; 226 229 } 230 231 public void ConfigureAsDefaultTimeSeriesPrognosisGrammar() { 232 Symbols.First(s => s is Average).Enabled = false; 233 Symbols.First(s => s.Name == TrigonometricFunctionsName).Enabled = false; 234 Symbols.First(s => s.Name == PowerFunctionsName).Enabled = false; 235 Symbols.First(s => s.Name == ConditionalSymbolsName).Enabled = false; 236 Symbols.First(s => s.Name == SpecialFunctionsName).Enabled = false; 237 238 Symbols.First(s => s.Name == TimeSeriesSymbolsName).Enabled = true; 239 Symbols.First(s => s is Derivative).Enabled = false; 240 Symbols.First(s => s is Integral).Enabled = false; 241 Symbols.First(s => s is TimeLag).Enabled = false; 242 } 227 243 } 228 244 }
Note: See TracChangeset
for help on using the changeset viewer.