Changeset 15252


Ignore:
Timestamp:
07/15/17 11:04:09 (2 months ago)
Author:
gkronber
Message:

#2640: merged r14227 and r14786 from trunk to stable

Location:
stable
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Algorithms.NSGA2/3.3/NSGA2.cs

    r15238 r15252  
    3939  /// </summary>
    4040  [Item("NSGA-II", "The Nondominated Sorting Genetic Algorithm II was introduced in Deb et al. 2002. A Fast and Elitist Multiobjective Genetic Algorithm: NSGA-II. IEEE Transactions on Evolutionary Computation, 6(2), pp. 182-197.")]
    41   [Creatable(CreatableAttribute.Categories.Algorithms, Priority = 100)]
     41  [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 135)]
    4242  [StorableClass]
    4343  public class NSGA2 : HeuristicOptimizationEngineAlgorithm, IStorableContent {
  • stable/HeuristicLab.Algorithms.RandomSearch/3.3/RandomSearchAlgorithm.cs

    r14186 r15252  
    3636namespace HeuristicLab.Algorithms.RandomSearch {
    3737  [Item("Random Search Algorithm (RS)", "A random search algorithm.")]
    38   [Creatable(CreatableAttribute.Categories.Algorithms, Priority = 150)]
     38  [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms, Priority = 150)]
    3939  [StorableClass]
    4040  public sealed class RandomSearchAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {
  • stable/HeuristicLab.Collections/3.3/IndexedItem.cs

    r14186 r15252  
    2020#endregion
    2121
    22 using System;
    23 
    2422namespace HeuristicLab.Collections {
    25   [Serializable]
    2623  public struct IndexedItem<T> {
    27     private int index;
     24    private readonly int index;
    2825    public int Index {
    2926      get { return index; }
    3027    }
    31     private T value;
     28    private readonly T value;
    3229    public T Value {
    3330      get { return value; }
     
    4037
    4138    public override string ToString() {
    42       return "[" + index.ToString() + ": " + value == null ? "null" : value.ToString() + "]";
     39      return "[" + index + ": " + (value == null ? "null" : value.ToString()) + "]";
    4340    }
    4441  }
Note: See TracChangeset for help on using the changeset viewer.