Changeset 17664

Timestamp:

07/12/20 15:35:34 (4 years ago)

Author:

dleko

Message:

#2825 Add generation count to results. Minor refactoring.

Location:

branches/2825-NSGA3/HeuristicLab.Algorithms.NSGA3/3.3

Files:

• NSGA3.cs (modified) (8 diffs)
• Utility.cs (modified) (2 diffs)

branches/2825-NSGA3/HeuristicLab.Algorithms.NSGA3/3.3/NSGA3.cs

@@ -53 +53 @@
 
         [Storable]
-        private int generation;
-
-        [Storable]
         private List<Solution> solutions;
 
@@ -76 +73 @@
 
         private const string GeneratedReferencePointsResultName = "Generated Reference Points";
+        private const string CurrentGenerationResultName = "Generations";
         private const string CurrentFrontResultName = "Pareto Front"; // Do not touch this
 
@@ -165 +163 @@
         }
 
+        public IntValue ResultsCurrentGeneration
+        {
+            get { return (IntValue)Results[CurrentGenerationResultName].Value; }
+            set { Results[CurrentGenerationResultName].Value = value; }
+        }
+
         #endregion ResultsProperties
 
@@ -173 +177 @@
             Parameters.Add(new FixedValueParameter<IntValue>(SeedName, "The random seed used to initialize the new pseudo random number generator.", new IntValue(0)));
             Parameters.Add(new FixedValueParameter<BoolValue>(SetSeedRandomlyName, "True if the random seed should be set to a random value, otherwise false.", new BoolValue(true)));
-            Parameters.Add(new FixedValueParameter<IntValue>(PopulationSizeName, "The size of the population of Individuals.", new IntValue(ReferencePoint.GetNumberOfGeneratedReferencePoints(NumberOfObjectives))));
+            Parameters.Add(new FixedValueParameter<IntValue>(PopulationSizeName, "The size of the population of Individuals.", new IntValue(200)));
             Parameters.Add(new FixedValueParameter<PercentValue>(CrossoverProbabilityName, "The probability that the crossover operator is applied on two parents.", new PercentValue(0.9)));
             Parameters.Add(new FixedValueParameter<DoubleValue>(CrossoverContiguityName, "The contiguity value for the Simulated Binary Crossover that specifies how close a child should be to its parents (larger value means closer). The value must be greater than or equal than 0. Typical values are in the range [2;5]."));
@@ -209 +213 @@
             base.Initialize(cancellationToken);
 
+            PopulationSize.Value = ReferencePoint.GetNumberOfGeneratedReferencePoints(Problem.Maximization.Length);
             InitResults();
             InitReferencePoints();
@@ -225 +230 @@
         {
             random = new MersenneTwister();
-            generation = 0;
             InitSolutions();
         }
@@ -249 +253 @@
             Results.Add(new Result(GeneratedReferencePointsResultName, "The initially generated reference points", new DoubleMatrix()));
             Results.Add(new Result(CurrentFrontResultName, "The Pareto Front", new DoubleMatrix()));
+            Results.Add(new Result(CurrentGenerationResultName, "The current generation", new IntValue(0)));
         }
 
@@ -257 +262 @@
         protected override void Run(CancellationToken cancellationToken)
         {
-            while (generation != MaximumGenerations.Value)
+            while (ResultsCurrentGeneration.Value < MaximumGenerations.Value)
             {
                 // create copies of generated reference points (to preserve the original ones for
                 // the next generation) maybe todo: use cloner?
                 ToNextGeneration(CreateCopyOfReferencePoints());
-                generation++;
+                ResultsCurrentGeneration.Value++;
             }
         }

branches/2825-NSGA3/HeuristicLab.Algorithms.NSGA3/3.3/Utility.cs

@@ -116 +116 @@
         internal static Tuple<TIn, TOut> MinArgMin<TIn, TOut>(Func<TIn, TOut> func, IEnumerable<TIn> inputs) where TOut : IComparable
         {
+            if (func == null) throw new ArgumentNullException(nameof(func));
             if (inputs == null) throw new ArgumentNullException(nameof(inputs));
             var it = inputs.GetEnumerator();
@@ -162 +163 @@
         internal static Tuple<TIn, TOut> MaxArgMax<TIn, TOut>(Func<TIn, TOut> func, IEnumerable<TIn> inputs) where TOut : IComparable
         {
+            if (func == null) throw new ArgumentNullException(nameof(func));
             if (inputs == null) throw new ArgumentNullException(nameof(inputs));
             var it = inputs.GetEnumerator();