summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortorset2009-02-11 11:14:05 +0000
committertorset2009-02-11 11:14:05 +0000
commit74f515c607592aa4bfbd03bdbd68fb365d71e60f (patch)
tree14edacae7118c12524fe4097c08bffbea8e08198
parent96de5d7059b0678305e78793b38dc97683d886b4 (diff)
downloadscilab2c-74f515c607592aa4bfbd03bdbd68fb365d71e60f.tar.gz
scilab2c-74f515c607592aa4bfbd03bdbd68fb365d71e60f.tar.bz2
scilab2c-74f515c607592aa4bfbd03bdbd68fb365d71e60f.zip
Update
-rw-r--r--Doc/FunctionIntegrationOverview.xlsbin102912 -> 103424 bytes
-rw-r--r--src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci38
-rw-r--r--src/matrixOperations/zeros/testMatrixZeros.c10
3 files changed, 15 insertions, 33 deletions
diff --git a/Doc/FunctionIntegrationOverview.xls b/Doc/FunctionIntegrationOverview.xls
index 99bfca85..da3f1a15 100644
--- a/Doc/FunctionIntegrationOverview.xls
+++ b/Doc/FunctionIntegrationOverview.xls
Binary files differ
diff --git a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
index 378ded91..716d61e3 100644
--- a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
+++ b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
@@ -1,38 +1,20 @@
-//SCI2C: DEFAULT_PRECISION= FLOAT
+//SCI2C: DEFAULT_PRECISION= DOUBLE
function mainfunction()
-//test lev
+//test variance
-//reals
-b=[1 2 3 4]
+c=[4 2 3 ;8 8 4; 3 4 5]
+d=[4 2 3 ;8 8-1*%i 4; 3+4*%i 4 5]
-disp(lev(b))
-[u,v]=lev(b)
-disp(u)
-disp(v)
-
-[x,y,z]=lev(b)
-disp(x)
-disp(y)
-disp(z)
-
-//complexes
-
-c=[1+2*%i 2 3-3*%i 4+%i]
-
-disp(lev(c))
-
-[uc,vc]=lev(c)
-disp(uc)
-disp(vc)
-
-[xc,yc,zc]=lev(c)
-disp(xc)
-disp(yc)
-disp(zc)
+disp (variance(c))
+disp (variance(c,1))
+disp (variance(c,2))
+disp (variance(d))
+disp (variance(d,1))
+disp (variance(d,2))
endfunction
diff --git a/src/matrixOperations/zeros/testMatrixZeros.c b/src/matrixOperations/zeros/testMatrixZeros.c
index 37f0596b..b6ebe36f 100644
--- a/src/matrixOperations/zeros/testMatrixZeros.c
+++ b/src/matrixOperations/zeros/testMatrixZeros.c
@@ -108,13 +108,13 @@ static void czerosaTest ( void )
-static int testEye(void) {
+static int testZeros(void) {
- printf("\n>>>> Matrix ONES Tests\n");
- printf("\t>>>> Matrix Double Realt Tests\n");
+ printf("\n>>>> Matrix ZEROS Tests\n");
+ printf("\t>>>> Matrix Double Real Tests\n");
dzerosaTest();
- printf("\n\n\t>>>> Matrix Float Realt Tests\n");
+ printf("\n\n\t>>>> Matrix Float Real Tests\n");
szerosaTest();
printf("\n\n\n");
@@ -131,7 +131,7 @@ static int testEye(void) {
int main(void) {
- assert(testEye() == 0);
+ assert(testZeros() == 0);
return 0;
}