discreteness

This commit is contained in:
Florian Stecker 2018-08-04 13:15:33 +02:00
parent 5c26fec87d
commit 664b106c0a
3 changed files with 10 additions and 5 deletions

View File

@ -7,11 +7,14 @@ SPECIAL_OPTIONS=-O3 -flto -funroll-loops -Winline
OPTIONS=-m64 -march=native -mtune=native -std=gnu99 -D_GNU_SOURCE $(SPECIAL_OPTIONS) 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 singular_values: singular_values.o triangle.o linalg.o
gcc $(OPTIONS) -o singular_values triangle.o linalg.o singular_values.o -lm -lgsl -lcblas 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 element_path: element_path.o linalg.o
gcc $(OPTIONS) -o element_path element_path.o linalg.o -lm -lgsl -lcblas 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) singular_values.o: singular_values.c $(HEADERS)
gcc $(OPTIONS) -c singular_values.c gcc $(OPTIONS) -c singular_values.c
discreteness.o: discreteness.c $(HEADERS)
gcc $(OPTIONS) -c discreteness.c
element_path.o: element_path.c $(HEADERS) element_path.o: element_path.c $(HEADERS)
gcc $(OPTIONS) -c element_path.c gcc $(OPTIONS) -c element_path.c
@ -40,4 +46,4 @@ hyperbolic.o: hyperbolic.c $(HEADERS)
gcc $(OPTIONS) -c hyperbolic.c gcc $(OPTIONS) -c hyperbolic.c
clean: 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

View File

@ -8,7 +8,6 @@
#define POINCARE 1 #define POINCARE 1
#define LOOP(i) for(int i = 0; i < 3; i++) #define LOOP(i) for(int i = 0; i < 3; i++)
void cartan_matrix(gsl_matrix *cartan, double a1, double a2, double a3, double s) void cartan_matrix(gsl_matrix *cartan, double a1, double a2, double a3, double s)
{ {
gsl_matrix_set(cartan, 0, 0, -2); gsl_matrix_set(cartan, 0, 0, -2);
@ -193,7 +192,7 @@ int main()
gsl_matrix *frame; gsl_matrix *frame;
workspace_t *ws; workspace_t *ws;
int elements = 5000; int elements = 5000;
int p = 3, q = 3, r = 5; int p = 5, q = 5, r = 5;
group = malloc(elements*sizeof(groupelement_t)); group = malloc(elements*sizeof(groupelement_t));
matrices = malloc(elements*sizeof(gsl_matrix*)); matrices = malloc(elements*sizeof(gsl_matrix*));

View File

@ -4,7 +4,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#define QUEUE_SIZE 50000 #define QUEUE_SIZE 1500000
#define ERROR(condition, msg, ...) if(condition){fprintf(stderr, msg, ##__VA_ARGS__); exit(1);} #define ERROR(condition, msg, ...) if(condition){fprintf(stderr, msg, ##__VA_ARGS__); exit(1);}
#ifdef _DEBUG #ifdef _DEBUG