Skip to content

Commit 16792bd

Browse files
committed
Merge remote-tracking branch 'upstream/master' into bcif-integration
# Conflicts: # biojava-structure/src/test/java/org/biojava/nbio/structure/TestDownloadChemCompProvider.java
2 parents 0c00cac + e99364a commit 16792bd

File tree

11 files changed

+121
-861
lines changed

11 files changed

+121
-861
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ BioJava 6.0.0 (future release)
1212
* The whole `org.biojava.nbio.structure.rcsb` package, a client for the legacy RCSB PDB APIs (disappearing in Nov 2020)
1313
* The whole `org.biojava.nbio.structure.validation` package
1414
* The `org.biojava.nbio.structure.domain.PDBDomainProvider` class to pull domain definitions from legacy RCSB PDB APIs
15+
* Support for automatically fetching dssp files from RCSB (`org.biojava.nbio.structure.secstruc.DSSPParser.fetch()`)
16+
* `org.biojava.nbio.structure.PDBStatus`: simplified `Status` enum to 3 states, with OBSOLETE now called REMOVED
17+
* `org.biojava.nbio.structure.PDBStatus`: removed `getReplacement` and `getReplaces`
1518

1619
BioJava 5.4.0
1720
=============

biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/symmetry/TestQuatSymmetryDetectorExamples.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ public void testLocal() throws IOException, StructureException {
241241
testIds.add("BIO:3JC9:1");
242242
testStoichiometries.add("A12B12C12D12E12F12G5H2");
243243
localSymmetries = new HashMap<>();
244-
localSymmetries.put("A12C12D12E12F12H2","C2");
244+
localSymmetries.put("A12B12C12D12E12H2","C2");
245245
localSymmetries.put("A12B12C12D12E12F12","C12");
246246
localSymmetries.put("G5","H");
247247
testLocalSymmetries.add(localSymmetries);
@@ -269,7 +269,7 @@ public void testLocal() throws IOException, StructureException {
269269
for (QuatSymmetryResults local:foundLocal) {
270270
logger.info("Found stoichiometry "+local.getStoichiometry().toString()+" with symmetry "+local.getSymmetry());
271271
assertTrue("Stoichiometry "+local.getStoichiometry().toString()+" not expected for "+testIds.get(iTest),
272-
refLocal.keySet().contains(local.getStoichiometry().toString()));
272+
refLocal.containsKey(local.getStoichiometry().toString()));
273273

274274
assertEquals("Symmetry "+local.getSymmetry()+" with stoichiometry "+local.getStoichiometry().toString()+
275275
" not expected for "+testIds.get(iTest),

biojava-structure/src/main/java/demo/DemoLoadSecStruc.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.biojava.nbio.structure.StructureFiletype;
2929
import org.biojava.nbio.structure.align.util.AtomCache;
3030
import org.biojava.nbio.structure.io.FileParsingParameters;
31-
import org.biojava.nbio.structure.secstruc.DSSPParser;
3231
import org.biojava.nbio.structure.secstruc.SecStrucCalc;
3332
import org.biojava.nbio.structure.secstruc.SecStrucInfo;
3433
import org.biojava.nbio.structure.secstruc.SecStrucTools;
@@ -65,13 +64,6 @@ public static void main(String[] args) throws IOException,
6564
System.out.println("Author's assignment: ");
6665
printSecStruc(s);
6766

68-
// If the more detailed DSSP prediction is required call this
69-
DSSPParser.fetch(pdbID, s, true);
70-
71-
// Print the assignment residue by residue
72-
System.out.println("DSSP assignment: ");
73-
printSecStruc(s);
74-
7567
// finally use BioJava's built in DSSP-like secondary structure assigner
7668
SecStrucCalc secStrucCalc = new SecStrucCalc();
7769

0 commit comments

Comments
 (0)