Changeset 16507 for branches/2974_Constants_Optimization/UnitTests/ConstantsOptimizationTests.cs

Timestamp:

01/06/19 18:03:15 (5 years ago)

Author:

mkommend

Message:

#2974: First stable version of new CoOp.

File:

• branches/2974_Constants_Optimization/UnitTests/ConstantsOptimizationTests.cs (modified) (2 diffs)

branches/2974_Constants_Optimization/UnitTests/ConstantsOptimizationTests.cs

@@ -37 +37 @@
 
     public static void CompareConstantsOptimizationResults(IRegressionProblemData problemData, ISymbolicExpressionTree tree) {
+      var applyLinearScaling = true;
       var old_optimizedTree = (ISymbolicExpressionTree)tree.Clone();
       var old_result = SymbolicRegressionConstantOptimizationEvaluator.OptimizeConstants(
         new SymbolicDataAnalysisExpressionTreeLinearInterpreter(),
-        old_optimizedTree, problemData, problemData.TrainingIndices, applyLinearScaling: true, maxIterations: 10);
+        old_optimizedTree, problemData, problemData.TrainingIndices, applyLinearScaling, maxIterations: 10);
 
 
       var new_optimizedTree = (ISymbolicExpressionTree)tree.Clone();
-      var new_result = LMConstantsOptimizer.OptimizeConstants(new_optimizedTree, problemData, problemData.TrainingIndices, applyLinearScaling: true, maxIterations: 10);
+      var new_result = LMConstantsOptimizer.OptimizeConstants(new_optimizedTree, problemData.Dataset, problemData.TargetVariable, problemData.TrainingIndices, applyLinearScaling, maxIterations: 10);
 
       //check R² values
@@ -50 +51 @@
 
       //check numeric values of constants
-      var old_constants = Util.ExtractConstants(old_optimizedTree);
-      var new_constants = Util.ExtractConstants(new_optimizedTree);
+      var old_constants = Util.ExtractConstants(old_optimizedTree, applyLinearScaling);
+      var new_constants = Util.ExtractConstants(new_optimizedTree, applyLinearScaling);
       //Assert.IsTrue(old_constants.SequenceEqual(new_constants));