Changeset 17688 for branches

Timestamp:

07/19/20 20:08:01 (4 years ago)

Author:

dleko

Message:

#2825 Bugfix NSGA3 can now be cloned.

Location:

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

Files:

• NSGA3.cs (modified) (9 diffs)
• ReferencePoint.cs (modified) (2 diffs)

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

@@ -46 +46 @@
             get
             {
-                if (!(Problem is MultiObjectiveTestFunctionProblem testFunctionProblem)) throw new NotSupportedException("Only test multi objective test function problems are supported");
+                if (!(Problem is MultiObjectiveTestFunctionProblem testFunctionProblem)) throw new NotSupportedException("Only Multi Objective Test Function problems are supported");
                 return testFunctionProblem.Objectives;
             }
@@ -60 +60 @@
         [Storable]
         private List<Solution> solutions; // maybe todo: rename to nextGeneration (see Run method)
+
+        [Storable]
+        private List<ReferencePoint> referencePoints;
 
         #endregion Storable fields
@@ -149 +152 @@
         public BoolValue DominateOnEqualQualities => DominateOnEqualQualitiesParameter.Value;
 
-        public List<List<Solution>> Fronts { get; private set; }
-
-        public List<ReferencePoint> ReferencePoints { get; private set; }
-
         // todo: create one property for the Generated Reference Points and one for the current
         // generations reference points
@@ -224 +223 @@
             // todo: don't forget to clone storable fields
             random = cloner.Clone(original.random);
-            solutions = new List<Solution>(original.solutions?.Select(cloner.Clone));
+            solutions = original.solutions != null ? original.solutions.Select(cloner.Clone).ToList() : null;
+            referencePoints = original.referencePoints != null ? original.referencePoints.Select(r => {
+                var refPoint = new ReferencePoint(random, r.NumberOfDimensions);
+                r.Values.CopyTo(refPoint.Values, 0);
+                return refPoint;
+            }).ToList() : null;
         }
 
@@ -245 +249 @@
             InitResults();
             InitFields();
-            InitReferencePoints();
             Analyze();
-        }
-
-        private void InitReferencePoints()
-        {
-            // Generate reference points and add them to results
-            ReferencePoints = ReferencePoint.GenerateReferencePoints(random, NumberOfObjectives);
-            ResultsGeneratedReferencePoints = Utility.ConvertToDoubleMatrix(ReferencePoints);
-        }
-
-        private void InitFields()
-        {
-            random = new MersenneTwister();
-            InitSolutions();
-        }
-
-        private void InitSolutions()
-        {
-            int minBound = 0;
-            int maxBound = 1;
-
-            // Initialise solutions
-            solutions = new List<Solution>(PopulationSize.Value);
-            for (int i = 0; i < PopulationSize.Value; i++)
-            {
-                RealVector randomRealVector = new RealVector(Problem.Encoding.Length, random, minBound, maxBound);
-
-                solutions.Add(new Solution(randomRealVector));
-                solutions[i].Fitness = Evaluate(solutions[i].Chromosome);
-            }
         }
 
@@ -293 +267 @@
         }
 
+        private void InitFields()
+        {
+            random = new MersenneTwister();
+            InitSolutions();
+            InitReferencePoints();
+        }
+        private void InitReferencePoints()
+        {
+            // Generate reference points and add them to results
+            referencePoints = ReferencePoint.GenerateReferencePoints(random, NumberOfObjectives);
+            ResultsGeneratedReferencePoints = Utility.ConvertToDoubleMatrix(referencePoints);
+        }
+
+
+        private void InitSolutions()
+        {
+            int minBound = 0;
+            int maxBound = 1;
+
+            // Initialise solutions
+            solutions = new List<Solution>(PopulationSize.Value);
+            for (int i = 0; i < PopulationSize.Value; i++)
+            {
+                RealVector randomRealVector = new RealVector(Problem.Encoding.Length, random, minBound, maxBound);
+
+                solutions.Add(new Solution(randomRealVector));
+                solutions[i].Fitness = Evaluate(solutions[i].Chromosome);
+            }
+        }
+
         #endregion Initialization
 
@@ -301 +305 @@
             while (ResultsCurrentGeneration.Value < MaximumGenerations.Value)
             {
-                // create copies of generated reference points (to preserve the original ones for
-                // the next generation) maybe todo: use cloner?
 
                 try
@@ -309 +311 @@
                     List<Solution> rt = Utility.Concat(solutions, qt);
 
+                    // create copies of generated reference points (to preserve the original ones for
+                    // the next generation) maybe todo: use cloner?
                     solutions = NSGA3Selection.SelectSolutionsForNextGeneration(rt, GetCopyOfReferencePoints(), Problem.Maximization, random);
 
@@ -327 +331 @@
         private List<ReferencePoint> GetCopyOfReferencePoints()
         {
-            if (ReferencePoints == null) return null;
-
-            List<ReferencePoint> referencePoints = new List<ReferencePoint>();
-            foreach (var referencePoint in ReferencePoints)
-                referencePoints.Add(new ReferencePoint(referencePoint));
-
-            return referencePoints;
+            if (referencePoints == null) return null;
+
+            List<ReferencePoint> referencePointsCopy = new List<ReferencePoint>();
+            foreach (var referencePoint in referencePoints)
+                referencePointsCopy.Add(new ReferencePoint(referencePoint));
+
+            return referencePointsCopy;
         }
 

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

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Algorithms.NSGA3
 {
-    public class ReferencePoint
+    public class ReferencePoint : IDeepCloneable
     {
+
+        #region Properties
+
         // The potentially associated solutions to this reference point and the distance to that solution
         private readonly Dictionary<Solution, double> potentialAssociatedSolutions = new Dictionary<Solution, double>();
 
-        #region Properties
-
         private readonly IRandom random;
+
         public double[] Values { get; }
         public int NumberOfDimensions => Values.Length;
@@ -33 +37 @@
             Values = new double[other.NumberOfDimensions];
             other.Values.CopyTo(Values, 0);
+        }
+
+        public ReferencePoint(ReferencePoint other, Cloner cloner)
+        {
+            random = cloner.Clone(other.random);
+            Values = new double[other.NumberOfDimensions];
+            other.Values.CopyTo(Values, 0);
+        }
+
+        public IDeepCloneable Clone(Cloner cloner)
+        {
+            return new ReferencePoint(this, cloner);
+        }
+
+        public object Clone()
+        {
+            return new Cloner().Clone(this);
         }