X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fmath%2FRotatableMatrix.java;fp=src%2Fjalview%2Fmath%2FRotatableMatrix.java;h=c0ec1c98abc4719ede8489e2c6a2c7f51e80cc2c;hb=588042b69abf8e60bcc950b24c283933c7dd422f;hp=d9f4bd588af1b88d35d0a3e3f053eba53bbb47cd;hpb=5cd8e373c75fb348ecda4d94d8a46468fb92756d;p=jalview.git diff --git a/src/jalview/math/RotatableMatrix.java b/src/jalview/math/RotatableMatrix.java index d9f4bd5..c0ec1c9 100755 --- a/src/jalview/math/RotatableMatrix.java +++ b/src/jalview/math/RotatableMatrix.java @@ -16,374 +16,241 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ - package jalview.math; - - public class RotatableMatrix { + float[][] matrix; + float[] temp; + float[][] rot; - float matrix[][]; - - float[] temp; - - float[][] rot; - - - - public RotatableMatrix(int rows, int cols) { - - matrix = new float[rows][cols]; - - temp = new float[3]; - - rot = new float[3][3]; - - } - - - - public void addElement(int i, int j, float value) { - - matrix[i][j] = value; - - } - - - - public void print() { - - System.out.println(matrix[0][0] + " " + matrix[0][1] + " " + matrix[0][2]); - - System.out.println(matrix[1][0] + " " + matrix[1][1] + " " + matrix[1][2]); - - System.out.println(matrix[2][0] + " " + matrix[2][1] + " " + matrix[2][2]); - - } - - - - public void rotate (float degrees, char axis) { - - - - float costheta = (float)Math.cos(degrees*Math.PI/(float)180.0); - - float sintheta = (float)Math.sin(degrees*Math.PI/(float)180.0); - - - - if (axis == 'z') { - - + public RotatableMatrix(int rows, int cols) { + matrix = new float[rows][cols]; - rot[0][0] = (float)costheta; - - rot[0][1] = (float)-sintheta; - - rot[0][2] = (float)0.0; - - - - rot[1][0] = (float)sintheta; - - rot[1][1] = (float)costheta; - - rot[1][2] = (float)0.0; - - - - rot[2][0] = (float)0.0; - - rot[2][1] = (float)0.0; - - rot[2][2] = (float)1.0; - - - - preMultiply(rot); + temp = new float[3]; + rot = new float[3][3]; } - if (axis == 'x') { - - rot[0][0] = (float)1.0; - - rot[0][1] = (float)0.0; - - rot[0][2] = (float)0.0; - - - - rot[1][0] = (float)0.0; - - rot[1][1] = (float)costheta; - - rot[1][2] = (float)sintheta; - - - - rot[2][0] = (float)0.0; - - rot[2][1] = (float)-sintheta; - - rot[2][2] = (float)costheta; - - - - preMultiply(rot); - - - + public void addElement(int i, int j, float value) { + matrix[i][j] = value; } - if (axis == 'y') { - - rot[0][0] = (float)costheta; - - rot[0][1] = (float)0.0; - - rot[0][2] = (float)-sintheta; - - - - rot[1][0] = (float)0.0; - - rot[1][1] = (float)1.0; - - rot[1][2] = (float)0.0; - - - - rot[2][0] = (float)sintheta; - - rot[2][1] = (float)0.0; - - rot[2][2] = (float)costheta; - - - - preMultiply(rot); - + public void print() { + System.out.println(matrix[0][0] + " " + matrix[0][1] + " " + + matrix[0][2]); + System.out.println(matrix[1][0] + " " + matrix[1][1] + " " + + matrix[1][2]); + System.out.println(matrix[2][0] + " " + matrix[2][1] + " " + + matrix[2][2]); } + public void rotate(float degrees, char axis) { + float costheta = (float) Math.cos((degrees * Math.PI) / (float) 180.0); + float sintheta = (float) Math.sin((degrees * Math.PI) / (float) 180.0); - } - - - - public float[] vectorMultiply(float[] vect) { + if (axis == 'z') { + rot[0][0] = (float) costheta; - temp[0] = vect[0]; + rot[0][1] = (float) -sintheta; - temp[1] = vect[1]; + rot[0][2] = (float) 0.0; - temp[2] = vect[2]; + rot[1][0] = (float) sintheta; + rot[1][1] = (float) costheta; + rot[1][2] = (float) 0.0; - for (int i = 0; i < 3; i++) { + rot[2][0] = (float) 0.0; - temp[i] = matrix[i][0]*vect[0] + matrix[i][1]*vect[1] + matrix[i][2]*vect[2]; + rot[2][1] = (float) 0.0; - } - - - - vect[0] = temp[0]; - - vect[1] = temp[1]; - - vect[2] = temp[2]; - - - - return vect; + rot[2][2] = (float) 1.0; - } + preMultiply(rot); + } + if (axis == 'x') { + rot[0][0] = (float) 1.0; + rot[0][1] = (float) 0.0; - public void preMultiply(float mat[][]) { + rot[0][2] = (float) 0.0; - float tmp[][] = new float[3][3]; + rot[1][0] = (float) 0.0; + rot[1][1] = (float) costheta; + rot[1][2] = (float) sintheta; - for (int i = 0; i < 3 ; i++) { + rot[2][0] = (float) 0.0; - for (int j = 0; j < 3; j++ ) { + rot[2][1] = (float) -sintheta; - tmp[i][j] = mat[i][0]*matrix[0][j] + + rot[2][2] = (float) costheta; - mat[i][1]*matrix[1][j] + + preMultiply(rot); + } - mat[i][2]*matrix[2][j]; + if (axis == 'y') { + rot[0][0] = (float) costheta; - } + rot[0][1] = (float) 0.0; - } + rot[0][2] = (float) -sintheta; + rot[1][0] = (float) 0.0; + rot[1][1] = (float) 1.0; - for (int i = 0; i < 3 ; i++) { + rot[1][2] = (float) 0.0; - for (int j = 0; j < 3; j++ ) { + rot[2][0] = (float) sintheta; - matrix[i][j] = tmp[i][j]; + rot[2][1] = (float) 0.0; - } + rot[2][2] = (float) costheta; + preMultiply(rot); + } } - } - - - - public void postMultiply(float mat[][]) { - - float tmp[][] = new float[3][3]; + public float[] vectorMultiply(float[] vect) { + temp[0] = vect[0]; + temp[1] = vect[1]; + temp[2] = vect[2]; - for (int i = 0; i < 3 ; i++) { + for (int i = 0; i < 3; i++) { + temp[i] = (matrix[i][0] * vect[0]) + (matrix[i][1] * vect[1]) + + (matrix[i][2] * vect[2]); + } - for (int j = 0; j < 3; j++ ) { + vect[0] = temp[0]; - tmp[i][j] = matrix[i][0]*mat[0][j] + + vect[1] = temp[1]; - matrix[i][1]*mat[1][j] + - - matrix[i][2]*mat[2][j]; - - } + vect[2] = temp[2]; + return vect; } - - - for (int i = 0; i < 3 ; i++) { - - for (int j = 0; j < 3; j++ ) { - - matrix[i][j] = tmp[i][j]; - - } - + public void preMultiply(float[][] mat) { + float[][] tmp = new float[3][3]; + + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 3; j++) { + tmp[i][j] = (mat[i][0] * matrix[0][j]) + + (mat[i][1] * matrix[1][j]) + (mat[i][2] * matrix[2][j]); + } + } + + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 3; j++) { + matrix[i][j] = tmp[i][j]; + } + } } - } - - - - public static void main(String[] args) { - - - - RotatableMatrix m = new RotatableMatrix(3,3); - - m.addElement(0,0,1); - - m.addElement(0,1,0); - - m.addElement(0,2,0); - - m.addElement(1,0,0); - - m.addElement(1,1,2); - - m.addElement(1,2,0); - - m.addElement(2,0,0); - - m.addElement(2,1,0); - - m.addElement(2,2,1); - - - - m.print(); - - - - RotatableMatrix n = new RotatableMatrix(3,3); - - n.addElement(0,0,2); - - n.addElement(0,1,1); - - n.addElement(0,2,1); - - n.addElement(1,0,2); - - n.addElement(1,1,1); + public void postMultiply(float[][] mat) { + float[][] tmp = new float[3][3]; + + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 3; j++) { + tmp[i][j] = (matrix[i][0] * mat[0][j]) + + (matrix[i][1] * mat[1][j]) + (matrix[i][2] * mat[2][j]); + } + } + + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 3; j++) { + matrix[i][j] = tmp[i][j]; + } + } + } - n.addElement(1,2,1); + public static void main(String[] args) { + RotatableMatrix m = new RotatableMatrix(3, 3); - n.addElement(2,0,2); + m.addElement(0, 0, 1); - n.addElement(2,1,1); + m.addElement(0, 1, 0); - n.addElement(2,2,1); + m.addElement(0, 2, 0); + m.addElement(1, 0, 0); + m.addElement(1, 1, 2); - n.print(); + m.addElement(1, 2, 0); + m.addElement(2, 0, 0); + m.addElement(2, 1, 0); - //m.postMultiply(n.matrix); + m.addElement(2, 2, 1); - //m.print(); + m.print(); - // m.rotate(45,'z',new RotatableMatrix(3,3)); + RotatableMatrix n = new RotatableMatrix(3, 3); + n.addElement(0, 0, 2); + n.addElement(0, 1, 1); - float vect[] = new float[3]; + n.addElement(0, 2, 1); - vect[0] = 2; + n.addElement(1, 0, 2); - vect[1] = 4; + n.addElement(1, 1, 1); - vect[2] = 6; + n.addElement(1, 2, 1); + n.addElement(2, 0, 2); + n.addElement(2, 1, 1); - vect = m.vectorMultiply(vect); + n.addElement(2, 2, 1); - System.out.println(vect[0] + " " + vect[1] + " " + vect[2]); + n.print(); + //m.postMultiply(n.matrix); + //m.print(); + // m.rotate(45,'z',new RotatableMatrix(3,3)); + float[] vect = new float[3]; + vect[0] = 2; - } + vect[1] = 4; - public void setIdentity() { + vect[2] = 6; - matrix[0][0] = (float)1.0; + vect = m.vectorMultiply(vect); - matrix[1][1] = (float)1.0; + System.out.println(vect[0] + " " + vect[1] + " " + vect[2]); + } - matrix[2][2] = (float)1.0; + public void setIdentity() { + matrix[0][0] = (float) 1.0; - matrix[0][1] = (float)0.0; + matrix[1][1] = (float) 1.0; - matrix[0][2] = (float)0.0; + matrix[2][2] = (float) 1.0; - matrix[1][0] = (float)0.0; + matrix[0][1] = (float) 0.0; - matrix[1][2] = (float) 0.0; + matrix[0][2] = (float) 0.0; - matrix[2][0] = (float)0.0; + matrix[1][0] = (float) 0.0; - matrix[2][1] = (float)0.0; + matrix[1][2] = (float) 0.0; - } + matrix[2][0] = (float) 0.0; + matrix[2][1] = (float) 0.0; + } } - - -