Merge tag 'upstream/2017.02.26'
Upstream version 2017.02.26
Ole Streicher
7 years ago
50 | 50 | double res2 = v1.angle(v2); |
51 | 51 | System.out.println("res1 = " + res1 + " res2=" + res2); |
52 | 52 | assertEquals("angular Distance=" + res2, 1.0, res1 / res2, 1e-10); |
53 | /* Check known problem with vecmath for small vector differences */ | |
53 | ||
54 | 54 | |
55 | 55 | Vector3d v3 = new Vector3d(1.5, 1.6, 0.); |
56 | 56 | Vector3d v4 = new Vector3d(1.5, 1.601, 0.); |
58 | 58 | double res4 = v3.angle(v4); |
59 | 59 | // |
60 | 60 | System.out.println("res3 = " + res3 + " res4=" + res4); |
61 | assertEquals("angular Distance=" + res4, 1., (Math.PI / 2. + res3) | |
62 | / res4, 1e-3); | |
61 | assertEquals("angular Distance=" + res4, 1., res3/res4, 1e-3); | |
63 | 62 | Vector3d v5 = new Vector3d(1.5, 1.6, 0.); |
64 | 63 | Vector3d v6 = new Vector3d(-1.5, -1.75, 0.); |
65 | 64 | double res5 = PixTools.getInstance().AngDist(v5, v6); |
66 | 65 | double res6 = v5.angle(v6); |
67 | 66 | System.out.println("res5 = " + res5 + " res6=" + res6); |
68 | assertEquals("angular Distance=" + res6, 2.0, res5 / res6, 1e-10); | |
67 | assertEquals("angular Distance=" + res6, 1.0, res5 / res6, 1e-10); | |
69 | 68 | System.out.println(" test of AngDist is done"); |
70 | 69 | } |
71 | 70 |
58 | 58 | double res2 = v1.angle(v2); |
59 | 59 | System.out.println("res1 = " + res1 + " res2=" + res2); |
60 | 60 | assertEquals("angular Distance=" + res2, 1.0, res1 / res2, 1e-10); |
61 | /* Check known problem with vecmath for small vector differences */ | |
61 | ||
62 | 62 | |
63 | 63 | Vector3d v3 = new Vector3d(1.5, 1.6, 0.); |
64 | 64 | Vector3d v4 = new Vector3d(1.5, 1.601, 0.); |
66 | 66 | double res4 = v3.angle(v4); |
67 | 67 | // |
68 | 68 | System.out.println("res3 = " + res3 + " res4=" + res4); |
69 | assertEquals("angular Distance=" + res4, 1., (Math.PI / 2. + res3) | |
70 | / res4, 1e-3); | |
69 | assertEquals("angular Distance=" + res4, 1., res3/ res4, 1e-3); | |
71 | 70 | Vector3d v5 = new Vector3d(1.5, 1.6, 0.); |
72 | 71 | Vector3d v6 = new Vector3d(-1.5, -1.75, 0.); |
73 | 72 | double res5 = pixTools.AngDist(v5, v6); |
74 | 73 | double res6 = v5.angle(v6); |
75 | 74 | System.out.println("res5 = " + res5 + " res6=" + res6); |
76 | assertEquals("angular Distance=" + res6, 2.0, res5 / res6, 1e-10); | |
75 | assertEquals("angular Distance=" + res6, 1.0, res5 / res6, 1e-10); | |
77 | 76 | System.out.println(" test of AngDist is done"); |
78 | 77 | } |
79 | 78 |
60 | 60 | double res2 = v1.angle(v2); |
61 | 61 | System.out.println("res1 = " + res1 + " res2=" + res2); |
62 | 62 | assertEquals("angular Distance=" + res2, 1.0, res1 / res2, 1e-10); |
63 | /* Check known problem with vecmath for small vector differences */ | |
63 | ||
64 | 64 | |
65 | 65 | Vector3d v3 = new Vector3d(1.5, 1.6, 0.); |
66 | 66 | Vector3d v4 = new Vector3d(1.5, 1.601, 0.); |
68 | 68 | double res4 = v3.angle(v4); |
69 | 69 | // |
70 | 70 | System.out.println("res3 = " + res3 + " res4=" + res4); |
71 | assertEquals("angular Distance=" + res4, 1., (Math.PI / 2. + res3) | |
72 | / res4, 1e-3); | |
71 | assertEquals("angular Distance=" + res4, 1., res3/res4, 1e-3); | |
73 | 72 | Vector3d v5 = new Vector3d(1.5, 1.6, 0.); |
74 | 73 | Vector3d v6 = new Vector3d(-1.5, -1.75, 0.); |
75 | 74 | double res5 = pt.AngDist(v5, v6); |
76 | 75 | double res6 = v5.angle(v6); |
77 | 76 | System.out.println("res5 = " + res5 + " res6=" + res6); |
78 | assertEquals("angular Distance=" + res6, 2.0, res5 / res6, 1e-10); | |
77 | assertEquals("angular Distance=" + res6, 1.0, res5 / res6, 1e-10); | |
79 | 78 | System.out.println(" test of AngDist is done"); |
80 | 79 | } |
81 | 80 |