Changeset 14029 for branches/crossvalidation-2434/HeuristicLab.Core/3.3/Collections

Timestamp:

07/08/16 14:40:02 (8 years ago)

Author:

gkronber

Message:

#2434: merged trunk changes r12934:14026 from trunk to branch

Location:

branches/crossvalidation-2434

Files:

• . (modified) (1 prop)
• HeuristicLab.Core (modified) (1 prop)
• HeuristicLab.Core/3.3/Collections/DirectedGraph/Arc.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Collections/ScopeList.cs (modified) (2 diffs)

branches/crossvalidation-2434/HeuristicLab.Core/3.3/Collections/DirectedGraph/Arc.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -39 +39 @@
       get { return label; }
       set {
-        if (label.Equals(value)) return;
+        if (label == value) return;
         label = value;
         OnChanged(this, EventArgs.Empty);
@@ -83 +83 @@
 
   [StorableClass]
-  public class Arc<T> : Arc, IArc<T> where T : class,IDeepCloneable {
+  public class Arc<T> : Arc, IArc<T> where T : class, IDeepCloneable {
     [Storable]
     protected T data;

branches/crossvalidation-2434/HeuristicLab.Core/3.3/Collections/ScopeList.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -31 +30 @@
     [StorableConstructor]
     private ScopeList(bool deserializing) : base(deserializing) { }
-    private ScopeList(ScopeList original, Cloner cloner)
-      : base(original, cloner) {
-      list = new List<IScope>(original.Select(x => cloner.Clone(x)));
-    }
+    private ScopeList(ScopeList original, Cloner cloner) : base(original, cloner) { }
     public ScopeList() : base() { }
     public ScopeList(int capacity) : base(capacity) { }