Changes in src/ellipsoid.cpp [112b09:c94eeb]

File:

• src/ellipsoid.cpp (modified) (4 diffs)

src/ellipsoid.cpp

@@ -21 +21 @@
 #include "tesselation.hpp"
 #include "vector.hpp"
+#include "Matrix.hpp"
 #include "verbose.hpp"
 
@@ -34 +35 @@
   Vector helper, RefPoint;
   double distance = -1.;
-  double Matrix[NDIM*NDIM];
+  Matrix Matrix;
   double InverseLength[3];
   double psi,theta,phi; // euler angles in ZX'Z'' convention
@@ -51 +52 @@
   theta = EllipsoidAngle[1];
   phi = EllipsoidAngle[2];
-  Matrix[0] = cos(psi)*cos(phi) - sin(psi)*cos(theta)*sin(phi);
-  Matrix[1] = -cos(psi)*sin(phi) - sin(psi)*cos(theta)*cos(phi);
-  Matrix[2] = sin(psi)*sin(theta);
-  Matrix[3] = sin(psi)*cos(phi) + cos(psi)*cos(theta)*sin(phi);
-  Matrix[4] = cos(psi)*cos(theta)*cos(phi) - sin(psi)*sin(phi);
-  Matrix[5] = -cos(psi)*sin(theta);
-  Matrix[6] = sin(theta)*sin(phi);
-  Matrix[7] = sin(theta)*cos(phi);
-  Matrix[8] = cos(theta);
+  Matrix.at(0,0) = cos(psi)*cos(phi) - sin(psi)*cos(theta)*sin(phi);
+  Matrix.at(1,0) = -cos(psi)*sin(phi) - sin(psi)*cos(theta)*cos(phi);
+  Matrix.at(2,0) = sin(psi)*sin(theta);
+  Matrix.at(0,1) = sin(psi)*cos(phi) + cos(psi)*cos(theta)*sin(phi);
+  Matrix.at(1,1) = cos(psi)*cos(theta)*cos(phi) - sin(psi)*sin(phi);
+  Matrix.at(2,1) = -cos(psi)*sin(theta);
+  Matrix.at(0,2) = sin(theta)*sin(phi);
+  Matrix.at(1,2) = sin(theta)*cos(phi);
+  Matrix.at(2,2) = cos(theta);
   helper.MatrixMultiplication(Matrix);
   helper.ScaleAll(InverseLength);
@@ -73 +74 @@
   phi = -EllipsoidAngle[2];
   helper.ScaleAll(EllipsoidLength);
-  Matrix[0] = cos(psi)*cos(phi) - sin(psi)*cos(theta)*sin(phi);
-  Matrix[1] = -cos(psi)*sin(phi) - sin(psi)*cos(theta)*cos(phi);
-  Matrix[2] = sin(psi)*sin(theta);
-  Matrix[3] = sin(psi)*cos(phi) + cos(psi)*cos(theta)*sin(phi);
-  Matrix[4] = cos(psi)*cos(theta)*cos(phi) - sin(psi)*sin(phi);
-  Matrix[5] = -cos(psi)*sin(theta);
-  Matrix[6] = sin(theta)*sin(phi);
-  Matrix[7] = sin(theta)*cos(phi);
-  Matrix[8] = cos(theta);
+  Matrix.at(0,0) = cos(psi)*cos(phi) - sin(psi)*cos(theta)*sin(phi);
+  Matrix.at(1,0) = -cos(psi)*sin(phi) - sin(psi)*cos(theta)*cos(phi);
+  Matrix.at(2,0) = sin(psi)*sin(theta);
+  Matrix.at(0,1) = sin(psi)*cos(phi) + cos(psi)*cos(theta)*sin(phi);
+  Matrix.at(1,1) = cos(psi)*cos(theta)*cos(phi) - sin(psi)*sin(phi);
+  Matrix.at(2,1) = -cos(psi)*sin(theta);
+  Matrix.at(0,2) = sin(theta)*sin(phi);
+  Matrix.at(1,2) = sin(theta)*cos(phi);
+  Matrix.at(2,2) = cos(theta);
   helper.MatrixMultiplication(Matrix);
   //Log() << Verbose(4) << "Intersection is at " << helper << "." << endl;