geo 0.1.4 → 0.1.5

data/ext/line_set.c

@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 
-#include "common.h"
+#include <common.h>
 
 VALUE rb_line_set;
 
@@ -70,16 +70,17 @@ rb_line_set_delete(VALUE self, VALUE line) {
   return geo_set_delete(me, (gpointer) t, line);
 }
 
-static void
-g_hash_table_yield_line(gpointer key, gpointer value, gpointer user_data) {
-  rb_yield(( (Line *) key )->rbLine);
+static gpointer
+g_hash_table_yield_line(GeoSet *set, gpointer structure, gpointer user_data) {
+  rb_yield(( (Line *) structure )->rbLine);
+  return NULL;
 }
 
 VALUE
 rb_line_set_each(VALUE self) {
   GeoSet *set;
   GEO_SET(self, set);
-  geo_set_foreach(set, g_hash_table_yield_line);
+  geo_set_each_structure_until(set, g_hash_table_yield_line, NULL);
   return self;
 }
 
@@ -95,9 +96,13 @@ line_set_intersection(GeoSet *set, gpointer set_line_gp, gpointer line_gp) {
 
 gboolean
 line_set_intersects(GeoSet *set, Line *line) {
-  Intersection *intersection;
-  LINE_SET_REINDEX(set);
-  intersection = geo_set_each_structure_having_common_segment_id_with_line_until(set, line, line_set_intersection, line);
+  Intersection *intersection = NULL;
+  if (set->indexed) {
+    LINE_SET_REINDEX(set);
+    intersection = geo_set_each_structure_having_common_segment_id_with_line_until(set, line, line_set_intersection, line);
+  } else {
+    intersection = geo_set_each_structure_until(set, line_set_intersection, line);
+  }
   if (intersection != NULL)
     free_intersection(intersection);
   return GBOOL2RB(intersection != NULL);
@@ -147,127 +152,24 @@ line_set_closest_intersection(GeoSet *set, Line *line) {
   Intersection *closest = NULL;
   double closest_distance = -1;
   gpointer args[3] = { &closest_distance, &closest, line };
-  LINE_SET_REINDEX(set);
-  geo_set_each_structure_having_common_segment_id_with_line_until(set, line, line_set_closest_intersection_in_segments, args);
+  if (set->indexed) {
+    LINE_SET_REINDEX(set);
+    geo_set_each_structure_having_common_segment_id_with_line_until(set, line, line_set_closest_intersection_in_segments, args);
+  } else {
+    geo_set_each_structure_until(set, line_set_closest_intersection_in_segments, args);
+  }
   return closest;
 }
 
-static void
-line_set_slide(GeoSet *set, Line *line, gint ttl) {
+void
+line_set_slide_point(GeoSet *set, Line *line, gint ttl) {
+  gboolean done = FALSE;
+  Intersection *intersection;
   ZERO_DISTANCE_CHECK(line->p1, line->p2);
-  Intersection *intersection = line_set_closest_intersection(set, line);
-  if (intersection != NULL) {
-    Point touchPoint;
-    Point destOne;
-    Point destTwo;
-    gdouble distanceLeft;
-    gdouble errorOne;
-    gdouble errorTwo;
-    /*
-     * The line we want to adjust against. If the intersection is with a line of zero
-     * length, then it is against ourselves. Otherwise with the intersecting line.
-     */
-    gboolean zero_intersection = intersection->type == itLINE && ZERO_DISTANCE_P(intersection->with->p1, intersection->with->p2);
-    gdouble adjustment_length = zero_intersection ? DISTANCE(line->p1, line->p2) : DISTANCE(intersection->with->p1, intersection->with->p2);
-    gdouble adjustment_xunit = zero_intersection ? \
-      (line->p2->x - line->p1->x) / adjustment_length : \
-      (intersection->with->p2->x - intersection->with->p1->x) / adjustment_length;
-    gdouble adjustment_yunit = zero_intersection ? \
-      (line->p2->y - line->p1->y) / adjustment_length : \
-      (intersection->with->p2->y - intersection->with->p1->y) / adjustment_length;
-    /*
-     * Calculate where we actually touch the other line.
-     */
-    if (intersection->type == itLINE) {
-      if (DISTANCE(intersection->line->p1, line->p1) <
-	  DISTANCE(intersection->line->p2, line->p1)) {
-	touchPoint = *(intersection->line->p1);
-      } else {
-	touchPoint = *(intersection->line->p2);
-      }
-    } else {
-      touchPoint = *(intersection->point);
-    }
-    if (intersection->type == itPOINT) {
-      /*
-       * If we intersected with a point, move the touch point back towards the start point to not actually touch the other line.
-       */
-      if (line->p1->x > touchPoint.x) 
-	touchPoint.x += MIN(1, line->p1->x - touchPoint.x);
-      if (line->p1->x < touchPoint.x)
-	touchPoint.x -= MIN(1, touchPoint.x - line->p1->x);
-      if (line->p1->y > touchPoint.y)
-	touchPoint.y += MIN(1, line->p1->y - touchPoint.y);
-      if (line->p1->y < touchPoint.y)
-	touchPoint.y -= MIN(1, touchPoint.y - line->p1->y);
-    } else {
-      /*
-       * If we intersected with a line, move perpendicular to our adjustment-line.
-       */
-      if (rand() < RAND_MAX / 2) {
-	touchPoint.x += adjustment_yunit;
-	touchPoint.y -= adjustment_xunit;
-      } else {
-	touchPoint.x -= adjustment_yunit;
-	touchPoint.y += adjustment_xunit;
-      }
-    }
-    /*
-     * Now that we wont use the intersection anymore, lets free it.
-     */
+  while ((intersection = line_set_closest_intersection(set, line)) != NULL && ttl > 0 && !done) {
+    done = line_slide_point(intersection, line, ttl);
     free_intersection(intersection);
-    /*
-     * If the ttl is reached then we just set the line's p2 to the touchPoint.
-     */
-    if (ttl < 1) {
-      line->p2->x = touchPoint.x;
-      line->p2->y = touchPoint.y;
-    } else {
-      /*
-       * Otherwise we calculate two alternate destinations.
-       *
-       * If we intersected with a zero length line, then we just go ahead in our 
-       * original direction, otherwise we follow the intersecting line.
-       *
-       */
-      destOne = touchPoint;
-      destTwo = touchPoint;
-      distanceLeft = DISTANCE(line->p1, line->p2) - DISTANCE(&touchPoint, line->p1);
-      if (zero_intersection) {
-	destOne.x += adjustment_xunit * distanceLeft;
-	destOne.y += adjustment_yunit * distanceLeft;
-	destTwo.x += adjustment_xunit * distanceLeft;
-	destTwo.y += adjustment_yunit * distanceLeft;
-      } else {
-	destOne.x += adjustment_xunit * distanceLeft;
-	destOne.y += adjustment_yunit * distanceLeft;
-	destTwo.x -= adjustment_xunit * distanceLeft;
-	destTwo.y -= adjustment_yunit * distanceLeft;
-      }
-      /*
-       * And select the one with the least error.
-       */
-      errorOne = DISTANCE(line->p2, &destOne);
-      errorTwo = DISTANCE(line->p2, &destTwo);
-      if (DBL_EQL(errorOne, errorTwo)) {
-	line->p2->x = touchPoint.x;
-	line->p2->y = touchPoint.y;
-      } else {
-	if (errorOne < errorTwo) {
-	  line->p2->x = destOne.x;
-	  line->p2->y = destOne.y;
-	} else if (errorOne > errorTwo) {
-	  line->p2->x = destTwo.x;
-	  line->p2->y = destTwo.y;
-	}
-	line->p1->x = touchPoint.x;
-	line->p1->y = touchPoint.y;
-	/*
-	 * And slide along, in case something else gets in the way.
-	 */
-	line_set_slide(set, line, ttl - 1);
-      }
-    }
+    ttl--;
   }
 }
 
@@ -278,48 +180,64 @@ rb_line_set_slide(VALUE self, VALUE l) {
   CHECK_LINE(l);
   GEO_SET(self, set);
   LINE(l, line);
-  line_set_slide(set, line, 3);
+  line_set_slide_point(set, line, 3);
   return line->p2->rbPoint;
 }
 
 static void
-g_hash_table_intersection_free_endpoint(gpointer key, gpointer data, gpointer user_data) {
+g_hash_table_each_intersection_free_endpoint(gpointer key, gpointer data, gpointer user_data) {
   gpointer *arg_wrapper = (gpointer *) user_data;
   
   gpointer *original_args = (gpointer *) arg_wrapper[0];
   gdouble *max_distance = (gdouble *) original_args[1];
-  Line *tmpLine = (Line *) original_args[3];
-  
+  Line *tmpLine = (Line *) original_args[2];
+  GeoSet *line_set = (GeoSet *) original_args[3];
+  geo_set_structure_handler handler = (geo_set_structure_handler) original_args[4];
+  gpointer handler_args = original_args[5];
+  GHashTable *seen_points = (GHashTable *) original_args[6];
+
   *(tmpLine->p1) = *( (Point *) arg_wrapper[1] );
   *(tmpLine->p2) = *( (Point *) key);
   
   if (*max_distance < 0 || DISTANCE(tmpLine->p1, tmpLine->p2) < *max_distance) {
-    if (!line_set_intersects((GeoSet *) original_args[4], tmpLine)) {
-      rb_ary_push(*( (VALUE *) original_args[2] ), ( (Point *) key )->rbPoint);
+    if (!line_set_intersects(line_set, tmpLine)) {
+      if (g_hash_table_lookup(seen_points, key) == NULL) {
+	handler(line_set, key, handler_args);
+	g_hash_table_insert(seen_points, key, GINT_TO_POINTER(1));
+      }
     }
   }
 }
 
+static gpointer
+line_set_insert_point_into_rb_ary(GeoSet *line_set, gpointer point, gpointer rval) {
+  rb_ary_push(*( (VALUE *) rval ), ((Point *) point)->rbPoint);
+  return NULL;
+}
+
 static void
-g_hash_table_intersection_free_endpoints(gpointer key, gpointer data, gpointer user_data) {
+g_hash_table_each_intersection_free_endpoint_for_point(gpointer key, gpointer data, gpointer user_data) {
   gpointer my_args[2];
   gpointer *given_args = (gpointer *) user_data;
-  GeoSet *table = (GeoSet *) given_args[0];
+  GeoSet *endpoints = (GeoSet *) given_args[0];
   my_args[0] = user_data;
   my_args[1] = key;
-  g_hash_table_foreach(table->table, g_hash_table_intersection_free_endpoint, (gpointer) my_args);
+  g_hash_table_foreach(endpoints->table, g_hash_table_each_intersection_free_endpoint, (gpointer) my_args);
 }
  
-static VALUE
-line_set_intersection_free_endpoints(GeoSet *set, GeoSet *origins, GeoSet *endpoints, gdouble max_distance) {
-  VALUE rval = rb_ary_new();
+void
+line_set_each_intersection_free_endpoint(GeoSet *set, 
+					 GeoSet *origins, 
+					 GeoSet *endpoints, 
+					 gdouble max_distance, 
+					 geo_set_structure_handler handler,
+					 gpointer user_data) {
   Line *line = new_line_with_coordinates(0,0,0,0);
-  gpointer args[5] = { endpoints, &max_distance, &rval, line, set };
-  g_hash_table_foreach(origins->table, g_hash_table_intersection_free_endpoints, args);
-  free(line->p1);
-  free(line->p2);
-  free(line);
-  return rval;
+  GHashTable *seen_points = g_hash_table_new(g_direct_hash, g_direct_equal);
+  gpointer args[7] = { endpoints, &max_distance, line, set, handler, user_data, seen_points };
+  g_hash_table_foreach(origins->table, g_hash_table_each_intersection_free_endpoint_for_point, args);
+  line_free(line);
+  g_hash_table_destroy(seen_points);
 }
 
 static gpointer
@@ -340,8 +258,12 @@ static gint
 line_set_n_intersections_with_line(GeoSet *set, Line *line) {
   gint rval = 0;
   gpointer args[2] = { &rval, line };
-  LINE_SET_REINDEX(set);
-  geo_set_each_structure_having_common_segment_id_with_line_until(set, line, line_set_count_intersections, args);
+  if (set->indexed) {
+    LINE_SET_REINDEX(set);
+    geo_set_each_structure_having_common_segment_id_with_line_until(set, line, line_set_count_intersections, args);
+  } else {
+    geo_set_each_structure_until(set, line_set_count_intersections, args);
+  }
   return rval;
 }
 
@@ -355,22 +277,6 @@ rb_line_set_n_intersections(VALUE self, VALUE line) {
   return INT2NUM(line_set_n_intersections_with_line(me, l));
 }
 
-static void
-g_hash_table_each_intersection(gpointer key, gpointer value, gpointer user_data) {
-  gpointer *args = (gpointer *) user_data;
-  Intersection *intersection = line_intersection((Line *) key, (Line *) args[0]);
-  if (intersection != NULL) {
-    ((GFunc) args[1])(intersection, args[2]);
-    free_intersection(intersection);
-  }
-}
-
-void
-line_set_each_intersection(GeoSet *set, Line *line, GFunc func, gpointer user_data) {
-  gpointer args[3] = { line, func, user_data };
-  g_hash_table_foreach(set->table, g_hash_table_each_intersection, args);
-}
-
 static gpointer
 line_set_collect_intersections_in_rb_ary(GeoSet *set, gpointer segment_line_gp, gpointer user_data) {
   gpointer *args = (gpointer *) user_data;
@@ -388,8 +294,12 @@ static VALUE
 line_set_intersections(GeoSet *set, Line *line) {
   VALUE rval = rb_ary_new();
   gpointer args[2] = { line, &rval };
-  LINE_SET_REINDEX(set);
-  geo_set_each_structure_having_common_segment_id_with_line_until(set, line, line_set_collect_intersections_in_rb_ary, args);
+  if (set->indexed) {
+    LINE_SET_REINDEX(set);
+    geo_set_each_structure_having_common_segment_id_with_line_until(set, line, line_set_collect_intersections_in_rb_ary, args);
+  } else {
+    geo_set_each_structure_until(set, line_set_collect_intersections_in_rb_ary, args);
+  }
   return rval;
 }
 
@@ -422,7 +332,7 @@ rb_line_set_intersection_free_endpoints(int argc, VALUE *argv, VALUE self) {
     endpoints = argv[1];
     max_distance = NUM2DBL(argv[2]);
   } else {
-    rb_raise(rb_eTypeError, "Arguments to %s#intersection_free_endpoints have to be (Geo::Point | Geo::PointSet, Geo::PointSet [, Number])");
+    rb_raise(rb_eTypeError, "Arguments to %s#intersection_free_endpoints have to be (Geo::Point | Geo::PointSet, Geo::PointSet [, Number])", rb_obj_classname(self));
   }
   if (POINT_P(origins)) {
     ops = new_geo_set();
@@ -433,12 +343,13 @@ rb_line_set_intersection_free_endpoints(int argc, VALUE *argv, VALUE self) {
   } else if (POINT_SET_P(origins)) {
     GEO_SET(origins, ops);
   } else {
-    rb_raise(rb_eTypeError, "Arguments to %s#intersection_free_endpoints have to be (Geo::Point | Geo::PointSet, Geo::PointSet [, Number])");
+    rb_raise(rb_eTypeError, "Arguments to %s#intersection_free_endpoints have to be (Geo::Point | Geo::PointSet, Geo::PointSet [, Number])", rb_obj_classname(self));
   }
   CHECK_POINT_SET(endpoints);
   GEO_SET(self, me);
   GEO_SET(endpoints, eps);
-  rval = line_set_intersection_free_endpoints(me, ops, eps, max_distance);
+  rval = rb_ary_new();
+  line_set_each_intersection_free_endpoint(me, ops, eps, max_distance, line_set_insert_point_into_rb_ary, &rval);
   if (created_ops)
     geo_set_free(ops);
   return rval;
@@ -514,6 +425,9 @@ geo_set_each_segment_id_of_intersection_until(GeoSet *set, Line *segment_line, g
   if ((intersection = line_intersection(line, segment_line)) != NULL) {
     if (intersection->type == itPOINT) {
       rval = geo_set_each_segment_id_for_point_until(set, intersection->point, seen_segment_ids, handler, handler_args);
+    } else {
+      rval = geo_set_each_segment_id_for_point_until(set, intersection->line->p1, seen_segment_ids, handler, handler_args);
+      rval = geo_set_each_segment_id_for_point_until(set, intersection->line->p2, seen_segment_ids, handler, handler_args);
     }
     free_intersection(intersection);
   }
@@ -611,3 +525,7 @@ rb_line_set_reindex(VALUE self) {
   return GBOOL2RB(line_set_reindex(me));
 }
 
+void
+init_line_set_o() {
+}
+

data/ext/line_set.h

@@ -19,12 +19,13 @@
 #ifndef LINE_SET_H
 #define LINE_SET_H
 
-#include "common.h"
+#include <common.h>
 
 extern VALUE rb_line_set;
 
-#define RB_LINE_SET(line_set_pointer,klass) Data_Wrap_Struct(klass, line_set_mark, geo_set_free, (line_set_pointer))
-#define LINE_SET_REINDEX(set) if (set->index_dirty) line_set_reindex(set)
+#define RB_LINE_SET(line_set_pointer,klass) ((line_set_pointer)->rbGeoSet = Data_Wrap_Struct(klass, line_set_mark, geo_set_free, (line_set_pointer)))
+#define LINE_SET_REINDEX(set) if (set->index_dirty && set->indexed) line_set_reindex(set)
+#define LINE_SET_P(l) (!NIL_P((l)) && rb_is_a((l), rb_line_set))
 
 typedef gboolean
 (*line_set_line_handler)(GeoSet *set, Line *line, gpointer user_data);
@@ -77,9 +78,6 @@ g_hash_table_clone_line_value_into_rb_value(gpointer key, gpointer value, gpoint
 VALUE
 rb_line_set_segment_lines(VALUE self, VALUE line);
 
-void
-line_set_each_intersection(GeoSet *set, Line *line, GFunc func, gpointer user_data);
-
 VALUE
 rb_line_set_structures_in_segment(VALUE self, VALUE x, VALUE y);
 
@@ -101,4 +99,15 @@ geo_set_each_structure_having_common_segment_id_with_line_until(GeoSet *set,
 								geo_set_structure_handler handler, 
 								gpointer user_data);
 
+void
+line_set_slide_point(GeoSet *set, Line *line, gint ttl);
+
+void
+line_set_each_intersection_free_endpoint(GeoSet *set, 
+					 GeoSet *origins, 
+					 GeoSet *endpoints, 
+					 gdouble max_distance, 
+					 geo_set_structure_handler handler,
+					 gpointer user_data);
+
 #endif

data/ext/point.c

@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 
-#include "common.h"
+#include <common.h>
 
 VALUE rb_point;
 
@@ -81,13 +81,23 @@ rb_point_y(VALUE self) {
   return rb_float_new(p->y);
 }
 
+gchar*
+point_inspect(Point *p) {
+  gchar *rval = calloc(1024, sizeof(gchar));
+  snprintf(rval, 1024, "<%s:%p x=%f y=%f>", rb_obj_classname(p->rbPoint), p, p->x, p->y);
+  return rval;
+}
+
 VALUE
 rb_point_inspect(VALUE self) {
-  gchar rval[1024];
+  gchar *str;
   Point *p;
+  VALUE rval;
   POINT(self, p);
-  snprintf(rval, 1023, "<%s:%p x=%f y=%f>", rb_obj_classname(self), p, p->x, p->y);
-  return rb_str_new2(rval);
+  str = point_inspect(p);
+  rval = rb_str_new2(str);
+  free(str);
+  return rval;
 }
 
 
@@ -108,6 +118,11 @@ rb_point_abs(VALUE self) {
   return rb_float_new(DISTANCE(&ORIGO, me));
 }
 
+gboolean
+point_equals(gconstpointer p1, gconstpointer p2) {
+  return POINT_EQUALS(p1, p2);
+}
+
 VALUE
 rb_point_equals(VALUE self, VALUE o) {
   if (!POINT_P(o)) {
@@ -280,3 +295,12 @@ rb_point_minus(VALUE self, VALUE p) {
   return RB_POINT(rval, CLASS(self));
 }
 
+guint
+point_hash(gconstpointer p) {
+  Point *point = (Point *) p;
+  return (guint) (point->x + point->y);
+}
+
+void
+init_point_o() {
+}

data/ext/point.h

@@ -19,7 +19,7 @@
 #ifndef POINT_H
 #define POINT_H
 
-#include "common.h"
+#include <common.h>
 
 extern VALUE rb_point;
 
@@ -51,10 +51,10 @@ extern VALUE rb_point;
 			:						\
 			M_PI)))
 
-#define POINT_EQUALS(p1,p2) (DBL_EQL((p1)->x, (p2)->x) && DBL_EQL((p1)->y, (p2)->y))
+#define POINT_EQUALS(p1,p2) (DBL_EQL(((Point *) (p1))->x, ((Point *) (p2))->x) && DBL_EQL(((Point *) (p1))->y, ((Point *) (p2))->y))
 #define POINT_DOT(p1,p2) ((p1)->x * (p2)->x + (p1)->y * (p2)->y)
 #define POINT_P(p) (!NIL_P((p)) && rb_is_a((p), rb_point))
-#define CHECK_POINT(p) if (!POINT_P((p))) rb_raise(rb_eTypeError, "Expected Grueserve::Map::Point!")
+#define CHECK_POINT(p) if (!POINT_P((p))) rb_raise(rb_eTypeError, "Expected Geo::Point!")
 #define ZERO_LENGTH_P(p) ((p)->x == 0 && (p)->y == 0)
 #define ZERO_LENGTH_CHECK(p) if (ZERO_LENGTH_P((p))) rb_raise(rb_eTypeError, "Expected something with length > 0!")
 #define ZERO_DISTANCE_P(p1,p2) ((p1)->x == (p2)->x && ((p1)->y == (p2)->y))
@@ -129,7 +129,14 @@ rb_point_minus(VALUE self, VALUE p);
 gint
 point_cmp(Point *me, Point *other);
 
+gchar*
+point_inspect(Point *p);
 
+guint
+point_hash(gconstpointer p);
+
+gboolean
+point_equals(gconstpointer a, gconstpointer b);
 
 
 

data/ext/point_set.c

@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 
-#include "common.h"
+#include <common.h>
 
 VALUE rb_point_set;
 
@@ -69,16 +69,17 @@ rb_point_set_delete(VALUE self, VALUE point) {
   return geo_set_delete(me, (gpointer) t, point);
 }
 
-static void
-g_hash_table_yield_point(gpointer key, gpointer value, gpointer user_data) {
-  rb_yield(( (Point *) key )->rbPoint);
+static gpointer
+g_hash_table_yield_point(GeoSet *set, gpointer structure, gpointer user_data) {
+  rb_yield(( (Point *) structure )->rbPoint);
+  return NULL;
 }
 
 VALUE
 rb_point_set_each(VALUE self) {
   GeoSet *set;
   GEO_SET(self, set);
-  geo_set_foreach(set, g_hash_table_yield_point);
+  geo_set_each_structure_until(set, g_hash_table_yield_point, NULL);
   return self;
 }
 
@@ -108,3 +109,6 @@ geo_set_each_structure_having_common_segment_id_with_point_until(GeoSet *set,
   return rval;
 }
 
+void
+init_point_set_o() {
+}

data/ext/point_set.h

@@ -19,14 +19,14 @@
 #ifndef POINT_SET_H
 #define POINT_SET_H
 
-#include "common.h"
+#include <common.h>
 
 extern VALUE rb_point_set;
 
-#define RB_POINT_SET(point_set_pointer,klass) Data_Wrap_Struct(klass, point_set_mark, geo_set_free, (point_set_pointer))
+#define RB_POINT_SET(point_set_pointer,klass) ((point_set_pointer)->rbGeoSet = Data_Wrap_Struct(klass, point_set_mark, geo_set_free, (point_set_pointer)))
 
 #define POINT_SET_P(pl) (!NIL_P((pl)) && rb_is_a((pl), rb_point_set))
-#define CHECK_POINT_SET(pl) if (!POINT_SET_P((pl))) rb_raise(rb_eTypeError, "Expected Grueserve::Map::PointSet!")
+#define CHECK_POINT_SET(pl) if (!POINT_SET_P((pl))) rb_raise(rb_eTypeError, "Expected Geo::PointSet!")
 
 void
 point_set_mark(GeoSet *set);

data/ext/triangle.c

@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 
-#include "common.h"
+#include <common.h>
 
 VALUE rb_triangle;
 
@@ -91,17 +91,33 @@ rb_triangle_initialize(int argc, VALUE *argv, VALUE self) {
   return self;
 }
 
+gchar*
+triangle_inspect(Triangle *t) {
+  gchar *rval = calloc(1024, sizeof(gchar));
+  gchar *p1 = point_inspect(t->p1);
+  gchar *p2 = point_inspect(t->p2);
+  gchar *p3 = point_inspect(t->p3);
+  snprintf(rval, 1024, "<%s:%p p1=%s p2=%s p3=%s>",
+	   rb_obj_classname(t->rbTriangle), t, 
+	   p1,
+	   p2,
+	   p3);
+  free(p1);
+  free(p2);
+  free(p3);
+  return rval;
+}
+
 VALUE
 rb_triangle_inspect(VALUE self) {
-  gchar rval[1024];
   Triangle *t;
+  gchar *str;
+  VALUE rval;
   TRIANGLE(self, t);
-  snprintf(rval, 1024, "<%s:%p p1=<%s:%p x=%f y=%f> p2=<%s:%p x=%f y=%f> p3=<%s:%p x=%f y=%f>>", 
-	   rb_obj_classname(self), t, 
-	   rb_obj_classname(t->p1->rbPoint), t->p1, t->p1->x, t->p1->y, 
-	   rb_obj_classname(t->p2->rbPoint), t->p2, t->p2->x, t->p2->y, 
-	   rb_obj_classname(t->p3->rbPoint), t->p3, t->p3->x, t->p3->y);
-  return rb_str_new2(rval);
+  str = triangle_inspect(t);
+  rval = rb_str_new2(str);
+  free(str);
+  return rval;
 }
 
 VALUE
@@ -181,15 +197,9 @@ triangle_contains(Triangle *triangle, Point *point) {
   Line *l13p = LINE_PARALLEL(lines[1], triangle->p2);
   Line *l23p = LINE_PARALLEL(lines[2], triangle->p1);
   gint rval = POINT_BETWEEN_PARALLEL_LINES(lines[0], l12p, point) && POINT_BETWEEN_PARALLEL_LINES(lines[1], l13p, point) && POINT_BETWEEN_PARALLEL_LINES(lines[2], l23p, point);
-  free(l12p->p1);
-  free(l12p->p2);
-  free(l13p->p1);
-  free(l13p->p2);
-  free(l23p->p1);
-  free(l23p->p2);
-  free(l12p);
-  free(l13p);
-  free(l23p);
+  line_free(l12p);
+  line_free(l13p);
+  line_free(l23p);
   free_triangle_lines(lines);
   return rval;
 }
@@ -354,6 +364,23 @@ triangle_area(Triangle *me) {
   return sin(acos(LINE_DOT(l1,l2) / (length1 * length2))) * length1 * length2 / 2.0;
 }
 
+static gint
+triangle_cmp(Triangle *me, Triangle *other) {
+  gint tmp;
+  gdouble my_area;
+  gdouble other_area;
+  my_area = triangle_area(me);
+  other_area = triangle_area(other);
+  if (!DBL_EQL(my_area, other_area)) 
+    return CMP(my_area, other_area);
+  else if ((tmp = point_cmp(me->p1, other->p1)) != 0)
+    return tmp;
+  else if ((tmp = point_cmp(me->p2, other->p2)) != 0)
+    return tmp;
+  else
+    return point_cmp(me->p3, other->p3);
+}
+
 VALUE
 rb_triangle_cmp(VALUE self, VALUE o) {
   if (!TRIANGLE_P(o)) {
@@ -361,18 +388,9 @@ rb_triangle_cmp(VALUE self, VALUE o) {
   } else {
     Triangle *me;
     Triangle *other;
-    gdouble my_area;
-    gdouble other_area;
     TRIANGLE(self, me);
     TRIANGLE(o, other);
-    my_area = triangle_area(me);
-    other_area = triangle_area(other);
-    if (my_area > other_area)
-      return INT2NUM(1);
-    else if (my_area < other_area) 
-      return INT2NUM(-1);
-    else
-      return INT2NUM(0);
+    return INT2NUM(triangle_cmp(me, other));
   }
 }
 
@@ -427,3 +445,7 @@ VALUE
 rb_triangle_from_gpointer(gpointer l) {
   return ( (Triangle *) l)->rbTriangle;
 }
+
+void
+init_triangle_o() {
+}