renamed --dim command line option

6 files changed, 9 insertions, 9 deletions

diff --git a/README.md b/README.md
index a3fa958..77eec68 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ $ c++ -std=c++11 ripser.cpp -o ripser -Ofast -D NDEBUG -D FILE_FORMAT_LOWER_TRIA
 
 The following options are supported at the command line:
 
-  - `--top_dim k`: compute persistent homology up to dimension *k*
+  - `--dim k`: compute persistent homology up to dimension *k*
   - `--threshold t`: compute Rips complexes up to diameter *t*
   - `--modulus p`: compute homology with coefficients in the prime field Z/*p*Z (only available when build with the option `USE_COEFFICIENTS`)
 
diff --git a/benchmarks/benchmarks.txt b/benchmarks/benchmarks.txt
index 348d015..679c5e7 100644
--- a/benchmarks/benchmarks.txt
+++ b/benchmarks/benchmarks.txt
@@ -6,5 +6,5 @@
 
 /usr/bin/time -l ~/Source/Gudhi_library_1.3.0/example/Persistent_cohomology/rips_persistence -d3 -p2 ~/Bitbucket/phat-paper/benchmark/point\ cloud/sphere_3_192_points.dat -o/dev/null
 
-c++ -std=c++11 ripser.cpp -o ripser -Ofast -D NDEBUG -D FILE_FORMAT_DIPHA -D PRINT_PERSISTENCE_PAIRS && /usr/bin/time -l ./ripser --top_dim 2 ~/Bitbucket/phat-paper/benchmark/dipha/sphere_3_192.complex
+c++ -std=c++11 ripser.cpp -o ripser -Ofast -D NDEBUG -D FILE_FORMAT_DIPHA -D PRINT_PERSISTENCE_PAIRS && /usr/bin/time -l ./ripser --dim 2 ~/Bitbucket/phat-paper/benchmark/dipha/sphere_3_192.complex
 
diff --git a/benchmarks/examples.txt b/benchmarks/examples.txt
index 39afeb6..d2ec1f9 100644
--- a/benchmarks/examples.txt
+++ b/benchmarks/examples.txt
@@ -1,4 +1,4 @@
-c++ -std=c++14 ripser.cpp -o ripser -Ofast -D NDEBUG -D STORE_DIAMETERS -D FILE_FORMAT_UPPER_TRIANGULAR_CSV -D PRINT_PERSISTENCE_PAIRS && /usr/bin/time -l ./ripser --top_dim 1 ~/Downloads/avian_all_nt_concat_jukes_cantor.csv
+c++ -std=c++14 ripser.cpp -o ripser -Ofast -D NDEBUG -D STORE_DIAMETERS -D FILE_FORMAT_UPPER_TRIANGULAR_CSV -D PRINT_PERSISTENCE_PAIRS && /usr/bin/time -l ./ripser --dim 1 ~/Downloads/avian_all_nt_concat_jukes_cantor.csv
 
-c++ -std=c++14 ripser.cpp -o ripser -Ofast -D NDEBUG -D STORE_DIAMETERS -D FILE_FORMAT_DIPHA -D PRINT_PERSISTENCE_PAIRS && /usr/bin/time -l ./ripser --top_dim 2 ~/Bitbucket/phat-paper/benchmark/dipha/sphere_3_192.complex
+c++ -std=c++14 ripser.cpp -o ripser -Ofast -D NDEBUG -D STORE_DIAMETERS -D FILE_FORMAT_DIPHA -D PRINT_PERSISTENCE_PAIRS && /usr/bin/time -l ./ripser --dim 2 ~/Bitbucket/phat-paper/benchmark/dipha/sphere_3_192.complex
 
diff --git a/benchmarks/sphere_3_192/ripser.txt b/benchmarks/sphere_3_192/ripser.txt
index 60b7939..6dbee3f 100644
--- a/benchmarks/sphere_3_192/ripser.txt
+++ b/benchmarks/sphere_3_192/ripser.txt
@@ -1,4 +1,4 @@
-uli:ripser uli$ c++ -std=c++11 ripser.cpp -o ripser -Ofast -D NDEBUG -D FILE_FORMAT_DIPHA -D PRINT_PERSISTENCE_PAIRS && /usr/bin/time -l ./ripser --top_dim 2 ~/Bitbucket/phat-paper/benchmark/dipha/sphere_3_192.complex
+uli:ripser uli$ c++ -std=c++11 ripser.cpp -o ripser -Ofast -D NDEBUG -D FILE_FORMAT_DIPHA -D PRINT_PERSISTENCE_PAIRS && /usr/bin/time -l ./ripser --dim 2 ~/Bitbucket/phat-paper/benchmark/dipha/sphere_3_192.complex
 distance matrix with 192 points
 distance matrix transformed to lower triangular form
 value range: [0.00367531,2]
diff --git a/benchmarks/sphere_3_64/ripser.txt b/benchmarks/sphere_3_64/ripser.txt
index 016143d..761403c 100644
--- a/benchmarks/sphere_3_64/ripser.txt
+++ b/benchmarks/sphere_3_64/ripser.txt
@@ -1,4 +1,4 @@
-uli:ripser uli$ c++ -std=c++11 ripser.cpp -o ripser -Ofast -D NDEBUG -D FILE_FORMAT_DIPHA -D PRINT_PERSISTENCE_PAIRS && /usr/bin/time -l ./ripser --top_dim 2 ~/Bitbucket/phat-paper/benchmark/dipha/sphere_3_64.complex
+uli:ripser uli$ c++ -std=c++11 ripser.cpp -o ripser -Ofast -D NDEBUG -D FILE_FORMAT_DIPHA -D PRINT_PERSISTENCE_PAIRS && /usr/bin/time -l ./ripser --dim 2 ~/Bitbucket/phat-paper/benchmark/dipha/sphere_3_64.complex
 distance matrix with 64 points
 distance matrix transformed to lower triangular form
 value range: [0.00391946,1.99927]
diff --git a/ripser.cpp b/ripser.cpp
index b850972..f091c6e 100644
--- a/ripser.cpp
+++ b/ripser.cpp
@@ -510,7 +510,7 @@ void compute_pairs(std::vector<diameter_index_t>& columns_to_reduce,
 		value_t diameter = get_diameter(column_to_reduce);
 
 #ifdef INDICATE_PROGRESS
-        if ((i+1) % 1000 == 0)
+        if ((i+1) % 1000000 == 0)
             std::cout << "\033[K"
 			          << "reducing column " << i + 1 << "/" << columns_to_reduce.size()
 			          << " (diameter " << diameter << ")" << std::flush << "\r";
@@ -689,7 +689,7 @@ void print_usage_and_exit(int exit_code) {
 	std::cerr << "Options:" << std::endl;
 	std::cerr << std::endl;
 	std::cerr << "  --help           print this screen" << std::endl;
-	std::cerr << "  --top_dim <k>    compute persistent homology up to dimension <k>" << std::endl;
+	std::cerr << "  --dim <k>        compute persistent homology up to dimension <k>" << std::endl;
 	std::cerr << "  --threshold <t>  compute Rips complexes up to diameter <t>" << std::endl;
 #ifdef USE_COEFFICIENTS
 	std::cerr << "  --modulus <p>    compute homology with coefficients in the prime field Z/<p>Z"
@@ -718,7 +718,7 @@ int main(int argc, char** argv) {
 		const std::string arg(argv[i]);
 		if (arg == "--help") {
 			print_usage_and_exit(0);
-		} else if (arg == "--top_dim") {
+		} else if (arg == "--dim") {
 			std::string parameter = std::string(argv[++i]);
 			size_t next_pos;
 			dim_max = std::stol(parameter, &next_pos);