Merge pull request #2765 from peastman/amoeba

Added new features to AmoebaVdwForce

wrappers/python/tests/TestAPIUnits.py

@@ -969,29 +969,32 @@ class TestAPIUnits(unittest.TestCase):
 
         self.assertEqual(force.getNumParticles(), 3)
 
-        p, sig, eps, scale, alchemical = force.getParticleParameters(0)
+        p, sig, eps, scale, alchemical, type = force.getParticleParameters(0)
         self.assertEqual(p, 0)
         self.assertEqual(sig, 0.1*nanometers)
         self.assertIs(sig.unit, nanometers)
         self.assertEqual(eps, 1.0*kilojoules_per_mole)
         self.assertIs(eps.unit, kilojoules_per_mole)
         self.assertEqual(scale, 1.0)
+        self.assertEqual(type, -1)
 
-        p, sig, eps, scale, alchemical = force.getParticleParameters(1)
+        p, sig, eps, scale, alchemical, type = force.getParticleParameters(1)
         self.assertEqual(p, 1)
         self.assertEqual(sig, 1.0*angstroms)
         self.assertIs(sig.unit, nanometers)
         self.assertEqual(eps, 1.0*kilocalories_per_mole)
         self.assertIs(eps.unit, kilojoules_per_mole)
         self.assertEqual(scale, 0.5)
+        self.assertEqual(type, -1)
 
-        p, sig, eps, scale, alchemical = force.getParticleParameters(2)
+        p, sig, eps, scale, alchemical, type = force.getParticleParameters(2)
         self.assertEqual(p, 1)
         self.assertAlmostEqualUnit(sig, 0.8*angstroms)
         self.assertIs(sig.unit, nanometers)
         self.assertEqual(eps, 2.0*kilocalories_per_mole)
         self.assertIs(eps.unit, kilojoules_per_mole)
         self.assertEqual(scale, 0.25)
+        self.assertEqual(type, -1)
 
     def testAmoebaWcaDispersionForce(self):
         """ Tests the AmoebaWcaDispersionForce API features """