Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/17/14 15:34:25 (10 years ago)
Author:
gkronber
Message:

#1967 removed obsolete classes and cleaned up the implementation. Added the ProblemInstanceProvider interface to allow loading of CSV files.

Location:
branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning

    • Property svn:ignore

      •  

        old new  
        22obj
        33bin
         4Plugin.cs

  • branches/HeuristicLab.Problems.GaussianProcessTuning/HeuristicLab.Problems.GaussianProcessTuning/BestSolutionAnalyzer.cs

    r8753 r10757  
    1717    private const string QualityParameterName = "Quality";
    1818    private const string SymbolicExpressionTreeParameterName = "GaussianProcessConfiguration";
    19     private const string BestSolutionParameterName = "Best solution";
    2019    private const string ResultsParameterName = "Results";
    2120    private const string ProblemDataParameterName = "ProblemData";
    2221    private const string InterpreterParameterName = "Interpreter";
    2322    private const string SolutionParameterName = "Solution";
     23    private const string TreeParameterName = "Covariance function";
    2424
    2525    public IScopeTreeLookupParameter<DoubleValue> QualityParameter {
    … …  
    3131    public IScopeTreeLookupParameter<ISymbolicExpressionTree> SymbolicExpressionTreeParameter {
    3232      get { return (IScopeTreeLookupParameter<ISymbolicExpressionTree>)Parameters[SymbolicExpressionTreeParameterName]; }
    33     }
    34     public ILookupParameter<Solution> BestSolutionParameter {
    35       get { return (ILookupParameter<Solution>)Parameters[BestSolutionParameterName]; }
    3633    }
    3734    public ILookupParameter<ResultCollection> ResultParameter {
    … …  
    5552      Parameters.Add(new ScopeTreeLookupParameter<ISymbolicExpressionTree>(SymbolicExpressionTreeParameterName, "The Gaussian process configuration to evaluate represented as symbolic expression tree."));
    5653      Parameters.Add(new ScopeTreeLookupParameter<IGaussianProcessSolution>(SolutionParameterName, "The solution of the Gaussian process algorithm."));
    57       Parameters.Add(new LookupParameter<Solution>(BestSolutionParameterName, "The best Gaussian process configuration."));
    5854      Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName, "The result collection of the algorithm."));
    5955      Parameters.Add(new LookupParameter<IRegressionProblemData>(ProblemDataParameterName, ""));
    … …  
    8581      }
    8682      var cloner = new Cloner();
    87       var problemData = cloner.Clone(ProblemDataParameter.ActualValue);
    88       var interpreter = cloner.Clone(InterpreterParameter.ActualValue);
    8983      bestTree = cloner.Clone(bestTree);
    90       var bestModel = new GaussianProcessRegressionModel(bestTree, problemData, interpreter);
    91       var bestSolutionConfiguration = new Solution(bestModel, problemData);
    92 
    93       BestSolutionParameter.ActualValue = bestSolutionConfiguration;
    9484
    9585      var resultCollection = ResultParameter.ActualValue;
    96       if (!resultCollection.ContainsKey(BestSolutionParameterName)) {
    97         resultCollection.Add(new Result(BestSolutionParameterName, "The best Gaussian process solution", bestSolutionConfiguration));
     86      if (!resultCollection.ContainsKey(SolutionParameterName)) {
    9887        resultCollection.Add(new Result(SolutionParameterName, "The Gaussian process algorithm solution", bestSolution));
     88        resultCollection.Add(new Result(TreeParameterName, "The best covariance function", bestTree));
    9989      } else {
    100         resultCollection[BestSolutionParameterName].Value = bestSolutionConfiguration;
    10190        resultCollection[SolutionParameterName].Value = bestSolution;
     91        resultCollection[TreeParameterName].Value = bestTree;
    10292      }
    10393
Note: See TracChangeset for help on using the changeset viewer.