Changeset 15097 for stable/HeuristicLab.Common

Timestamp:

06/30/17 16:41:06 (7 years ago)

Author:

pfleck

Message:

#2713 #2715 #2765
Merged to stable

• 14435-14439,14493,14516,14519,14982,14987,14992,15042 (from #2713)
• 14457-14458,14508,14582,14740,14984,15068,15095 (from #2715)
• 14860-14861 (from #2765)

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Common/3.3/Point2D.cs (modified) (4 diffs)

stable/HeuristicLab.Common/3.3/Point2D.cs

@@ -26 +26 @@
 namespace HeuristicLab.Common {
   [Serializable]
-  public struct Point2D<T> where T : struct {
+  public struct Point2D<T> where T : struct, IEquatable<T> {
     public static readonly Point2D<T> Empty = new Point2D<T>();
 
@@ -38 +38 @@
     }
 
+    private object tag;
+    public object Tag {
+      get { return tag; }
+    }
+
     [Browsable(false)]
     public bool IsEmpty {
@@ -43 +48 @@
     }
 
-    public Point2D(T x, T y) {
+    public Point2D(T x, T y, object tag = null) {
       this.x = x;
       this.y = y;
+      this.tag = tag;
     }
 
     public static bool operator ==(Point2D<T> left, Point2D<T> right) {
-      return left.x.Equals(right.x) && left.y.Equals(right.y);
+      return left.x.Equals(right.x) && left.y.Equals(right.y) && left.tag == right.tag;
     }
     public static bool operator !=(Point2D<T> left, Point2D<T> right) {
@@ -59 +65 @@
         return false;
       Point2D<T> point = (Point2D<T>)obj;
-      return x.Equals(point.x) && y.Equals(point.y) && GetType().Equals(point.GetType());
+      return GetType() == point.GetType() && x.Equals(point.x) && y.Equals(point.y) &&
+             ((tag != null && tag.Equals(point.tag)) || tag == point.tag);
     }
     public override int GetHashCode() {