Print

Print


Commit in projects/lcsim/trunk/detector-framework/src/test/java/org/lcsim/detector on MAIN
RotationApacheTest.java+19-53349 -> 3350
Activate test to check for quaternion normalization issue fixed in commons math 3.1

projects/lcsim/trunk/detector-framework/src/test/java/org/lcsim/detector
RotationApacheTest.java 3349 -> 3350
--- projects/lcsim/trunk/detector-framework/src/test/java/org/lcsim/detector/RotationApacheTest.java	2014-09-27 20:46:06 UTC (rev 3349)
+++ projects/lcsim/trunk/detector-framework/src/test/java/org/lcsim/detector/RotationApacheTest.java	2014-09-27 20:47:23 UTC (rev 3350)
@@ -41,6 +41,19 @@
         return isEqual;
     }
     
+    private boolean checkCardanAnglesEquality(double[] r1, double[] r2 ) {
+        boolean isEqual = true;
+        double diff = 0.0;
+        for(int row=0;row<3;++row) {
+            diff = r1[row]-r2[row];
+            if(Math.abs(diff) > 0.00001) {
+                System.out.printf("angle at index %d is not equal: %f vs %f diff %f\n",row,r1[row],r2[row],diff);
+                isEqual = false;
+            }
+        }
+        return isEqual;
+    }
+    
     private void printMatrix(double m[][]) {
        
         for(int row=0;row<3;++row) {
@@ -121,11 +134,7 @@
         boolean eq2 = checkRotationEquality(rc_uv, rc_vw);
         boolean eq3 = checkRotationEquality(rc_uw, rc_vw);
         
-        if(!eq1 || !eq2 || !eq3) {
-            System.out.printf("Matrices are not equal\n");
-        } else {
-            System.out.printf("Matrices are equal\n");
-        }
+        assertTrue(eq1 && eq2 &&eq3);
         
         // Get Cardan-angles
         
@@ -137,9 +146,14 @@
         System.out.printf("angles_rc_uw (%f,%f,%f)\n",angles_rc_uw[0],angles_rc_uw[1],angles_rc_uw[2]);
         System.out.printf("angles_rc_vw (%f,%f,%f)\n",angles_rc_vw[0],angles_rc_vw[1],angles_rc_vw[2]);
         
+        eq1 = checkCardanAnglesEquality(angles_rc_uv, angles_rc_uw);
+        eq2 = checkCardanAnglesEquality(angles_rc_uv, angles_rc_vw);
+        eq3 = checkCardanAnglesEquality(angles_rc_uw, angles_rc_vw);
         
+        assertTrue(eq1 && eq2 &&eq3);
         
         
+        
     }
        
    
SVNspam 0.1


Use REPLY-ALL to reply to list

To unsubscribe from the LCDET-SVN list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1