Links to HEAD: | (view) (annotate) |
Sticky Revision: | |
Sort logs by: |
Fixed bug in Graph constructor from sadp's ContactMap
contactTypes.dat -SC_CAGLY contact type added SecStrucElement.java -getSheetSerial method is now public Pdb.java -writeToDbFast added Graph.java -write_graph_to_db_fast -expBB,CW,CT,CR,w,d are now taken into account in a correct way -node_id, sssid, sheetSerial and turn are now also filled in DbGraph.java -expBB,CW,CT,CR,w,d are now taken into account in a correct way -directionality is also taken into account now when reading edges genDbGraph.java -sequence separation added as option createGraphDb.java added
Not asserting anymore pdbChainCode to be uppercase. pdb chain codes are case sensitive!
New method setSequence
finally implemented the setCutoff method ;)
fixed nasty bug in constructor Graph(sequence) (residue indexing was wrong)
added method setCutoff() and some javadocs
Fixed bug: getContacts was not copying weights Got rid of useless copyKeepingNodes(), made main Graph constructor public. Some new setters and getters
Method writeUndirUnweightGraphToNetworkFiles added in Graph class
Now weights are kept in the Edge objects rather than separately in a member variable in Graph
Graph,PredEval: added fields coverage and title to predEval (and evalPrediction) GraphAverager: added method to return average graph (with weighted edges) PdbfilePdb: fixed bug when reading from Casp prediction files
Changed constructor with all parameters to protected, now shouldn't be used at all outside of package
Added two new constructors for Graph (sequence only and no parameters), changed interface of GraphAverager (pass target sequence instead of target graph), extracted constant DEFAULT_WEIGHT in Edge.
Added GraphAverager class and PredEval class. GraphAverager copied from HomologyPredictor (in CMPredict): doing the averaging correctly now Added method evaluatePrediction to Graph Some refactoring in Alignment and better javadocs
Removed class AA and replace it by AAinfo, which reads contact types from separate file contactTypes.dat New class ContactType which contains atoms for each contact type and residue. A static object for each contact type is loaded into AAinfo upon reading the contactTypes.dat file Changed all references accordingly
Better checks for sequence equality in compare
Now also filling chain_pdb_code in write_graph_to_db
Fixed bug in compare, wasn't assigning new weights
Introduced weights in Graph objects: we can read them from file or db and write them into file or db. On calling pdb.get_graph the weighs are taken as number of atom-edges per residue-edge (similar to Ioannis weights in chain_graph tables)
Fixed bug in Graph constructor: was not getting correct fullLength (related to last bug fix)
Added secondary structure to write_graph_to_db New method getNumSecStructureElements in SecondaryStructure
Added new SecondaryStructure object to Pdb and Graph
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
Made constructor public
New methods containsContact and resetContacts
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
Fixed bug in addEdge method. In case of undirected we need to check that the contact is inserted in the right order j>i
Made ContactList a TreeSet instead of an ArrayList, should improve performance (log(n) rather than linear) REFACTORING: ContactList -> EdgeSet Contact -> Edge
Now checking in addEdge that we don't duplicate edges New methods: get2ndshell, copyKeepingNodes
now casting pdb codes to lower and pdb chain codes to upper in all constructors
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
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
Major refactoring: accode -> pdbCode chaincode -> pdbChainCode chain -> chainCode Major change of signatures (publics to privates) Implemented getters for needed member variables Major clean up
Using apache xmlrpc version 3.0 in PyMolServerOutputStream
MySQLConnection now throwing SQLException on connect Many files changed following this: all calling classes now re-throwing or catching the SQLException
Made contacts public
New method getAllEdgeNbhSizes
Added basic compare method to the Graph class and test class compareCMs
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
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
New functionality: added methods to get node/edge neighbours
made Graph.directed public
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
FIXED BUG in get_db_graph_info, was not dealing well with the case of chaincode being NULL in the database
FIXED BUG: in getCM when directed was passing a reference to the contacts object and not deep copying it!
Now passing also chaincode from Pdb object to Graph object in get_graph
Fixed bug: wasn't initialising accode, chain and chaincode when reading to file. Now all set to "" when not present in file
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
Made cutoff and ct public
Made some fields public: sequence, accode, chaincode, model
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
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
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
Changed input in constructor for reading from db: chain->chaincode Now getgraphid initialises too the internal chain code (pchain_code from graph db)
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
Implemented basic reading contacts from file
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
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.