GeezerVison is showing github.com — Merge remote-tracking branch 'upstream/master' into bcif-integration · biojava/biojava@16792bd
File tree
Expand file treeCollapse file tree
Open diff view settings
biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/symmetry org/biojava/nbio/structure
test/java/org/biojava/nbio/structure
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: CHANGELOG.md +3Lines changed: 3 additions & 0 deletions - Display the source diff
- Display the rich diff
| Original file line number | Diff line number | Diff line change |
|---|
@@ -12,6 +12,9 @@ BioJava 6.0.0 (future release) |
12 | 12 | * The whole `org.biojava.nbio.structure.rcsb` package, a client for the legacy RCSB PDB APIs (disappearing in Nov 2020) |
13 | 13 | * The whole `org.biojava.nbio.structure.validation` package |
14 | 14 | * 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` |
15 | 18 |
|
16 | 19 | BioJava 5.4.0 |
17 | 20 | ============= |
|
Collapse file
Copy file name to clipboardExpand all lines: biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/symmetry/TestQuatSymmetryDetectorExamples.java +2-2Lines changed: 2 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -241,7 +241,7 @@ public void testLocal() throws IOException, StructureException { |
241 | 241 | testIds.add("BIO:3JC9:1"); |
242 | 242 | testStoichiometries.add("A12B12C12D12E12F12G5H2"); |
243 | 243 | localSymmetries = new HashMap<>(); |
244 | | - localSymmetries.put("A12C12D12E12F12H2","C2"); |
| 244 | + localSymmetries.put("A12B12C12D12E12H2","C2"); |
245 | 245 | localSymmetries.put("A12B12C12D12E12F12","C12"); |
246 | 246 | localSymmetries.put("G5","H"); |
247 | 247 | testLocalSymmetries.add(localSymmetries); |
@@ -269,7 +269,7 @@ public void testLocal() throws IOException, StructureException { |
269 | 269 | for (QuatSymmetryResults local:foundLocal) { |
270 | 270 | logger.info("Found stoichiometry "+local.getStoichiometry().toString()+" with symmetry "+local.getSymmetry()); |
271 | 271 | assertTrue("Stoichiometry "+local.getStoichiometry().toString()+" not expected for "+testIds.get(iTest), |
272 | | - refLocal.keySet().contains(local.getStoichiometry().toString())); |
| 272 | + refLocal.containsKey(local.getStoichiometry().toString())); |
273 | 273 |
|
274 | 274 | assertEquals("Symmetry "+local.getSymmetry()+" with stoichiometry "+local.getStoichiometry().toString()+ |
275 | 275 | " not expected for "+testIds.get(iTest), |
|
Collapse file
Copy file name to clipboardExpand all lines: biojava-structure/src/main/java/demo/DemoLoadSecStruc.java -8Lines changed: 0 additions & 8 deletions | Original file line number | Diff line number | Diff line change |
|---|
|
28 | 28 | import org.biojava.nbio.structure.StructureFiletype; |
29 | 29 | import org.biojava.nbio.structure.align.util.AtomCache; |
30 | 30 | import org.biojava.nbio.structure.io.FileParsingParameters; |
31 | | -import org.biojava.nbio.structure.secstruc.DSSPParser; |
32 | 31 | import org.biojava.nbio.structure.secstruc.SecStrucCalc; |
33 | 32 | import org.biojava.nbio.structure.secstruc.SecStrucInfo; |
34 | 33 | import org.biojava.nbio.structure.secstruc.SecStrucTools; |
@@ -65,13 +64,6 @@ public static void main(String[] args) throws IOException, |
65 | 64 | System.out.println("Author's assignment: "); |
66 | 65 | printSecStruc(s); |
67 | 66 |
|
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 | | - |
75 | 67 | // finally use BioJava's built in DSSP-like secondary structure assigner |
76 | 68 | SecStrucCalc secStrucCalc = new SecStrucCalc(); |
77 | 69 |
|
|