From 38a2d24e20e33da84432c068411dae980e32baeb Mon Sep 17 00:00:00 2001 From: Brijeshcr Date: Thu, 27 Jul 2017 18:29:25 +0530 Subject: Nanmin and Nanmean added --- 2.3-1/demos/Brijesh_Demos/Test_Add_SCE.sce | 4 - 2.3-1/demos/Brijesh_Demos/Test_Addition.sci | 8 -- 2.3-1/demos/Brijesh_Demos/Test_Cross.sci | 44 ---------- 2.3-1/demos/Brijesh_Demos/Test_Erf.sci | 10 --- 2.3-1/demos/Brijesh_Demos/Test_Erfc.sci | 10 --- 2.3-1/demos/Brijesh_Demos/Test_Erfcx.sci | 10 --- 2.3-1/demos/Brijesh_Demos/Test_Erfinv.sci | 10 --- 2.3-1/demos/Brijesh_Demos/Test_Isreal.sci | 25 ------ 2.3-1/demos/Brijesh_Demos/Test_Toeplitz.sci | 50 ----------- 2.3-1/demos/Brijesh_Demos/test_addition.sci | 8 ++ 2.3-1/demos/Brijesh_Demos/test_cross.sci | 44 ++++++++++ 2.3-1/demos/Brijesh_Demos/test_erf.sci | 10 +++ 2.3-1/demos/Brijesh_Demos/test_erfc.sci | 10 +++ 2.3-1/demos/Brijesh_Demos/test_erfcx.sci | 10 +++ 2.3-1/demos/Brijesh_Demos/test_erfinv.sci | 10 +++ 2.3-1/demos/Brijesh_Demos/test_isequal.sci | 25 ++++++ 2.3-1/demos/Brijesh_Demos/test_nanmean.sci | 14 +++ 2.3-1/demos/Brijesh_Demos/test_nanmin.sci | 16 ++++ 2.3-1/demos/Brijesh_Demos/test_toeplitz.sci | 50 +++++++++++ 2.3-1/includes/sci2clib.h | 6 ++ 2.3-1/jar/scilab_en_US_help.jar | Bin 18123 -> 11210 bytes 2.3-1/macros/ASTManagement/lib | Bin 0 -> 2008 bytes 2.3-1/macros/CCodeGeneration/lib | Bin 0 -> 1056 bytes 2.3-1/macros/ErrorMessages/lib | Bin 0 -> 520 bytes 2.3-1/macros/FunctionAnnotation/lib | Bin 0 -> 2412 bytes 2.3-1/macros/FunctionList/lib | Bin 0 -> 588 bytes 2.3-1/macros/GeneralFunctions/lib | Bin 0 -> 1132 bytes 2.3-1/macros/Hardware/AVR/lib | Bin 0 -> 972 bytes 2.3-1/macros/Hardware/RasberryPi/Digital/lib | Bin 0 -> 600 bytes 2.3-1/macros/Hardware/RasberryPi/I2C/lib | Bin 0 -> 704 bytes 2.3-1/macros/Hardware/RasberryPi/Interrupt/lib | Bin 0 -> 536 bytes 2.3-1/macros/Hardware/RasberryPi/Misc/lib | Bin 0 -> 564 bytes 2.3-1/macros/Hardware/RasberryPi/SPI/lib | Bin 0 -> 584 bytes 2.3-1/macros/Hardware/RasberryPi/Serial/lib | Bin 0 -> 692 bytes 2.3-1/macros/Hardware/RasberryPi/Setup/lib | Bin 0 -> 616 bytes 2.3-1/macros/Hardware/RasberryPi/Shift/lib | Bin 0 -> 568 bytes 2.3-1/macros/Hardware/RasberryPi/Soft/lib | Bin 0 -> 636 bytes 2.3-1/macros/Hardware/RasberryPi/Timing/lib | Bin 0 -> 596 bytes 2.3-1/macros/Hardware/RasberryPi/gertBoard/lib | Bin 0 -> 656 bytes 2.3-1/macros/Hardware/RasberryPi/lcd/lib | Bin 0 -> 776 bytes 2.3-1/macros/Hardware/RasberryPi/lcd128x64/lib | Bin 0 -> 800 bytes 2.3-1/macros/Hardware/RasberryPi/lib | Bin 0 -> 592 bytes 2.3-1/macros/Hardware/RasberryPi/mcp/lib | Bin 0 -> 608 bytes 2.3-1/macros/Hardware/RasberryPi/pcf/lib | Bin 0 -> 536 bytes 2.3-1/macros/Hardware/RasberryPi/piGlow/lib | Bin 0 -> 596 bytes 2.3-1/macros/Hardware/RasberryPi/pinMap/lib | Bin 0 -> 548 bytes 2.3-1/macros/Hardware/RasberryPi/pwm/lib | Bin 0 -> 608 bytes 2.3-1/macros/ImageProcessing/core/lib | Bin 0 -> 524 bytes 2.3-1/macros/ImageProcessing/highgui/lib | Bin 0 -> 584 bytes 2.3-1/macros/ImageProcessing/imgproc/lib | Bin 0 -> 752 bytes 2.3-1/macros/Scilab-Arduino/lib | Bin 0 -> 716 bytes 2.3-1/macros/SymbolTable/lib | Bin 0 -> 752 bytes .../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 97 ++++++++++++++++++++- 2.3-1/macros/ToolInitialization/lib | Bin 0 -> 804 bytes 2.3-1/macros/findDeps/getAllHeaders.sci | 2 + 2.3-1/macros/findDeps/getAllInterfaces.sci | 2 + 2.3-1/macros/findDeps/getAllSources.sci | 13 +++ 2.3-1/macros/findDeps/lib | Bin 0 -> 620 bytes 2.3-1/macros/lib | Bin 0 -> 536 bytes 2.3-1/src/c/elementaryFunctions/includes/nanmean.h | 42 +++++++++ 2.3-1/src/c/elementaryFunctions/includes/nanmin.h | 37 ++++++++ .../c/elementaryFunctions/interfaces/int_nanmean.h | 32 +++++++ .../c/elementaryFunctions/interfaces/int_nanmin.h | 29 ++++++ .../src/c/elementaryFunctions/nanmean/cnanmeana.c | 37 ++++++++ .../c/elementaryFunctions/nanmean/cnanmeancola.c | 37 ++++++++ .../c/elementaryFunctions/nanmean/cnanmeanrowa.c | 37 ++++++++ .../src/c/elementaryFunctions/nanmean/dnanmeana.c | 33 +++++++ .../c/elementaryFunctions/nanmean/dnanmeancola.c | 36 ++++++++ .../c/elementaryFunctions/nanmean/dnanmeanrowa.c | 36 ++++++++ .../src/c/elementaryFunctions/nanmean/snanmeana.c | 33 +++++++ .../c/elementaryFunctions/nanmean/snanmeancola.c | 35 ++++++++ .../c/elementaryFunctions/nanmean/snanmeanrowa.c | 35 ++++++++ .../src/c/elementaryFunctions/nanmean/znanmeana.c | 37 ++++++++ .../c/elementaryFunctions/nanmean/znanmeancola.c | 37 ++++++++ .../c/elementaryFunctions/nanmean/znanmeanrowa.c | 37 ++++++++ 2.3-1/src/c/elementaryFunctions/nanmin/dnanmina.c | 53 +++++++++++ .../src/c/elementaryFunctions/nanmin/dnanminnpa.c | 51 +++++++++++ .../src/c/elementaryFunctions/nanmin/dnanminnps.c | 25 ++++++ 2.3-1/src/c/elementaryFunctions/nanmin/dnanmins.c | 32 +++++++ 2.3-1/src/c/signalProcessing/includes/dct.h | 2 +- 2.3-1/src/c/signalProcessing/interfaces/int_dct.h | 4 +- .../testLinearAlgebra/testsqroot/testsqroot.sci | 2 +- 82 files changed, 1050 insertions(+), 177 deletions(-) delete mode 100644 2.3-1/demos/Brijesh_Demos/Test_Add_SCE.sce delete mode 100644 2.3-1/demos/Brijesh_Demos/Test_Addition.sci delete mode 100644 2.3-1/demos/Brijesh_Demos/Test_Cross.sci delete mode 100644 2.3-1/demos/Brijesh_Demos/Test_Erf.sci delete mode 100644 2.3-1/demos/Brijesh_Demos/Test_Erfc.sci delete mode 100644 2.3-1/demos/Brijesh_Demos/Test_Erfcx.sci delete mode 100644 2.3-1/demos/Brijesh_Demos/Test_Erfinv.sci delete mode 100644 2.3-1/demos/Brijesh_Demos/Test_Isreal.sci delete mode 100644 2.3-1/demos/Brijesh_Demos/Test_Toeplitz.sci create mode 100644 2.3-1/demos/Brijesh_Demos/test_addition.sci create mode 100644 2.3-1/demos/Brijesh_Demos/test_cross.sci create mode 100644 2.3-1/demos/Brijesh_Demos/test_erf.sci create mode 100644 2.3-1/demos/Brijesh_Demos/test_erfc.sci create mode 100644 2.3-1/demos/Brijesh_Demos/test_erfcx.sci create mode 100644 2.3-1/demos/Brijesh_Demos/test_erfinv.sci create mode 100644 2.3-1/demos/Brijesh_Demos/test_isequal.sci create mode 100644 2.3-1/demos/Brijesh_Demos/test_nanmean.sci create mode 100644 2.3-1/demos/Brijesh_Demos/test_nanmin.sci create mode 100644 2.3-1/demos/Brijesh_Demos/test_toeplitz.sci create mode 100644 2.3-1/macros/ASTManagement/lib create mode 100644 2.3-1/macros/CCodeGeneration/lib create mode 100644 2.3-1/macros/ErrorMessages/lib create mode 100644 2.3-1/macros/FunctionAnnotation/lib create mode 100644 2.3-1/macros/FunctionList/lib create mode 100644 2.3-1/macros/GeneralFunctions/lib create mode 100644 2.3-1/macros/Hardware/AVR/lib create mode 100644 2.3-1/macros/Hardware/RasberryPi/Digital/lib create mode 100644 2.3-1/macros/Hardware/RasberryPi/I2C/lib create mode 100644 2.3-1/macros/Hardware/RasberryPi/Interrupt/lib create mode 100644 2.3-1/macros/Hardware/RasberryPi/Misc/lib create mode 100644 2.3-1/macros/Hardware/RasberryPi/SPI/lib create mode 100644 2.3-1/macros/Hardware/RasberryPi/Serial/lib create mode 100644 2.3-1/macros/Hardware/RasberryPi/Setup/lib create mode 100644 2.3-1/macros/Hardware/RasberryPi/Shift/lib create mode 100644 2.3-1/macros/Hardware/RasberryPi/Soft/lib create mode 100644 2.3-1/macros/Hardware/RasberryPi/Timing/lib create mode 100644 2.3-1/macros/Hardware/RasberryPi/gertBoard/lib create mode 100644 2.3-1/macros/Hardware/RasberryPi/lcd/lib create mode 100644 2.3-1/macros/Hardware/RasberryPi/lcd128x64/lib create mode 100644 2.3-1/macros/Hardware/RasberryPi/lib create mode 100644 2.3-1/macros/Hardware/RasberryPi/mcp/lib create mode 100644 2.3-1/macros/Hardware/RasberryPi/pcf/lib create mode 100644 2.3-1/macros/Hardware/RasberryPi/piGlow/lib create mode 100644 2.3-1/macros/Hardware/RasberryPi/pinMap/lib create mode 100644 2.3-1/macros/Hardware/RasberryPi/pwm/lib create mode 100644 2.3-1/macros/ImageProcessing/core/lib create mode 100644 2.3-1/macros/ImageProcessing/highgui/lib create mode 100644 2.3-1/macros/ImageProcessing/imgproc/lib create mode 100644 2.3-1/macros/Scilab-Arduino/lib create mode 100644 2.3-1/macros/SymbolTable/lib create mode 100644 2.3-1/macros/ToolInitialization/lib create mode 100644 2.3-1/macros/findDeps/lib create mode 100644 2.3-1/macros/lib create mode 100644 2.3-1/src/c/elementaryFunctions/includes/nanmean.h create mode 100644 2.3-1/src/c/elementaryFunctions/includes/nanmin.h create mode 100644 2.3-1/src/c/elementaryFunctions/interfaces/int_nanmean.h create mode 100644 2.3-1/src/c/elementaryFunctions/interfaces/int_nanmin.h create mode 100644 2.3-1/src/c/elementaryFunctions/nanmean/cnanmeana.c create mode 100644 2.3-1/src/c/elementaryFunctions/nanmean/cnanmeancola.c create mode 100644 2.3-1/src/c/elementaryFunctions/nanmean/cnanmeanrowa.c create mode 100644 2.3-1/src/c/elementaryFunctions/nanmean/dnanmeana.c create mode 100644 2.3-1/src/c/elementaryFunctions/nanmean/dnanmeancola.c create mode 100644 2.3-1/src/c/elementaryFunctions/nanmean/dnanmeanrowa.c create mode 100644 2.3-1/src/c/elementaryFunctions/nanmean/snanmeana.c create mode 100644 2.3-1/src/c/elementaryFunctions/nanmean/snanmeancola.c create mode 100644 2.3-1/src/c/elementaryFunctions/nanmean/snanmeanrowa.c create mode 100644 2.3-1/src/c/elementaryFunctions/nanmean/znanmeana.c create mode 100644 2.3-1/src/c/elementaryFunctions/nanmean/znanmeancola.c create mode 100644 2.3-1/src/c/elementaryFunctions/nanmean/znanmeanrowa.c create mode 100644 2.3-1/src/c/elementaryFunctions/nanmin/dnanmina.c create mode 100644 2.3-1/src/c/elementaryFunctions/nanmin/dnanminnpa.c create mode 100644 2.3-1/src/c/elementaryFunctions/nanmin/dnanminnps.c create mode 100644 2.3-1/src/c/elementaryFunctions/nanmin/dnanmins.c diff --git a/2.3-1/demos/Brijesh_Demos/Test_Add_SCE.sce b/2.3-1/demos/Brijesh_Demos/Test_Add_SCE.sce deleted file mode 100644 index e250078d..00000000 --- a/2.3-1/demos/Brijesh_Demos/Test_Add_SCE.sce +++ /dev/null @@ -1,4 +0,0 @@ -a = 1; -b = 5; -c = a+b; -disp(c); diff --git a/2.3-1/demos/Brijesh_Demos/Test_Addition.sci b/2.3-1/demos/Brijesh_Demos/Test_Addition.sci deleted file mode 100644 index 856ba63e..00000000 --- a/2.3-1/demos/Brijesh_Demos/Test_Addition.sci +++ /dev/null @@ -1,8 +0,0 @@ -function Test_Addition() - a = 1; - b = 2; - d = float(b); - e = float(a) - c = e+d; - disp(c); -endfunction diff --git a/2.3-1/demos/Brijesh_Demos/Test_Cross.sci b/2.3-1/demos/Brijesh_Demos/Test_Cross.sci deleted file mode 100644 index 01206b3c..00000000 --- a/2.3-1/demos/Brijesh_Demos/Test_Cross.sci +++ /dev/null @@ -1,44 +0,0 @@ -function Test_Cross - disp('Datatype: Double'); - i1 = [1 2;3 4;5 6]; - i2 = [7 8;9 10;11 12]; - o1 = cross(i1,i2); - disp(o1); - - disp('Datatype: DoubleComplex'); - i3 = [1+1*%i 2+2*%i;3+3*%i 4+4*%i;5+5*%i 6+6*%i]; - i4 = [7+7*%i 8+8*%i;9+9*%i 10+10*%i;11+11*%i 12+12*%i]; - o2 = cross(i3,i4); - disp(o2); - - disp('Float'); - i5 = float([1 2;3 4;5 6]); - i6 = float([7 8;9 10;11 12]); - o3 = cross(i5,i6); - disp(o3); - - disp('Datatype: uint8'); - i7 = uint8([1 2;3 4;5 6]); - i8 = uint8([7 8;9 10;11 12]); - o4 = cross(i7,i8); - disp(o4); - - disp('Datatype: int8'); - i9 = int8([1 2;3 4;5 6]); - i10 = int8([7 8;9 10;11 12]); - o5 = cross(i9,i10); - disp(o5); - - disp('Datatype: uint16'); - i11 = uint16([1 2;3 4;5 6]); - i12 = uint16([7 8;9 10;11 12]); - o6 = cross(i11,i12); - disp(o6); - - disp('Datatype: int16'); - i13 = int8([1 2;3 4;5 6]); - i14 = int8([7 8;9 10;11 12]); - o7 = cross(i13,i14); - disp(o7); - -endfunction diff --git a/2.3-1/demos/Brijesh_Demos/Test_Erf.sci b/2.3-1/demos/Brijesh_Demos/Test_Erf.sci deleted file mode 100644 index 42208f61..00000000 --- a/2.3-1/demos/Brijesh_Demos/Test_Erf.sci +++ /dev/null @@ -1,10 +0,0 @@ -function Test_Erf - disp('Datatype: Double'); - i1 = [1 2 .5; 7 .8 .9]; - o1 = erf(i1); - disp(o1); - disp('Datatype: float'); - i2 = float([1 2 .5; 7 .8 .9]); - o2 = erf(i2); - disp(o2); -endfunction diff --git a/2.3-1/demos/Brijesh_Demos/Test_Erfc.sci b/2.3-1/demos/Brijesh_Demos/Test_Erfc.sci deleted file mode 100644 index 2ad8cfed..00000000 --- a/2.3-1/demos/Brijesh_Demos/Test_Erfc.sci +++ /dev/null @@ -1,10 +0,0 @@ -function Test_Erfc - disp('Datatype: Double'); - i1 = [1 2 .5; 7 .8 .9]; - o1 = erfc(i1); - disp(o1); - disp('Datatype: float'); - i2 = float([1 2 .5; 7 .8 .9]); - o2 = erfc(i2); - disp(o2); -endfunction diff --git a/2.3-1/demos/Brijesh_Demos/Test_Erfcx.sci b/2.3-1/demos/Brijesh_Demos/Test_Erfcx.sci deleted file mode 100644 index e17ae514..00000000 --- a/2.3-1/demos/Brijesh_Demos/Test_Erfcx.sci +++ /dev/null @@ -1,10 +0,0 @@ -function Test_Erfcx - disp('Datatype: Double'); - i1 = [.75 .8 -.32]; - o1 = erfcx(i1); - disp(o1); - disp('Datatype: float'); - i2 = float([1 2 .5; 7 .8 .9]); - o2 = erfc(i2); - disp(o2); -endfunction diff --git a/2.3-1/demos/Brijesh_Demos/Test_Erfinv.sci b/2.3-1/demos/Brijesh_Demos/Test_Erfinv.sci deleted file mode 100644 index 99a8683a..00000000 --- a/2.3-1/demos/Brijesh_Demos/Test_Erfinv.sci +++ /dev/null @@ -1,10 +0,0 @@ -function Test_Erfinv - disp('Datatype: Double'); - i1 = [12 0.6 -2 -0.75]; - o1 = erfinv(i1); - disp(o1); - disp('Datatype: float'); - i2 = float([5 0.35 -1 -.97 -6]); - o2 = erf(i2); - disp(o2); -endfunction diff --git a/2.3-1/demos/Brijesh_Demos/Test_Isreal.sci b/2.3-1/demos/Brijesh_Demos/Test_Isreal.sci deleted file mode 100644 index 4846d31c..00000000 --- a/2.3-1/demos/Brijesh_Demos/Test_Isreal.sci +++ /dev/null @@ -1,25 +0,0 @@ -function Test_Isreal - disp('Datatype: Double'); - i1 = [1 2 3]; - i2 = [1 2 3]; - o1 = isequal(i1,i2); - disp(o1); - - disp('Datatype: Float'); - i3 = float([4 5 6]); - i4 = float([4 5 6]); - o2 = isequal(i3,i4); - disp(o2); - - disp('Datatype: DoubleComplex'); - i5 = [%i*3 %i*3 %i*3]; - i6 = [%i*3 %i*3 %i*3]; - o3 = isequal(i5,i6); - disp(o3); - - disp('Datatype: uint16'); - i7 = uint16([4 5 6]); - i8 = uint16([4 5 6]); - o4 = isequal(i7,i8); - disp(o4); -endfunction diff --git a/2.3-1/demos/Brijesh_Demos/Test_Toeplitz.sci b/2.3-1/demos/Brijesh_Demos/Test_Toeplitz.sci deleted file mode 100644 index 6d1269ec..00000000 --- a/2.3-1/demos/Brijesh_Demos/Test_Toeplitz.sci +++ /dev/null @@ -1,50 +0,0 @@ -function Test_Toeplitz() - disp('Datatype: Double'); - ai = [1 2 3 4]; - bi = [1 6 7 8]; - as1 = toeplitz(ai,bi); - disp(as1); - - disp('Datatype: Float'); - aid = float(ai); - bid = float(bi); - as2 = toeplitz(aid,bid); - disp(as2); - - disp('Datatype: uint8'); - aiu8 = uint8(ai); - biu8 = uint8(bi); - as3 = toeplitz(aiu8,biu8); - disp(as3); - - disp('Datatype: int8'); - ai8 = int8(ai); - bi8 = int8(bi); - as4= toeplitz(ai8,bi8); - disp(as4); - - disp('Datatype: uint16'); - aiu16 = uint16(ai); - biu16 = uint16(bi); - as5 = toeplitz(aiu16,biu16); - disp(as5); - - disp('Datatype: int16'); - ai16 = int16(ai); - bi16 = int16(bi); - as6 = toeplitz(ai16,bi16); - disp(as6); - - disp('Datatype: Double Complex'); - adc = [1+%i*1 2+%i*2 3+%i*3 4+%i*4]; - bdc = [1+%i*1 6+%i*6 7+%i*7 8+%i*8]; - as7 = toeplitz(adc,bdc); - disp(as7); - - disp('Datatype: Char'); - aic = ['a' 'b' 'c' 'd']; - bic = ['a' 'x' 'y' 'z']; - as9 = toeplitz(aic,bic); - disp(as9); - -endfunction diff --git a/2.3-1/demos/Brijesh_Demos/test_addition.sci b/2.3-1/demos/Brijesh_Demos/test_addition.sci new file mode 100644 index 00000000..f70f0aff --- /dev/null +++ b/2.3-1/demos/Brijesh_Demos/test_addition.sci @@ -0,0 +1,8 @@ +function test_addition() + a = 1; + b = 2; + d = float(b); + e = float(a) + c = e+d; + disp(c); +endfunction diff --git a/2.3-1/demos/Brijesh_Demos/test_cross.sci b/2.3-1/demos/Brijesh_Demos/test_cross.sci new file mode 100644 index 00000000..6c2224d6 --- /dev/null +++ b/2.3-1/demos/Brijesh_Demos/test_cross.sci @@ -0,0 +1,44 @@ +function test_cross + disp('Datatype: Double'); + i1 = [1 2;3 4;5 6]; + i2 = [7 8;9 10;11 12]; + o1 = cross(i1,i2); + disp(o1); + + disp('Datatype: DoubleComplex'); + i3 = [1+1*%i 2+2*%i;3+3*%i 4+4*%i;5+5*%i 6+6*%i]; + i4 = [7+7*%i 8+8*%i;9+9*%i 10+10*%i;11+11*%i 12+12*%i]; + o2 = cross(i3,i4); + disp(o2); + + disp('Float'); + i5 = float([1 2;3 4;5 6]); + i6 = float([7 8;9 10;11 12]); + o3 = cross(i5,i6); + disp(o3); + + disp('Datatype: uint8'); + i7 = uint8([1 2;3 4;5 6]); + i8 = uint8([7 8;9 10;11 12]); + o4 = cross(i7,i8); + disp(o4); + + disp('Datatype: int8'); + i9 = int8([1 2;3 4;5 6]); + i10 = int8([7 8;9 10;11 12]); + o5 = cross(i9,i10); + disp(o5); + + disp('Datatype: uint16'); + i11 = uint16([1 2;3 4;5 6]); + i12 = uint16([7 8;9 10;11 12]); + o6 = cross(i11,i12); + disp(o6); + + disp('Datatype: int16'); + i13 = int8([1 2;3 4;5 6]); + i14 = int8([7 8;9 10;11 12]); + o7 = cross(i13,i14); + disp(o7); + +endfunction diff --git a/2.3-1/demos/Brijesh_Demos/test_erf.sci b/2.3-1/demos/Brijesh_Demos/test_erf.sci new file mode 100644 index 00000000..5cebb253 --- /dev/null +++ b/2.3-1/demos/Brijesh_Demos/test_erf.sci @@ -0,0 +1,10 @@ +function test_erf + disp('Datatype: Double'); + i1 = [1 2 .5; 7 .8 .9]; + o1 = erf(i1); + disp(o1); + disp('Datatype: float'); + i2 = float([1 2 .5; 7 .8 .9]); + o2 = erf(i2); + disp(o2); +endfunction diff --git a/2.3-1/demos/Brijesh_Demos/test_erfc.sci b/2.3-1/demos/Brijesh_Demos/test_erfc.sci new file mode 100644 index 00000000..ac50e150 --- /dev/null +++ b/2.3-1/demos/Brijesh_Demos/test_erfc.sci @@ -0,0 +1,10 @@ +function test_erfc + disp('Datatype: Double'); + i1 = [1 2 .5; 7 .8 .9]; + o1 = erfc(i1); + disp(o1); + disp('Datatype: float'); + i2 = float([1 2 .5; 7 .8 .9]); + o2 = erfc(i2); + disp(o2); +endfunction diff --git a/2.3-1/demos/Brijesh_Demos/test_erfcx.sci b/2.3-1/demos/Brijesh_Demos/test_erfcx.sci new file mode 100644 index 00000000..a2a553c6 --- /dev/null +++ b/2.3-1/demos/Brijesh_Demos/test_erfcx.sci @@ -0,0 +1,10 @@ +function test_erfcx + disp('Datatype: Double'); + i1 = [.75 .8 -.32]; + o1 = erfcx(i1); + disp(o1); + disp('Datatype: float'); + i2 = float([1 2 .5; 7 .8 .9]); + o2 = erfc(i2); + disp(o2); +endfunction diff --git a/2.3-1/demos/Brijesh_Demos/test_erfinv.sci b/2.3-1/demos/Brijesh_Demos/test_erfinv.sci new file mode 100644 index 00000000..483d2903 --- /dev/null +++ b/2.3-1/demos/Brijesh_Demos/test_erfinv.sci @@ -0,0 +1,10 @@ +function test_erfinv + disp('Datatype: Double'); + i1 = [12 0.6 -2 -0.75]; + o1 = erfinv(i1); + disp(o1); + disp('Datatype: float'); + i2 = float([5 0.35 -1 -.97 -6]); + o2 = erf(i2); + disp(o2); +endfunction diff --git a/2.3-1/demos/Brijesh_Demos/test_isequal.sci b/2.3-1/demos/Brijesh_Demos/test_isequal.sci new file mode 100644 index 00000000..1531275d --- /dev/null +++ b/2.3-1/demos/Brijesh_Demos/test_isequal.sci @@ -0,0 +1,25 @@ +function test_isequal + disp('Datatype: Double'); + i1 = [1 2 3]; + i2 = [1 2 3]; + o1 = isequal(i1,i2); + disp(o1); + + disp('Datatype: Float'); + i3 = float([4 5 6]); + i4 = float([4 5 6]); + o2 = isequal(i3,i4); + disp(o2); + + disp('Datatype: DoubleComplex'); + i5 = [%i*3 %i*3 %i*3]; + i6 = [%i*3 %i*3 %i*3]; + o3 = isequal(i5,i6); + disp(o3); + + disp('Datatype: uint16'); + i7 = uint16([4 5 6]); + i8 = uint16([4 5 6]); + o4 = isequal(i7,i8); + disp(o4); +endfunction diff --git a/2.3-1/demos/Brijesh_Demos/test_nanmean.sci b/2.3-1/demos/Brijesh_Demos/test_nanmean.sci new file mode 100644 index 00000000..6009ad8a --- /dev/null +++ b/2.3-1/demos/Brijesh_Demos/test_nanmean.sci @@ -0,0 +1,14 @@ +function test_nanmean + disp('Datatype: Double'); + i1 = [1 %nan;3 4;5 %nan]; + o1 = nanmean(i1,'r'); + disp(o1); + disp('Datatype: Float'); + i2 = float([1 %nan;3 4;5 %nan]); + o2 = nanmean(i2,'r'); + disp(o2); + disp('Datatype: Double complex'); + i3 = [1 %nan %i;3 4+1*%i %nan;5 %nan %i]; + o3 = nanmean(i3,'c'); + disp(o3); +endfunction diff --git a/2.3-1/demos/Brijesh_Demos/test_nanmin.sci b/2.3-1/demos/Brijesh_Demos/test_nanmin.sci new file mode 100644 index 00000000..86517436 --- /dev/null +++ b/2.3-1/demos/Brijesh_Demos/test_nanmin.sci @@ -0,0 +1,16 @@ +function test_nanmin + disp('Datatype: Double'); + i1 = [%nan %nan; %nan %nan; %nan %nan]; + [o1, p1] = nanmin(i1); + //o1 = nanmin(i1); + disp(o1); + disp(p1); + //disp('Datatype: Float'); + //i2 = float([1 %nan;3 4;5 %nan]); + //o2 = nanmean(i2,'r'); + //disp(o2); + //disp('Datatype: Double complex'); + //i3 = [1 %nan %i;3 4+1*%i %nan;5 %nan %i]; + //o3 = nanmean(i3,'c'); + //disp(o3); +endfunction diff --git a/2.3-1/demos/Brijesh_Demos/test_toeplitz.sci b/2.3-1/demos/Brijesh_Demos/test_toeplitz.sci new file mode 100644 index 00000000..4a52e7ba --- /dev/null +++ b/2.3-1/demos/Brijesh_Demos/test_toeplitz.sci @@ -0,0 +1,50 @@ +function test_toeplitz() + disp('Datatype: Double'); + ai = [1 2 3 4]; + bi = [1 6 7 8]; + as1 = toeplitz(ai,bi); + disp(as1); + + disp('Datatype: Float'); + aid = float(ai); + bid = float(bi); + as2 = toeplitz(aid,bid); + disp(as2); + + disp('Datatype: uint8'); + aiu8 = uint8(ai); + biu8 = uint8(bi); + as3 = toeplitz(aiu8,biu8); + disp(as3); + + disp('Datatype: int8'); + ai8 = int8(ai); + bi8 = int8(bi); + as4= toeplitz(ai8,bi8); + disp(as4); + + disp('Datatype: uint16'); + aiu16 = uint16(ai); + biu16 = uint16(bi); + as5 = toeplitz(aiu16,biu16); + disp(as5); + + disp('Datatype: int16'); + ai16 = int16(ai); + bi16 = int16(bi); + as6 = toeplitz(ai16,bi16); + disp(as6); + + disp('Datatype: Double Complex'); + adc = [1+%i*1 2+%i*2 3+%i*3 4+%i*4]; + bdc = [1+%i*1 6+%i*6 7+%i*7 8+%i*8]; + as7 = toeplitz(adc,bdc); + disp(as7); + + disp('Datatype: Char'); + aic = ['a' 'b' 'c' 'd']; + bic = ['a' 'x' 'y' 'z']; + as9 = toeplitz(aic,bic); + disp(as9); + +endfunction diff --git a/2.3-1/includes/sci2clib.h b/2.3-1/includes/sci2clib.h index caad1f1d..c980a8f3 100644 --- a/2.3-1/includes/sci2clib.h +++ b/2.3-1/includes/sci2clib.h @@ -191,6 +191,12 @@ extern "C" { /*interfacing nanmax*/ #include "nanmax.h" #include "int_nanmax.h" +/*interfacing nanmean*/ +#include "nanmean.h" +#include "int_nanmean.h" +/*interfacing nanmin*/ +#include "nanmin.h" +#include "int_nanmin.h" /*interfacing issquare*/ #include "issquare.h" #include "int_issquare.h" diff --git a/2.3-1/jar/scilab_en_US_help.jar b/2.3-1/jar/scilab_en_US_help.jar index 526697fb..ad09fc53 100644 Binary files a/2.3-1/jar/scilab_en_US_help.jar and b/2.3-1/jar/scilab_en_US_help.jar differ diff --git a/2.3-1/macros/ASTManagement/lib b/2.3-1/macros/ASTManagement/lib new file mode 100644 index 00000000..dee4362f Binary files /dev/null and b/2.3-1/macros/ASTManagement/lib differ diff --git a/2.3-1/macros/CCodeGeneration/lib b/2.3-1/macros/CCodeGeneration/lib new file mode 100644 index 00000000..3d4fed1d Binary files /dev/null and b/2.3-1/macros/CCodeGeneration/lib differ diff --git a/2.3-1/macros/ErrorMessages/lib b/2.3-1/macros/ErrorMessages/lib new file mode 100644 index 00000000..ba3b9a5a Binary files /dev/null and b/2.3-1/macros/ErrorMessages/lib differ diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib new file mode 100644 index 00000000..239105c8 Binary files /dev/null and b/2.3-1/macros/FunctionAnnotation/lib differ diff --git a/2.3-1/macros/FunctionList/lib b/2.3-1/macros/FunctionList/lib new file mode 100644 index 00000000..1c722dd0 Binary files /dev/null and b/2.3-1/macros/FunctionList/lib differ diff --git a/2.3-1/macros/GeneralFunctions/lib b/2.3-1/macros/GeneralFunctions/lib new file mode 100644 index 00000000..7586a91b Binary files /dev/null and b/2.3-1/macros/GeneralFunctions/lib differ diff --git a/2.3-1/macros/Hardware/AVR/lib b/2.3-1/macros/Hardware/AVR/lib new file mode 100644 index 00000000..ed4c52b8 Binary files /dev/null and b/2.3-1/macros/Hardware/AVR/lib differ diff --git a/2.3-1/macros/Hardware/RasberryPi/Digital/lib b/2.3-1/macros/Hardware/RasberryPi/Digital/lib new file mode 100644 index 00000000..ba42ba7c Binary files /dev/null and b/2.3-1/macros/Hardware/RasberryPi/Digital/lib differ diff --git a/2.3-1/macros/Hardware/RasberryPi/I2C/lib b/2.3-1/macros/Hardware/RasberryPi/I2C/lib new file mode 100644 index 00000000..561476c1 Binary files /dev/null and b/2.3-1/macros/Hardware/RasberryPi/I2C/lib differ diff --git a/2.3-1/macros/Hardware/RasberryPi/Interrupt/lib b/2.3-1/macros/Hardware/RasberryPi/Interrupt/lib new file mode 100644 index 00000000..97a61acb Binary files /dev/null and b/2.3-1/macros/Hardware/RasberryPi/Interrupt/lib differ diff --git a/2.3-1/macros/Hardware/RasberryPi/Misc/lib b/2.3-1/macros/Hardware/RasberryPi/Misc/lib new file mode 100644 index 00000000..c718615f Binary files /dev/null and b/2.3-1/macros/Hardware/RasberryPi/Misc/lib differ diff --git a/2.3-1/macros/Hardware/RasberryPi/SPI/lib b/2.3-1/macros/Hardware/RasberryPi/SPI/lib new file mode 100644 index 00000000..a16d474e Binary files /dev/null and b/2.3-1/macros/Hardware/RasberryPi/SPI/lib differ diff --git a/2.3-1/macros/Hardware/RasberryPi/Serial/lib b/2.3-1/macros/Hardware/RasberryPi/Serial/lib new file mode 100644 index 00000000..a007f001 Binary files /dev/null and b/2.3-1/macros/Hardware/RasberryPi/Serial/lib differ diff --git a/2.3-1/macros/Hardware/RasberryPi/Setup/lib b/2.3-1/macros/Hardware/RasberryPi/Setup/lib new file mode 100644 index 00000000..83655c94 Binary files /dev/null and b/2.3-1/macros/Hardware/RasberryPi/Setup/lib differ diff --git a/2.3-1/macros/Hardware/RasberryPi/Shift/lib b/2.3-1/macros/Hardware/RasberryPi/Shift/lib new file mode 100644 index 00000000..2b12025f Binary files /dev/null and b/2.3-1/macros/Hardware/RasberryPi/Shift/lib differ diff --git a/2.3-1/macros/Hardware/RasberryPi/Soft/lib b/2.3-1/macros/Hardware/RasberryPi/Soft/lib new file mode 100644 index 00000000..09ecede9 Binary files /dev/null and b/2.3-1/macros/Hardware/RasberryPi/Soft/lib differ diff --git a/2.3-1/macros/Hardware/RasberryPi/Timing/lib b/2.3-1/macros/Hardware/RasberryPi/Timing/lib new file mode 100644 index 00000000..d271c900 Binary files /dev/null and b/2.3-1/macros/Hardware/RasberryPi/Timing/lib differ diff --git a/2.3-1/macros/Hardware/RasberryPi/gertBoard/lib b/2.3-1/macros/Hardware/RasberryPi/gertBoard/lib new file mode 100644 index 00000000..e8db080c Binary files /dev/null and b/2.3-1/macros/Hardware/RasberryPi/gertBoard/lib differ diff --git a/2.3-1/macros/Hardware/RasberryPi/lcd/lib b/2.3-1/macros/Hardware/RasberryPi/lcd/lib new file mode 100644 index 00000000..c2b693fa Binary files /dev/null and b/2.3-1/macros/Hardware/RasberryPi/lcd/lib differ diff --git a/2.3-1/macros/Hardware/RasberryPi/lcd128x64/lib b/2.3-1/macros/Hardware/RasberryPi/lcd128x64/lib new file mode 100644 index 00000000..94dfda86 Binary files /dev/null and b/2.3-1/macros/Hardware/RasberryPi/lcd128x64/lib differ diff --git a/2.3-1/macros/Hardware/RasberryPi/lib b/2.3-1/macros/Hardware/RasberryPi/lib new file mode 100644 index 00000000..49ed8116 Binary files /dev/null and b/2.3-1/macros/Hardware/RasberryPi/lib differ diff --git a/2.3-1/macros/Hardware/RasberryPi/mcp/lib b/2.3-1/macros/Hardware/RasberryPi/mcp/lib new file mode 100644 index 00000000..d411aad8 Binary files /dev/null and b/2.3-1/macros/Hardware/RasberryPi/mcp/lib differ diff --git a/2.3-1/macros/Hardware/RasberryPi/pcf/lib b/2.3-1/macros/Hardware/RasberryPi/pcf/lib new file mode 100644 index 00000000..da6a8dad Binary files /dev/null and b/2.3-1/macros/Hardware/RasberryPi/pcf/lib differ diff --git a/2.3-1/macros/Hardware/RasberryPi/piGlow/lib b/2.3-1/macros/Hardware/RasberryPi/piGlow/lib new file mode 100644 index 00000000..3f30f859 Binary files /dev/null and b/2.3-1/macros/Hardware/RasberryPi/piGlow/lib differ diff --git a/2.3-1/macros/Hardware/RasberryPi/pinMap/lib b/2.3-1/macros/Hardware/RasberryPi/pinMap/lib new file mode 100644 index 00000000..133363e6 Binary files /dev/null and b/2.3-1/macros/Hardware/RasberryPi/pinMap/lib differ diff --git a/2.3-1/macros/Hardware/RasberryPi/pwm/lib b/2.3-1/macros/Hardware/RasberryPi/pwm/lib new file mode 100644 index 00000000..8711baf0 Binary files /dev/null and b/2.3-1/macros/Hardware/RasberryPi/pwm/lib differ diff --git a/2.3-1/macros/ImageProcessing/core/lib b/2.3-1/macros/ImageProcessing/core/lib new file mode 100644 index 00000000..40b7b0a1 Binary files /dev/null and b/2.3-1/macros/ImageProcessing/core/lib differ diff --git a/2.3-1/macros/ImageProcessing/highgui/lib b/2.3-1/macros/ImageProcessing/highgui/lib new file mode 100644 index 00000000..0d7f88a9 Binary files /dev/null and b/2.3-1/macros/ImageProcessing/highgui/lib differ diff --git a/2.3-1/macros/ImageProcessing/imgproc/lib b/2.3-1/macros/ImageProcessing/imgproc/lib new file mode 100644 index 00000000..63b5e7e9 Binary files /dev/null and b/2.3-1/macros/ImageProcessing/imgproc/lib differ diff --git a/2.3-1/macros/Scilab-Arduino/lib b/2.3-1/macros/Scilab-Arduino/lib new file mode 100644 index 00000000..a62fd4e4 Binary files /dev/null and b/2.3-1/macros/Scilab-Arduino/lib differ diff --git a/2.3-1/macros/SymbolTable/lib b/2.3-1/macros/SymbolTable/lib new file mode 100644 index 00000000..4379c83d Binary files /dev/null and b/2.3-1/macros/SymbolTable/lib differ diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 436d8bc1..9e31b31f 100644 --- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -1015,9 +1015,65 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex // ------------------- -// --- Class Nanmax. --- +// --- Class Nanmin. --- // ------------------- -ClassName = 'Nanmax'; +ClassName = 'Nanmin'; + +// --- Class Annotation. --- +PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); +ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); +PrintStringInfo('NIN= 1',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); + +PrintStringInfo('NIN= 1',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 2',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); +PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y'); +PrintStringInfo('OUT(2).SZ(1)= ''1''',ClassFileName,'file','y'); +PrintStringInfo('OUT(2).SZ(2)= ''2''',ClassFileName,'file','y'); + + +//PrintStringInfo('NIN= 2',ClassFileName,'file','y'); +//PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); +//PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); +//PrintStringInfo('OUT(1).SZ(1)= FA_SZ_SEL1(IN(1).SZ(1),IN(2).VAL)',ClassFileName,'file','y'); +//PrintStringInfo('OUT(1).SZ(2)= FA_SZ_SEL2(IN(1).SZ(2),IN(2).VAL)',ClassFileName,'file','y'); + +//PrintStringInfo('NIN= 2',ClassFileName,'file','y'); +//PrintStringInfo('NOUT= 2',ClassFileName,'file','y'); +//PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); +//PrintStringInfo('OUT(1).SZ(1)= FA_SZ_SEL1(IN(1).SZ(1),IN(2).VAL)',ClassFileName,'file','y'); +//PrintStringInfo('OUT(1).SZ(2)= FA_SZ_SEL2(IN(1).SZ(2),IN(2).VAL)',ClassFileName,'file','y'); +//PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y'); +//PrintStringInfo('OUT(2).SZ(1)= ''1''',ClassFileName,'file','y'); +//PrintStringInfo('OUT(2).SZ(2)= ''2''',ClassFileName,'file','y'); + +//---Function list class. ---- +ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); +PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('d2'+ArgSeparator+'d0d2',ClassFileName,'file','y'); +PrintStringInfo('d0'+ArgSeparator+'d0d2',ClassFileName,'file','y'); +//PrintStringInfo('d2g2'+ArgSeparator+'d2',ClassFileName,'file','y'); +//PrintStringInfo('d2g2'+ArgSeparator+'d2d2',ClassFileName,'file','y'); + + +// --- Annotation Function And Function List Function. --- +FunctionName = 'nanmin'; +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + + +// ------------------- +// --- Class Nanmean. --- +// ------------------- +ClassName = 'Nanmean'; // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); @@ -1039,6 +1095,40 @@ PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y'); PrintStringInfo('d2g2'+ArgSeparator+'d2',ClassFileName,'file','y'); PrintStringInfo('s2'+ArgSeparator+'s0',ClassFileName,'file','y'); PrintStringInfo('s2g2'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('z2'+ArgSeparator+'z0',ClassFileName,'file','y'); +PrintStringInfo('z2g2'+ArgSeparator+'z2',ClassFileName,'file','y'); + + +// --- Annotation Function And Function List Function. --- +FunctionName = 'nanmean'; +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + + +// ------------------- +// --- Class Nanmax. --- +// ------------------- +ClassName = 'Nanmax'; + +// --- Class Annotation. --- +PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); +ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); +PrintStringInfo('NIN= 1',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); + +PrintStringInfo('NIN= 2',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= FA_SZ_SEL1(IN(1).SZ(1),IN(2).VAL)',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= FA_SZ_SEL2(IN(1).SZ(2),IN(2).VAL)',ClassFileName,'file','y'); +//---Function list class. ---- +ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); +PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y'); + // --- Annotation Function And Function List Function. --- @@ -1046,6 +1136,9 @@ FunctionName = 'nanmax'; PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + + + // ------------------- // --- Class Issquare. --- // ------------------- diff --git a/2.3-1/macros/ToolInitialization/lib b/2.3-1/macros/ToolInitialization/lib new file mode 100644 index 00000000..670a52e0 Binary files /dev/null and b/2.3-1/macros/ToolInitialization/lib differ diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci index 90b80dfc..79c471db 100644 --- a/2.3-1/macros/findDeps/getAllHeaders.sci +++ b/2.3-1/macros/findDeps/getAllHeaders.sci @@ -134,6 +134,8 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/elementaryFunctions/includes/nthroot.h" "src/c/elementaryFunctions/includes/pmodulo.h" "src/c/elementaryFunctions/includes/nanmax.h" + "src/c/elementaryFunctions/includes/nanmean.h" + "src/c/elementaryFunctions/includes/nanmin.h" "src/c/elementaryFunctions/includes/issquare.h" "src/c/elementaryFunctions/includes/isscalar.h" "src/c/elementaryFunctions/includes/isvector.h" diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci index 49829000..cd441478 100644 --- a/2.3-1/macros/findDeps/getAllInterfaces.sci +++ b/2.3-1/macros/findDeps/getAllInterfaces.sci @@ -105,6 +105,8 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/elementaryFunctions/interfaces/int_nthroot.h" "src/c/elementaryFunctions/interfaces/int_pmodulo.h" "src/c/elementaryFunctions/interfaces/int_nanmax.h" + "src/c/elementaryFunctions/interfaces/int_nanmean.h" + "src/c/elementaryFunctions/interfaces/int_nanmin.h" "src/c/elementaryFunctions/interfaces/int_issquare.h" "src/c/elementaryFunctions/interfaces/int_isscalar.h" "src/c/elementaryFunctions/interfaces/int_isvector.h" diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci index cbb0a1ec..ce73f5e5 100644 --- a/2.3-1/macros/findDeps/getAllSources.sci +++ b/2.3-1/macros/findDeps/getAllSources.sci @@ -816,6 +816,19 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/elementaryFunctions/nanmax/snanmaxa.c" "src/c/elementaryFunctions/nanmax/snanmaxcola.c" "src/c/elementaryFunctions/nanmax/snanmaxrowa.c" + "src/c/elementaryFunctions/nanmean/dnanmeana.c" + "src/c/elementaryFunctions/nanmean/dnanmeanrowa.c" + "src/c/elementaryFunctions/nanmean/dnanmeancola.c" + "src/c/elementaryFunctions/nanmean/snanmeana.c" + "src/c/elementaryFunctions/nanmean/snanmeanrowa.c" + "src/c/elementaryFunctions/nanmean/snanmeancola.c" + "src/c/elementaryFunctions/nanmean/znanmeana.c" + "src/c/elementaryFunctions/nanmean/znanmeanrowa.c" + "src/c/elementaryFunctions/nanmean/znanmeancola.c" + "src/c/elementaryFunctions/nanmin/dnanmina.c" + "src/c/elementaryFunctions/nanmin/dnanmins.c" + "src/c/elementaryFunctions/nanmin/dnanminnpa.c" + "src/c/elementaryFunctions/nanmin/dnanminnps.c" "src/c/elementaryFunctions/isscalar/disscalara.c" "src/c/elementaryFunctions/isscalar/disscalars.c" "src/c/elementaryFunctions/isscalar/gisscalars.c" diff --git a/2.3-1/macros/findDeps/lib b/2.3-1/macros/findDeps/lib new file mode 100644 index 00000000..afcd3cab Binary files /dev/null and b/2.3-1/macros/findDeps/lib differ diff --git a/2.3-1/macros/lib b/2.3-1/macros/lib new file mode 100644 index 00000000..551263ea Binary files /dev/null and b/2.3-1/macros/lib differ diff --git a/2.3-1/src/c/elementaryFunctions/includes/nanmean.h b/2.3-1/src/c/elementaryFunctions/includes/nanmean.h new file mode 100644 index 00000000..097fec4e --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/includes/nanmean.h @@ -0,0 +1,42 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Brijesh Gupta C R + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#ifndef __NANMEAN_H__ +#define __NANMEAN_H__ + + +#include "types.h" +#include "doubleComplex.h" +#include "floatComplex.h" +#include "int16.h" + +#ifdef __cplusplus +extern "C" { +#endif + +double dnanmeana(double* in, int size); +void dnanmeancola(double *in, int row, int col, double* out); +void dnanmeanrowa(double *in, int row, int col, double* out); + +float snanmeana(float* in, int size); +void snanmeancola(float *in, int row, int col, float* out); +void snanmeanrowa(float *in, int row, int col, float* out); + +doubleComplex znanmeana(doubleComplex* in, int size); +void znanmeancola(doubleComplex *in, int row, int col, doubleComplex* out); +void znanmeanrowa(doubleComplex *in, int row, int col, doubleComplex* out); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__NANMEAN_H__*/ diff --git a/2.3-1/src/c/elementaryFunctions/includes/nanmin.h b/2.3-1/src/c/elementaryFunctions/includes/nanmin.h new file mode 100644 index 00000000..ba71bb0b --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/includes/nanmin.h @@ -0,0 +1,37 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Brijesh Gupta C R + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#ifndef __NANMIN_H__ +#define __NANMIN_H__ + + +#include "types.h" +#include "doubleComplex.h" +#include "floatComplex.h" +#include "int16.h" + +#ifdef __cplusplus +extern "C" { +#endif + +double dnanmina(double* in, int row, int col, double* pos); +double dnanminnpa(double* in, int row, int col); +double dnanmins(double in, double* pos); +double dnanminnps(double in); + + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__NANMIN_H__*/ diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_nanmean.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_nanmean.h new file mode 100644 index 00000000..0195b0d3 --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/interfaces/int_nanmean.h @@ -0,0 +1,32 @@ + /*This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Brijesh Gupta C R + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#ifndef __INT_NANMEAN_H__ +#define __INT_NANMEAN_H__ + +#ifdef __cplusplus +extern "C" { +#endif + + +#define d2nanmeand0(in1, size) dnanmeana(in1,size[0]* size[1]) +#define d2g2nanmeand2(in1, size1, in2, size2, out) (in2[0]=='r') ? dnanmeanrowa(in1, size1[0], size1[1], out) : dnanmeancola(in1, size1[0] , size1[1], out) + +#define s2nanmeans0(in1, size) snanmeana(in1,size[0]* size[1]) +#define s2g2nanmeans2(in1, size1, in2, size2, out) (in2[0]=='r') ? snanmeanrowa(in1, size1[0], size1[1], out) : snanmeancola(in1, size1[0] , size1[1], out) + +#define z2nanmeanz0(in1, size) znanmeana(in1,size[0]* size[1]) +#define z2g2nanmeanz2(in1, size1, in2, size2, out) (in2[0]=='r') ? znanmeanrowa(in1, size1[0], size1[1], out) : znanmeancola(in1, size1[0] , size1[1], out) + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__INT_NANMEAN_H__*/ diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_nanmin.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_nanmin.h new file mode 100644 index 00000000..4e8018a9 --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/interfaces/int_nanmin.h @@ -0,0 +1,29 @@ + /*This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Brijesh Gupta C R + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#ifndef __INT_NANMIN_H__ +#define __INT_NANMIN_H__ + +#ifdef __cplusplus +extern "C" { +#endif + + +#define d2nanmind0d2(in1, size, pos) dnanmina(in1,size[0], size[1], pos) +#define d2nanmind0(in1, size) dnanminnpa(in1,size[0], size[1]) +#define d0nanmind0d2(in1, pos) dnanmins(in1, pos) +#define d0nanmind0(in1) dnanminnps(in1) + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__INT_NANMIN_H__*/ diff --git a/2.3-1/src/c/elementaryFunctions/nanmean/cnanmeana.c b/2.3-1/src/c/elementaryFunctions/nanmean/cnanmeana.c new file mode 100644 index 00000000..eaca1e79 --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/nanmean/cnanmeana.c @@ -0,0 +1,37 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Brijesh Gupta C R + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#include +#include +#include +#include "nanmean.h" +#include "doubleComplex.h" +#include "floatComplex.h" + + +floatComplex cnanmeana(floatComplex* in, int size) +{ + floatComplex sum = 0; + double count = 0; + + for(int i = 0; i +#include +#include +#include "nanmean.h" +#include "doubleComplex.h" +#include "floatComplex.h" + +void cnanmeancola(floatComplex *in, int row, int col, floatComplex* out) +{ + floatComplex inter[col]; + + +for(int i=0; i< row; i++) + { + for(int j=0 ; j< col; j++) + { + inter[j]= in[i+ (j*row)]; + + } + out[i]= cnanmeana( inter, col); + + } + + +} diff --git a/2.3-1/src/c/elementaryFunctions/nanmean/cnanmeanrowa.c b/2.3-1/src/c/elementaryFunctions/nanmean/cnanmeanrowa.c new file mode 100644 index 00000000..05aa7e93 --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/nanmean/cnanmeanrowa.c @@ -0,0 +1,37 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Brijesh Gupta C R + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#include +#include +#include +#include "nanmean.h" +#include "doubleComplex.h" +#include "floatComplex.h" + +void cnanmeanrowa(floatComplex *in, int row, int col, floatComplex* out) +{ + floatComplex inter[row]; + + +for(int i=0; i< col; i++) + { + for(int j=0 ; j< row; j++) + { + inter[j]= in[j+ (i*row)]; + + } + out[i]= cnanmeana( inter, row); + + } + + +} diff --git a/2.3-1/src/c/elementaryFunctions/nanmean/dnanmeana.c b/2.3-1/src/c/elementaryFunctions/nanmean/dnanmeana.c new file mode 100644 index 00000000..40f9ac6f --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/nanmean/dnanmeana.c @@ -0,0 +1,33 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Brijesh Gupta C R + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#include +#include +#include +#include "nanmean.h" + +double dnanmeana(double* in, int size) +{ + double count = 0, sum = 0; + + for(int i = 0; i +#include +#include +#include "nanmean.h" + +void dnanmeancola(double *in, int row, int col, double* out) +{ + double inter[col]; + + +for(int i=0; i< row; i++) + { + for(int j=0 ; j< col; j++) + { + inter[j]= in[i+ (j*row)]; + + } + out[i]= dnanmeana( inter, col); + + } + + +} + diff --git a/2.3-1/src/c/elementaryFunctions/nanmean/dnanmeanrowa.c b/2.3-1/src/c/elementaryFunctions/nanmean/dnanmeanrowa.c new file mode 100644 index 00000000..1ac02f5f --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/nanmean/dnanmeanrowa.c @@ -0,0 +1,36 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Brijesh Gupta C R + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#include +#include +#include +#include "nanmean.h" + +void dnanmeanrowa(double *in, int row, int col, double* out) +{ + double inter[row]; + + + +for(int i=0; i< col; i++) + { + for(int j=0 ; j< row; j++) + { + inter[j]= in[j+ (i*row)]; + + } + out[i]= dnanmeana( inter, row); + + } + + +} diff --git a/2.3-1/src/c/elementaryFunctions/nanmean/snanmeana.c b/2.3-1/src/c/elementaryFunctions/nanmean/snanmeana.c new file mode 100644 index 00000000..aecf6984 --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/nanmean/snanmeana.c @@ -0,0 +1,33 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Brijesh Gupta C R + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#include +#include +#include +#include "nanmean.h" + +float snanmeana(float* in, int size) +{ + float count = 0, sum = 0; + + for(int i = 0; i +#include +#include +#include "nanmean.h" + +void snanmeancola(float *in, int row, int col, float* out) +{ + float inter[col]; + + +for(int i=0; i< row; i++) + { + for(int j=0 ; j< col; j++) + { + inter[j]= in[i+ (j*row)]; + + } + out[i]= snanmeana( inter, col); + + } + + +} diff --git a/2.3-1/src/c/elementaryFunctions/nanmean/snanmeanrowa.c b/2.3-1/src/c/elementaryFunctions/nanmean/snanmeanrowa.c new file mode 100644 index 00000000..1664aa4e --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/nanmean/snanmeanrowa.c @@ -0,0 +1,35 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Brijesh Gupta C R + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#include +#include +#include +#include "nanmean.h" + +void snanmeanrowa(float *in, int row, int col, float* out) +{ + float inter[row]; + + +for(int i=0; i< col; i++) + { + for(int j=0 ; j< row; j++) + { + inter[j]= in[j+ (i*row)]; + + } + out[i]= snanmeana( inter, row); + + } + + +} diff --git a/2.3-1/src/c/elementaryFunctions/nanmean/znanmeana.c b/2.3-1/src/c/elementaryFunctions/nanmean/znanmeana.c new file mode 100644 index 00000000..366657a5 --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/nanmean/znanmeana.c @@ -0,0 +1,37 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Brijesh Gupta C R + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#include +#include +#include +#include "nanmean.h" +#include "doubleComplex.h" +#include "floatComplex.h" + + +doubleComplex znanmeana(doubleComplex* in, int size) +{ + doubleComplex sum = 0; + double count = 0; + + for(int i = 0; i +#include +#include +#include "nanmean.h" +#include "doubleComplex.h" +#include "floatComplex.h" + +void znanmeancola(doubleComplex *in, int row, int col, doubleComplex* out) +{ + doubleComplex inter[col]; + + +for(int i=0; i< row; i++) + { + for(int j=0 ; j< col; j++) + { + inter[j]= in[i+ (j*row)]; + + } + out[i]= znanmeana( inter, col); + + } + + +} diff --git a/2.3-1/src/c/elementaryFunctions/nanmean/znanmeanrowa.c b/2.3-1/src/c/elementaryFunctions/nanmean/znanmeanrowa.c new file mode 100644 index 00000000..8d80c779 --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/nanmean/znanmeanrowa.c @@ -0,0 +1,37 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Brijesh Gupta C R + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#include +#include +#include +#include "nanmean.h" +#include "doubleComplex.h" +#include "floatComplex.h" + +void znanmeanrowa(doubleComplex *in, int row, int col, doubleComplex* out) +{ + doubleComplex inter[row]; + + +for(int i=0; i< col; i++) + { + for(int j=0 ; j< row; j++) + { + inter[j]= in[j+ (i*row)]; + + } + out[i]= znanmeana( inter, row); + + } + + +} diff --git a/2.3-1/src/c/elementaryFunctions/nanmin/dnanmina.c b/2.3-1/src/c/elementaryFunctions/nanmin/dnanmina.c new file mode 100644 index 00000000..f2bce003 --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/nanmin/dnanmina.c @@ -0,0 +1,53 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Brijesh Gupta C R + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#include +#include +#include +#include "nanmin.h" + +double dnanmina(double* in, int row, int col, double* pos) +{ + double low = 0; + int ival = 0, nanflag = 1; + + for(int i = 0; i +#include +#include +#include "nanmin.h" + +double dnanminnpa(double* in, int row, int col) +{ + double low = 0; + int nanflag = 1; + + + for(int i = 0; i +#include +#include +#include "nanmin.h" + +double dnanminnps(double in) +{ + if(isnan(in)) + return 0; + + return in; +} + diff --git a/2.3-1/src/c/elementaryFunctions/nanmin/dnanmins.c b/2.3-1/src/c/elementaryFunctions/nanmin/dnanmins.c new file mode 100644 index 00000000..86764a2a --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/nanmin/dnanmins.c @@ -0,0 +1,32 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Brijesh Gupta C R + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#include +#include +#include +#include "nanmin.h" + +double dnanmins(double in, double* pos) +{ + pos[0] = 1; + pos[1] = 1; + + if(isnan(in)) + { + pos[0] = 0; + pos[1] = 0; + return 0; + } + + return in; +} + diff --git a/2.3-1/src/c/signalProcessing/includes/dct.h b/2.3-1/src/c/signalProcessing/includes/dct.h index db95274b..80668ffa 100644 --- a/2.3-1/src/c/signalProcessing/includes/dct.h +++ b/2.3-1/src/c/signalProcessing/includes/dct.h @@ -29,7 +29,7 @@ void sdcta(float *in,int row,int col,int sign,float *out); void zdcta(doubleComplex *in,int row,int col,int sign,doubleComplex *out); -//void cdcta(floatComplex *in,int row,int col,int sign,floatComplex *out); +void cdcta(floatComplex *in,int row,int col,int sign,floatComplex *out); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_dct.h b/2.3-1/src/c/signalProcessing/interfaces/int_dct.h index ef58b48e..3481c4d5 100644 --- a/2.3-1/src/c/signalProcessing/interfaces/int_dct.h +++ b/2.3-1/src/c/signalProcessing/interfaces/int_dct.h @@ -29,8 +29,8 @@ #define z2d0dctz2(in,size,sign,out) zdcta(in,size[0],size[1],sign,out) -//#define c2dctc2(in,size,out) cdcta(in,size[0],size[1],-1,out) +#define c2dctc2(in,size,out) cdcta(in,size[0],size[1],-1,out) -//#define c2s0dctc2(in,size,sign,out) cdcta(in,size[0],size[1],sign,out) +#define c2s0dctc2(in,size,sign,out) cdcta(in,size[0],size[1],sign,out) #endif diff --git a/2.3-1/tests/unit_tests/testLinearAlgebra/testsqroot/testsqroot.sci b/2.3-1/tests/unit_tests/testLinearAlgebra/testsqroot/testsqroot.sci index 63db1f49..8e9fe30e 100644 --- a/2.3-1/tests/unit_tests/testLinearAlgebra/testsqroot/testsqroot.sci +++ b/2.3-1/tests/unit_tests/testLinearAlgebra/testsqroot/testsqroot.sci @@ -1,5 +1,5 @@ function testsqroot() - a = [1,2,3;4,5,6;7,8,9]; + a = [1,1,-1;1,2,0;-1,0,5]; e = sqroot(a); disp(e) endfunction -- cgit