From 70c01ac4beed60e06c26bd67eadf6ffed64a04f1 Mon Sep 17 00:00:00 2001 From: Ric Date: Fri, 16 Oct 2020 22:29:09 -0400 Subject: [PATCH] fix paths (#3504) --- Contrib/ConformerParser/Wrap/testConformerParser.py | 6 ++---- Contrib/ConformerParser/test.cpp | 9 ++++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Contrib/ConformerParser/Wrap/testConformerParser.py b/Contrib/ConformerParser/Wrap/testConformerParser.py index 35e92db53..34eddc109 100644 --- a/Contrib/ConformerParser/Wrap/testConformerParser.py +++ b/Contrib/ConformerParser/Wrap/testConformerParser.py @@ -13,8 +13,7 @@ class TestCase(unittest.TestCase): pass def testReadAmberTraj(self): - fileN = os.path.join(RDConfig.RDBaseDir, 'Contrib', 'ConformerParser', 'test_data', - 'water_coords.trx') + fileN = os.path.join(RDConfig.RDBaseDir, 'Code', 'GraphMol', 'test_data', 'water_coords.trx') mol = Chem.MolFromSmiles('O') mol = Chem.AddHs(mol) ids = rdConformerParser.AddConformersFromAmberTrajectory(mol, fileN) @@ -22,8 +21,7 @@ class TestCase(unittest.TestCase): self.failUnless(len(ids) == 1) self.failUnless(ids[0] == 0) - fileN = os.path.join(RDConfig.RDBaseDir, 'Contrib', 'ConformerParser', 'test_data', - 'water_coords2.trx') + fileN = os.path.join(RDConfig.RDBaseDir, 'Code', 'GraphMol', 'test_data', 'water_coords2.trx') ids = rdConformerParser.AddConformersFromAmberTrajectory(mol, fileN, clearConfs=True) self.failUnless(mol.GetNumConformers() == 2) ids = rdConformerParser.AddConformersFromAmberTrajectory(mol, fileN, clearConfs=False) diff --git a/Contrib/ConformerParser/test.cpp b/Contrib/ConformerParser/test.cpp index db47db956..8653fc845 100644 --- a/Contrib/ConformerParser/test.cpp +++ b/Contrib/ConformerParser/test.cpp @@ -60,8 +60,7 @@ void test1() { ROMol *mol = SmilesToMol("CCC"); std::vector> coords; std::string rdbase = getenv("RDBASE"); - std::string fName = - rdbase + "/Contrib/ConformerParser/test_data/water_coords_bad.trx"; + std::string fName = rdbase + "/Code/GraphMol/test_data/water_coords_bad.trx"; bool ok = false; try { readAmberTrajectory(fName, coords, mol->getNumAtoms()); @@ -70,7 +69,7 @@ void test1() { } TEST_ASSERT(ok); - fName = rdbase + "/Contrib/ConformerParser/test_data/water_coords_bad2.trx"; + fName = rdbase + "/Code/GraphMol/test_data/water_coords_bad2.trx"; ok = false; try { readAmberTrajectory(fName, coords, mol->getNumAtoms()); @@ -80,7 +79,7 @@ void test1() { } TEST_ASSERT(ok); - fName = rdbase + "/Contrib/ConformerParser/test_data/water_coords.trx"; + fName = rdbase + "/Code/GraphMol/test_data/water_coords.trx"; readAmberTrajectory(fName, coords, mol->getNumAtoms()); TEST_ASSERT(coords.size() == 1); TEST_ASSERT(coords[0].size() == 9); @@ -99,7 +98,7 @@ void test1() { coords.resize(0); mol->clearConformers(); - fName = rdbase + "/Contrib/ConformerParser/test_data/water_coords2.trx"; + fName = rdbase + "/Code/GraphMol/test_data/water_coords2.trx"; readAmberTrajectory(fName, coords, mol->getNumAtoms()); TEST_ASSERT(coords.size() == 2); TEST_ASSERT(coords[1].size() == 9);