diff options
Diffstat (limited to '2.3-1/src/c/string/disp/zdispa.c')
| -rw-r--r-- | 2.3-1/src/c/string/disp/zdispa.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/2.3-1/src/c/string/disp/zdispa.c b/2.3-1/src/c/string/disp/zdispa.c index 5d085d32..6f651b83 100644 --- a/2.3-1/src/c/string/disp/zdispa.c +++ b/2.3-1/src/c/string/disp/zdispa.c @@ -16,7 +16,11 @@ 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 printf("\n"); } return 0; |