Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/10/10 21:01:03 (15 years ago)
Author:
gkronber
Message:

Implemented #834 (IPredictor.Predict() should return an IEnumerable<double> instead of an double[]).

Location:
trunk/sources/HeuristicLab.Modeling/3.2
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Modeling/3.2/IPredictor.cs

    r2381 r2619  
    3030    double UpperPredictionLimit { get; set; }
    3131    double LowerPredictionLimit { get; set; }
    32     double[] Predict(Dataset dataset, int start, int end);
     32    IEnumerable<double> Predict(Dataset dataset, int start, int end);
    3333    IEnumerable<string> GetInputVariables();
    3434  }

  • trunk/sources/HeuristicLab.Modeling/3.2/PredictorBase.cs

    r2381 r2619  
    3131    public double UpperPredictionLimit { get; set; }
    3232    public double LowerPredictionLimit { get; set; }
    33     public abstract double[] Predict(Dataset dataset, int start, int end);
     33    public abstract IEnumerable<double> Predict(Dataset dataset, int start, int end);
    3434    public abstract IEnumerable<string> GetInputVariables();
    3535

  • trunk/sources/HeuristicLab.Modeling/3.2/VariableEvaluationImpactCalculator.cs

    r2559 r2619  
    8585      Dataset dirtyDataset = (Dataset)dataset.Clone();
    8686      IPredictor dirtyPredictor = (IPredictor)predictor.Clone();
    87       double[] referenceValues = predictor.Predict(dataset, start, end);
     87      double[] referenceValues = predictor.Predict(dataset, start, end).ToArray();
    8888
    8989      double mean;
    … …  
    101101            mean = dataset.GetMean(variableName, start, end);
    102102            oldValues = dirtyDataset.ReplaceVariableValues(variableName, Enumerable.Repeat(mean, end - start), start, end);
    103             newValues = dirtyPredictor.Predict(dirtyDataset, start, end);
     103            newValues = dirtyPredictor.Predict(dirtyDataset, start, end).ToArray();
    104104            evaluationImpacts[variableName] = 1 - CalculateVAF(referenceValues, newValues);
    105105            dirtyDataset.ReplaceVariableValues(variableName, oldValues, start, end);

  • trunk/sources/HeuristicLab.Modeling/3.2/VariableQualityImpactCalculator.cs

    r2559 r2619  
    8585      IPredictor dirtyPredictor = (IPredictor)predictor.Clone();
    8686
    87       double[] predictedValues = predictor.Predict(dataset, start, end);
     87      double[] predictedValues = predictor.Predict(dataset, start, end).ToArray();
    8888      double[] targetValues = dataset.GetVariableValues(targetVariableName, start, end);
    8989
    … …  
    105105          mean = dataset.GetMean(variableName, start, end);
    106106          oldValues = dirtyDataset.ReplaceVariableValues(variableName, Enumerable.Repeat(mean, end - start), start, end);
    107           predictedValues = dirtyPredictor.Predict(dirtyDataset, start, end);
     107          predictedValues = dirtyPredictor.Predict(dirtyDataset, start, end).ToArray();
    108108          newMSE = CalculateMSE(predictedValues, targetValues);
    109109          evaluationImpacts[variableName] = newMSE / oldMSE;
Note: See TracChangeset for help on using the changeset viewer.