Changeset 30983

Timestamp:

Mar 18, 2011, 6:09:58 PM (15 years ago)

Author:

watersc1

Message:

Added -C mode to calculate matches using great circle distances instead of Cartesian distances. It's much slower, but that's the tradeoff

Location:

trunk/Ohana/src/gcompare

Files:

• Makefile (modified) (1 diff)
• include/gcompare.h (modified) (1 diff)
• src/gc_compare.c (added)
• src/gcompare.c (modified) (5 diffs)

trunk/Ohana/src/gcompare/Makefile

@@ -24 +24 @@
 $(SRC)/compare.$(ARCH).o                        $(SRC)/sort.$(ARCH).o                   \
 $(SRC)/count_neighbors.$(ARCH).o                $(SRC)/nextline.$(ARCH).o               \
-$(SRC)/nextword.$(ARCH).o                       $(SRC)/gcompare.$(ARCH).o
+$(SRC)/nextword.$(ARCH).o                       $(SRC)/gcompare.$(ARCH).o               \
+$(SRC)/gc_compare.$(ARCH).o
 
 $(GCOMPARE): $(INC)/gcompare.h

trunk/Ohana/src/gcompare/include/gcompare.h

@@ -26 +26 @@
 data_type          input             PROTO((char *, int, int, int));
 match_type        *compare           PROTO((data_type, data_type, int *, double, double, double, double));
+match_type        *gc_compare        PROTO((data_type, data_type, int *, double, double, double, double));
 int                get_argument      PROTO((int, char **, char *));
 int                remove_argument   PROTO((int, int *, char **));

trunk/Ohana/src/gcompare/src/gcompare.c

@@ -6 +6 @@
   
   int Nskip1, Nskip2, Nmatches, N;
-  int X1, X2, Y1, Y2, deltas, match, nomatch1, nomatch2;
+  int X1, X2, Y1, Y2, deltas, match, nomatch1, nomatch2, greatcircle;
   data_type data1, data2;
   match_type *matches;
@@ -12 +12 @@
 
   DX = DY = Nskip1 = Nskip2 = 0;
-  noauto = match = nomatch1 = nomatch2 = deltas = FALSE;
+  noauto = match = nomatch1 = nomatch2 = deltas = greatcircle = FALSE;
 
   if (remove_argument(get_argument (argc, argv, "-d"), &argc, argv))
@@ -26 +26 @@
   if (remove_argument(get_argument (argc, argv, "-n2"), &argc, argv))
     nomatch2 = TRUE;
+  if (remove_argument(get_argument (argc, argv, "-C"), &argc, argv))
+    greatcircle = TRUE;
   if (!(match || deltas || nomatch1 || nomatch2)) {
     fprintf (stderr, "no output mode, use at least one of -d, -m, -n1, or -n2\n");
@@ -75 +77 @@
 
   fprintf (stderr, "noauto: %e\n", noauto);
-  matches = compare (data1, data2, &Nmatches, radius, DX, DY, noauto);
+  if (greatcircle) {
+    matches = gc_compare (data1, data2, &Nmatches, radius, DX, DY, noauto);
+  }
+  else {
+    matches = compare (data1, data2, &Nmatches, radius, DX, DY, noauto);
+  }
+
 
   output (data1, data2, matches, Nmatches, match, deltas, nomatch1, nomatch2);
@@ -90 +98 @@
   fprintf (stderr, "  -d      return delta coords\n");
   fprintf (stderr, "  -m      return matched lines\n");
+  fprintf (stderr, "  -C      uses great circle calculation\n");
   fprintf (stderr, "  -n1     return unmatched lines, file 1\n");
   fprintf (stderr, "  -n2     return unmatched lines, file 2\n");