Changeset 17700 for branches

Timestamp:

07/27/20 14:38:37 (4 years ago)

Author:

dleko

Message:

#2825 Copy a reference point using a cloner instead of a copy constructor.

Location:

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

Files:

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

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

@@ -210 +210 @@
         public NSGA3(NSGA3 original, Cloner cloner) : base(original, cloner)
         {
-            // todo: don't forget to clone storable fields
             random = cloner.Clone(original.random);
             solutions = original.solutions?.Select(cloner.Clone).ToList();
-            referencePoints = original.referencePoints?.Select(r =>
-            {
-                var refPoint = new ReferencePoint(random, r.NumberOfDimensions);
-                r.Values.CopyTo(refPoint.Values, 0);
-                return refPoint;
-            }).ToList();
+            referencePoints = original.referencePoints?.Select(cloner.Clone).ToList();
         }
 
@@ -344 +338 @@
             if (referencePoints == null) return null;
 
-            List<ReferencePoint> referencePointsCopy = new List<ReferencePoint>();
-            foreach (var referencePoint in referencePoints)
-                referencePointsCopy.Add(new ReferencePoint(referencePoint));
-
-            return referencePointsCopy;
+            return referencePoints.Select(rp => (ReferencePoint)rp.Clone()).ToList();
         }
 

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

@@ -28 +28 @@
             this.random = random;
             Values = new double[numberOfDimensions];
-        }
-
-        public ReferencePoint(ReferencePoint other)
-        {
-            random = other.random;
-            Values = new double[other.NumberOfDimensions];
-            other.Values.CopyTo(Values, 0);
         }
 
@@ -216 +209 @@
             {
                 refPoint.Values[element] = ((double)left) / total;
-                var newRefPoint = new ReferencePoint(refPoint);
+                var newRefPoint = (ReferencePoint)refPoint.Clone();
                 referencePoints.Add(newRefPoint);
             }