diff options
Diffstat (limited to 'src/c/string/disp/zdispa.c')
| -rw-r--r-- | src/c/string/disp/zdispa.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/c/string/disp/zdispa.c b/src/c/string/disp/zdispa.c index 6f651b83..94b24e98 100644 --- a/src/c/string/disp/zdispa.c +++ b/src/c/string/disp/zdispa.c @@ -16,11 +16,7 @@ double zdispa (doubleComplex* in, int rows, int columns){ int i = 0,j = 0; for (i = 0; i < rows; ++i) { -<<<<<<< HEAD - for (j=0;j<columns;j++) printf(" %1.20lf + %1.20lfi " ,zreals(in[i+j*rows]) ,zimags(in[i+j*rows])); -======= - for (j=0;j<columns;j++) printf(" %1.20f + %1.20fi " ,zreals(in[i+j*rows]) ,zimags(in[i+j*rows])); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + for (j=0;j<columns;j++) printf(" %e + %ei " ,zreals(in[i+j*rows]) ,zimags(in[i+j*rows])); printf("\n"); } return 0; |