- Timestamp:
- 09/20/11 11:12:10 (13 years ago)
- Location:
- trunk/sources
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources
- Property svn:ignore
-
old new 13 13 *.vsp 14 14 *.docstates 15 bin 16 HeuristicLab 3.3.6.0.ReSharper.user
-
- Property svn:mergeinfo changed
/branches/GP.Grammar.Editor (added) merged: 6284-6285,6296,6299,6335,6337,6377,6379,6387,6403,6409,6415,6493-6494,6497,6618,6620,6622,6626,6647,6675,6782,6784,6786,6795
- Property svn:ignore
-
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/MultiObjective/SymbolicClassificationMultiObjectiveProblem.cs
r6754 r6803 62 62 MaximumSymbolicExpressionTreeLength.Value = InitialMaximumTreeLength; 63 63 64 SymbolicExpressionTreeGrammarParameter.ValueChanged += (o, e) => ConfigureGrammarSymbols(); 65 66 ConfigureGrammarSymbols(); 64 67 InitializeOperators(); 65 68 UpdateEstimationLimits(); 69 } 70 71 private void ConfigureGrammarSymbols() { 72 var grammar = SymbolicExpressionTreeGrammar as TypeCoherentExpressionGrammar; 73 if (grammar != null) grammar.ConfigureAsDefaultClassificationGrammar(); 66 74 } 67 75 -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveProblem.cs
r6754 r6803 60 60 MaximumSymbolicExpressionTreeLength.Value = InitialMaximumTreeLength; 61 61 62 SymbolicExpressionTreeGrammarParameter.ValueChanged += (o, e) => ConfigureGrammarSymbols(); 63 64 ConfigureGrammarSymbols(); 62 65 InitializeOperators(); 63 66 UpdateEstimationLimits(); 67 } 68 69 private void ConfigureGrammarSymbols() { 70 var grammar = SymbolicExpressionTreeGrammar as TypeCoherentExpressionGrammar; 71 if (grammar != null) grammar.ConfigureAsDefaultClassificationGrammar(); 64 72 } 65 73 -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicDiscriminantFunctionClassificationModel.cs
r6740 r6803 140 140 if (startNode.GetSubtree(0).Symbol is Addition) { 141 141 var addNode = startNode.GetSubtree(0); 142 if (addNode.Subtree sCount == 2 && addNode.GetSubtree(0).Symbol is Multiplication && addNode.GetSubtree(1).Symbol is Constant) {142 if (addNode.SubtreeCount == 2 && addNode.GetSubtree(0).Symbol is Multiplication && addNode.GetSubtree(1).Symbol is Constant) { 143 143 alphaTreeNode = addNode.GetSubtree(1) as ConstantTreeNode; 144 144 var mulNode = addNode.GetSubtree(0); 145 if (mulNode.Subtree sCount == 2 && mulNode.GetSubtree(1).Symbol is Constant) {145 if (mulNode.SubtreeCount == 2 && mulNode.GetSubtree(1).Symbol is Constant) { 146 146 betaTreeNode = mulNode.GetSubtree(1) as ConstantTreeNode; 147 147 }
Note: See TracChangeset
for help on using the changeset viewer.