From ef1b48e86e637be647dad67d54a33a594ebe4cee Mon Sep 17 00:00:00 2001
From: Florian Stecker <mail@florianstecker.de>
Date: Sat, 23 Oct 2021 12:21:02 -0500
Subject: [PATCH] restore basic functionality

---
 singular_values.c   | 6 ++++--
 singular_values.plt | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/singular_values.c b/singular_values.c
index 973fe6c..fe0cff0 100644
--- a/singular_values.c
+++ b/singular_values.c
@@ -485,6 +485,8 @@ int main(int argc, char *argv[])
 
 	DEBUG("Get unique traces\n");
 
+	qsort(distinct_invariants, n, sizeof(struct result*), compare_result);
+
 	nuniq = 0;
 	for(int i = 0; i < n; i++) {
 		if(i == 0 || compare_result(&distinct_invariants[i], &distinct_invariants[nuniq-1]) != 0) {
@@ -499,7 +501,7 @@ int main(int argc, char *argv[])
 				distinct_invariants[nuniq-1]->id = distinct_invariants[i]->id;
 		}
 
-		gmp_printf("%d %d %s\n", i, nuniq-1, print_word(&group->elements[i], buf));
+//		gmp_printf("%d %d %s\n", i, nuniq-1, print_word(&group->elements[i], buf));
 	}
 
 	max_slope = 0;
@@ -560,7 +562,7 @@ int main(int argc, char *argv[])
 		}
 
 		cumulative += distinct_invariants[i]->count;
-		gmp_printf("%d %d %d %f %f %f %f %f %s\n",
+		gmp_printf("%d %d %d %Qd %Qd %f %f %f %f %f %s\n",
 		           distinct_invariants[i]->id, distinct_invariants[i]->count, cumulative,
 		           distinct_invariants[i]->tr, distinct_invariants[i]->trinv,
 		           log(fabs(mpq_get_d(distinct_invariants[i]->tr))), log(fabs(mpq_get_d(distinct_invariants[i]->trinv))),
diff --git a/singular_values.plt b/singular_values.plt
index ef88c1e..e840fe1 100644
--- a/singular_values.plt
+++ b/singular_values.plt
@@ -7,13 +7,13 @@ file = sprintf("< ./singular_values 1621 %f %f", exp(logs), exp(logt))
 set zeroaxis
 set samples 1000
 set size square
-set xrange [0:3]
-set yrange [0:3]
+set xrange [0:30]
+set yrange [0:30]
 set trange [0:5]
 set grid
 set parametric
 
-plot file using ($8/$9):($6/$7) w p pt 7 ps 0.3 lc 1 t sprintf("t = %.2f", exp(logt)), t, t
+plot file using 8:9 w p pt 7 ps 1 lc 1 t sprintf("t = %.2f", exp(logt))
 
 #plot for[i=-10:10] log(tr(t,t*exp(log(2)*i/10.0))),log(trinv(t,t*exp(log(2)*i/10.0))) w l lw 2 t ""