Changeset 2279 for research/2008-displacement/main.cTweet

Timestamp:

Apr 16, 2008, 12:09:47 AM (15 years ago)

Author:

Sam Hocevar

Message:

• Various cosmetic changes.

File:

• research/2008-displacement/main.c (modified) (6 diffs)

research/2008-displacement/main.c

@@ -557 +557 @@
     free(tmp);
 
-    printf("E = %g E_fast = %g E_min = %g dx = %g dy = %g\n",
+    printf("E: %g E_fast: %g E_min: %g dx: %g dy: %g\n",
            1000. * e0, 1000. * e1, 1000. * best, fx, fy);
     fflush(stdout);
@@ -685 +685 @@
                 /* We only want 4-cell kernels for now */
                 if(b2) continue;
-                //printf("K = %d,%d,%d,%d,%d ", a2, b2, c2, d2, e2);
-                printf("K = %d,%d,%d,%d ", a2, c2, d2, e2);
+                //printf("K: %d,%d,%d,%d,%d ", a2, b2, c2, d2, e2);
+                printf("K: %d,%d,%d,%d ", a2, c2, d2, e2);
 
                 dest = ed(src, false, a2, 0,
@@ -699 +699 @@
                     tmp = gauss(src, mat);
                     tmp2 = gauss(dest, mat);
-                    printf("E = %.5g\n", 1000. * dist(tmp, tmp2, 1.));
+                    printf("E: %.5g\n", 1000. * dist(tmp, tmp2, 1.));
                     free(tmp);
                     free(tmp2);
@@ -718 +718 @@
                          0, 3, 5, 1, 0,
                          0, 0, 0, 0, 0);
+            printf("[1] ");
             study(src, dest, 1.2, 0.001, .16, .28);
             free(dest);
@@ -724 +725 @@
                          3, 5, 7, 5, 3,
                          1, 3, 5, 3, 1);
+            printf("[2] ");
             study(src, dest, 1.2, 0.001, .26, .76);
             free(dest);
 
             dest = ostromoukhov(src);
+            printf("[3] ");
             study(src, dest, 1.2, 0.001, .0, .19);
             free(dest);
@@ -734 +737 @@
                   0, 1373, 3457, 2258, 0,
                   0,    0,    0,    0, 0);
+            printf("[4] ");
             study(src, dest, 1.2, 0.001, .0, .34);
         }