Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/10/17 19:19:26 (7 years ago)
Author:
gkronber
Message:

#2782: merged r14899,r14918,r15160,r15163,r15165,r15187 from trunk to stable

Location:
stable
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Algorithms.DataAnalysis

  • stable/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessModelCreator.cs

    r14186 r15188  
    3737    private const string ModelParameterName = "Model";
    3838    private const string NegativeLogLikelihoodParameterName = "NegativeLogLikelihood";
     39    private const string NegativeLogPseudoLikelihoodParameterName = "NegativeLogPseudoLikelihood (LOOCV)";
    3940    private const string HyperparameterGradientsParameterName = "HyperparameterGradients";
    4041    protected const string ScaleInputValuesParameterName = "ScaleInputValues";
     
    6061    public ILookupParameter<DoubleValue> NegativeLogLikelihoodParameter {
    6162      get { return (ILookupParameter<DoubleValue>)Parameters[NegativeLogLikelihoodParameterName]; }
     63    }
     64    public ILookupParameter<DoubleValue> NegativeLogPseudoLikelihoodParameter {
     65      get { return (ILookupParameter<DoubleValue>)Parameters[NegativeLogPseudoLikelihoodParameterName]; }
    6266    }
    6367    public ILookupParameter<BoolValue> ScaleInputValuesParameter {
     
    8690      Parameters.Add(new LookupParameter<RealVector>(HyperparameterGradientsParameterName, "The gradients of the hyperparameters for the produced Gaussian process model (necessary for hyperparameter optimization)"));
    8791      Parameters.Add(new LookupParameter<DoubleValue>(NegativeLogLikelihoodParameterName, "The negative log-likelihood of the produced Gaussian process model given the data."));
     92      Parameters.Add(new LookupParameter<DoubleValue>(NegativeLogPseudoLikelihoodParameterName, "The leave-one-out-cross-validation negative log pseudo-likelihood of the produced Gaussian process model given the data."));
    8893
    8994
     
    100105        Parameters[ScaleInputValuesParameterName].Hidden = true;
    101106      }
     107      if (!Parameters.ContainsKey(NegativeLogPseudoLikelihoodParameterName)) {
     108        Parameters.Add(new LookupParameter<DoubleValue>(NegativeLogPseudoLikelihoodParameterName,
     109          "The leave-one-out-cross-validation negative log pseudo-likelihood of the produced Gaussian process model given the data."));
     110      }
    102111    }
    103112  }
Note: See TracChangeset for help on using the changeset viewer.