Changeset 6999 for trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3

Timestamp:

11/16/11 13:58:19 (13 years ago)

Author:

mkommend

Message:

#1479:

• Renamed symbolic classification sample.
• Updated samples unit test to use new features of the SymbolicExpressionGrammar.
• Updated symbolic regression and classification sample.
• Filtered symbolic in AllowedChildSymbolsView.

File:

• trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/SamplesTest.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/SamplesTest.cs

@@ -280 +280 @@
       // configure grammar
       var grammar = new TypeCoherentExpressionGrammar();
-      grammar.Symbols.OfType<Sine>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<Cosine>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<Tangent>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<IfThenElse>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<GreaterThan>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<LessThan>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<And>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<Or>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<Not>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<TimeLag>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<Integral>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<Derivative>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<LaggedVariable>().Single().InitialFrequency = 0.0;
+      grammar.ConfigureAsDefaultRegressionGrammar();
       grammar.Symbols.OfType<VariableCondition>().Single().InitialFrequency = 0.0;
       var varSymbol = grammar.Symbols.OfType<Variable>().Where(x => !(x is LaggedVariable)).Single();
@@ -393 +381 @@
       // configure grammar
       var grammar = new TypeCoherentExpressionGrammar();
-      grammar.Symbols.OfType<Sine>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<Cosine>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<Tangent>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<Power>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<Root>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<TimeLag>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<Integral>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<Derivative>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<LaggedVariable>().Single().InitialFrequency = 0.0;
-      grammar.Symbols.OfType<VariableCondition>().Single().InitialFrequency = 0.0;
+      grammar.ConfigureAsDefaultClassificationGrammar();
+      grammar.Symbols.OfType<VariableCondition>().Single().Enabled = false;
       var varSymbol = grammar.Symbols.OfType<Variable>().Where(x => !(x is LaggedVariable)).Single();
       varSymbol.WeightMu = 1.0;