src/hg/oneShot/freen/freen.c 1.96
1.96 2010/01/04 19:12:39 kent
Merging viewInTheMiddle branch.
Index: src/hg/oneShot/freen/freen.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/oneShot/freen/freen.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -b -B -U 4 -r1.95 -r1.96
--- src/hg/oneShot/freen/freen.c 3 Dec 2009 06:03:50 -0000 1.95
+++ src/hg/oneShot/freen/freen.c 4 Jan 2010 19:12:39 -0000 1.96
@@ -5,91 +5,22 @@
#include "memalloc.h"
#include "dystring.h"
#include "linefile.h"
#include "hash.h"
-#include "rql.h"
-
-char *simplifyPathToDir(char *path);
-
-static char const rcsid[] = "$Id$";
+#include "portable.h"
void usage()
{
errAbort("freen - test some hairbrained thing.\n"
- "usage: freen file\n");
+ "usage: freen input\n");
}
-#ifdef SOON
-static struct optionSpec options[] = {
- {NULL, 0},
-};
-#endif
-
-void rangeRoundUp(double start, double end, double *retStart, double *retEnd)
-/* Round start and end so that they cover a slightly bigger range, but with more round
- * numbers. For instance 0.23:9.89 becomes 0:10 */
-{
-double size = end - start;
-if (size < 0)
- errAbort("start (%g) after end (%g) in rangeRoundUp", start, end);
-
-/* Flat ranges get moved to include zero for scale. */
-if (size == 0.0)
- {
- if (start < 0.0)
- {
- *retStart = start;
- *retEnd = 0;
- }
- else if (start > 0.0)
- {
- *retStart = 0;
- *retEnd = end;
- }
- else
- {
- *retStart = 0;
- *retEnd = 1;
- }
- return;
- }
-
-/* Figure out "increment", which will be 1, 2, 5, or 10, or a multiple of 10 of these
- * Want to have at least two increments in range. */
-double exponent = 1;
-double scaledSize = size;
-double increment = 0;
-while (scaledSize < 100)
- {
- scaledSize *= 10;
- exponent /= 10;
- }
-while (scaledSize >= 100)
- {
- scaledSize /= 10;
- exponent *= 10;
- }
-/* At this point have a number between 10 and 100 */
-if (scaledSize < 10)
- increment = 1;
-else if (scaledSize < 20)
- increment = 2;
-else
- increment = 5;
-increment *= exponent;
-
-int startInIncrements = floor(start/increment);
-int endInIncrements = ceil(end/increment);
-*retStart = startInIncrements * increment;
-*retEnd = endInIncrements * increment;
-}
+
void freen(char *a)
/* Test some hair-brained thing. */
{
-struct lineFile *lf = lineFileOnString("query", TRUE, cloneString(a));
-struct rqlStatement *rql = rqlStatementParse(lf);
-rqlStatementDump(rql, stdout);
+uglyf("%s\n", simplifyPathToDir(a));
}
int main(int argc, char *argv[])
/* Process command line. */