diff --git a/Makefile b/Makefile index ecd48d8..e9f8209 100644 --- a/Makefile +++ b/Makefile @@ -7,11 +7,14 @@ SPECIAL_OPTIONS=-O3 -flto -funroll-loops -Winline OPTIONS=-m64 -march=native -mtune=native -std=gnu99 -D_GNU_SOURCE $(SPECIAL_OPTIONS) -all: singular_values element_path limit_set hyperbolic +all: discreteness singular_values element_path limit_set hyperbolic singular_values: singular_values.o triangle.o linalg.o gcc $(OPTIONS) -o singular_values triangle.o linalg.o singular_values.o -lm -lgsl -lcblas +discreteness: discreteness.o triangle.o linalg.o + gcc $(OPTIONS) -o discreteness triangle.o linalg.o discreteness.o -lm -lgsl -lcblas + element_path: element_path.o linalg.o gcc $(OPTIONS) -o element_path element_path.o linalg.o -lm -lgsl -lcblas @@ -24,6 +27,9 @@ hyperbolic: hyperbolic.o triangle.o linalg.o singular_values.o: singular_values.c $(HEADERS) gcc $(OPTIONS) -c singular_values.c +discreteness.o: discreteness.c $(HEADERS) + gcc $(OPTIONS) -c discreteness.c + element_path.o: element_path.c $(HEADERS) gcc $(OPTIONS) -c element_path.c @@ -40,4 +46,4 @@ hyperbolic.o: hyperbolic.c $(HEADERS) gcc $(OPTIONS) -c hyperbolic.c clean: - rm -f singular_values element_path limit_set hyperbolic triangle.o linalg.o singular_values.o element_path.o limit_set.o hyperbolic.o + rm -f singular_values discreteness element_path limit_set hyperbolic triangle.o linalg.o singular_values.o discreteness.o element_path.o limit_set.o hyperbolic.o diff --git a/hyperbolic.c b/hyperbolic.c index b0dee1f..53c2450 100644 --- a/hyperbolic.c +++ b/hyperbolic.c @@ -8,7 +8,6 @@ #define POINCARE 1 #define LOOP(i) for(int i = 0; i < 3; i++) - void cartan_matrix(gsl_matrix *cartan, double a1, double a2, double a3, double s) { gsl_matrix_set(cartan, 0, 0, -2); @@ -193,7 +192,7 @@ int main() gsl_matrix *frame; workspace_t *ws; int elements = 5000; - int p = 3, q = 3, r = 5; + int p = 5, q = 5, r = 5; group = malloc(elements*sizeof(groupelement_t)); matrices = malloc(elements*sizeof(gsl_matrix*)); diff --git a/queue.h b/queue.h index 2be1af0..a37b2f2 100644 --- a/queue.h +++ b/queue.h @@ -4,7 +4,7 @@ #include #include -#define QUEUE_SIZE 50000 +#define QUEUE_SIZE 1500000 #define ERROR(condition, msg, ...) if(condition){fprintf(stderr, msg, ##__VA_ARGS__); exit(1);} #ifdef _DEBUG