annotate BEDTools-Version-2.14.3/src/overlap/overlap.cpp @ 0:dfcd8b6c1bda

Uploaded
author aaronquinlan
date Thu, 03 Nov 2011 10:25:04 -0400
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
1 /*****************************************************************************
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
2 overlap.cpp
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
3
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
4 (c) 2009 - Aaron Quinlan
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
5 Hall Laboratory
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
6 Department of Biochemistry and Molecular Genetics
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
7 University of Virginia
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
8 aaronquinlan@gmail.com
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
9
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
10 Licenced under the GNU General Public License 2.0 license.
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
11 ******************************************************************************/
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
12 #include <vector>
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
13 #include <iostream>
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
14 #include <fstream>
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
15 #include <stdlib.h>
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
16
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
17 #include "version.h"
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
18 #include "lineFileUtilities.h"
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
19 #include "bedFile.h"
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
20 using namespace std;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
21
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
22
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
23 // define our program name
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
24 #define PROGRAM_NAME "overlap"
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
25
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
26 // define our parameter checking macro
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
27 #define PARAMETER_CHECK(param, paramLen, actualLen) (strncmp(argv[i], param, min(actualLen, paramLen))== 0) && (actualLen == paramLen)
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
28
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
29
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
30 // function declarations
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
31 void ShowHelp(void);
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
32 void DetermineInput(string &inFile, short &s1Col, short &e1Col, short &s2Col, short &e2Col);
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
33 void ComputeOverlaps(istream &input, short &s1Col, short &e1Col, short &s2Col, short &e2Col);
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
34
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
35 int main(int argc, char* argv[]) {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
36
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
37 // input files
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
38 string inFile = "stdin";
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
39 string columns;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
40
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
41 // our configuration variables
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
42 bool showHelp = false;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
43 bool haveInFile = true;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
44 bool haveColumns = false;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
45
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
46
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
47 for(int i = 1; i < argc; i++) {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
48 int parameterLength = (int)strlen(argv[i]);
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
49
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
50 if((PARAMETER_CHECK("-h", 2, parameterLength)) ||
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
51 (PARAMETER_CHECK("--help", 5, parameterLength))) {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
52 showHelp = true;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
53 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
54 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
55
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
56 if(showHelp) ShowHelp();
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
57
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
58 // do some parsing (all of these parameters require 2 strings)
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
59 for(int i = 1; i < argc; i++) {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
60
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
61 int parameterLength = (int)strlen(argv[i]);
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
62
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
63 if(PARAMETER_CHECK("-i", 2, parameterLength)) {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
64 if ((i+1) < argc) {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
65 inFile = argv[i + 1];
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
66 i++;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
67 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
68 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
69 else if(PARAMETER_CHECK("-cols", 5, parameterLength)) {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
70 haveColumns = true;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
71 columns = argv[i + 1];
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
72 i++;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
73 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
74 else {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
75 cerr << endl << "*****ERROR: Unrecognized parameter: " << argv[i] << " *****" << endl << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
76 showHelp = true;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
77 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
78 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
79
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
80 // make sure we have an input files
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
81 if (!haveInFile ) {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
82 cerr << endl << "*****" << endl << "*****ERROR: Need -i file. " << endl << "*****" << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
83 showHelp = true;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
84 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
85
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
86 if (!showHelp) {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
87
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
88 // Split the column string sent by the user into discrete column numbers
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
89 // A comma separated string is expected.
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
90 vector<string> posColumns;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
91 Tokenize(columns, posColumns, ",");
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
92
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
93 if (posColumns.size() != 4) {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
94 cerr << endl << "*****" << endl << "*****ERROR: Please specify 4, comma-separated position columns. " << endl << "*****" << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
95 ShowHelp();
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
96 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
97 else {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
98 short s1, e1, s2, e2;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
99 s1 = atoi(posColumns[0].c_str());
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
100 e1 = atoi(posColumns[1].c_str());
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
101 s2 = atoi(posColumns[2].c_str());
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
102 e2 = atoi(posColumns[3].c_str());
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
103
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
104 DetermineInput(inFile, s1, e1, s2, e2);
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
105 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
106 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
107 else {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
108 ShowHelp();
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
109 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
110 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
111
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
112 void ShowHelp(void) {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
113
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
114 cerr << endl << "Program: " << PROGRAM_NAME << " (v" << VERSION << ")" << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
115
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
116 cerr << "Author: Aaron Quinlan (aaronquinlan@gmail.com)" << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
117
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
118 cerr << "Summary: Computes the amount of overlap (positive values)" << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
119 cerr << "\t or distance (negative values) between genome features" << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
120 cerr << "\t and reports the result at the end of the same line." << endl << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
121
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
122 cerr << "Usage: " << PROGRAM_NAME << " [OPTIONS] -i <input> -cols s1,e1,s2,e2 " << endl << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
123
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
124 cerr << "Options: " << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
125 cerr << "\t-i\t" << "Input file. Use \"stdin\" for pipes." << endl << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
126
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
127 cerr << "\t-cols\t" << "Specify the columns (1-based) for the starts and ends of the" << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
128 cerr << "\t\tfeatures for which you'd like to compute the overlap/distance." << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
129 cerr << "\t\tThe columns must be listed in the following order: " << endl << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
130 cerr << "\t\tstart1,end1,start2,end2" << endl << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
131
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
132 cerr << "Example: " << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
133 cerr << "\t$ windowBed -a A.bed -b B.bed -w 10" << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
134 cerr << "\tchr1 10 20 A chr1 15 25 B" << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
135 cerr << "\tchr1 10 20 C chr1 25 35 D" << endl << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
136 cerr << "\t$ windowBed -a A.bed -b B.bed -w 10 | overlap -i stdin -cols 2,3,6,7" << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
137 cerr << "\tchr1 10 20 A chr1 15 25 B 5" << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
138 cerr << "\tchr1 10 20 C chr1 25 35 D -5" << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
139
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
140 // end the program here
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
141 exit(1);
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
142
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
143 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
144
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
145
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
146 void DetermineInput(string &inFile, short &s1Col, short &e1Col, short &s2Col, short &e2Col) {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
147
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
148
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
149 if (inFile != "stdin") { // process a file
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
150
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
151 ifstream in(inFile.c_str(), ios::in);
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
152 if ( !in ) {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
153 cerr << "Error: The requested input file (" << inFile << ") could not be opened. Exiting!" << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
154 exit (1);
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
155 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
156 ComputeOverlaps(in, s1Col, e1Col, s2Col, e2Col);
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
157 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
158 else ComputeOverlaps(cin, s1Col, e1Col, s2Col, e2Col);
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
159 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
160
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
161
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
162 void ComputeOverlaps(istream &input, short &s1Col, short &e1Col, short &s2Col, short &e2Col) {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
163
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
164 int lineNum = 0;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
165 string inLine;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
166 vector<string> inFields;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
167
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
168 int overlap;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
169
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
170 char *s1End, *e1End, *s2End, *e2End;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
171 long s1, e1, s2, e2;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
172
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
173 while (getline(input, inLine)) {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
174 lineNum++;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
175 Tokenize(inLine, inFields);
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
176
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
177 if (inFields.size() > 1) {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
178
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
179 // test if columns 2 and 3 are integers. If so, assume BED.
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
180 s1 = strtol(inFields[s1Col-1].c_str(), &s1End, 10);
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
181 e1 = strtol(inFields[e1Col-1].c_str(), &e1End, 10);
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
182 s2 = strtol(inFields[s2Col-1].c_str(), &s2End, 10);
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
183 e2 = strtol(inFields[e2Col-1].c_str(), &e2End, 10);
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
184
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
185 // strtol will set pointers to the start of the string if non-integral, base 10
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
186 // if they all check out, we have valid numeric columns. Otherwise, complain.
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
187 if (s1End != inFields[s1Col-1].c_str() &&
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
188 e1End != inFields[e1Col-1].c_str() &&
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
189 s2End != inFields[s2Col-1].c_str() &&
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
190 e2End != inFields[e2Col-1].c_str()) {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
191
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
192 overlap = overlaps(s1, e1, s2, e2);
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
193 printf("%s\t%d\n", inLine.c_str(), overlap);
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
194 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
195 else {
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
196 cerr << "One of your columns appears to be non-numeric at line " << lineNum << ". Exiting..." << endl << endl;
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
197 exit(1);
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
198 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
199 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
200 inFields.clear();
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
201 }
dfcd8b6c1bda Uploaded
aaronquinlan
parents:
diff changeset
202 }