diff options
| author | Abhinav Dronamraju | 2017-07-10 22:08:27 +0530 |
|---|---|---|
| committer | Abhinav Dronamraju | 2017-07-10 22:08:27 +0530 |
| commit | d2c00f5343785085bcfefb62cbc041a5cffa8f31 (patch) | |
| tree | 3d4fc371c30f2340af2def6dcabeb4fd4821eaf8 /src/c/matrixOperations/norm | |
| parent | c7d123014c05daaa6c7ce32bc5e86e5f3e7e4692 (diff) | |
| parent | 49d8281d2da2f4c6bf0e62d148a8a7328d3bf970 (diff) | |
| download | Scilab2C_fossee_old-d2c00f5343785085bcfefb62cbc041a5cffa8f31.tar.gz Scilab2C_fossee_old-d2c00f5343785085bcfefb62cbc041a5cffa8f31.tar.bz2 Scilab2C_fossee_old-d2c00f5343785085bcfefb62cbc041a5cffa8f31.zip | |
Pulled from upstream master
Diffstat (limited to 'src/c/matrixOperations/norm')
| -rw-r--r-- | src/c/matrixOperations/norm/dnorma.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/c/matrixOperations/norm/dnorma.c b/src/c/matrixOperations/norm/dnorma.c index c912f85..2bb9b8b 100644 --- a/src/c/matrixOperations/norm/dnorma.c +++ b/src/c/matrixOperations/norm/dnorma.c @@ -6,6 +6,8 @@ are also available at http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt Author: Siddhesh Wani + + Edited by: Sandeep Gupta Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ @@ -14,13 +16,17 @@ /*Acceptable norms are: 1, 2, 'inf', 'fro', */ #include "norm.h" +#include "svd.h" #include <math.h> +#include <stdio.h> +#include<stdlib.h> double dnorma (double *in, int row, int col, int norm) { double res = 0, sum = 0; int col_count, row_count; - + double *S; + S = (double *)malloc(min(row,col)*sizeof(double)); switch (norm) { case 1: /*largest column sum*/ @@ -37,6 +43,8 @@ double dnorma (double *in, int row, int col, int norm) break; case 2: /*Largest singular value of the matrix*/ + dsvda(0,in,row,col,0,1,S,NULL,NULL); + res = S[0]; break; case 3: /*inf: largest row sum*/ @@ -69,4 +77,4 @@ double dnorma (double *in, int row, int col, int norm) return res; -}
\ No newline at end of file +} |