Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/24/18 10:43:25 (7 years ago)
Author:
fholzing
Message:

#2904: Reverted the additional CalculateValue-Method in IOnlineCalculator and created a static property/method in RegressionSolutionVariableImpactsCalculator

Location:
branches/2904_CalculateImpacts/3.4/OnlineCalculators
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/2904_CalculateImpacts/3.4/OnlineCalculators/OnlineAccuracyCalculator.cs

    r15831 r16001  
    2929    private int correctlyClassified;
    3030    private int n;
    31     public double Accuracy
    32     {
    33       get
    34       {
     31    public double Accuracy {
     32      get {
    3533        return correctlyClassified / (double)n;
    3634      }
    … …  
    5553    #region IOnlineCalculator Members
    5654    private OnlineCalculatorError errorState;
    57     public OnlineCalculatorError ErrorState
    58     {
     55    public OnlineCalculatorError ErrorState {
    5956      get { return errorState; }
    6057    }
    61     public double Value
    62     {
     58    public double Value {
    6359      get { return Accuracy; }
    6460    }
    … …  
    107103    }
    108104
    109     public double CalculateValue(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, out OnlineCalculatorError errorState) {
    110       return Calculate(originalValues, estimatedValues, out errorState);
    111     }
    112105  }
    113106}

  • branches/2904_CalculateImpacts/3.4/OnlineCalculators/OnlineBoundedMeanSquaredErrorCalculator.cs

    r15831 r16001  
    2929    private double errorSum;
    3030    private int n;
    31     public double BoundedMeanSquaredError
    32     {
    33       get
    34       {
     31    public double BoundedMeanSquaredError {
     32      get {
    3533        return n > 0 ? errorSum / n : 0.0;
    3634      }
    … …  
    6159    #region IOnlineCalculator Members
    6260    private OnlineCalculatorError errorState;
    63     public OnlineCalculatorError ErrorState
    64     {
     61    public OnlineCalculatorError ErrorState {
    6562      get { return errorState; }
    6663    }
    67     public double Value
    68     {
     64    public double Value {
    6965      get { return BoundedMeanSquaredError; }
    7066    }
    … …  
    113109      }
    114110    }
    115 
    116     public double CalculateValue(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, out OnlineCalculatorError errorState) {
    117       throw new NotImplementedException();
    118     }
    119111  }
    120112}

  • branches/2904_CalculateImpacts/3.4/OnlineCalculators/OnlineCovarianceCalculator.cs

    r15831 r16001  
    2929    private double xMean, yMean, Cn;
    3030    private int n;
    31     public double Covariance
    32     {
    33       get
    34       {
     31    public double Covariance {
     32      get {
    3533        return n > 0 ? Cn / n : 0.0;
    3634      }
    … …  
    5654    #region IOnlineCalculator Members
    5755    private OnlineCalculatorError errorState;
    58     public OnlineCalculatorError ErrorState
    59     {
     56    public OnlineCalculatorError ErrorState {
    6057      get { return errorState; }
    6158    }
    62     public double Value
    63     {
     59    public double Value {
    6460      get { return Covariance; }
    6561    }
    … …  
    112108      }
    113109    }
    114 
    115     public double CalculateValue(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, out OnlineCalculatorError errorState) {
    116       return Calculate(originalValues, estimatedValues, out errorState);
    117     }
    118110  }
    119111}

  • branches/2904_CalculateImpacts/3.4/OnlineCalculators/OnlineMaxAbsoluteErrorCalculator.cs

    r15831 r16001  
    2929    private double mae;
    3030    private int n;
    31     public double MaxAbsoluteError
    32     {
    33       get
    34       {
     31    public double MaxAbsoluteError {
     32      get {
    3533        return n > 0 ? mae : 0.0;
    3634      }
    … …  
    5351    #region IOnlineCalculator Members
    5452    private OnlineCalculatorError errorState;
    55     public OnlineCalculatorError ErrorState
    56     {
     53    public OnlineCalculatorError ErrorState {
    5754      get { return errorState; }
    5855    }
    59     public double Value
    60     {
     56    public double Value {
    6157      get { return MaxAbsoluteError; }
    6258    }
    … …  
    10399      }
    104100    }
    105 
    106     public double CalculateValue(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, out OnlineCalculatorError errorState) {
    107       return Calculate(originalValues, estimatedValues, out errorState);
    108     }
    109101  }
    110102}

  • branches/2904_CalculateImpacts/3.4/OnlineCalculators/OnlineMeanAbsoluteErrorCalculator.cs

    r15831 r16001  
    2929    private double sae;
    3030    private int n;
    31     public double MeanAbsoluteError
    32     {
    33       get
    34       {
     31    public double MeanAbsoluteError {
     32      get {
    3533        return n > 0 ? sae / n : 0.0;
    3634      }
    … …  
    5351    #region IOnlineCalculator Members
    5452    private OnlineCalculatorError errorState;
    55     public OnlineCalculatorError ErrorState
    56     {
     53    public OnlineCalculatorError ErrorState {
    5754      get { return errorState; }
    5855    }
    59     public double Value
    60     {
     56    public double Value {
    6157      get { return MeanAbsoluteError; }
    6258    }
    … …  
    10298      }
    10399    }
    104     public double CalculateValue(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, out OnlineCalculatorError errorState) {
    105       return Calculate(originalValues, estimatedValues, out errorState);
    106     }
    107100  }
    108101}

  • branches/2904_CalculateImpacts/3.4/OnlineCalculators/OnlineMeanAbsolutePercentageErrorCalculator.cs

    r15831 r16001  
    2929    private double sre;
    3030    private int n;
    31     public double MeanAbsolutePercentageError
    32     {
    33       get
    34       {
     31    public double MeanAbsolutePercentageError {
     32      get {
    3533        return n > 0 ? sre / n : 0.0;
    3634      }
    … …  
    5452    #region IOnlineCalculator Members
    5553    private OnlineCalculatorError errorState;
    56     public OnlineCalculatorError ErrorState
    57     {
     54    public OnlineCalculatorError ErrorState {
    5855      get { return errorState; }
    5956    }
    60     public double Value
    61     {
     57    public double Value {
    6258      get { return MeanAbsolutePercentageError; }
    6359    }
    … …  
    104100      }
    105101    }
    106 
    107     public double CalculateValue(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, out OnlineCalculatorError errorState) {
    108       return Calculate(originalValues, estimatedValues, out errorState);
    109     }
    110102  }
    111103}

  • branches/2904_CalculateImpacts/3.4/OnlineCalculators/OnlineMeanErrorCalculator.cs

    r15831 r16001  
    2828
    2929    private readonly OnlineMeanAndVarianceCalculator meanAndVarianceCalculator;
    30     public double MeanError
    31     {
     30    public double MeanError {
    3231      get { return meanAndVarianceCalculator.Mean; }
    3332    }
    … …  
    4746
    4847    #region IOnlineCalculator Members
    49     public OnlineCalculatorError ErrorState
    50     {
     48    public OnlineCalculatorError ErrorState {
    5149      get { return meanAndVarianceCalculator.MeanErrorState; }
    5250    }
    53     public double Value
    54     {
     51    public double Value {
    5552      get { return MeanError; }
    5653    }
    … …  
    8683      }
    8784    }
    88 
    89     public double CalculateValue(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, out OnlineCalculatorError errorState) {
    90       return Calculate(originalValues, estimatedValues, out errorState);
    91     }
    9285  }
    9386}

  • branches/2904_CalculateImpacts/3.4/OnlineCalculators/OnlineMeanSquaredErrorCalculator.cs

    r15831 r16001  
    2929    private double sse;
    3030    private int n;
    31     public double MeanSquaredError
    32     {
    33       get
    34       {
     31    public double MeanSquaredError {
     32      get {
    3533        return n > 0 ? sse / n : 0.0;
    3634      }
    … …  
    5351    #region IOnlineCalculator Members
    5452    private OnlineCalculatorError errorState;
    55     public OnlineCalculatorError ErrorState
    56     {
     53    public OnlineCalculatorError ErrorState {
    5754      get { return errorState; }
    5855    }
    59     public double Value
    60     {
     56    public double Value {
    6157      get { return MeanSquaredError; }
    6258    }
    … …  
    10298      }
    10399    }
    104 
    105     public double CalculateValue(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, out OnlineCalculatorError errorState) {
    106       return Calculate(originalValues, estimatedValues, out errorState);
    107     }
    108100  }
    109101}

  • branches/2904_CalculateImpacts/3.4/OnlineCalculators/OnlineNormalizedMeanSquaredErrorCalculator.cs

    r15831 r16001  
    2929    private OnlineMeanAndVarianceCalculator originalVarianceCalculator;
    3030
    31     public double NormalizedMeanSquaredError
    32     {
    33       get
    34       {
     31    public double NormalizedMeanSquaredError {
     32      get {
    3533        double var = originalVarianceCalculator.PopulationVariance;
    3634        double m = meanSquaredErrorCalculator.Mean;
    … …  
    5553
    5654    #region IOnlineCalculator Members
    57     public OnlineCalculatorError ErrorState
    58     {
     55    public OnlineCalculatorError ErrorState {
    5956      get { return meanSquaredErrorCalculator.MeanErrorState | originalVarianceCalculator.PopulationVarianceErrorState; }
    6057    }
    61     public double Value
    62     {
     58    public double Value {
    6359      get { return NormalizedMeanSquaredError; }
    6460    }
    … …  
    107103    }
    108104
    109     public double CalculateValue(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, out OnlineCalculatorError errorState) {
    110       return Calculate(originalValues, estimatedValues, out errorState);
    111     }
     105
    112106  }
    113107}

  • branches/2904_CalculateImpacts/3.4/OnlineCalculators/OnlinePearsonsRCalculator.cs

    r15831 r16001  
    3030    private OnlineMeanAndVarianceCalculator syCalculator = new OnlineMeanAndVarianceCalculator();
    3131
    32     public double R
    33     {
    34       get
    35       {
     32    public double R {
     33      get {
    3634        double xVar = sxCalculator.PopulationVariance;
    3735        double yVar = syCalculator.PopulationVariance;
    … …  
    6058
    6159    #region IOnlineCalculator Members
    62     public OnlineCalculatorError ErrorState
    63     {
     60    public OnlineCalculatorError ErrorState {
    6461      get { return covCalculator.ErrorState | sxCalculator.PopulationVarianceErrorState | syCalculator.PopulationVarianceErrorState; }
    6562    }
    66     public double Value
    67     {
     63    public double Value {
    6864      get { return R; }
    6965    }
    … …  
    105101      }
    106102    }
    107 
    108     public double CalculateValue(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, out OnlineCalculatorError errorState) {
    109       return Calculate(originalValues, estimatedValues, out errorState);
    110     }
    111103  }
    112104}

  • branches/2904_CalculateImpacts/3.4/OnlineCalculators/OnlinePearsonsRSquaredCalculator.cs

    r15831 r16001  
    2020#endregion
    2121
     22using System;
    2223using System.Collections.Generic;
    2324using HeuristicLab.Common;
    2425
    2526namespace HeuristicLab.Problems.DataAnalysis {
     27  [Obsolete("Use OnlinePearsonsRCalculator directly")]
    2628  public class OnlinePearsonsRSquaredCalculator : DeepCloneable, IOnlineCalculator {
    2729    private readonly OnlinePearsonsRCalculator rCalculator = new OnlinePearsonsRCalculator();
    2830
    29     public double RSquared
    30     {
    31       get
    32       {
     31    public double RSquared {
     32      get {
    3333        if (rCalculator.ErrorState != OnlineCalculatorError.None) return 0.0;
    3434        else return rCalculator.R * rCalculator.R;
    … …  
    4747
    4848    #region IOnlineCalculator Members
    49     public OnlineCalculatorError ErrorState
    50     {
     49    public OnlineCalculatorError ErrorState {
    5150      get { return rCalculator.ErrorState; }
    5251    }
    53     public double Value
    54     {
     52    public double Value {
    5553      get { return RSquared; }
    5654    }
    … …  
    7068    }
    7169
    72     public double CalculateValue(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, out OnlineCalculatorError errorState) {
    73       return Calculate(originalValues, estimatedValues, out errorState);
    74     }
     70
    7571  }
    7672}
Note: See TracChangeset for help on using the changeset viewer.