Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/13/15 15:00:15 (9 years ago)
Author:
abeham
Message:

#2174, #2282: merged revisions r11961,r11963,r11967,r11970,r11971,r11982,r11984,r11998,r12001,r12002,r12003,r12004,r11939,r11945,r11956,r11958,r11959,r11960,r11983,r11987,r11988,r11990,r11993,r11994,r11996,r11999,r12000 to stable

Location:
stable
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Encodings.RealVectorEncoding

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/HLScript/HeuristicLab.Encodings.RealVectorEncodingmergedeligible
      /trunk/sources/HeuristicLab.Encodings.RealVectorEncodingmergedeligible
      /branches/1721-RandomForestPersistence/HeuristicLab.Encodings.RealVectorEncoding10321-10322
      /branches/Algorithms.GradientDescent/HeuristicLab.Encodings.RealVectorEncoding5516-5520
      /branches/Benchmarking/sources/HeuristicLab.Encodings.RealVectorEncoding6917-7005
      /branches/CloningRefactoring/HeuristicLab.Encodings.RealVectorEncoding4656-4721
      /branches/CodeEditor/HeuristicLab.Encodings.RealVectorEncoding11700-11806
      /branches/DataAnalysis Refactoring/HeuristicLab.Encodings.RealVectorEncoding5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Encodings.RealVectorEncoding5815-6180
      /branches/DataAnalysis/HeuristicLab.Encodings.RealVectorEncoding4458-4459,​4462,​4464
      /branches/DataPreprocessing/HeuristicLab.Encodings.RealVectorEncoding10085-11101
      /branches/GP.Grammar.Editor/HeuristicLab.Encodings.RealVectorEncoding6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Encodings.RealVectorEncoding5060
      /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Encodings.RealVectorEncoding6123-9799
      /branches/LogResidualEvaluator/HeuristicLab.Encodings.RealVectorEncoding10202-10483
      /branches/NET40/sources/HeuristicLab.Encodings.RealVectorEncoding5138-5162
      /branches/ParallelEngine/HeuristicLab.Encodings.RealVectorEncoding5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Encodings.RealVectorEncoding7568-7810
      /branches/ProgrammableProblem/HeuristicLab.Encodings.RealVectorEncoding11777-11959
      /branches/QAPAlgorithms/HeuristicLab.Encodings.RealVectorEncoding6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Encodings.RealVectorEncoding6828
      /branches/RuntimeOptimizer/HeuristicLab.Encodings.RealVectorEncoding8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.Encodings.RealVectorEncoding7787-8333
      /branches/SlaveShutdown/HeuristicLab.Encodings.RealVectorEncoding8944-8956
      /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Encodings.RealVectorEncoding10204-10479
      /branches/SuccessProgressAnalysis/HeuristicLab.Encodings.RealVectorEncoding5370-5682
      /branches/Trunk/HeuristicLab.Encodings.RealVectorEncoding6829-6865
      /branches/UnloadJobs/HeuristicLab.Encodings.RealVectorEncoding9168-9215
      /branches/VNS/HeuristicLab.Encodings.RealVectorEncoding5594-5752
      /branches/histogram/HeuristicLab.Encodings.RealVectorEncoding5959-6341
  • stable/HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/BlendAlphaBetaCrossover.cs

    r11170 r12005  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
     26using HeuristicLab.Optimization;
    2627using HeuristicLab.Parameters;
    2728using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    4041  [Item("BlendAlphaBetaCrossover", "The blend alpha beta crossover (BLX-a-b) for real vectors is similar to the blend alpha crossover (BLX-a), but distinguishes between the better and worse of the parents. The interval from which to choose the new offspring can be extended beyond the better parent by specifying a higher alpha value, and beyond the worse parent by specifying a higher beta value. The new offspring is sampled uniformly in the extended range. It is implemented as described in Takahashi, M. and Kita, H. 2001. A crossover operator using independent component analysis for real-coded genetic algorithms Proceedings of the 2001 Congress on Evolutionary Computation, pp. 643-649.")]
    4142  [StorableClass]
    42   public class BlendAlphaBetaCrossover : RealVectorCrossover {
     43  public class BlendAlphaBetaCrossover : RealVectorCrossover, ISingleObjectiveOperator {
    4344    /// <summary>
    4445    /// Whether the problem is a maximization or minimization problem.
  • stable/HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/HeuristicCrossover.cs

    r11170 r12005  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
     26using HeuristicLab.Optimization;
    2627using HeuristicLab.Parameters;
    2728using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    3738  [Item("HeuristicCrossover", "The heuristic crossover produces offspring that extend the better parent in direction from the worse to the better parent. It is implemented as described in Wright, A.H. (1994), Genetic algorithms for real parameter optimization, Foundations of Genetic Algorithms, G.J.E. Rawlins (Ed.), Morgan Kaufmann, San Mateo, CA, 205-218.")]
    3839  [StorableClass]
    39   public class HeuristicCrossover : RealVectorCrossover {
     40  public class HeuristicCrossover : RealVectorCrossover, ISingleObjectiveOperator {
    4041    /// <summary>
    4142    /// Whether the problem is a maximization or minimization problem.
Note: See TracChangeset for help on using the changeset viewer.