Changeset 16498

Timestamp:

01/04/19 13:03:29 (6 years ago)

Author:

jzenisek

Message:

#2288: adapted online calculation of variable impacts within VIN-view according to new interface of RegressionSolutionVariableImpactsCalculator.CalculateImpacts(..)

File:

• branches/2288_HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3/RunCollectionVariableInteractionNetworkView.cs (modified) (2 diffs)

branches/2288_HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3/RunCollectionVariableInteractionNetworkView.cs

@@ -121 +121 @@
           var solutions = group.Select(run => Tuple.Create(run, (IRegressionSolution)run.Results.Values.Single(sol => sol is IRegressionSolution)));
           var best = solutions.OrderBy(x => x.Item2.TrainingRSquared).Last();
-          var impacts = RegressionSolutionVariableImpactsCalculator.CalculateImpacts(best.Item2, RegressionSolutionVariableImpactsCalculator.DataPartitionEnum.All, RegressionSolutionVariableImpactsCalculator.ReplacementMethodEnum.Shuffle).ToDictionary(x => x.Item1, x => x.Item2);
+          var impacts = RegressionSolutionVariableImpactsCalculator.CalculateImpacts(best.Item2, 
+            RegressionSolutionVariableImpactsCalculator.ReplacementMethodEnum.Shuffle,
+            RegressionSolutionVariableImpactsCalculator.FactorReplacementMethodEnum.Best,
+            RegressionSolutionVariableImpactsCalculator.DataPartitionEnum.All).ToDictionary(x => x.Item1, x => x.Item2);
 
           targetImpacts[best.Item2.ProblemData.TargetVariable] = Tuple.Create(new[] { best.Item1 }.AsEnumerable(), impacts);
@@ -139 +142 @@
             var md = dataset.ToModifiable();
 
-            var impacts = RegressionSolutionVariableImpactsCalculator.CalculateImpacts(sol, RegressionSolutionVariableImpactsCalculator.DataPartitionEnum.All, RegressionSolutionVariableImpactsCalculator.ReplacementMethodEnum.Shuffle);
+            var impacts = RegressionSolutionVariableImpactsCalculator.CalculateImpacts(sol,
+              RegressionSolutionVariableImpactsCalculator.ReplacementMethodEnum.Shuffle,
+              RegressionSolutionVariableImpactsCalculator.FactorReplacementMethodEnum.Best,
+              RegressionSolutionVariableImpactsCalculator.DataPartitionEnum.All);            
             foreach (var t in impacts) {
               if (averageImpacts.ContainsKey(t.Item1))