Changeset 5940

Timestamp:

Nov 11, 2008, 4:02:32 PM (17 years ago)

Author:

rwilson

Message:

Modify the Rajaraman test case.

File:

• anuga_core/source/anuga/utilities/test_polygon.py (modified) (1 diff)

anuga_core/source/anuga/utilities/test_polygon.py

@@ -979 +979 @@
         """
 
-        # define 4 *almost* collinear points
-        #    P1---P2---P3---P4
-        P1 = [2.0, 2.0]
-        P2 = [0.0, 0.0]
-        P3 = [1.0, 1.0]
-        P4 = [0.0, 0.0]
-
-        self.helper_test_parallel_intersection_code(P1, P2, P3, P4)        
+        # define 4  collinear points
+        #
+        #   Y
+        #   ^
+        #   |         x (2,2)
+        #   |        /
+        #   |       /
+        #   |      /
+        #   |     /
+        #   |    x (1,1)
+        #   |   /
+        #   |  /
+        #   | /
+        #   |/
+        #   x------------>X
+
+        line0 = [[2.0, 2.0],[0.0,0.0]]
+        line1 = [[1.0, 1.0],[0.0,0.0]]
+
+        status, value = intersection(line0, line1)
+        print 'status=%s, value=%s' % (str(status), str(value))
+        
+        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
+                               (str(status), str(value)))
+        self.failUnless(allclose(value, [line0[0],line1[1]]))