Changeset 15554 for branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/Geometry/Line3D.cs

Timestamp:

12/20/17 16:15:38 (6 years ago)

Author:

rhanghof

Message:

#2817:

• Unittests
• Bugfixes on the line projection based extreme point creation method

File:

• branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/Geometry/Line3D.cs (modified) (3 diffs)

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/Geometry/Line3D.cs

@@ -9 +9 @@
   /// A line is given as a point and a directing vector
   /// </summary>
-  internal class Line3D {
+  public class Line3D {
     public Vector3D Point;
     public Vector3D Direction;
@@ -30 +30 @@
     }
 
+    /// <summary>
+    /// Returns the intersection point of two lines.
+    /// It the lines doesn't intersect it returns null.
+    /// </summary>
+    /// <param name="line"></param>
+    /// <returns></returns>
     public Vector3D Intersect(Line3D line) {
       double r = 0;
       double s = 0;
+
+      // if they have the same source point, this point can be returned.
+      if (this.Point.Equals(line.Point)) {
+        return this.Point;
+      }
 
       if (Direction.X != 0) {
@@ -49 +60 @@
         s = (this.Point.Z - line.Point.Z) / (double)line.Direction.Z;
       }
-
-      var a = r * this.Direction + this.Point;
-      var b = s * line.Direction + line.Point;
-      var c = a.Equals(b);
-      if (s!=0 && r!=0 && a.Equals(b)) {
-        
-        return a;
+      var p1 = r * this.Direction + this.Point;
+      var p2 = s * line.Direction + line.Point;
+      var c = p1.Equals(p2);
+      if (s!=0 && r!=0 && p1.Equals(p2)) {        
+        return p1;
       }