Changeset 15252

Timestamp:

07/15/17 11:04:09 (7 years ago)

Author:

gkronber

Message:

#2640: merged r14227 and r14786 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.NSGA2/3.3/NSGA2.cs (modified) (1 diff)
• HeuristicLab.Algorithms.RandomSearch/3.3/RandomSearchAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Collections/3.3/IndexedItem.cs (modified) (2 diffs)

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

@@ -39 +39 @@
   /// </summary>
   [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.")]
-  [Creatable(CreatableAttribute.Categories.Algorithms, Priority = 100)]
+  [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 135)]
   [StorableClass]
   public class NSGA2 : HeuristicOptimizationEngineAlgorithm, IStorableContent {

stable/HeuristicLab.Algorithms.RandomSearch/3.3/RandomSearchAlgorithm.cs

@@ -36 +36 @@
 namespace HeuristicLab.Algorithms.RandomSearch {
   [Item("Random Search Algorithm (RS)", "A random search algorithm.")]
-  [Creatable(CreatableAttribute.Categories.Algorithms, Priority = 150)]
+  [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms, Priority = 150)]
   [StorableClass]
   public sealed class RandomSearchAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {

stable/HeuristicLab.Collections/3.3/IndexedItem.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-
 namespace HeuristicLab.Collections {
-  [Serializable]
   public struct IndexedItem<T> {
-    private int index;
+    private readonly int index;
     public int Index {
       get { return index; }
     }
-    private T value;
+    private readonly T value;
     public T Value {
       get { return value; }
@@ -40 +37 @@
 
     public override string ToString() {
-      return "[" + index.ToString() + ": " + value == null ? "null" : value.ToString() + "]";
+      return "[" + index + ": " + (value == null ? "null" : value.ToString()) + "]";
     }
   }