Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/04/15 10:18:39 (10 years ago)
Author:
abeham
Message:

#1985:

  • Restored compilable state of TimeLimitRunOptimizer branch
  • Updated changes from trunk
Location:
branches/TimeLimitRunOptimizer
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/TimeLimitRunOptimizer

    • Property svn:ignore set to
      *.suo

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/HLScript/HeuristicLab.Optimizationmergedeligible
      /stable/HeuristicLab.Optimizationmergedeligible
      /trunk/sources/HeuristicLab.Optimizationmergedeligible
      /branches/1721-RandomForestPersistence/HeuristicLab.Optimization10321-10322
      /branches/Algorithms.GradientDescent/HeuristicLab.Optimization5516-5520
      /branches/Benchmarking/sources/HeuristicLab.Optimization6917-7005
      /branches/Classification-Extensions/HeuristicLab.Optimization11687-11761
      /branches/CloningRefactoring/HeuristicLab.Optimization4656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Optimization5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Optimization5815-6180
      /branches/DataAnalysis/HeuristicLab.Optimization4458-4459,​4462,​4464
      /branches/DataPreprocessing/HeuristicLab.Optimization10085-11101
      /branches/GP.Grammar.Editor/HeuristicLab.Optimization6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Optimization5060
      /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Optimization6123-9799
      /branches/LogResidualEvaluator/HeuristicLab.Optimization10202-10483
      /branches/NET40/sources/HeuristicLab.Optimization5138-5162
      /branches/ParallelEngine/HeuristicLab.Optimization5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization7568-7810
      /branches/ProgrammableProblem/HeuristicLab.Optimization11573-11959
      /branches/QAPAlgorithms/HeuristicLab.Optimization6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Optimization6828
      /branches/RuntimeOptimizer/HeuristicLab.Optimization8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization7787-8333
      /branches/SlaveShutdown/HeuristicLab.Optimization8944-8956
      /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Optimization10204-10479
      /branches/SuccessProgressAnalysis/HeuristicLab.Optimization5370-5682
      /branches/Trunk/HeuristicLab.Optimization6829-6865
      /branches/UnloadJobs/HeuristicLab.Optimization9168-9215
      /branches/VNS/HeuristicLab.Optimization5594-5752
      /branches/histogram/HeuristicLab.Optimization5959-6341

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Problems/HeuristicOptimizationProblem.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    7878
    7979    public U SolutionCreator {
    80       get { return SolutionCreatorParameter.Value; }
     80      get { return (U)SolutionCreatorParameter.Value; }
    8181      protected set { SolutionCreatorParameter.Value = value; }
    8282    }
    83     public ValueParameter<U> SolutionCreatorParameter {
    84       get { return (ValueParameter<U>)Parameters[SolutionCreateParameterName]; }
     83    public IValueParameter SolutionCreatorParameter {
     84      get { return (IValueParameter)Parameters[SolutionCreateParameterName]; }
    8585    }
    8686    ISolutionCreator IHeuristicOptimizationProblem.SolutionCreator { get { return SolutionCreator; } }
    … …  
    9999    }
    100100
    101     private void SolutionCreatorParameter_ValueChanged(object sender, EventArgs e) {
     101    protected virtual void SolutionCreatorParameter_ValueChanged(object sender, EventArgs e) {
    102102      OnSolutionCreatorChanged();
    103103    }

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Problems/MultiObjectiveHeuristicOptimizationProblem.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Problems/Problem.cs

    r8004 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    114114      }
    115115    }
    116     IEnumerable<IItem> IProblem.Operators { get { return Operators; } }
     116    IEnumerable<IItem> IProblem.Operators { get { return GetOperators(); } }
     117
     118    protected virtual IEnumerable<IItem> GetOperators() {
     119      return Operators;
     120    }
     121
     122    public virtual IEnumerable<IParameterizedItem> ExecutionContextItems {
     123      get { yield return this; }
     124    }
    117125    #endregion
    118126

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs

    r7442 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Problems/UserDefinedProblem.cs

    r7999 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    115115      get { return OperatorsParameter.Value; }
    116116    }
     117
     118    public IEnumerable<IParameterizedItem> ExecutionContextItems {
     119      get { yield return this; }
     120    }
    117121    #endregion
    118122
Note: See TracChangeset for help on using the changeset viewer.