ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/owl/trunk/proteinstructure/Pdb.java
Links to HEAD: (view) (annotate)
Sticky Revision:
(Current path doesn't exist after revision 950)
Sort logs by:
Revision 275 - (view) (annotate) - [select for diffs]
Modified Tue Aug 14 10:28:01 2007 UTC (17 years, 1 month ago) by duarte
File length: 27540 byte(s)
Diff to previous 274
Fixed bug: wasn't taken into account OXT atoms in calculating the ALL graph
Revision 274 - (view) (annotate) - [select for diffs]
Modified Tue Aug 14 10:26:32 2007 UTC (17 years, 1 month ago) by stehr
File length: 27234 byte(s)
Diff to previous 260
Added new SecondaryStructure object to Pdb and Graph
Revision 260 - (view) (annotate) - [select for diffs]
Modified Fri Aug 10 18:30:47 2007 UTC (17 years, 1 month ago) by duarte
File length: 28486 byte(s)
Diff to previous 259
Implemented write_graph_to_db
New member variable model in Graph, thus changed constructor
New methods to get degree of a node in Graph
New methos in NodeNbh to write other kinds of neighbourhood strings
Revision 259 - (view) (annotate) - [select for diffs]
Modified Fri Aug 10 16:40:44 2007 UTC (17 years, 1 month ago) by stehr
File length: 28491 byte(s)
Diff to previous 257
completed first version of dssp secondary structure assignment, can be switched on/off by status variable in Start, some other little fixes
Revision 257 - (view) (annotate) - [select for diffs]
Modified Thu Aug 9 16:43:32 2007 UTC (17 years, 1 month ago) by stehr
File length: 24998 byte(s)
Diff to previous 256
fixed bugs in ATOM line export (atom names were wrongly aligned & added three more columns after coordinates), added method to run DSSP (still incomplete)
Revision 256 - (view) (annotate) - [select for diffs]
Modified Thu Aug 9 14:21:39 2007 UTC (17 years, 1 month ago) by duarte
File length: 23470 byte(s)
Diff to previous 250
Added getNumAtoms
Revision 250 - (view) (annotate) - [select for diffs]
Modified Mon Aug 6 14:48:37 2007 UTC (17 years, 1 month ago) by stehr
File length: 23249 byte(s)
Diff to previous 237
added application to count grid density, suppressed warning for secondary structure reassignment
Revision 237 - (view) (annotate) - [select for diffs]
Modified Thu Jul 19 14:23:35 2007 UTC (17 years, 2 months ago) by duarte
File length: 20131 byte(s)
Diff to previous 236
Now rmsd calculation works for 2 Pdb objects where there are missing residues (unobserved) or missing atoms
New Exception ConformationNotSameSizeError
Still not printing out individual distances between 2 conformations (altghough it is possible)
Can't specify yet a restricted range of residues to calculate rmsd only with them
Revision 236 - (view) (annotate) - [select for diffs]
Modified Thu Jul 19 12:57:29 2007 UTC (17 years, 2 months ago) by duarte
File length: 17898 byte(s)
Diff to previous 235
Fixed bug. Was not doing correctly reflection along smallest principal axis in is_reflection case
Revision 235 - (view) (annotate) - [select for diffs]
Modified Thu Jul 19 12:43:12 2007 UTC (17 years, 2 months ago) by duarte
File length: 17894 byte(s)
Diff to previous 234
Implemented rmsd calculation (based on Jama matrix package)
rmsd method still not taking care of unobserved or missing atoms. Also not returning individual distances between optimally superimposed structures (although it can calculate them in commented out code)

Revision 234 - (view) (annotate) - [select for diffs]
Modified Tue Jul 10 14:14:58 2007 UTC (17 years, 2 months ago) by duarte
File length: 12574 byte(s)
Diff to previous 229
Made ContactList a TreeSet instead of an ArrayList, should improve performance (log(n) rather than linear)
REFACTORING: 
ContactList -> EdgeSet
Contact -> Edge
Revision 229 - (view) (annotate) - [select for diffs]
Modified Mon Jul 9 15:02:24 2007 UTC (17 years, 2 months ago) by duarte
File length: 12639 byte(s)
Diff to previous 228
Now calculate_dist_matrix returns the matrix with residue serials as indices (rather than atom serials)
Now AA.isValidSingleCT and AA.isValidMultiCT check also for crossed cases
Revision 228 - (view) (annotate) - [select for diffs]
Modified Mon Jul 9 14:32:47 2007 UTC (17 years, 2 months ago) by duarte
File length: 11960 byte(s)
Diff to previous 226
Now can do crossed contacts also with geometric hashing
Renamed getGraphGeometricHashing to get_graph (so interface remains as it was before we introduced the geometric hashing)
Revision 226 - (view) (annotate) - [select for diffs]
Modified Fri Jul 6 13:43:30 2007 UTC (17 years, 2 months ago) by duarte
File length: 11918 byte(s)
Diff to previous 224
First geometric hashing implementation for calculating graph (with new class Box). Only does non-crossed cts
Geometrich hashing graph calculation kept in a separate method than normal get_graph. Still either of the methods can be used.
Using javax.vectormath objects for the vectors (distance method also from that)
Using TreeMap for get_coords_for_ct
Revision 224 - (view) (annotate) - [select for diffs]
Modified Thu Jul 5 13:42:37 2007 UTC (17 years, 2 months ago) by duarte
File length: 8476 byte(s)
Diff to previous 222
Now calculate distance matrix uses HashMap instead of TreeMap
Needed to change the hashCode function in Contact to make it faster
Revision 222 - (view) (annotate) - [select for diffs]
Modified Wed Jul 4 15:39:01 2007 UTC (17 years, 2 months ago) by duarte
File length: 8476 byte(s)
Diff to previous 219
New secstruct2resinterval TreeMap to store secondary structure elements as a map of ss string ids to intervals
New class Interval
Revision 219 - (view) (annotate) - [select for diffs]
Modified Tue Jul 3 15:38:21 2007 UTC (17 years, 2 months ago) by duarte
File length: 8260 byte(s)
Diff to previous 216
Now reading also secondary structure (in a map of residue serials to secondary structure identifiers)
Revision 216 - (view) (annotate) - [select for diffs]
Modified Fri Jun 29 08:30:55 2007 UTC (17 years, 3 months ago) by duarte
File length: 8070 byte(s)
Diff to previous 208
Fixed bug: ATOM lines printing was locale dependant, thus was printing ',' for decimal separators in some locales
Revision 208 - (view) (annotate) - [select for diffs]
Modified Wed Jun 27 14:42:12 2007 UTC (17 years, 3 months ago) by duarte
File length: 7922 byte(s)
Diff to previous 207
FIXED BUGS:
- directed was not set when reading from cm file
- pdbChainCode not set when reading from db given pdbCode
- filling pdbresser2resser and resser2pdbresser hashmaps also in reading from pdb file
- using "A" as chainCode when reading from pdb file
- some error handling for file formats: new exception classes GraphFileFormatError and PdbfileFormatError
Revision 207 - (view) (annotate) - [select for diffs]
Modified Wed Jun 27 11:06:34 2007 UTC (17 years, 3 months ago) by duarte
File length: 7337 byte(s)
Diff to previous 206
Restructured construction of Pdb and Graph objects: now subclasses for each case
Cleaned up and made consistent database connections
Now can also pass a MySQLConnection in all cases (as well as having default values for a default connection)
PdbaseInfo and MsdsdInfo classes removed: now merged into PdbasePdb and MsdsdPdb respectively
Updated following this changes testPdb and compareCMs

Revision 206 - (view) (annotate) - [select for diffs]
Modified Tue Jun 26 17:01:48 2007 UTC (17 years, 3 months ago) by duarte
File length: 18280 byte(s)
Diff to previous 202
Major refactoring:
 accode -> pdbCode
 chaincode -> pdbChainCode
 chain -> chainCode
Major change of signatures (publics to privates)
Implemented getters for needed member variables
Major clean up
Revision 202 - (view) (annotate) - [select for diffs]
Modified Thu Jun 21 17:18:11 2007 UTC (17 years, 3 months ago) by duarte
File length: 17893 byte(s)
Diff to previous 200
MySQLConnection now throwing SQLException on connect
Many files changed following this: all calling classes now re-throwing or catching the SQLException
Revision 200 - (view) (annotate) - [select for diffs]
Modified Mon Jun 18 17:43:43 2007 UTC (17 years, 3 months ago) by duarte
File length: 17675 byte(s)
Diff to previous 190
New isValidCT methods in AA
New method get_resser_from_atomser in Pdb
Revision 190 - (view) (annotate) - [select for diffs]
Modified Tue Jun 12 13:38:46 2007 UTC (17 years, 3 months ago) by duarte
File length: 17584 byte(s)
Diff to previous 175
NEW FEATURE: mapping of pdb residue serials and internal serials in the Pdb object

Revision 175 - (view) (annotate) - [select for diffs]
Modified Fri May 25 17:31:58 2007 UTC (17 years, 4 months ago) by duarte
File length: 16818 byte(s)
Diff to previous 159
FIXED BUG in initialisation of fullLength when reading from file. In case of no sequence and nodes provided, was not getting correctly the maximum value for contacts. Now using the method getMaxContact from new class ContactList
NEW FUNCTIONALITY in Graph:
-New member variable modified
-New methods addEdge, delEdge, restrictContactsToMaxRange, restrictContactsToMinRange, getContacts, getNodes, copy
-Improved slightly the implementation of getEdgeNbh 
FIXED BUG in initialisation of fullLenght when reading from file. In case of no sequence and nodes provided, was not getting correctly the maximum value for contacts. Now using the method getMaxContact from ContactList
New class ContactList
NEW FUNCTIONALITY in Graph:
-New member variable modified
-New methods addEdge, delEdge, restrictContactsToMaxRange, restrictContactsToMinRange, getContacts, getNodes, copy
-Improved slightly the implementation of getEdgeNbh 
New method getRange in Contact
Revision 159 - (view) (annotate) - [select for diffs]
Modified Thu May 24 09:37:25 2007 UTC (17 years, 4 months ago) by duarte
File length: 16832 byte(s)
Diff to previous 156
Moved ContactMap and EdgeState out of this repository. 
Extra functionality of ContactMap now in Graph:
- new member variables fullLength, obsLength, numContacts. New method getIntMatrix
- removed getCM method
Revision 156 - (view) (annotate) - [select for diffs]
Modified Tue May 22 10:40:04 2007 UTC (17 years, 4 months ago) by duarte
File length: 16939 byte(s)
Diff to previous 154
Now passing also chaincode from Pdb object to Graph object in get_graph
Revision 154 - (view) (annotate) - [select for diffs]
Modified Fri May 18 09:32:28 2007 UTC (17 years, 4 months ago) by duarte
File length: 16929 byte(s)
Diff to previous 153
Recoded chain reading in read_pdb_data_from_file to make it clearer, no change in functionality
Revision 153 - (view) (annotate) - [select for diffs]
Modified Wed May 16 17:22:08 2007 UTC (17 years, 4 months ago) by duarte
File length: 16991 byte(s)
Diff to previous 145
NEW FUNCTIONALITY: Reading from pdb file given chain code or model serial fully implemented
Changed the chain that is dumped in dump2pdbfile directly to the Pdb.chain field i.e. internal chain identifier
Loads of new comments, including java doc for all constructors
Revision 145 - (view) (annotate) - [select for diffs]
Modified Tue May 15 13:28:24 2007 UTC (17 years, 4 months ago) by duarte
File length: 13486 byte(s)
Diff to previous 140
Made some fields public: sequence, accode, chaincode, model
Revision 140 - (view) (annotate) - [select for diffs]
Modified Mon May 14 15:34:21 2007 UTC (17 years, 4 months ago) by stehr
File length: 13465 byte(s)
Diff to previous 139
Made Pdb.acccode public
Revision 139 - (view) (annotate) - [select for diffs]
Modified Mon May 14 15:29:08 2007 UTC (17 years, 4 months ago) by duarte
File length: 13458 byte(s)
Diff to previous 138
Changed default accode and chaincode to "Unknown" when reading from pdb file
Revision 138 - (view) (annotate) - [select for diffs]
Modified Mon May 14 14:58:29 2007 UTC (17 years, 4 months ago) by duarte
File length: 13399 byte(s)
Diff to previous 137
FIXED BUG: wasn't setting the chain field when reading from msdsd
Revision 137 - (view) (annotate) - [select for diffs]
Modified Mon May 14 14:53:09 2007 UTC (17 years, 4 months ago) by stehr
File length: 13370 byte(s)
Diff to previous 135
Made chain field in PDB class public
Revision 135 - (view) (annotate) - [select for diffs]
Modified Mon May 14 09:49:04 2007 UTC (17 years, 4 months ago) by duarte
File length: 13363 byte(s)
Diff to previous 133
NEW FUNCTIONALITY: reading of graph from db is fully implemented for all cases

New chain member variable in the Info classes, read in get_asym_id (Pdbase) and in get_chain_id (Msdsd)
Reading chain also in Pdb in read_pdb_data_from_file
Not reading chain anymore in read_atomData of PdbaseInfo
Added oneletter2threeletter and getoneletter2threeletter to AA class
Changes in Graph:
- added db static vars and getUserName method
- new member variables graphid and sm_id
- new method read_graph_from_db to read contacts, nodes (and sequence from nodes) from db
- new method getgraphid
New Exception class GraphIdNotFoundError
Revision 133 - (view) (annotate) - [select for diffs]
Modified Fri May 11 09:37:38 2007 UTC (17 years, 4 months ago) by duarte
File length: 12833 byte(s)
Diff to previous 130
New functionality: now can create a Pdb object passing a model serial for NMR structures. Not implemented when reading from pdb files!
Revision 130 - (view) (annotate) - [select for diffs]
Modified Thu May 10 15:52:24 2007 UTC (17 years, 4 months ago) by duarte
File length: 11799 byte(s)
Diff to previous 129
NEW FEATURE: reading pdb data from msdsd
New classes MsdsdInfo and its exception classes
FIXED BUG in dump2pdbfile in Pdb: was not sorting the atom lines
Revision 129 - (view) (annotate) - [select for diffs]
Modified Thu May 10 13:12:32 2007 UTC (17 years, 4 months ago) by duarte
File length: 10095 byte(s)
Diff to previous 127
NEW FUNCTIONALITY: can retrieve now a ContactMap object from a Graph object
New method getCM in Graph. New member variables: sequence, accode, chain, nodes, directed
Passing more data from Pdb to Graph in get_graph
New constructor in ContactMap
Revision 127 - (view) (annotate) - [select for diffs]
Modified Wed May 9 14:54:02 2007 UTC (17 years, 4 months ago) by duarte
File length: 8991 byte(s)
Diff to previous 124
Implemented read of pdb data from pdb file.
FIXED BUG in dumping of pdb file. Was missing end of line in atom lines
Added more tests in testPdb

Revision 124 - (view) (annotate) - [select for diffs]
Modified Wed May 9 11:57:24 2007 UTC (17 years, 4 months ago) by duarte
File length: 6497 byte(s)
Diff to previous 123
Added error handling for PdbaseInfo: 2 new exception classes
Revision 123 - (view) (annotate) - [select for diffs]
Added Wed May 9 10:45:53 2007 UTC (17 years, 4 months ago) by duarte
File length: 6320 byte(s)
Initial commit of the proteinstructure package. Contains classes to use pdb protein structures

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

  Diffs between and
  Type of Diff should be a