X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=05a.c;h=8a2e9f1a40b49f0aa9c55fd7aefe963425149d08;hb=a622aa41088ddf29d38c50e2032ca84984b0e12b;hp=f8d34216d4f9ee54a8fe7c45b24348df1b991038;hpb=e6e0aa417e54599d37bb43f456085e9a1dab4f1b;p=advent21.git

diff --git a/05a.c b/05a.c
index f8d3421..8a2e9f1 100644
--- a/05a.c
+++ b/05a.c
@@ -1,60 +1,58 @@
 #include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
+#include <stdint.h>
+#include <uthash.h>
 
-struct line { int x1; int y1; int x2; int y2; };
+#define SWAP(x, y) { x ^= y; y ^= x; x ^= y; }
 
-#define max(x, y) ((x)>(y) ? (x) : (y))
-#define min(x, y) ((x)<(y) ? (x) : (y))
-#define between(a, a1, a2) ((a) >= min(a1, a2) && (a) <= max(a1, a2))
+struct point { int x; int y; };
+struct entry { struct point key; int i; UT_hash_handle hh; };
 
-int parse_lines(struct line lines[], int *maxx, int *maxy)
+void mark_point(int x, int y, struct entry **entries, int *r)
 {
-	int i = 0;
-	char buf[1000];
-	while (fgets(buf, 1000, stdin) != NULL) {
-		char *p = &buf[0];
-		lines[i].x1 = strtol(p, &p, 10);
-		p++;
-		lines[i].y1 = strtol(p, &p, 10);
-		p+=4;
-		lines[i].x2 = strtol(p, &p, 10);
-		p++;
-		lines[i].y2 = strtol(p, &p, 10);
-		*maxx = max(*maxx, lines[i].x1);
-		*maxx = max(*maxx, lines[i].x2);
-		*maxy = max(*maxy, lines[i].y1);
-		*maxy = max(*maxy, lines[i].y2);
-		i++;
+	struct entry *p;
+	struct point s;
+	memset(&s, 0, sizeof s);
+	s.x = x;
+	s.y = y;
+	HASH_FIND(hh, *entries, &s, sizeof(struct point), p);
+	if (p) {
+		if (p->i++ == 1)
+			*r = *r+1;
+	} else {
+		p = calloc(1, sizeof(struct entry));
+		p->key = s;
+		p->i = 1;
+		HASH_ADD(hh, *entries, key, sizeof(struct point), p);
 	}
-	return i;
-}
-
-bool online(int x, int y, struct line line)
-{
-	//Vertical
-	if (line.x1 == line.x2 && x == line.x1)
-		return between(y, line.y1, line.y2);
-	//Horizontal
-	if (line.y1 == line.y2 && y == line.y2)
-		return between(x, line.x1, line.x2);
-	return false;
 }
 
 int main()
 {
-	struct line lines[1000];
-	int maxx = 0, maxy = 0;
-	int nlines = parse_lines(lines, &maxx, &maxy);
+	char buf[1000];
+	struct entry *entries = NULL;
 	int r = 0;
-	for (int x = 0; x<=maxx; x++) {
-		for (int y = 0; y<=maxy; y++) {
-			int matches = 0;
-			for (int line = 0; line<nlines && matches < 2; line++)
-				if (online(x, y, lines[line]))
-					matches++;
-			r = matches >= 2 ? r+1 : r;
-		}
+	while (fgets(buf, 1000, stdin) != NULL) {
+		char *ptr = &buf[0];
+		int x1 = strtol(ptr, &ptr, 10);
+		ptr++;
+		int y1 = strtol(ptr, &ptr, 10);
+		ptr+=4;
+		int x2 = strtol(ptr, &ptr, 10);
+		ptr++;
+		int y2 = strtol(ptr, &ptr, 10);
+		if (x1 > x2)
+			SWAP(x1, x2);
+		if (y1 > y2)
+			SWAP(y1, y2);
+
+		//Vertical
+		if (x1 == x2)
+			for (int y = y1; y<=y2; y++)
+				mark_point(x1, y, &entries, &r);
+		//Horizontal
+		else if (y1 == y2)
+			for (int x = x1; x<=x2; x++)
+				mark_point(x, y1, &entries, &r);
 	}
 	printf("%d\n", r);
 }