summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Bauer <ulrich.bauer@tum.de>2016-07-17 15:12:18 +0200
committerUlrich Bauer <ulrich.bauer@tum.de>2016-07-17 16:22:51 +0200
commit6cacc0520b9cf95eae9855a00209219d0b6faedf (patch)
treef9a8041d9623ea69f27793c2bdfcb1ff3b39e75c
parentae581881d2c36d276a42f58bc3f6dc637f45ed47 (diff)
rearranged compile time options
made PRINT_PERSISTENCE_PAIRS default
-rw-r--r--Makefile7
-rw-r--r--ripser.cpp6
2 files changed, 8 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 253d8fa..1bb9a9e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,5 @@
-all:
- c++ -std=c++11 ripser.cpp -o ripser -Ofast -D NDEBUG -D FILE_FORMAT_LOWER_TRIANGULAR_CSV -D PRINT_PERSISTENCE_PAIRS
+build:
+ c++ -std=c++11 ripser.cpp -o ripser -Ofast -D NDEBUG -D FILE_FORMAT_LOWER_TRIANGULAR_CSV
+
+coefficients:
+ c++ -std=c++11 ripser.cpp -o ripser_coeff -Ofast -D NDEBUG -D FILE_FORMAT_LOWER_TRIANGULAR_CSV -D USE_COEFFICIENTS
diff --git a/ripser.cpp b/ripser.cpp
index 1b87dff..db1b20b 100644
--- a/ripser.cpp
+++ b/ripser.cpp
@@ -2,11 +2,11 @@
//#define USE_COEFFICIENTS
//#define INDICATE_PROGRESS
-//#define PRINT_PERSISTENCE_PAIRS
+#define PRINT_PERSISTENCE_PAIRS
-//#define FILE_FORMAT_DIPHA
-//#define FILE_FORMAT_UPPER_TRIANGULAR_CSV
//#define FILE_FORMAT_LOWER_TRIANGULAR_CSV
+//#define FILE_FORMAT_UPPER_TRIANGULAR_CSV
+//#define FILE_FORMAT_DIPHA
#include <iostream>
#include <fstream>