Changeset 16507 for branches/2974_Constants_Optimization/UnitTests

Timestamp:

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

Author:

mkommend

Message:

#2974: First stable version of new CoOp.

Location:

branches/2974_Constants_Optimization/UnitTests

Files:

• ConstantsOptimizationTests.cs (modified) (2 diffs)
• PerformanceTest.cs (modified) (5 diffs)
• UnitTests.csproj (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));
 

branches/2974_Constants_Optimization/UnitTests/PerformanceTest.cs

@@ -6 +6 @@
 using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Problems.DataAnalysis.Symbolic;
+using HeuristicLab.Problems.DataAnalysis.Symbolic.ConstantsOptimization;
 using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
 using HeuristicLab.Problems.Instances.DataAnalysis;
@@ -23 +24 @@
     [TestCategory("Problems.DataAnalysis.Symbolic.Regression")]
     [TestProperty("Time", "long")]
-    public void New_ConstantsOptimization_Tower_Algorithm() {
+    public static void New_ConstantsOptimization_Tower_Algorithm() {
       var twister = new MersenneTwister((uint)seed);
       var problemData = new RegressionRealWorldInstanceProvider().LoadData(new Tower());
@@ -40 +41 @@
       //warm up
       for (int i = 0; i < trees.Length; i++) {
-        double quality = LMConstantsOptimizer.OptimizeConstants(trees[i], problemData, rows, true, maxIterations);
+        if (!trees[i].IterateNodesPrefix().OfType<VariableTreeNode>().Any()) Debugger.Break();
+        double quality = LMConstantsOptimizer.OptimizeConstants(trees[i], problemData.Dataset,problemData.TargetVariable, rows, true, maxIterations);
       }
 
@@ -47 +49 @@
         watch.Start();
         for (int i = 0; i < trees.Length; i++) {
-          double quality = LMConstantsOptimizer.OptimizeConstants(trees[i], problemData, rows, true, maxIterations);
+          double quality = LMConstantsOptimizer.OptimizeConstants(trees[i], problemData.Dataset, problemData.TargetVariable, rows, true, maxIterations);
         }
         watch.Stop();
@@ -76 +78 @@
       //warm up
       for (int i = 0; i < trees.Length; i++) {
+        if (!trees[i].IterateNodesPrefix().OfType<VariableTreeNode>().Any()) Debugger.Break();
         double quality = SymbolicRegressionConstantOptimizationEvaluator.OptimizeConstants(
           interpreter, trees[i], problemData, rows, true, maxIterations);

branches/2974_Constants_Optimization/UnitTests/UnitTests.csproj

@@ -11 +11 @@
     <RootNamespace>UnitTests</RootNamespace>
     <AssemblyName>UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -21 +21 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">