restore basic functionality

This commit is contained in:
Florian Stecker 2021-10-23 12:21:02 -05:00
parent 6daac5888e
commit ef1b48e86e
2 changed files with 7 additions and 5 deletions

View File

@ -485,6 +485,8 @@ int main(int argc, char *argv[])
DEBUG("Get unique traces\n"); DEBUG("Get unique traces\n");
qsort(distinct_invariants, n, sizeof(struct result*), compare_result);
nuniq = 0; nuniq = 0;
for(int i = 0; i < n; i++) { for(int i = 0; i < n; i++) {
if(i == 0 || compare_result(&distinct_invariants[i], &distinct_invariants[nuniq-1]) != 0) { 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; 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; max_slope = 0;
@ -560,7 +562,7 @@ int main(int argc, char *argv[])
} }
cumulative += distinct_invariants[i]->count; 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]->id, distinct_invariants[i]->count, cumulative,
distinct_invariants[i]->tr, distinct_invariants[i]->trinv, 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))), log(fabs(mpq_get_d(distinct_invariants[i]->tr))), log(fabs(mpq_get_d(distinct_invariants[i]->trinv))),

View File

@ -7,13 +7,13 @@ file = sprintf("< ./singular_values 1621 %f %f", exp(logs), exp(logt))
set zeroaxis set zeroaxis
set samples 1000 set samples 1000
set size square set size square
set xrange [0:3] set xrange [0:30]
set yrange [0:3] set yrange [0:30]
set trange [0:5] set trange [0:5]
set grid set grid
set parametric 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 "" #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 ""