Changeset 15132 for stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples

Timestamp:

07/06/17 10:22:27 (7 years ago)

Author:

gkronber

Message:

#2650: merged r14827, r14829:14832 from trunk to stable

Location:

stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples

Files:

• GPSymbolicClassificationSampleTest.cs (modified) (1 diff)
• GPSymbolicRegressionSampleTest.cs (modified) (1 diff)
• GPTimeSeriesSampleTest.cs (modified) (1 diff)

stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPSymbolicClassificationSampleTest.cs

@@ -100 +100 @@
       grammar.ConfigureAsDefaultClassificationGrammar();
       grammar.Symbols.OfType<VariableCondition>().Single().Enabled = false;
-      var varSymbol = grammar.Symbols.OfType<Variable>().Where(x => !(x is LaggedVariable)).Single();
+      foreach (var varSy in grammar.Symbols.OfType<VariableBase>()) varSy.VariableChangeProbability = 1.0; // for backwards compatibilty
+      var varSymbol = grammar.Symbols.OfType<Variable>().Single();
       varSymbol.WeightMu = 1.0;
       varSymbol.WeightSigma = 1.0;

stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPSymbolicRegressionSampleTest.cs

@@ -101 +101 @@
       grammar.ConfigureAsDefaultRegressionGrammar();
       grammar.Symbols.OfType<VariableCondition>().Single().InitialFrequency = 0.0;
-      var varSymbol = grammar.Symbols.OfType<Variable>().Where(x => !(x is LaggedVariable)).Single();
+      foreach (var varSy in grammar.Symbols.OfType<VariableBase>()) varSy.VariableChangeProbability = 1.0; // for backwards compatibilty
+      var varSymbol = grammar.Symbols.OfType<Variable>().Single();
       varSymbol.WeightMu = 1.0;
       varSymbol.WeightSigma = 1.0;

stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPTimeSeriesSampleTest.cs

@@ -74 +74 @@
           autoRegressiveSymbol.MaxLag = -1;
         }
+        if (symbol is VariableBase) {
+          var varSy = symbol as VariableBase;
+          varSy.VariableChangeProbability = 1.0; // backwards compatibility
+        }
       }