src/hg/oneShot/freen/freen.c 1.94

Index: src/hg/oneShot/freen/freen.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/oneShot/freen/freen.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -b -B -U 4 -r1.93 -r1.94
--- src/hg/oneShot/freen/freen.c	22 Nov 2009 00:18:05 -0000	1.93
+++ src/hg/oneShot/freen/freen.c	24 Nov 2009 00:59:18 -0000	1.94
@@ -17,26 +17,88 @@
 errAbort("freen - test some hairbrained thing.\n"
          "usage:  freen file\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;
 
-void freen(char *input)
+int startInIncrements = floor(start/increment);
+int endInIncrements = ceil(end/increment);
+*retStart = startInIncrements * increment;
+*retEnd = endInIncrements * increment;
+}
+
+void freen(char *a, char *b)
 /* Test some hair-brained thing. */
 {
-extern void simplifyPathToDirSelfTest();
-simplifyPathToDirSelfTest();
-printf("%s\n", simplifyPathToDir(input));
+double x = atof(a), y = atof(b);
+double nx, ny;
+rangeRoundUp(x, y, &nx, &ny);
+printf("old %g:%g  new %g:%g\n", x, y, nx, ny);
 }
 
 int main(int argc, char *argv[])
 /* Process command line. */
 {
-optionInit(&argc, argv, options);
-if (argc != 2)
+// optionInit(&argc, argv, options);
+
+if (argc != 3)
     usage();
-freen(argv[1]);
+freen(argv[1], argv[2]);
 return 0;
 }