6419fc05af66878081e2b7d4d944900ec42d7cb1 tdreszer Fri Jun 22 15:29:37 2012 -0700 First of many checkins as dictated by Jim's OCD. Formatting space after if and limiting lines to 100 chars. Changes limited to lines last touched by tdreszer (git blame) so as not to ruin history. None of these changes should affect executables in any way. Only affect is to my sanity and Jim's. diff --git src/ameme/fixpAmeme.c src/ameme/fixpAmeme.c index fe53010..88cecc6 100644 --- src/ameme/fixpAmeme.c +++ src/ameme/fixpAmeme.c @@ -2244,40 +2244,37 @@ if (isControlRun) goodName = randomSpoof(goodName); if (isRandomTest ) { puts("

Random test mode - this will take a good long time. Be sure to kill " "the process if you get impatient.

\n"); doRandomTest(badName, premade); } else { if (isFromWeb && calcApproximateTime() > 5.0) { errAbort("Sorry, this job is too big for our web server - it would use about " "%2.1f minutes of CPU time. Out of fairness to the other users of this " "machine we limit jobs to 5.0 minutes of CPU time or less. Please reduce " - "the size of your data (now %d sequences of %d bases each), " - "the number of motifs you're looking " - "for (now %d), or the number of sequences in the initial scan (now %d). " - "The most important influence on run time is the maximum size of an individual sequence. " - " If you really need " - "to run the program on a data set this large contact Jim Kent (kent@biology.ucsc.edu) " - "to get a batch version of this program to run on your own machine.", calcApproximateTime(), - goodSeqListSize, goodSeqElSize, - numMotifs, startScanLimit - ); + "the size of your data (now %d sequences of %d bases each), the number of " + "motifs you're looking for (now %d), or the number of sequences in the initial " + "scan (now %d). The most important influence on run time is the maximum size " + "of an individual sequence. If you really need to run the program on a data " + "set this large contact Jim Kent (kent@biology.ucsc.edu) to get a batch version " + "of this program to run on your own machine.", calcApproximateTime(), + goodSeqListSize, goodSeqElSize, numMotifs, startScanLimit ); } puts("

Improbizer will display the results in parts. First it will " "display the profiles (consensus sequences with the probability of " "each base at each position) individually as they are calculated. The " "position of a profile in a sequence is indicated by upper case. The " "strength of the profile match is indicated by the score on the left. " "There will be a delay during this phase as each profile is calculated. " "Second Improbizer will " "display all profiles at one over each sequence. Each profile " "has it's own color and the stronger the profile matches the darker " "it will appear in the sequence. Finally there will be a graphic " "summary of all the profiles at the end, using the same color " "conventions.

"); oneSearchSet(badName, premade, NULL); }