diff options
Diffstat (limited to 'src/c/matrixOperations')
-rw-r--r-- | src/c/matrixOperations/cross/ccrossa.c | 6 | ||||
-rw-r--r-- | src/c/matrixOperations/cross/i16crossa.c | 6 | ||||
-rw-r--r-- | src/c/matrixOperations/cross/i8crossa.c | 6 | ||||
-rw-r--r-- | src/c/matrixOperations/cross/u16crossa.c | 6 | ||||
-rw-r--r-- | src/c/matrixOperations/cross/u8crossa.c | 6 | ||||
-rw-r--r-- | src/c/matrixOperations/cross/zcrossa.c | 6 | ||||
-rw-r--r-- | src/c/matrixOperations/expm/cexpma.c | 2 | ||||
-rw-r--r-- | src/c/matrixOperations/expm/dexpma.c | 4 | ||||
-rw-r--r-- | src/c/matrixOperations/expm/sexpma.c | 4 | ||||
-rw-r--r-- | src/c/matrixOperations/expm/zexpma.c | 2 | ||||
-rw-r--r-- | src/c/matrixOperations/matrix/dmatrixa.c | 1 | ||||
-rw-r--r-- | src/c/matrixOperations/matrix/smatrixa.c | 1 | ||||
-rw-r--r-- | src/c/matrixOperations/matrix/u16matrixa.c | 1 | ||||
-rw-r--r-- | src/c/matrixOperations/matrix/zmatrixa.c | 1 | ||||
-rw-r--r-- | src/c/matrixOperations/norm/dnorma.c | 1 |
15 files changed, 29 insertions, 24 deletions
diff --git a/src/c/matrixOperations/cross/ccrossa.c b/src/c/matrixOperations/cross/ccrossa.c index 5f74bb36..6563d374 100644 --- a/src/c/matrixOperations/cross/ccrossa.c +++ b/src/c/matrixOperations/cross/ccrossa.c @@ -15,9 +15,9 @@ void ccrossa (floatComplex* inp1, int size1_r, int size1_c, floatComplex* inp2, oup[0] = inp1[1]*inp2[2] - inp1[2]*inp2[1]; oup[1] = inp1[2]*inp2[0] - inp1[0]*inp2[2]; oup[2] = inp1[0]*inp2[1] - inp1[1]*inp2[0]; - printf("%lf ", oup[0]); - printf("%lf ", oup[1]); - printf("%lf \n", oup[2]); + printf("%f %f ", crealf(oup[0]), cimagf(oup[0])); + printf("%f %f ", crealf(oup[1]), cimagf(oup[1])); + printf("%f %f \n", crealf(oup[2]), cimagf(oup[2])); } else // Calculating the cross product for a 3XN Matrix { diff --git a/src/c/matrixOperations/cross/i16crossa.c b/src/c/matrixOperations/cross/i16crossa.c index 91cdb7f0..77a3ca36 100644 --- a/src/c/matrixOperations/cross/i16crossa.c +++ b/src/c/matrixOperations/cross/i16crossa.c @@ -12,9 +12,9 @@ void i16crossa (int16* inp1, int size1_r, int size1_c, int16* inp2, int size2_r, oup[0] = inp1[1]*inp2[2] - inp1[2]*inp2[1]; oup[1] = inp1[2]*inp2[0] - inp1[0]*inp2[2]; oup[2] = inp1[0]*inp2[1] - inp1[1]*inp2[0]; - printf("%lf ", oup[0]); - printf("%lf ", oup[1]); - printf("%lf \n", oup[2]); + printf("%d ", oup[0]); + printf("%d ", oup[1]); + printf("%d \n", oup[2]); } else // Calculating the cross product for a 3XN Matrix { diff --git a/src/c/matrixOperations/cross/i8crossa.c b/src/c/matrixOperations/cross/i8crossa.c index adfbd534..f485ebb7 100644 --- a/src/c/matrixOperations/cross/i8crossa.c +++ b/src/c/matrixOperations/cross/i8crossa.c @@ -12,9 +12,9 @@ void i8crossa (int8* inp1, int size1_r, int size1_c, int8* inp2, int size2_r, in oup[0] = inp1[1]*inp2[2] - inp1[2]*inp2[1]; oup[1] = inp1[2]*inp2[0] - inp1[0]*inp2[2]; oup[2] = inp1[0]*inp2[1] - inp1[1]*inp2[0]; - printf("%lf ", oup[0]); - printf("%lf ", oup[1]); - printf("%lf \n", oup[2]); + printf("%d ", oup[0]); + printf("%d ", oup[1]); + printf("%d \n", oup[2]); } else // Calculating the cross product for a 3XN Matrix { diff --git a/src/c/matrixOperations/cross/u16crossa.c b/src/c/matrixOperations/cross/u16crossa.c index e0a32bcc..3cf813c9 100644 --- a/src/c/matrixOperations/cross/u16crossa.c +++ b/src/c/matrixOperations/cross/u16crossa.c @@ -12,9 +12,9 @@ void u16crossa (uint16* inp1, int size1_r, int size1_c, uint16* inp2, int size2_ oup[0] = inp1[1]*inp2[2] - inp1[2]*inp2[1]; oup[1] = inp1[2]*inp2[0] - inp1[0]*inp2[2]; oup[2] = inp1[0]*inp2[1] - inp1[1]*inp2[0]; - printf("%lf ", oup[0]); - printf("%lf ", oup[1]); - printf("%lf \n", oup[2]); + printf("%u ", oup[0]); + printf("%u ", oup[1]); + printf("%u \n", oup[2]); } else // Calculating the cross product for a 3XN Matrix { diff --git a/src/c/matrixOperations/cross/u8crossa.c b/src/c/matrixOperations/cross/u8crossa.c index 7a8b857f..7c2d7c1a 100644 --- a/src/c/matrixOperations/cross/u8crossa.c +++ b/src/c/matrixOperations/cross/u8crossa.c @@ -12,9 +12,9 @@ void u8crossa (uint8* inp1, int size1_r, int size1_c, uint8* inp2, int size2_r, oup[0] = inp1[1]*inp2[2] - inp1[2]*inp2[1]; oup[1] = inp1[2]*inp2[0] - inp1[0]*inp2[2]; oup[2] = inp1[0]*inp2[1] - inp1[1]*inp2[0]; - printf("%lf ", oup[0]); - printf("%lf ", oup[1]); - printf("%lf \n", oup[2]); + printf("%u ", oup[0]); + printf("%u ", oup[1]); + printf("%u \n", oup[2]); } else // Calculating the cross product for a 3XN Matrix { diff --git a/src/c/matrixOperations/cross/zcrossa.c b/src/c/matrixOperations/cross/zcrossa.c index 85a19607..591c1087 100644 --- a/src/c/matrixOperations/cross/zcrossa.c +++ b/src/c/matrixOperations/cross/zcrossa.c @@ -15,9 +15,9 @@ void zcrossa (doubleComplex* inp1, int size1_r, int size1_c, doubleComplex* inp2 oup[0] = inp1[1]*inp2[2] - inp1[2]*inp2[1]; oup[1] = inp1[2]*inp2[0] - inp1[0]*inp2[2]; oup[2] = inp1[0]*inp2[1] - inp1[1]*inp2[0]; - printf("%lf ", oup[0]); - printf("%lf ", oup[1]); - printf("%lf \n", oup[2]); + printf("%lf %lf ", creal(oup[0]), cimag(oup[0])); + printf("%lf %lf ", creal(oup[1]), cimag(oup[1])); + printf("%lf %lf \n", creal(oup[2]), cimag(oup[2])); } else // Calculating the cross product for a 3XN Matrix { diff --git a/src/c/matrixOperations/expm/cexpma.c b/src/c/matrixOperations/expm/cexpma.c index 7da0fc70..e7c9f0b2 100644 --- a/src/c/matrixOperations/expm/cexpma.c +++ b/src/c/matrixOperations/expm/cexpma.c @@ -69,7 +69,7 @@ void cexpma(floatComplex * in, floatComplex * out, int _iLeadDim) pfltMatrixX[iIndex1] = pfltMatrixA[iIndex1] ; - ceyea(pfltMatrixEye, _iLeadDim, _iLeadDim); + ceyea(pfltMatrixEye, _iLeadDim, _iLeadDim); /*cmulma ( & cfltCst , 1 ,1, pfltMatrixA , _iLeadDim, _iLeadDim, diff --git a/src/c/matrixOperations/expm/dexpma.c b/src/c/matrixOperations/expm/dexpma.c index d9b42327..8939813d 100644 --- a/src/c/matrixOperations/expm/dexpma.c +++ b/src/c/matrixOperations/expm/dexpma.c @@ -67,7 +67,7 @@ void dexpma (double* in, double* out, int _iLeadDim){ for ( iIndex1 = 0 ; iIndex1 < iSquare ; iIndex1++ ) pdblMatrixX[iIndex1] = pdblMatrixA[iIndex1] ; - deyea(pdblMatrixEye, _iLeadDim, _iLeadDim); + deyea(pdblMatrixEye, _iLeadDim, _iLeadDim); /*cA = A * c*/ @@ -106,7 +106,7 @@ void dexpma (double* in, double* out, int _iLeadDim){ pdblMatrixcX[iIndex1] = pdblMatrixX[iIndex1] * dblCst ; /*E = E + cX*/ - dadda ( out, iSquare , pdblMatrixcX , iSquare , out ) ; + dadda ( out, iSquare , pdblMatrixcX , iSquare , out ) ; if(iFlag == 1) /*D = D + cX*/ { diff --git a/src/c/matrixOperations/expm/sexpma.c b/src/c/matrixOperations/expm/sexpma.c index cd969981..b265a212 100644 --- a/src/c/matrixOperations/expm/sexpma.c +++ b/src/c/matrixOperations/expm/sexpma.c @@ -68,7 +68,7 @@ void sexpma (float* in, float* out, int _iLeadDim){ for ( iIndex1 = 0 ; iIndex1 < iSquare ; iIndex1++ ) pfltMatrixX[iIndex1] = pfltMatrixA[iIndex1] ; - seyea(pfltMatrixEye, _iLeadDim, _iLeadDim); + seyea(pfltMatrixEye, _iLeadDim, _iLeadDim); /*cA = A * c*/ @@ -110,7 +110,7 @@ void sexpma (float* in, float* out, int _iLeadDim){ pfltMatrixcX[iIndex1] = pfltMatrixX[iIndex1] * (float) dblCst ; /*E = E + cX*/ - sadda ( out, iSquare , pfltMatrixcX , iSquare , out ) ; + sadda ( out, iSquare , pfltMatrixcX , iSquare , out ) ; if(iFlag == 1) /*D = D + cX*/ { diff --git a/src/c/matrixOperations/expm/zexpma.c b/src/c/matrixOperations/expm/zexpma.c index 3de35e02..680f68ab 100644 --- a/src/c/matrixOperations/expm/zexpma.c +++ b/src/c/matrixOperations/expm/zexpma.c @@ -71,7 +71,7 @@ void zexpma(doubleComplex * in, doubleComplex * out, int _iLeadDim) pdblMatrixX[iIndex1] = pdblMatrixA[iIndex1] ; - zeyea(pdblMatrixEye, _iLeadDim, _iLeadDim); + zeyea(pdblMatrixEye, _iLeadDim, _iLeadDim); /* zmulma ( & zdblCst , 1 ,1, pdblMatrixA , _iLeadDim, _iLeadDim, diff --git a/src/c/matrixOperations/matrix/dmatrixa.c b/src/c/matrixOperations/matrix/dmatrixa.c index 649dbc34..9bbc2154 100644 --- a/src/c/matrixOperations/matrix/dmatrixa.c +++ b/src/c/matrixOperations/matrix/dmatrixa.c @@ -12,6 +12,7 @@ /*Function returns cumulative sum of members of array/matrix*/ +#include <stdio.h> #include "matrix.h" #include "types.h" #include "uint16.h" diff --git a/src/c/matrixOperations/matrix/smatrixa.c b/src/c/matrixOperations/matrix/smatrixa.c index f432023a..6c00f980 100644 --- a/src/c/matrixOperations/matrix/smatrixa.c +++ b/src/c/matrixOperations/matrix/smatrixa.c @@ -12,6 +12,7 @@ /*Function returns cumulative sum of members of array/matrix*/ +#include <stdio.h> #include "matrix.h" #include "types.h" #include "uint16.h" diff --git a/src/c/matrixOperations/matrix/u16matrixa.c b/src/c/matrixOperations/matrix/u16matrixa.c index e60d880d..ff0965ba 100644 --- a/src/c/matrixOperations/matrix/u16matrixa.c +++ b/src/c/matrixOperations/matrix/u16matrixa.c @@ -12,6 +12,7 @@ /*Function returns cumulative sum of members of array/matrix*/ +#include <stdio.h> #include "matrix.h" #include "types.h" #include "uint16.h" diff --git a/src/c/matrixOperations/matrix/zmatrixa.c b/src/c/matrixOperations/matrix/zmatrixa.c index 5e5651b1..3f0e6b9b 100644 --- a/src/c/matrixOperations/matrix/zmatrixa.c +++ b/src/c/matrixOperations/matrix/zmatrixa.c @@ -12,6 +12,7 @@ /*Function returns cumulative sum of members of array/matrix*/ +#include <stdio.h> #include "matrix.h" #include "types.h" #include "doubleComplex.h" diff --git a/src/c/matrixOperations/norm/dnorma.c b/src/c/matrixOperations/norm/dnorma.c index 2bb9b8b7..4d016de0 100644 --- a/src/c/matrixOperations/norm/dnorma.c +++ b/src/c/matrixOperations/norm/dnorma.c @@ -20,6 +20,7 @@ #include <math.h> #include <stdio.h> #include<stdlib.h> +#include "min.h" double dnorma (double *in, int row, int col, int norm) { |