ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/owl/trunk/proteinstructure/Graph.java
Links to HEAD: (view) (annotate)
Sticky Revision:
(Current path doesn't exist after revision 490)
Sort logs by:
Revision 252 - (view) (annotate) - [select for diffs]
Modified Thu Aug 9 10:37:14 2007 UTC (17 years, 1 month ago) by duarte
File length: 11994 byte(s)
Diff to previous 249
Made constructor public
Revision 249 - (view) (annotate) - [select for diffs]
Modified Sat Aug 4 17:53:11 2007 UTC (17 years, 1 month ago) by duarte
File length: 11997 byte(s)
Diff to previous 240
New methods containsContact and resetContacts
Revision 240 - (view) (annotate) - [select for diffs]
Modified Tue Jul 31 13:51:59 2007 UTC (17 years, 2 months ago) by duarte
File length: 11617 byte(s)
Diff to previous 239
Fixed bug in delEdge. Wasn't taking care of if contact was given as i>j in undirected case. Also recount of contacts and set of modified to true was wrong
Revision 239 - (view) (annotate) - [select for diffs]
Modified Mon Jul 30 10:57:28 2007 UTC (17 years, 2 months ago) by duarte
File length: 11153 byte(s)
Diff to previous 234
Fixed bug in addEdge method. In case of undirected we need to check that the contact is inserted in the right order j>i
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: 10826 byte(s)
Diff to previous 232
Made ContactList a TreeSet instead of an ArrayList, should improve performance (log(n) rather than linear)
REFACTORING: 
ContactList -> EdgeSet
Contact -> Edge
Revision 232 - (view) (annotate) - [select for diffs]
Modified Tue Jul 10 13:00:23 2007 UTC (17 years, 2 months ago) by duarte
File length: 10801 byte(s)
Diff to previous 217
Now checking in addEdge that we don't duplicate edges
New methods: get2ndshell, copyKeepingNodes
Revision 217 - (view) (annotate) - [select for diffs]
Modified Fri Jun 29 09:04:00 2007 UTC (17 years, 3 months ago) by stehr
File length: 9745 byte(s)
Diff to previous 208
now casting pdb codes to lower and pdb chain codes to upper in all constructors
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: 9518 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: 9771 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: 22256 byte(s)
Diff to previous 203
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 203 - (view) (annotate) - [select for diffs]
Modified Tue Jun 26 14:25:58 2007 UTC (17 years, 3 months ago) by duarte
File length: 21086 byte(s)
Diff to previous 202
Using apache xmlrpc version 3.0 in PyMolServerOutputStream
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: 21084 byte(s)
Diff to previous 192
MySQLConnection now throwing SQLException on connect
Many files changed following this: all calling classes now re-throwing or catching the SQLException
Revision 192 - (view) (annotate) - [select for diffs]
Modified Tue Jun 12 18:27:20 2007 UTC (17 years, 3 months ago) by duarte
File length: 20938 byte(s)
Diff to previous 191
Made contacts public
Revision 191 - (view) (annotate) - [select for diffs]
Modified Tue Jun 12 17:15:17 2007 UTC (17 years, 3 months ago) by duarte
File length: 20931 byte(s)
Diff to previous 189
New method getAllEdgeNbhSizes
Revision 189 - (view) (annotate) - [select for diffs]
Modified Tue Jun 12 10:38:29 2007 UTC (17 years, 3 months ago) by duarte
File length: 20240 byte(s)
Diff to previous 179
Added basic compare method to the Graph class and test class compareCMs
Revision 179 - (view) (annotate) - [select for diffs]
Modified Thu May 31 09:41:41 2007 UTC (17 years, 4 months ago) by duarte
File length: 18901 byte(s)
Diff to previous 175
FIXED BUG: fixed restrictContactsToMax/MinRange. Couldn't delete contacts at the same time as looping in them
NEW CLASSES NodeNbh and EdgeNbh, now used in getNodeNbh and getEdgeNbh
New method getResidueType
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: 18502 byte(s)
Diff to previous 165
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 165 - (view) (annotate) - [select for diffs]
Modified Thu May 24 15:43:13 2007 UTC (17 years, 4 months ago) by duarte
File length: 17003 byte(s)
Diff to previous 161
New functionality: added methods to get node/edge neighbours
Revision 161 - (view) (annotate) - [select for diffs]
Modified Thu May 24 10:12:41 2007 UTC (17 years, 4 months ago) by stehr
File length: 15881 byte(s)
Diff to previous 159
made Graph.directed public
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: 15874 byte(s)
Diff to previous 158
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 158 - (view) (annotate) - [select for diffs]
Modified Tue May 22 15:37:15 2007 UTC (17 years, 4 months ago) by duarte
File length: 14228 byte(s)
Diff to previous 157
FIXED BUG in get_db_graph_info, was not dealing well with the case of chaincode being NULL in the database
Revision 157 - (view) (annotate) - [select for diffs]
Modified Tue May 22 12:04:43 2007 UTC (17 years, 4 months ago) by duarte
File length: 14077 byte(s)
Diff to previous 156
FIXED BUG: in getCM when directed was passing a reference to the contacts object and not deep copying it!
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: 13955 byte(s)
Diff to previous 155
Now passing also chaincode from Pdb object to Graph object in get_graph
Revision 155 - (view) (annotate) - [select for diffs]
Modified Tue May 22 10:13:03 2007 UTC (17 years, 4 months ago) by duarte
File length: 13909 byte(s)
Diff to previous 152
Fixed bug: wasn't initialising accode, chain and chaincode when reading to file. Now all set to "" when not present in file
Revision 152 - (view) (annotate) - [select for diffs]
Modified Wed May 16 14:12:50 2007 UTC (17 years, 4 months ago) by duarte
File length: 13751 byte(s)
Diff to previous 146
FIXED 2 BUGS. NEW FEATURE reading graph from db given graph_id
Bugs:
- nodes TreeMap in read_graph_from_file contained one letter res codes, now three letter codes
- in getCM was passing residues as a TreeMap of nums to three letter residue types, now passing one letter residue types
New constructor for getting graph from db given graph_id, new method to go with that get_db_graph_info

Revision 146 - (view) (annotate) - [select for diffs]
Modified Tue May 15 13:51:17 2007 UTC (17 years, 4 months ago) by duarte
File length: 11310 byte(s)
Diff to previous 145
Made cutoff and ct public
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: 11296 byte(s)
Diff to previous 144
Made some fields public: sequence, accode, chaincode, model
Revision 144 - (view) (annotate) - [select for diffs]
Modified Tue May 15 12:13:31 2007 UTC (17 years, 4 months ago) by duarte
File length: 11289 byte(s)
Diff to previous 143
NEW FEATURE: Read and write graphs from file fully implemented.

Refactored read_contacts_from_file to read_graph_from_file. Now can read other fields as well as contacts. Also gets nodes if sequence present
New method write_graph_to_file

Revision 143 - (view) (annotate) - [select for diffs]
Modified Tue May 15 10:06:47 2007 UTC (17 years, 4 months ago) by duarte
File length: 9215 byte(s)
Diff to previous 142
FIXED BUG: last commit didn't fix bug correctly:
Changed the ContactMap constructor to put into residueNums and residueTypes nums from 1 to maximum of residues.keySet()

Made public accode and chain fields in Graph
Revision 142 - (view) (annotate) - [select for diffs]
Modified Tue May 15 08:33:44 2007 UTC (17 years, 4 months ago) by duarte
File length: 9201 byte(s)
Diff to previous 141
FIXED BUG: getCM wasn't working well when reading from db and there were unobserved residues

Now setting the sequence to blank when reading from db. Also when reading from file (still nodes reading is not implemented)
In ContactMap constructor different handling when sequence is blank
Revision 141 - (view) (annotate) - [select for diffs]
Modified Mon May 14 15:51:54 2007 UTC (17 years, 4 months ago) by duarte
File length: 8536 byte(s)
Diff to previous 135
Changed input in constructor for reading from db: chain->chaincode
Now getgraphid initialises too the internal chain code (pchain_code from graph db)
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: 8357 byte(s)
Diff to previous 134
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 134 - (view) (annotate) - [select for diffs]
Modified Mon May 14 07:52:10 2007 UTC (17 years, 4 months ago) by duarte
File length: 3795 byte(s)
Diff to previous 129
Implemented basic reading contacts from file
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: 2243 byte(s)
Diff to previous 123
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 123 - (view) (annotate) - [select for diffs]
Added Wed May 9 10:45:53 2007 UTC (17 years, 4 months ago) by duarte
File length: 651 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