Fix and unit test for biojava#715

josemduarte · josemduarte · commit fe8c7167393d · 2017-12-07T17:38:11.000-08:00
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Calc.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Calc.java
@@ -521,6 +521,11 @@ public static final void transform (Chain chain, Matrix4d m) {
 			for (Atom atom: g.getAtoms()) {
 				transform(atom,m);
 			}
+			for (Group altG : g.getAltLocs()) {
+				for (Atom atom : altG.getAtoms()) {
+					transform(atom, m);
+				}				
+			}
 		}
 	}
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestCalc.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestCalc.java
@@ -156,6 +156,53 @@ public void testVecmathTransformation() {
 
 		assertEquals(expected, actual);
 	}
+	
+	/**
+	 * Issue https://github.com/biojava/biojava/issues/715
+	 */
+	@Test
+	public void testChainTransform() {
+		Group g = new AminoAcidImpl();
+		Atom a = new AtomImpl();
+		a.setName("CA");
+		a.setX(1);
+		a.setY(1);
+		a.setZ(1);
+		g.addAtom(a);
+		Group altLocG = new AminoAcidImpl();
+		Atom a2 = new AtomImpl();
+		a2.setName("CA");
+		a2.setX(2);
+		a2.setY(2);
+		a2.setZ(2);
+		altLocG.addAtom(a2);
+		
+		g.addAltLoc(altLocG);
+		
+		Chain c = new ChainImpl();
+		c.addGroup(g);
+		
+		Matrix4d m = new Matrix4d(1,0,0,1, 0,1,0,0, 0,0,1,0, 0,0,0,1); // shift of 1 in x axis
+ 		Calc.transform(c, m);
+ 		
+ 		Group thegroup = c.getAtomGroup(0);
+ 		Group thealtlocgroup = thegroup.getAltLocs().get(0);
+ 		
+ 		Atom atom1 = thegroup.getAtom("CA");
+ 		Atom atom2 = thealtlocgroup.getAtom("CA");
+ 		
+ 		// x should be shitfted by 1
+ 		assertEquals(2, atom1.getX(), 0.00001);
+ 		assertEquals(1, atom1.getY(), 0.00001);
+ 		assertEquals(1, atom1.getZ(), 0.00001);
+ 		
+ 		// x should be shitfted by 1
+ 		assertEquals(3, atom2.getX(), 0.00001);
+ 		assertEquals(2, atom2.getY(), 0.00001);
+ 		assertEquals(2, atom2.getZ(), 0.00001);
+
+ 		
+	}
 
 	private static Atom getAtom(double x, double y, double z) {
 		Atom a = new AtomImpl();

Original file line number	Diff line number	Diff line change
`@@ -521,6 +521,11 @@ public static final void transform (Chain chain, Matrix4d m) {`
`521`	`521`	`for (Atom atom: g.getAtoms()) {`
`522`	`522`	`transform(atom,m);`
`523`	`523`	`}`
	`524`	`+ for (Group altG : g.getAltLocs()) {`
	`525`	`+ for (Atom atom : altG.getAtoms()) {`
	`526`	`+ transform(atom, m);`
	`527`	`+ }`
	`528`	`+ }`
`524`	`529`	`}`
`525`	`530`	`}`
`526`	`531`