Changeset 16017

Timestamp:

07/25/18 19:04:33 (6 years ago)

Author:

fholzing

Message:

#2904: Added IFixedValueParameter for factory variable replacement. Unified the default values.

File:

• branches/2904_CalculateImpacts/3.4/Implementation/Regression/RegressionSolutionVariableImpactsCalculator.cs (modified) (6 diffs)

branches/2904_CalculateImpacts/3.4/Implementation/Regression/RegressionSolutionVariableImpactsCalculator.cs

@@ -37 +37 @@
   [Item("RegressionSolution Impacts Calculator", "Calculation of the impacts of input variables for any regression solution")]
   public sealed class RegressionSolutionVariableImpactsCalculator : ParameterizedNamedItem {
+    private static IOnlineCalculator calculator = new OnlinePearsonsRSquaredCalculator();
+
     public enum ReplacementMethodEnum {
       Median,
@@ -54 +56 @@
     }
 
-    //The PerasonsR²-Calculator is the default, but can be overwritten to any other IOnlineCalculator
-    //Just remember to reset it after you're done
-    private static IOnlineCalculator calculator = new OnlinePearsonsRSquaredCalculator();
-    public static IOnlineCalculator Calculator
-    {
-      get { return calculator; }
-      set { calculator = value; }
-    }
-
     private const string ReplacementParameterName = "Replacement Method";
+    private const string FactorReplacementParameterName = "Factor Replacement Method";
     private const string DataPartitionParameterName = "DataPartition";
 
@@ -69 +63 @@
     {
       get { return (IFixedValueParameter<EnumValue<ReplacementMethodEnum>>)Parameters[ReplacementParameterName]; }
+    }
+    public IFixedValueParameter<EnumValue<FactorReplacementMethodEnum>> FactorReplacementParameter
+    {
+      get { return (IFixedValueParameter<EnumValue<FactorReplacementMethodEnum>>)Parameters[FactorReplacementParameterName]; }
     }
     public IFixedValueParameter<EnumValue<DataPartitionEnum>> DataPartitionParameter
@@ -79 +77 @@
       get { return ReplacementParameter.Value.Value; }
       set { ReplacementParameter.Value.Value = value; }
+    }
+    public FactorReplacementMethodEnum FactorReplacementMethod
+    {
+      get { return FactorReplacementParameter.Value.Value; }
+      set { FactorReplacementParameter.Value.Value = value; }
     }
     public DataPartitionEnum DataPartition
@@ -98 +101 @@
       : base() {
       Parameters.Add(new FixedValueParameter<EnumValue<ReplacementMethodEnum>>(ReplacementParameterName, "The replacement method for variables during impact calculation.", new EnumValue<ReplacementMethodEnum>(ReplacementMethodEnum.Median)));
+      Parameters.Add(new FixedValueParameter<EnumValue<FactorReplacementMethodEnum>>(FactorReplacementParameterName, "The replacement method for factor variables during impact calculation.", new EnumValue<FactorReplacementMethodEnum>(FactorReplacementMethodEnum.Best)));
       Parameters.Add(new FixedValueParameter<EnumValue<DataPartitionEnum>>(DataPartitionParameterName, "The data partition on which the impacts are calculated.", new EnumValue<DataPartitionEnum>(DataPartitionEnum.Training)));
     }
@@ -322 +326 @@
       IRegressionModel model, string variable, ModifiableDataset dataset,
       IEnumerable<int> rows,
-      FactorReplacementMethodEnum replacement = FactorReplacementMethodEnum.Shuffle) {
+      FactorReplacementMethodEnum replacement = FactorReplacementMethodEnum.Best) {
       var originalValues = dataset.GetReadOnlyStringValues(variable).ToList();
       List<string> replacementValues;