Changeset 43

Timestamp:

09/25/07 05:57:33 (5 years ago)

Author:

cs186

Message:

skeleton for HW2

Location:

hw/hw2/postgresql-8.2.4/src/backend/utils/adt

Files:

• geo_ops.c (modified) (4 diffs)
• geo_selfuncs.c (modified) (1 diff)

hw/hw2/postgresql-8.2.4/src/backend/utils/adt/geo_ops.c

@@ -68 +68 @@
 static Point *line_interpt_internal(LINE *l1, LINE *l2);
 
-
 /*
  * Delimiters for input and output strings.
@@ -809 +808 @@
 }
 
+double box_distance_internal(BOX *box1, BOX *box2)
+{
+  Point         a,
+                                b;
+
+        box_cn(&a, box1);
+        box_cn(&b, box2);
+  return(HYPOT(a.x - b.x, a.y - b.y));
+        
+}
 
 /*              box_distance    -               returns the distance between the
@@ -818 +827 @@
         BOX                *box1 = PG_GETARG_BOX_P(0);
         BOX                *box2 = PG_GETARG_BOX_P(1);
-        Point           a,
-                                b;
-
-        box_cn(&a, box1);
-        box_cn(&b, box2);
-
-        PG_RETURN_FLOAT8(HYPOT(a.x - b.x, a.y - b.y));
+  double   result = box_distance_internal(box1, box2);
+
+        PG_RETURN_FLOAT8(result);
 }
 
@@ -5248 +5253 @@
         return FALSE;
 }
+
+double box_mindist_internal(BOX *box1, BOX *box2)
+{
+  /* CS186 HW2: fill me in! */
+}
+
+Datum box_mindistance(PG_FUNCTION_ARGS)
+{
+        BOX            *box1 = PG_GETARG_BOX_P(0);
+        BOX            *box2 = PG_GETARG_BOX_P(1);
+        
+        PG_RETURN_FLOAT8(box_mindist_internal(box1, box2));
+}
+
+Datum box_true(PG_FUNCTION_ARGS)
+{
+        PG_RETURN_BOOL(TRUE);
+}

hw/hw2/postgresql-8.2.4/src/backend/utils/adt/geo_selfuncs.c

@@ -94 +94 @@
         PG_RETURN_FLOAT8(0.001);
 }
+
+/* useful for near-neighbor predicates */
+Datum
+zerosel(PG_FUNCTION_ARGS)
+{
+        PG_RETURN_FLOAT8(0);
+}