Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions tests/test_BaseStruc.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@ def testBaseStruc():
if name not in iparamsCube:
iparamsCube[name] = dparams[name]

struc, unitCell = readStrucFile(iparamsSphere['structureFile'])
struc, unitCell, connectivity = readStrucFile(iparamsSphere['structureFile'])

if iparamsSphere['baseStrucFile']:
baseStruc, baseUnitCell = readStrucFile(iparamsSphere['baseStrucFile'])
baseStruc, baseUnitCell, baseConnectivity = readStrucFile(
iparamsSphere['baseStrucFile']
)
else:
baseStruc = None

Expand Down
6 changes: 3 additions & 3 deletions tests/test_atomFill.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ def testAtomFill():
if name not in iparamsCube:
iparamsCube[name] = dparams[name]

struc, unitCell = readStrucFile(iparamsSphere['structureFile'])
struc, unitCell, connectivity = readStrucFile(iparamsSphere['structureFile'])

if iparamsSphere['baseStrucFile']:
baseStruc = readStrucFile(iparamsSphere['baseStrucFile'])
baseStruc, _, _ = readStrucFile(iparamsSphere['baseStrucFile'])
else:
baseStruc = None

Expand All @@ -45,4 +45,4 @@ def testAtomFill():

outStrucSphere, strucTypeSphere = drawMolSphere(struc, baseStruc, iparamsSphere)
assert len(outStrucSphere) != 0, "Output structure should have some length"
assert strucTypeSphere == "atom", "Structure type should be an atom"
assert strucTypeSphere == "atom", "Structure type should be an atom"
6 changes: 3 additions & 3 deletions tests/test_atomRandomPlace.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ def testRandomPlace():
if name not in iparamsCube:
iparamsCube[name] = dparams[name]

struc, unitCell = readStrucFile(iparamsSphere['structureFile'])
struc, unitCell, connectivity = readStrucFile(iparamsSphere['structureFile'])

if iparamsSphere['baseStrucFile']:
baseStruc = readStrucFile(iparamsSphere['baseStrucFile'])
baseStruc, _, _ = readStrucFile(iparamsSphere['baseStrucFile'])
else:
baseStruc = None

Expand All @@ -45,4 +45,4 @@ def testRandomPlace():

outStrucSphere, strucTypeSphere = drawMolSphere(struc, baseStruc, iparamsSphere)
assert len(outStrucSphere) != 0, "Output structure should have some length"
assert strucTypeSphere == "atom", "Structure type should be an atom"
assert strucTypeSphere == "atom", "Structure type should be an atom"
6 changes: 3 additions & 3 deletions tests/test_moleculeFill.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ def testMoleculeFill():
if name not in iparamsCube:
iparamsCube[name] = dparams[name]

struc, unitCell = readStrucFile(iparamsSphere['structureFile'])
struc, unitCell, connectivity = readStrucFile(iparamsSphere['structureFile'])

if iparamsSphere['baseStrucFile']:
baseStruc = readStrucFile(iparamsSphere['baseStrucFile'])
baseStruc, _, _ = readStrucFile(iparamsSphere['baseStrucFile'])
else:
baseStruc = None

Expand All @@ -43,4 +43,4 @@ def testMoleculeFill():

outStrucSphere, strucTypeSphere = drawMolSphere(struc, baseStruc, iparamsSphere)
assert len(outStrucSphere) != 0, "Output structure should have some length"
assert strucTypeSphere == "molecule", "Structure type should be an atom"
assert strucTypeSphere == "molecule", "Structure type should be an atom"
8 changes: 5 additions & 3 deletions tests/test_moleculeRandomPlace.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@ def testMoleculeRandomPlace():
if name not in iparamsCube:
iparamsCube[name] = dparams[name]

struc, unitCell = readStrucFile(iparamsSphere['structureFile'])
struc, unitCell, connectivity = readStrucFile(iparamsSphere['structureFile'])

if iparamsSphere['baseStrucFile']:
baseStruc, baseUnitCell = readStrucFile(iparamsSphere['baseStrucFile'])
baseStruc, baseUnitCell, baseConnectivity = readStrucFile(
iparamsSphere['baseStrucFile']
)
else:
baseStruc = None

Expand All @@ -45,4 +47,4 @@ def testMoleculeRandomPlace():

outStrucSphere, strucTypeSphere = drawMolSphere(struc, baseStruc, iparamsSphere)
assert len(outStrucSphere) != 0, "Output structure should have some length"
assert strucTypeSphere == "molecule", "Structure type should be an atom"
assert strucTypeSphere == "molecule", "Structure type should be an atom"
6 changes: 3 additions & 3 deletions tests/test_randOrient.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ def testRandOrient():
if name not in iparamsCube:
iparamsCube[name] = dparams[name]

struc, unitCell = readStrucFile(iparamsSphere['structureFile'])
struc, unitCell, connectivity = readStrucFile(iparamsSphere['structureFile'])

if iparamsSphere['baseStrucFile']:
baseStruc = readStrucFile(iparamsSphere['baseStrucFile'])
baseStruc, _, _ = readStrucFile(iparamsSphere['baseStrucFile'])
else:
baseStruc = None

Expand All @@ -45,4 +45,4 @@ def testRandOrient():

outStrucSphere, strucTypeSphere = drawMolSphere(struc, baseStruc, iparamsSphere)
assert len(outStrucSphere) != 0, "Output structure should have some length"
assert strucTypeSphere == "molecule", "Structure type should be an atom"
assert strucTypeSphere == "molecule", "Structure type should be an atom"
6 changes: 3 additions & 3 deletions tests/test_readWritePDB.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ def testReadWritePDB():
if name not in iparamsCube:
iparamsCube[name] = dparams[name]

struc, unitCell = readStrucFile(iparamsSphere['structureFile'])
struc, unitCell, connectivity = readStrucFile(iparamsSphere['structureFile'])

if iparamsSphere['baseStrucFile']:
baseStruc = readStrucFile(iparamsSphere['baseStrucFile'])
baseStruc, _, _ = readStrucFile(iparamsSphere['baseStrucFile'])
else:
baseStruc = None

Expand All @@ -45,4 +45,4 @@ def testReadWritePDB():
outStrucSphere, strucTypeSphere = drawMolSphere(struc, baseStruc, iparamsSphere)
assert len(outStrucSphere) != 0, "Output structure should have some length"
assert strucTypeSphere == "molecule", "Structure type should be an atom"
assert isinstance(outStrucSphere[0][0][-1], str), 'Final place should be residue ID'
assert isinstance(outStrucSphere[0][0][-1], str), 'Final place should be residue ID'
Loading