summaryrefslogtreecommitdiff
path: root/2.3-1/macros/findDeps
diff options
context:
space:
mode:
Diffstat (limited to '2.3-1/macros/findDeps')
-rw-r--r--2.3-1/macros/findDeps/Scilab2CDeps.sci1306
-rw-r--r--2.3-1/macros/findDeps/getAllHeaders.sci4
-rw-r--r--2.3-1/macros/findDeps/getAllLibraries.sci4
-rw-r--r--2.3-1/macros/findDeps/getAllSources.sci14
-rw-r--r--2.3-1/macros/findDeps/get_rquird_fnctns.sci140
-rw-r--r--2.3-1/macros/findDeps/names4
6 files changed, 16 insertions, 1456 deletions
diff --git a/2.3-1/macros/findDeps/Scilab2CDeps.sci b/2.3-1/macros/findDeps/Scilab2CDeps.sci
index cb278b46..8044e276 100644
--- a/2.3-1/macros/findDeps/Scilab2CDeps.sci
+++ b/2.3-1/macros/findDeps/Scilab2CDeps.sci
@@ -7,25 +7,16 @@
// 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
-<<<<<<< HEAD
function scilab2ccode = initDependecies()
-=======
-// Edited by: Yash Pratap Singh Tomar
-
-function scilab2ccode = Scilab2CDeps()
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
/////////////////////////////////
////// AUXILIARY FUNCTIONS //////
/////////////////////////////////
-<<<<<<< HEAD
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//abs
scilab2ccode.deps.cabss=["ssqrts","sabss","creals","cimags"]
scilab2ccode.deps.cabsa=["cabss"]
@@ -35,19 +26,8 @@ scilab2ccode.deps.sabss=[]
scilab2ccode.deps.sabsa=["sabss"]
scilab2ccode.deps.zabss=["dsqrts","dabss","zreals","zimags"]
scilab2ccode.deps.zabsa=["zabss"]
-<<<<<<< HEAD
-
-
-=======
-scilab2ccode.deps.u8absa=["u8abss"]
-scilab2ccode.deps.u8abss=[]
-scilab2ccode.deps.i8absa=["i8abss"]
-scilab2ccode.deps.i8abss=[]
-scilab2ccode.deps.u16absa=["u16abss"]
-scilab2ccode.deps.u16abss=[]
-scilab2ccode.deps.i16absa=["i16abss"]
-scilab2ccode.deps.i16abss=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+
+
//conj
scilab2ccode.deps.cconjs=["FloatComplex","creals","cimags"]
scilab2ccode.deps.cconja=["cconjs"]
@@ -59,28 +39,7 @@ scilab2ccode.deps.cfinda=["creals","cimags"]
scilab2ccode.deps.dfinda=[]
scilab2ccode.deps.sfinda=[]
scilab2ccode.deps.zfinda=["zreals","zimags"]
-<<<<<<< HEAD
-
-=======
-scilab2ccode.deps.i8finda=[]
-scilab2ccode.deps.i16finda=[]
-scilab2ccode.deps.u8finda=[]
-scilab2ccode.deps.u16finda=[]
-
-//float
-scilab2ccode.deps.dfloats=[]
-scilab2ccode.deps.dfloata=[]
-scilab2ccode.deps.i8floats=[]
-scilab2ccode.deps.i8floata=[]
-scilab2ccode.deps.i16floats=[]
-scilab2ccode.deps.i16floata=[]
-scilab2ccode.deps.sfloats=[]
-scilab2ccode.deps.sfloata=[]
-scilab2ccode.deps.u8floats=[]
-scilab2ccode.deps.u8floata=[]
-scilab2ccode.deps.u16floats=[]
-scilab2ccode.deps.u16floata=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+
//find2d
scilab2ccode.deps.cfind2da=["creals","cimags"]
@@ -119,31 +78,9 @@ scilab2ccode.deps.zisnana=["zisnans"]
scilab2ccode.deps.cpythags=["csqrts","cadds","cmuls"]
scilab2ccode.deps.dpythags=["dsqrts"]
scilab2ccode.deps.spythags=["ssqrts"]
-<<<<<<< HEAD
scilab2ccode.deps.cpythags=["zsqrts","zadds","zmuls"]
//rand
-=======
-scilab2ccode.deps.zpythags=["zsqrts","zadds","zmuls"]
-
-//rand
-scilab2ccode.deps.cranda=["crands"]
-scilab2ccode.deps.crands=["FloatComplex"]
-scilab2ccode.deps.dranda=["drands"]
-scilab2ccode.deps.drands=[]
-scilab2ccode.deps.i8randa=["i8rands"]
-scilab2ccode.deps.i8rands=[]
-scilab2ccode.deps.i16randa=["i16rands"]
-scilab2ccode.deps.i16rands=[]
-scilab2ccode.deps.sranda=["srands"]
-scilab2ccode.deps.srands=[]
-scilab2ccode.deps.u8randa=["u8rands"]
-scilab2ccode.deps.u8rands=[]
-scilab2ccode.deps.u16randa=["u16rands"]
-scilab2ccode.deps.u16rands=[]
-scilab2ccode.deps.zranda=["drands","DoubleComplex","zreals",]
-scilab2ccode.deps.zrands=["drands","DoubleComplex"]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//sign
scilab2ccode.deps.csigns=["FloatComplex","cabss","creals","cimags"]
@@ -154,62 +91,11 @@ scilab2ccode.deps.dsigns=[]
scilab2ccode.deps.dsigna=["ssigns"]
scilab2ccode.deps.zsigns=["DoubleComplex","zabss","zreals","zimags"]
scilab2ccode.deps.zsigna=["zsigns"]
-<<<<<<< HEAD
//size
//type
-=======
-scilab2ccode.deps.i8signa=["i8signs"]
-scilab2ccode.deps.i8signs=[]
-scilab2ccode.deps.i16signa=["i16signs"]
-scilab2ccode.deps.i16signs=[]
-scilab2ccode.deps.u8signa=["u8signs"]
-scilab2ccode.deps.u8signs=[]
-scilab2ccode.deps.u16signa=["u16signs"]
-scilab2ccode.deps.u16signs=[]
-
-//size
-scilab2ccode.deps.dallsizea=[]
-
-//type
-
-/////////////////////////////////
-///// CACSD /////////////
-////////////////////////////////
-
-//lqe
-scilab2ccode.deps.dlqea=["dtransposea","dlqra"]
-
-//lqr
-scilab2ccode.deps.dlqra=["dtransposea","dmulma","dinverma","ddiffa","dschura","drdivma","dadda","deyea","dgschura"]
-
-//obscont
-scilab2ccode.deps.dobsconta=["dmulma","dadda"]
-
-//syslin
-scilab2ccode.deps.dsyslina=[]
-
-/////////////////////////////////
-///////DIFFERENTIAL CALCULUS/////
-/////////////////////////////////
-
-//diff
-scilab2ccode.deps.ddiffca=[]
-scilab2ccode.deps.i8diffca=[]
-scilab2ccode.deps.i16diffca=[]
-scilab2ccode.deps.sdiffca=[]
-scilab2ccode.deps.u8diffca=[]
-scilab2ccode.deps.u16diffca=[]
-
-//ode
-scilab2ccode.deps.dodea=[]
-scilab2ccode.deps.dodes=[]
-
-
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//////////////////////////////////
////// ELEMENTARY FUNCTIONS //////
@@ -225,14 +111,6 @@ scilab2ccode.deps.sacosa=["sacoss"]
scilab2ccode.deps.zacoss=["DoubleComplex","dsqrts","dabss","dacoss","datans","dlogs","dlog1ps","zreals","zimags"]
scilab2ccode.deps.zacosa=["zacoss"]
-<<<<<<< HEAD
-=======
-//acosd
-scilab2ccode.deps.dacosda=["dacosds"]
-scilab2ccode.deps.dacosds=[]
-scilab2ccode.deps.sacosda=["sacosds"]
-scilab2ccode.deps.sacosds=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//acosh
scilab2ccode.deps.cacoshs=["FloatComplex","cacoss","creals","cimags"]
@@ -244,79 +122,6 @@ scilab2ccode.deps.sacosha=["sacoshs"]
scilab2ccode.deps.zacoshs=["DoubleComplex","zacoss","zreals","zimags"]
scilab2ccode.deps.zacosha=["zacoshs"]
-<<<<<<< HEAD
-=======
-//acot
-scilab2ccode.deps.cacota=["cacots"]
-scilab2ccode.deps.cacots=["FloatComplex","crdivs","catans"]
-scilab2ccode.deps.dacota=["dacots"]
-scilab2ccode.deps.dacots=[]
-scilab2ccode.deps.sacota=["sacots"]
-scilab2ccode.deps.sacots=[]
-scilab2ccode.deps.zacota=["zacots"]
-scilab2ccode.deps.zacots=["DoubleComplex","zrdivs","zatans"]
-
-//acotd
-scilab2ccode.deps.dacotda=["dacotds"]
-scilab2ccode.deps.dacotds=[]
-scilab2ccode.deps.sacotda=["sacotds"]
-scilab2ccode.deps.sacotds=[]
-
-//acoth
-scilab2ccode.deps.cacotha=["cacoths"]
-scilab2ccode.deps.cacoths=["FloatComplex","crdivs","catanhs"]
-scilab2ccode.deps.dacotha=["dacoths"]
-scilab2ccode.deps.dacoths=[]
-scilab2ccode.deps.sacotha=["sacoths"]
-scilab2ccode.deps.sacoths=[]
-scilab2ccode.deps.zacotha=["zacoths"]
-scilab2ccode.deps.zacoths=["DoubleComplex","zrdivs","zatanhs"]
-
-//acsc
-scilab2ccode.deps.cacsca=["cacscs"]
-scilab2ccode.deps.cacscs=["FloatComplex","crdivs","casins"]
-scilab2ccode.deps.dacsca=["dacscs"]
-scilab2ccode.deps.dacscs=[]
-scilab2ccode.deps.sacsca=["sacscs"]
-scilab2ccode.deps.sacscs=[]
-scilab2ccode.deps.zacsca=["zacscs"]
-scilab2ccode.deps.zacscs=["DoubleComplex","zrdivs","zasins"]
-
-//acscd
-scilab2ccode.deps.dacscda=["dacscds"]
-scilab2ccode.deps.dacscds=[]
-scilab2ccode.deps.sacscda=["sacscds"]
-scilab2ccode.deps.sacscds=[]
-
-//acsch
-scilab2ccode.deps.cacsca=["cacscs"]
-scilab2ccode.deps.cacscs=["FloatComplex","crdivs","cmuls"]
-scilab2ccode.deps.dacscha=["dacschs"]
-scilab2ccode.deps.dacschs=[]
-scilab2ccode.deps.sacscha=["sacschs"]
-scilab2ccode.deps.sacschs=[]
-scilab2ccode.deps.zacsca=["zacscs"]
-scilab2ccode.deps.zacscs=["zrdivs","DoubleComplex","zasins"]
-
-//asec
-scilab2ccode.deps.daseca=["dasecs"]
-scilab2ccode.deps.dasecs=[]
-scilab2ccode.deps.saseca=["sasecs"]
-scilab2ccode.deps.sasecs=[]
-
-//asecd
-scilab2ccode.deps.dasecda=["dasecds"]
-scilab2ccode.deps.dasecds=[]
-scilab2ccode.deps.sasecda=["sasecds"]
-scilab2ccode.deps.sasecds=[]
-
-//asech
-scilab2ccode.deps.dasecha=["dasechs"]
-scilab2ccode.deps.dasechs=[]
-scilab2ccode.deps.sasecha=["sasechs"]
-scilab2ccode.deps.sasechs=[]
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//asin
scilab2ccode.deps.casins=["FloatComplex","ssqrts","sabss","sasins","satans","slogs","slog1ps","dabss","creals","cimags"]
scilab2ccode.deps.casina=["casins"]
@@ -327,16 +132,6 @@ scilab2ccode.deps.sasina=["sasins"]
scilab2ccode.deps.zasins=["DoubleComplex","dsqrts","dabss","dasins","datans","dlog1ps","dlogs","zreals","zimags"]
scilab2ccode.deps.zasina=["zasins"]
-<<<<<<< HEAD
-=======
-//asind
-scilab2ccode.deps.dasinda=["dasinds"]
-scilab2ccode.deps.dasinds=[]
-scilab2ccode.deps.sasinda=["sasinds"]
-scilab2ccode.deps.sasinds=[]
-
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//asinh
scilab2ccode.deps.casinhs=["FloatComplex","casins","creals","cimags"]
scilab2ccode.deps.casinha=["casinhs"]
@@ -365,14 +160,6 @@ scilab2ccode.deps.datan2a=["datan2s"]
scilab2ccode.deps.satan2s=[]
scilab2ccode.deps.satan2a=["satan2s"]
-<<<<<<< HEAD
-=======
-//atand
-scilab2ccode.deps.datanda=["datands"]
-scilab2ccode.deps.datands=[]
-scilab2ccode.deps.satanda=["satands"]
-scilab2ccode.deps.satands=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//atanh
scilab2ccode.deps.catanhs=["FloatComplex","creals","cimags","catans"]
@@ -384,58 +171,6 @@ scilab2ccode.deps.satanha=["satanhs"]
scilab2ccode.deps.zatanhs=["DoubleComplex","zreals","zimags","zatans"]
scilab2ccode.deps.zatanha=["zatanhs"]
-<<<<<<< HEAD
-=======
-//bitand
-scilab2ccode.deps.u8bitanda=["u8bitands"]
-scilab2ccode.deps.u8bitands=[]
-scilab2ccode.deps.u16bitanda=["u16bitands"]
-scilab2ccode.deps.u16bitands=[]
-
-//bitcmp
-scilab2ccode.deps.u8bitcmps=["u8bitcmps"]
-scilab2ccode.deps.u8bitcmps=[]
-scilab2ccode.deps.u16bitcmpa=["u16bitcmps"]
-scilab2ccode.deps.u16bitcmps=[]
-
-//bitget
-scilab2ccode.deps.u8bitgets=[]
-scilab2ccode.deps.u16bitgets=[]
-
-//bitor
-scilab2ccode.deps.u8bitora=["u8bitors"]
-scilab2ccode.deps.u8bitors=[]
-scilab2ccode.deps.u16bitora=["u16bitors"]
-scilab2ccode.deps.u16bitors=[]
-
-//bitset
-scilab2ccode.deps.u8bitsets=[]
-scilab2ccode.deps.u16bitsets=[]
-
-//bitxor
-scilab2ccode.deps.u8bitxora=["u8bitxors"]
-scilab2ccode.deps.u8bitxors=[]
-scilab2ccode.deps.u16bitxora=["u16bitxors"]
-scilab2ccode.deps.u16bitxors=[]
-
-//ceil
-scilab2ccode.deps.cceila=["cceils"]
-scilab2ccode.deps.cceils=["creals","cimags","FloatComplex"]
-scilab2ccode.deps.dceila=["dceils"]
-scilab2ccode.deps.dceils=[]
-scilab2ccode.deps.i8ceila=["i8ceils"]
-scilab2ccode.deps.i8ceils=[]
-scilab2ccode.deps.i16ceila=["i16ceils"]
-scilab2ccode.deps.i16ceils=[]
-scilab2ccode.deps.sceila=["sceils"]
-scilab2ccode.deps.sceils=[]
-scilab2ccode.deps.u8ceila=["u8ceils"]
-scilab2ccode.deps.u8ceils=[]
-scilab2ccode.deps.u16ceila=["u16ceils"]
-scilab2ccode.deps.u16ceils=[]
-scilab2ccode.deps.zceila=["zceils"]
-scilab2ccode.deps.zceils=["zreals","zimags","DoubleComplex"]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//cos
scilab2ccode.deps.ccoss=["creals","cimags","FloatComplex","scoss","scoshs","ssins","ssinhs"]
@@ -446,18 +181,7 @@ scilab2ccode.deps.scoss=[]
scilab2ccode.deps.scosa=["scoss"]
scilab2ccode.deps.zcoss=["zreals","zimags","DoubleComplex","dcoss","dcoshs","dsins","dsinhs"]
scilab2ccode.deps.zcosa=["zcoss"]
-<<<<<<< HEAD
-
-=======
-scilab2ccode.deps.i8cosa=["i8coss"]
-scilab2ccode.deps.i8coss=[]
-scilab2ccode.deps.i16cosa=["i16coss"]
-scilab2ccode.deps.i16coss=[]
-scilab2ccode.deps.u8cosa=["u8coss"]
-scilab2ccode.deps.u8coss=[]
-scilab2ccode.deps.u16cosa=["u16coss"]
-scilab2ccode.deps.u16coss=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+
//cosh
scilab2ccode.deps.ccoshs=["ccoss","FloatComplex","creals","cimags"]
@@ -468,17 +192,6 @@ scilab2ccode.deps.scoshs=["sexps","sabss"]
scilab2ccode.deps.scosha=["scoshs"]
scilab2ccode.deps.zcoshs=["zcoss","DoubleComplex","zreals","zimags"]
scilab2ccode.deps.zcosha=["zcoshs"]
-<<<<<<< HEAD
-=======
-scilab2ccode.deps.i8cosha=["i8coshs"]
-scilab2ccode.deps.i8coshs=["i8abss","i8exps"]
-scilab2ccode.deps.i16cosha=["i16coshs"]
-scilab2ccode.deps.i16coshs=["i16abss","i16exps"]
-scilab2ccode.deps.u8cosha=["u8coshs"]
-scilab2ccode.deps.u8coshs=["u8abss","u8exps"]
-scilab2ccode.deps.u16cosha=["u16coshs"]
-scilab2ccode.deps.u16coshs=["u16abss","u16exps"]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//exp
@@ -490,18 +203,7 @@ scilab2ccode.deps.sexps=[]
scilab2ccode.deps.sexpa=["sexps"]
scilab2ccode.deps.zexps=["zreals","zimags","DoubleComplex","dexps","dcoss","dsins"]
scilab2ccode.deps.zexpa=["zexps"]
-<<<<<<< HEAD
-
-=======
-scilab2ccode.deps.i8expa=["i8exps"]
-scilab2ccode.deps.i8exps=[]
-scilab2ccode.deps.i16expa=["i16exps"]
-scilab2ccode.deps.i16exps=[]
-scilab2ccode.deps.u8expa=["u8exps"]
-scilab2ccode.deps.u8exps=[]
-scilab2ccode.deps.u16expa=["u16exps"]
-scilab2ccode.deps.u16exps=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+
//exp10
scilab2ccode.deps.cexp10s=["cpows","FloatComplex"]
@@ -513,83 +215,6 @@ scilab2ccode.deps.sexp10a=["sexp10s"]
scilab2ccode.deps.zexp10s=["zpows","DoubleComplex"]
scilab2ccode.deps.zexp10a=["zexp10s"]
-<<<<<<< HEAD
-=======
-//fix
-scilab2ccode.deps.cfixa=["cfixs"]
-scilab2ccode.deps.cfixs=["creals","cimags","FloatComplex"]
-scilab2ccode.deps.dfixa=["dfixs"]
-scilab2ccode.deps.dfixs=[]
-scilab2ccode.deps.i8fixa=["i8fixs"]
-scilab2ccode.deps.i8fixs=["i8floors","i8ceils"]
-scilab2ccode.deps.i16fixa=["i16fixs"]
-scilab2ccode.deps.i16fixs=["i16floors","i16ceils"]
-scilab2ccode.deps.sfixa=["sfixs"]
-scilab2ccode.deps.sfixs=[]
-scilab2ccode.deps.u8fixa=["u8fixs"]
-scilab2ccode.deps.u8fixs=["u8floors","u8ceils"]
-scilab2ccode.deps.u16fixa=["u16fixs"]
-scilab2ccode.deps.u16fixs=["u16floors","u16ceils"]
-scilab2ccode.deps.zfixa=["zfixs"]
-scilab2ccode.deps.zfixs=["zreals","zimags","DoubleComplex"]
-
-//floor
-scilab2ccode.deps.cfloora=["cfloors"]
-scilab2ccode.deps.cfloors=["creals","cimags","FloatComplex"]
-scilab2ccode.deps.dfloora=["dfloors"]
-scilab2ccode.deps.dfloors=[]
-scilab2ccode.deps.i8floora=["i8floors"]
-scilab2ccode.deps.i8floors=[]
-scilab2ccode.deps.i16floora=["i16floors"]
-scilab2ccode.deps.i16floors=[]
-scilab2ccode.deps.sfloora=["sfloors"]
-scilab2ccode.deps.sfloors=[]
-scilab2ccode.deps.u8floora=["u8floors"]
-scilab2ccode.deps.u8floors=[]
-scilab2ccode.deps.u16floora=["u16floors"]
-scilab2ccode.deps.u16floors=[]
-scilab2ccode.deps.zfloors=["zfloors"]
-scilab2ccode.deps.zfloors=["zreals","zimags","DoubleComplex"]
-
-//int
-scilab2ccode.deps.cinta=["cfixa"]
-scilab2ccode.deps.cints=["cfixs"]
-scilab2ccode.deps.dinta=["dfixa"]
-scilab2ccode.deps.dints=["dfixs"]
-scilab2ccode.deps.sinta=["sfixa"]
-scilab2ccode.deps.sints=["sfixs"]
-scilab2ccode.deps.zinta=["zfixa"]
-scilab2ccode.deps.zints=["zfixs"]
-
-//int8
-scilab2ccode.deps.dint8a=["dint8s"]
-scilab2ccode.deps.dint8s=[]
-scilab2ccode.deps.i16int8a=["i16int8s"]
-scilab2ccode.deps.i16int8s=[]
-scilab2ccode.deps.sint8a=["sint8s"]
-scilab2ccode.deps.sint8s=[]
-scilab2ccode.deps.u8int8a=["u8int8s"]
-scilab2ccode.deps.u8int8s=[]
-scilab2ccode.deps.u16int8a=["u16int8s"]
-scilab2ccode.deps.u16int8s=[]
-
-//int16
-scilab2ccode.deps.dint16a=["dint16s"]
-scilab2ccode.deps.dint16s=[]
-scilab2ccode.deps.i8int16a=["i8int16s"]
-scilab2ccode.deps.i8int16s=[]
-scilab2ccode.deps.sint16a=["sint16s"]
-scilab2ccode.deps.sint16s=[]
-scilab2ccode.deps.u8int16a=["u8int16s"]
-scilab2ccode.deps.u8int16s=[]
-scilab2ccode.deps.u16int16a=["u16int16s"]
-scilab2ccode.deps.u16int16s=[]
-
-//linspace
-scilab2ccode.deps.dlinspacea=[]
-scilab2ccode.deps.dlinspaces=[]
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//lnp1m1
scilab2ccode.deps.dlnp1m1s=["dabss"]
@@ -628,12 +253,6 @@ scilab2ccode.deps.slog10a=["slog10s"]
scilab2ccode.deps.zlog10s=["zlogs","DoubleComplex","zreals","zimags","dlogs"]
scilab2ccode.deps.zlog10a=["zlog10s"]
-<<<<<<< HEAD
-=======
-//logspace
-scilab2ccode.deps.dlogspacea=[]
-scilab2ccode.deps.dlogspaces=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//pow
scilab2ccode.deps.cpows=["cexps","cmuls","clogs"]
@@ -644,36 +263,7 @@ scilab2ccode.deps.spows=[]
scilab2ccode.deps.spowa=["spows"]
scilab2ccode.deps.zpows=["zexps","zmuls","zlogs"]
scilab2ccode.deps.zpowa=["zpows"]
-<<<<<<< HEAD
-
-=======
-scilab2ccode.deps.i8powa=["i8pows"]
-scilab2ccode.deps.i8pows=[]
-scilab2ccode.deps.i16powa=["i16pows"]
-scilab2ccode.deps.i16pows=[]
-scilab2ccode.deps.u8powa=["u8pows"]
-scilab2ccode.deps.u8pows=[]
-scilab2ccode.deps.u16powa=["u16pows"]
-scilab2ccode.deps.u16pows=[]
-
-//round
-scilab2ccode.deps.crounda=["crounds"]
-scilab2ccode.deps.crounds=["creals","cimags","FloatComplex"]
-scilab2ccode.deps.drounda=["drounds"]
-scilab2ccode.deps.drounds=[]
-scilab2ccode.deps.i8rounda=["i8rounds"]
-scilab2ccode.deps.i8rounds=[]
-scilab2ccode.deps.i16rounda=["i16rounds"]
-scilab2ccode.deps.i16rounds=[]
-scilab2ccode.deps.srounda=["srounds"]
-scilab2ccode.deps.srounds=[]
-scilab2ccode.deps.u8rounda=["u8rounds"]
-scilab2ccode.deps.u8rounds=[]
-scilab2ccode.deps.u16rounda=["u16rounds"]
-scilab2ccode.deps.u16rounds=[]
-scilab2ccode.deps.zrounda=["zrounds"]
-scilab2ccode.deps.zrounds=["zreals","zimags","DoubleComplex"]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+
//sin
scilab2ccode.deps.csins=["creals","cimags","FloatComplex","ssins","scoshs","scoss","ssinhs"]
@@ -684,17 +274,6 @@ scilab2ccode.deps.ssins=[]
scilab2ccode.deps.ssina=["ssins"]
scilab2ccode.deps.zsins=["zreals","zimags","DoubleComplex","dsins","dcoshs","dcoss","dsinhs"]
scilab2ccode.deps.zsina=["zsins"]
-<<<<<<< HEAD
-=======
-scilab2ccode.deps.i8sina=["i8sins"]
-scilab2ccode.deps.i8sins=[]
-scilab2ccode.deps.i16sina=["i16sins"]
-scilab2ccode.deps.i16sins=[]
-scilab2ccode.deps.u8sina=["u8sins"]
-scilab2ccode.deps.u8sins=[]
-scilab2ccode.deps.u16sina=["u16sins"]
-scilab2ccode.deps.u16sins=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//sinh
@@ -706,17 +285,6 @@ scilab2ccode.deps.ssinhs=[]
scilab2ccode.deps.ssinha=["ssinhs"]
scilab2ccode.deps.zsinhs=["zreals","zimags","zsins","DoubleComplex"]
scilab2ccode.deps.zsinha=["zsinhs"]
-<<<<<<< HEAD
-=======
-scilab2ccode.deps.i8sinha=["i8sinhs"]
-scilab2ccode.deps.i8sinhs=[]
-scilab2ccode.deps.i16sinha=["i16sinhs"]
-scilab2ccode.deps.i16sinhs=[]
-scilab2ccode.deps.u8sinha=["u8sinhs"]
-scilab2ccode.deps.u8sinhs=[]
-scilab2ccode.deps.u16sinha=["u16sinhs"]
-scilab2ccode.deps.u16sinhs=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//sqrt
@@ -739,17 +307,6 @@ scilab2ccode.deps.stans=[]
scilab2ccode.deps.stana=["stans"]
scilab2ccode.deps.ztans=["dlogs","dsqrts","zreals","zimags","dcoss","dsinhs","dsins","dabss","DoubleComplex"]
scilab2ccode.deps.ztana=["ztans"]
-<<<<<<< HEAD
-=======
-scilab2ccode.deps.i8tana=["i8tans"]
-scilab2ccode.deps.i8tans=[]
-scilab2ccode.deps.i16tana=["i16tans"]
-scilab2ccode.deps.i16tans=[]
-scilab2ccode.deps.u8tana=["u8tans"]
-scilab2ccode.deps.u8tans=[]
-scilab2ccode.deps.u16tana=["u16tans"]
-scilab2ccode.deps.u16tans=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//tanh
@@ -761,294 +318,13 @@ scilab2ccode.deps.stanhs=[]
scilab2ccode.deps.stanha=["stanhs"]
scilab2ccode.deps.ztanhs=["zreals","zimags","ztans","DoubleComplex"]
scilab2ccode.deps.ztanha=["ztanhs"]
-<<<<<<< HEAD
-=======
-scilab2ccode.deps.i8tanha=["i8tanhs"]
-scilab2ccode.deps.i8tanhs=[]
-scilab2ccode.deps.i16tanha=["i16tanhs"]
-scilab2ccode.deps.i16tanhs=[]
-scilab2ccode.deps.u8tanha=["u8tanhs"]
-scilab2ccode.deps.u8tanhs=[]
-scilab2ccode.deps.u16tanha=["u16tanhs"]
-scilab2ccode.deps.u16tanhs=[]
-
-//uint8
-scilab2ccode.deps.duint8a=["duint8s"]
-scilab2ccode.deps.duint8s=[]
-scilab2ccode.deps.i8uint8a=["i8uint8s"]
-scilab2ccode.deps.i8uint8s=[]
-scilab2ccode.deps.i16uint8a=["i16uint8s"]
-scilab2ccode.deps.i16uint8s=[]
-scilab2ccode.deps.suint8a=["suint8s"]
-scilab2ccode.deps.suint8s=[]
-scilab2ccode.deps.u16uint8a=["u16uint8s"]
-scilab2ccode.deps.u16uint8s=[]
-
-//uint16
-scilab2ccode.deps.duint16a=["duint16s"]
-scilab2ccode.deps.duint16s=[]
-scilab2ccode.deps.i8uint16a=["i8uint16s"]
-scilab2ccode.deps.i8uint16s=[]
-scilab2ccode.deps.i16uint16a=["i16uint16s"]
-scilab2ccode.deps.i16uint16s=[]
-scilab2ccode.deps.suint16a=["suint16s"]
-scilab2ccode.deps.suint16s=[]
-scilab2ccode.deps.u8uint16a=["u8uint16s"]
-scilab2ccode.deps.u8uint16s=[]
-
-//////DISCRETE_MATHEMATICS/////////
-
-//factor
-scilab2ccode.deps.dfactors=[]
-scilab2ccode.deps.sfactors=[]
-
-//factorial
-scilab2ccode.deps.dfactoriala=["dfactorials"]
-scilab2ccode.deps.dfactorials=[]
-scilab2ccode.deps.sfactoriala=["dfactorials"]
-scilab2ccode.deps.sfactorials=[]
-
-//primes
-scilab2ccode.deps.dprimess=[]
-scilab2ccode.deps.sprimess=[]
-
-
-////////RADIX_CONVERSION////////
-
-//base2dec
-scilab2ccode.deps.dbase2decs=[]
-scilab2ccode.deps.gbase2decs=[]
-
-//bin2dec
-scilab2ccode.deps.dbin2deca=["dbin2decs"]
-scilab2ccode.deps.dbin2decs=[]
-scilab2ccode.deps.i8bin2deca=["i8bin2decs"]
-scilab2ccode.deps.i8bin2decs=[]
-scilab2ccode.deps.i16bin2deca=["i16bin2decs"]
-scilab2ccode.deps.i16bin2decs=[]
-scilab2ccode.deps.u8bin2deca=["u8bin2decs"]
-scilab2ccode.deps.u8bin2decs=[]
-scilab2ccode.deps.u16bin2deca=["u16bin2decs"]
-scilab2ccode.deps.u16bin2decs=[]
-
-//dec2base
-scilab2ccode.deps.ddec2basea=["ddec2bases"]
-scilab2ccode.deps.ddec2bases=[]
-scilab2ccode.deps.sdec2basea=["sdec2bases"]
-scilab2ccode.deps.sdec2bases=[]
-
-//dec2bin
-scilab2ccode.deps.ddec2bina=["ddec2bins"]
-scilab2ccode.deps.ddec2bins=[]
-scilab2ccode.deps.i8dec2bina=["i8dec2bins"]
-scilab2ccode.deps.i8dec2bins=[]
-scilab2ccode.deps.i16dec2bina=["i16dec2bins"]
-scilab2ccode.deps.i16dec2bins=[]
-scilab2ccode.deps.u8dec2bina=["u8dec2bins"]
-scilab2ccode.deps.u8dec2bins=[]
-scilab2ccode.deps.u16dec2bina=["u16dec2bins"]
-scilab2ccode.deps.u16dec2bins=[]
-
-//dec2hex
-scilab2ccode.deps.ddec2hexa=["ddec2hexs"]
-scilab2ccode.deps.ddec2hexs=[]
-scilab2ccode.deps.i8dec2hexa=["i8dec2hexs"]
-scilab2ccode.deps.i8dec2hexs=[]
-scilab2ccode.deps.i16dec2hexa=["i16dec2hexs"]
-scilab2ccode.deps.i16dec2hexs=[]
-scilab2ccode.deps.u8dec2hexa=["u8dec2hexs"]
-scilab2ccode.deps.u8dec2hexs=[]
-scilab2ccode.deps.u16dec2hexa=["u16dec2hexs"]
-scilab2ccode.deps.u16dec2hexs=[]
-
-//dec2oct
-scilab2ccode.deps.ddec2octa=["ddec2octs"]
-scilab2ccode.deps.ddec2octs=[]
-scilab2ccode.deps.i8dec2octa=["i8dec2octs"]
-scilab2ccode.deps.i8dec2octs=[]
-scilab2ccode.deps.i16dec2octa=["i16dec2octs"]
-scilab2ccode.deps.i16dec2octs=[]
-scilab2ccode.deps.u8dec2octa=["u8dec2octs"]
-scilab2ccode.deps.u8dec2octs=[]
-scilab2ccode.deps.u16dec2octs=["u16dec2octs"]
-scilab2ccode.deps.u16dec2octs=[]
-
-//hex2dec
-scilab2ccode.deps.dhex2decs=[]
-scilab2ccode.deps.ghex2decs=[]
-
-//oct2dec
-scilab2ccode.deps.doct2deca=["doct2decs"]
-scilab2ccode.deps.doct2decs=[]
-scilab2ccode.deps.i8oct2deca=["i8oct2decs"]
-scilab2ccode.deps.i8oct2decs=[]
-scilab2ccode.deps.i16oct2deca=["i16oct2decs"]
-scilab2ccode.deps.i16oct2decs=[]
-scilab2ccode.deps.u8oct2deca=["u8oct2decs"]
-scilab2ccode.deps.u8oct2decs=[]
-scilab2ccode.deps.u16oct2deca=["u16oct2decs"]
-scilab2ccode.deps.u16oct2decs=[]
-
-//////////Trigonometry/////////
-
-//cosd
-scilab2ccode.deps.dcosda=["dcosds"]
-scilab2ccode.deps.dcosds=[]
-scilab2ccode.deps.scosda=["scosds"]
-scilab2ccode.deps.scosds=[]
-
-//cotd
-scilab2ccode.deps.dcotda=["dcotds"]
-scilab2ccode.deps.dcotds=[]
-scilab2ccode.deps.scotda=["scotds"]
-scilab2ccode.deps.scotds=[]
-
-//coth
-scilab2ccode.deps.ccotha=["ccoths"]
-scilab2ccode.deps.ccoths=["ctanhs","FloatComplex","crdivs"]
-scilab2ccode.deps.dcotha=[]
-scilab2ccode.deps.dcoths=[]
-scilab2ccode.deps.scotha=[]
-scilab2ccode.deps.scoths=[]
-scilab2ccode.deps.zcotha=["zcoths"]
-scilab2ccode.deps.zcoths=["zrdivs","DoubleComplex","ztanhs"]
-
-//csc
-scilab2ccode.deps.ccsca=["ccscs"]
-scilab2ccode.deps.ccscs=["csins","FloatComplex","crdivs"]
-scilab2ccode.deps.dcsca=["dcscs"]
-scilab2ccode.deps.dcscs=[]
-scilab2ccode.deps.scsca=["scscs"]
-scilab2ccode.deps.scscs=[]
-scilab2ccode.deps.zcsca=["zcscs"]
-scilab2ccode.deps.zcscs=["DoubleComplex","zrdivs","dsins","dcoshs","dcoss","dsinhs","zreals","zimags"]
-
-//cscd
-scilab2ccode.deps.ccscda=["ccscds"]
-scilab2ccode.deps.ccscds=["csins","FloatComplex","crdivs"]
-scilab2ccode.deps.dcscda=["dcscds"]
-scilab2ccode.deps.dcscds=[]
-scilab2ccode.deps.scscda=["scscds"]
-scilab2ccode.deps.scscds=[]
-scilab2ccode.deps.zcscda=["zcscds"]
-scilab2ccode.deps.zcscds=["zrdivs","DoubleComplex","zsins"]
-
-//csch
-scilab2ccode.deps.ccscha=["ccschs"]
-scilab2ccode.deps.ccschs=["csinhs","FloatComplex","crdivs"]
-scilab2ccode.deps.dcscha=["dcschs"]
-scilab2ccode.deps.dcschs=[]
-scilab2ccode.deps.scscha=["scschs"]
-scilab2ccode.deps.scschs=[]
-scilab2ccode.deps.zcscha=["zcschs"]
-scilab2ccode.deps.zcschs=["zrdivs","DoubleComplex","zsinhs"]
-
-//sec
-scilab2ccode.deps.cseca=["csecs"]
-scilab2ccode.deps.csecs=["ccoss","FloatComplex","crdivs"]
-scilab2ccode.deps.dseca=[]
-scilab2ccode.deps.dsecs=[]
-scilab2ccode.deps.sseca=["ssecs"]
-scilab2ccode.deps.ssecs=[]
-scilab2ccode.deps.zseca=["zsecs"]
-scilab2ccode.deps.zsecs=["zrdivs","DoubleComplex","zcoss"]
-
-//secd
-scilab2ccode.deps.dsecda=["dsecds"]
-scilab2ccode.deps.dsecds=[]
-scilab2ccode.deps.ssecda=["ssecds"]
-scilab2ccode.deps.ssecds=[]
-
-//sech
-scilab2ccode.deps.csecha=["csechs"]
-scilab2ccode.deps.ccoths=["ccoshs","FloatComplex","crdivs"]
-scilab2ccode.deps.dsecha=["dsechs"]
-scilab2ccode.deps.dsechs=[]
-scilab2ccode.deps.ssecha=["ssechs"]
-scilab2ccode.deps.ssechs=[]
-scilab2ccode.deps.zsecha=["zsechs"]
-scilab2ccode.deps.zsechs=["zrdivs","DoubleComplex","zcoshs"]
-
-///////////////////////////////
-////// FILES //////
-///////////////////////////////
-
-
-//mclose
-scilab2ccode.deps.mclose=[]
-//mopen
-scilab2ccode.deps.mopen=[]
-
-
-//mput
-scilab2ccode.deps.dmputa=[]
-scilab2ccode.deps.dmputs=[]
-scilab2ccode.deps.i8mputa=[]
-scilab2ccode.deps.i8mputs=[]
-scilab2ccode.deps.i16mputa=[]
-scilab2ccode.deps.i16mputs=[]
-scilab2ccode.deps.smputa=[]
-scilab2ccode.deps.smputs=[]
-scilab2ccode.deps.u8mputa=[]
-scilab2ccode.deps.u8mputs=[]
-scilab2ccode.deps.u16mputa=[]
-scilab2ccode.deps.u16mputs=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
-
-
-
-///////////////////////////////
-<<<<<<< HEAD
-////// MATRIX OPERATIONS //////
-///////////////////////////////
-
-=======
-////// IMPLICITLIST //////
-///////////////////////////////
-
-scilab2ccode.deps.cimplicitLists=["simplicitLists"]
-scilab2ccode.deps.dimplicitLists=[]
-scilab2ccode.deps.simplicitLists=[]
-scilab2ccode.deps.zimplicitLists=["dimplicitLists"]
-
-///////////////////////////////
-/////// LINEARALGEBRA ///////
-///////////////////////////////
-
-//balanc
-scilab2ccode.deps.dbalanca=["deyea"]
-
-//rcond
-scilab2ccode.deps.drconda=[]
-
-//schur
-scilab2ccode.deps.dgschura=[]
-scilab2ccode.deps.dschura=[]
///////////////////////////////
////// MATRIX OPERATIONS //////
///////////////////////////////
-//cat
-scilab2ccode.deps.ccata=[]
-scilab2ccode.deps.ccats=[]
-scilab2ccode.deps.dcata=[]
-scilab2ccode.deps.dcatS=[]
-scilab2ccode.deps.scata=[]
-scilab2ccode.deps.scats=[]
-scilab2ccode.deps.zcata=[]
-scilab2ccode.deps.zcats=[]
-scilab2ccode.deps.i8cata=[]
-scilab2ccode.deps.i8cats=[]
-scilab2ccode.deps.i16cata=[]
-scilab2ccode.deps.i16catS=[]
-scilab2ccode.deps.u8cata=[]
-scilab2ccode.deps.u8cats=[]
-scilab2ccode.deps.u16cata=[]
-scilab2ccode.deps.u16cats=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//OpRc
scilab2ccode.deps.crowcats=[]
@@ -1079,95 +355,14 @@ scilab2ccode.deps.dchola=[]
scilab2ccode.deps.schols=["ssqrts"]
scilab2ccode.deps.schola=["ssqrts"]
scilab2ccode.deps.zchola=["DoubleComplex","zreals","zimags","zdiffs","zmuls","zrdivs","zsqrts"]
-<<<<<<< HEAD
-
-=======
-//cumprod
-scilab2ccode.deps.dcolumncumproda=[]
-scilab2ccode.deps.dcumproda=[]
-scilab2ccode.deps.drowcumproda=[]
-scilab2ccode.deps.i8columncumproda=[]
-scilab2ccode.deps.i8cumproda=[]
-scilab2ccode.deps.i8rowcumproda=[]
-scilab2ccode.deps.i16columncumproda=[]
-scilab2ccode.deps.i16cumproda=[]
-scilab2ccode.deps.i16rowcumproda=[]
-scilab2ccode.deps.scolumncumproda=[]
-scilab2ccode.deps.scumproda=[]
-scilab2ccode.deps.srowcumproda=[]
-scilab2ccode.deps.u8columncumproda=[]
-scilab2ccode.deps.u8cumproda=[]
-scilab2ccode.deps.u8rowcumproda=[]
-scilab2ccode.deps.u16columncumproda=[]
-scilab2ccode.deps.u16cumproda=[]
-scilab2ccode.deps.u16rowcumproda=[]
-
-//cumcum
-scilab2ccode.deps.dcolumncumsuma=[]
-scilab2ccode.deps.dcumsuma=[]
-scilab2ccode.deps.drowcumsuma=[]
-scilab2ccode.deps.i8columncumsuma=[]
-scilab2ccode.deps.i8cumsuma=[]
-scilab2ccode.deps.i8rowcumsuma=[]
-scilab2ccode.deps.i16columncumsuma=[]
-scilab2ccode.deps.i16cumsuma=[]
-scilab2ccode.deps.i16rowcumsuma=[]
-scilab2ccode.deps.scolumncumsuma=[]
-scilab2ccode.deps.scumsuma=[]
-scilab2ccode.deps.srowcumsuma=[]
-scilab2ccode.deps.u8columncumsuma=[]
-scilab2ccode.deps.u8cumsuma=[]
-scilab2ccode.deps.u8rowcumsuma=[]
-scilab2ccode.deps.u16columncumsuma=[]
-scilab2ccode.deps.u16cumsuma=[]
-scilab2ccode.deps.u16rowcumsuma=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+
//determ
scilab2ccode.deps.cdeterma=["cdiffs","FloatComplex","cmuls","cadds","DoubleComplex","creals","cimags","zreals","zimags","zmuls","crdivs"]
scilab2ccode.deps.ddeterma=[]
scilab2ccode.deps.sdeterma=[]
scilab2ccode.deps.zdeterma=["zdiffs","zmuls","DoubleComplex","zadds","zreals","zimags","zrdivs"]
-<<<<<<< HEAD
-
-=======
-scilab2ccode.deps.i8determa=[]
-scilab2ccode.deps.i16determa=[]
-scilab2ccode.deps.u8determa=[]
-scilab2ccode.deps.u16determa=[]
-
-//diag
-scilab2ccode.deps.ddiaga=[]
-scilab2ccode.deps.ddiagexa=[]
-scilab2ccode.deps.ddiagexs=[]
-scilab2ccode.deps.ddiagina=[]
-scilab2ccode.deps.ddiagins=[]
-scilab2ccode.deps.ddiags=[]
-scilab2ccode.deps.i8diags=[]
-scilab2ccode.deps.i8diagexa=[]
-scilab2ccode.deps.i8diagexs=[]
-scilab2ccode.deps.i8diagina=[]
-scilab2ccode.deps.i8diagins=[]
-scilab2ccode.deps.i8diags=[]
-scilab2ccode.deps.i16diaga=[]
-scilab2ccode.deps.i16diags=[]
-scilab2ccode.deps.i16diagexa=[]
-scilab2ccode.deps.i16diagexs=[]
-scilab2ccode.deps.i16diagina=[]
-scilab2ccode.deps.i16diagins=[]
-scilab2ccode.deps.u8diaga=[]
-scilab2ccode.deps.u8diags=[]
-scilab2ccode.deps.u8diagexa=[]
-scilab2ccode.deps.u8diagexs=[]
-scilab2ccode.deps.u8diagina=[]
-scilab2ccode.deps.u8diagins=[]
-scilab2ccode.deps.u16diaga=[]
-scilab2ccode.deps.u16diags=[]
-scilab2ccode.deps.u16diagexa=[]
-scilab2ccode.deps.u16diagexs=[]
-scilab2ccode.deps.u16diagina=[]
-scilab2ccode.deps.u16diagins=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+
//dist
scilab2ccode.deps.cdists=["spows","creals","cimags","ssqrts"]
@@ -1179,31 +374,6 @@ scilab2ccode.deps.sdista=["spows","ssqrts"]
scilab2ccode.deps.zdists=["dpows","zreals","zimags","dsqrts"]
scilab2ccode.deps.zdista=["dpows","zreals","zimags","dsqrts"]
-<<<<<<< HEAD
-=======
-//division
-scilab2ccode.deps.crdivcsv=["crdivv"]
-scilab2ccode.deps.crdivscv=["crdivv"]
-scilab2ccode.deps.crdivv=["crdivma","FloatComplex"]
-scilab2ccode.deps.drdivv=["drdivma"]
-scilab2ccode.deps.i8rdivma=["dtransposea"]
-scilab2ccode.deps.i8ldivma=[]
-scilab2ccode.deps.i8rdivv=["i8rdivma"]
-scilab2ccode.deps.i16ldivma=[]
-scilab2ccode.deps.i16rdivma=["dtransposea"]
-scilab2ccode.deps.i16rdivv=["i16rdivma"]
-scilab2ccode.deps.srdivv=["srdivma"]
-scilab2ccode.deps.u8rdivma=["dtransposea"]
-scilab2ccode.deps.u8ldivma=[]
-scilab2ccode.deps.u8rdivv=["u8rdivma"]
-scilab2ccode.deps.u16ldivma=[]
-scilab2ccode.deps.u16rdivma=["dtransposea"]
-scilab2ccode.deps.u16rdivv=["u16rdivma"]
-scilab2ccode.deps.zrdivdzv=["dzerosa","zrdivv"]
-scilab2ccode.deps.zrdivv=["zrdivma","DoubleComplex"]
-scilab2ccode.deps.zrdivzdv=["dzerosa","zrdivv"]
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//OpSlash
scilab2ccode.deps.crdivma=["DoubleComplex","creals","cimags","zrdivma","FloatComplex","zreals","zimags"]
@@ -1231,14 +401,7 @@ scilab2ccode.deps.ceyea= ["FloatComplex"]
scilab2ccode.deps.deyea= []
scilab2ccode.deps.seyea= []
scilab2ccode.deps.zeyea= ["DoubleComplex"]
-<<<<<<< HEAD
-=======
-scilab2ccode.deps.i8eyea= []
-scilab2ccode.deps.i16eyea= []
-scilab2ccode.deps.u8eyea= []
-scilab2ccode.deps.u16eyea= []
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//fill
scilab2ccode.deps.cfilla=["conesa","cmuls"]
@@ -1246,25 +409,10 @@ scilab2ccode.deps.dfilla=["donesa"]
scilab2ccode.deps.sfilla=["sonesa"]
scilab2ccode.deps.zfilla=["zonesa","zmuls"]
-<<<<<<< HEAD
//hilbert
scilab2ccode.deps.dhilberta=[]
scilab2ccode.deps.shilberta=[]
-=======
-//flipdim
-scilab2ccode.deps.dflipdima=[]
-scilab2ccode.deps.i8flipdima=[]
-scilab2ccode.deps.i16flipdima=[]
-scilab2ccode.deps.sflipdima=[]
-scilab2ccode.deps.u8flipdima=[]
-scilab2ccode.deps.u16flipdima=[]
-
-//hilb
-scilab2ccode.deps.dhilba=[]
-scilab2ccode.deps.shilba=[]
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//infinite norm
scilab2ccode.deps.cinfnorma=["spythags","creals","cimags"]
@@ -1278,26 +426,10 @@ scilab2ccode.deps.cinverma=["DoubleComplex","creals","cimags","zinverma","FloatC
scilab2ccode.deps.dinverma=[]
scilab2ccode.deps.sinverma=["dinverma"]
scilab2ccode.deps.zinverma=[]
-<<<<<<< HEAD
//jmat
-=======
-scilab2ccode.deps.i8inverma=[]
-scilab2ccode.deps.i16inverma=[]
-scilab2ccode.deps.u8inverma=[]
-scilab2ccode.deps.u16inverma=[]
-
-
-//jmat
-scilab2ccode.deps.djmata=[]
-scilab2ccode.deps.sjmata=[]
-
-//kron
-scilab2ccode.deps.dkrona=[]
-scilab2ccode.deps.skrona=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//logm
scilab2ccode.deps.clogma=["DoubleComplex","creals","cimags","zlogma","FloatComplex","zreals","zimags"]
@@ -1315,70 +447,21 @@ scilab2ccode.deps.smagns=[]
scilab2ccode.deps.smagna=["smagns"]
scilab2ccode.deps.zmagns=["zreals","zimags","dsqrts"]
scilab2ccode.deps.zmagna=["zmagns"]
-<<<<<<< HEAD
-
-=======
-scilab2ccode.deps.i8magna=[]
-scilab2ccode.deps.i8magns=["i8abss"]
-scilab2ccode.deps.i16magna=["dmagns"]
-scilab2ccode.deps.i16magns=["i16abss"]
-scilab2ccode.deps.u8magna=["dmagns"]
-scilab2ccode.deps.u8magns=["u8abss"]
-scilab2ccode.deps.u16magna=["dmagns"]
-scilab2ccode.deps.u16magns=["u16abss"]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+
//OpStar
scilab2ccode.deps.cmulma=["FloatComplex","cadds","cmuls"]
scilab2ccode.deps.dmulma=[]
scilab2ccode.deps.smulma=[]
scilab2ccode.deps.zmulma=["zreala","zimaga","DoubleComplex","zadds","zmuls"]
-<<<<<<< HEAD
-=======
-scilab2ccode.deps.i8mulma=[]
-scilab2ccode.deps.i16mulma=[]
-scilab2ccode.deps.u8mulma=[]
-scilab2ccode.deps.u16mulma=[]
-
-//norm
-scilab2ccode.deps.dnorma=[]
-scilab2ccode.deps.dnormv=[]
-scilab2ccode.deps.snorma=[]
-scilab2ccode.deps.snormv=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//ones
scilab2ccode.deps.conesa=["FloatComplex"]
scilab2ccode.deps.donesa=[]
scilab2ccode.deps.sonesa=[]
scilab2ccode.deps.zonesa=["DoubleComplex"]
-<<<<<<< HEAD
-
-=======
-scilab2ccode.deps.i8onesa=[]
-scilab2ccode.deps.i16onesa=[]
-scilab2ccode.deps.u8onesa=[]
-scilab2ccode.deps.u16onesa=[]
-
-//powm
-scilab2ccode.deps.cpowma=["creals","cimags","cspec2a","cpows","cmulma","ctransposea","cconja","cinverma"]
-scilab2ccode.deps.dpowma=["dzerosa","zspec2a","zpows","zmulma","ztransposea","zconja","zinverma","zreals","DoubleComplex"]
-scilab2ccode.deps.spowma=["szerosa","cspec2a","cpows","FloatComplex","cmulma","ctransposea","cconja","cinverma","creals"]
-scilab2ccode.deps.zpowma=["zreals","zimags","zspec2a","zpows","zmulma","ztransposea","zconja","zinverma"]
-
-//spec
-scilab2ccode.deps.cspeca=["DoubleComplex","creals","cimags","zspeca","FloatComplex","zreals","zimags"]
-scilab2ccode.deps.dspeca=[]
-scilab2ccode.deps.sspeca=["dspeca"]
-scilab2ccode.deps.zspeca=["DoubleComplex","zreals","zimags","zconjs","dzerosa"]
-
-//spec2
-scilab2ccode.deps.cspec2a=["DoubleComplex","creals","cimags","zspec2a","FloatComplex","zreals","zimags"]
-scilab2ccode.deps.dspec2a=["dzerosa"]
-scilab2ccode.deps.sspec2a=["dspec2a"]
-scilab2ccode.deps.zspec2a=["DoubleComplex","zreals","zimags","dzerosa"]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+
//Squared Magnitude
scilab2ccode.deps.csquMagns=["creals","cimags"]
@@ -1396,13 +479,6 @@ scilab2ccode.deps.ctracea=["creals","cimags","FloatComplex"]
scilab2ccode.deps.dtracea=[]
scilab2ccode.deps.stracea=[]
scilab2ccode.deps.ztracea=["zreals","zimags","DoubleComplex"]
-<<<<<<< HEAD
-=======
-scilab2ccode.deps.i8tracea=[]
-scilab2ccode.deps.i16tracea=[]
-scilab2ccode.deps.u8tracea=[]
-scilab2ccode.deps.u16tracea=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//transpose
@@ -1410,54 +486,16 @@ scilab2ccode.deps.ctransposea=["creals","cimags","FloatComplex"]
scilab2ccode.deps.dtransposea=[]
scilab2ccode.deps.stransposea=[]
scilab2ccode.deps.ztransposea=["zreals","zimags","DoubleComplex"]
-<<<<<<< HEAD
-
-
-
-=======
-scilab2ccode.deps.i8transposea=[]
-scilab2ccode.deps.i16transposea=[]
-scilab2ccode.deps.u8transposea=[]
-scilab2ccode.deps.u16transposea=[]
-
-//tril
-scilab2ccode.deps.dtrila=[]
-scilab2ccode.deps.i8trila=[]
-scilab2ccode.deps.i16trila=[]
-scilab2ccode.deps.strila=[]
-scilab2ccode.deps.u8trila=[]
-scilab2ccode.deps.u16trila=[]
-
-//triu
-scilab2ccode.deps.dtriua=[]
-scilab2ccode.deps.i8triua=[]
-scilab2ccode.deps.i16triua=[]
-scilab2ccode.deps.striua=[]
-scilab2ccode.deps.u8triua=[]
-scilab2ccode.deps.u16triua=[]
-
-//zeros
-scilab2ccode.deps.czerosa=["FloatComplex"]
-scilab2ccode.deps.dzerosa=[]
-scilab2ccode.deps.dzerosh=[]
-scilab2ccode.deps.i8zerosa=[]
-scilab2ccode.deps.i16zerosa=[]
-scilab2ccode.deps.szerosa=[]
-scilab2ccode.deps.u8zerosa=[]
-scilab2ccode.deps.u16zerosa=[]
-scilab2ccode.deps.zzerosa=["DoubleComplex"]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+
+
+
////////////////////////
////// OPERATIONS //////
////////////////////////
-<<<<<<< HEAD
//OpPlus
-=======
-//addition
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
scilab2ccode.deps.cadds=["creals","cimags","FloatComplex"]
scilab2ccode.deps.cadda=["cadds"]
scilab2ccode.deps.dadds=[]
@@ -1466,23 +504,9 @@ scilab2ccode.deps.sadds=[]
scilab2ccode.deps.sadda=["sadds"]
scilab2ccode.deps.zadds=["zreals","zimags","DoubleComplex"]
scilab2ccode.deps.zadda=["zadds"]
-<<<<<<< HEAD
//OpDotSlash/OpSlash
-=======
-scilab2ccode.deps.i8adda=["i8adds"]
-scilab2ccode.deps.i8adds=[]
-scilab2ccode.deps.i16adda=["i16adds"]
-scilab2ccode.deps.i16adds=[]
-scilab2ccode.deps.u8adda=["u8adds"]
-scilab2ccode.deps.u8adds=[]
-scilab2ccode.deps.u16adda=["u16adds"]
-scilab2ccode.deps.u16adds=[]
-
-
-//division
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
scilab2ccode.deps.crdivs=["FloatComplex"]
scilab2ccode.deps.crdiva=["crdivs"]
scilab2ccode.deps.drdivs=[]
@@ -1491,12 +515,9 @@ scilab2ccode.deps.srdivs=[]
scilab2ccode.deps.srdiva=["srdivs"]
scilab2ccode.deps.zrdivs=["DoubleComplex"]
scilab2ccode.deps.zrdiva=["zrdivs"]
-<<<<<<< HEAD
//OpBackSlash
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
scilab2ccode.deps.cldivs=["cmuls","cconjs","creals","cimags","FloatComplex","crdivs"]
scilab2ccode.deps.cldiva=["cldivs"]
scilab2ccode.deps.dldivs=[]
@@ -1505,30 +526,9 @@ scilab2ccode.deps.sldivs=[]
scilab2ccode.deps.sldiva=["scldivs"]
scilab2ccode.deps.zldivs=["zmuls","zconjs","zreals","zimags","DoubleComplex","zrdivs"]
scilab2ccode.deps.zldiva=["zldivs"]
-<<<<<<< HEAD
//OpStar/OpDotStar
-=======
-scilab2ccode.deps.i8ldiva=["i8ldivs"]
-scilab2ccode.deps.i8ldivs=[]
-scilab2ccode.deps.i8rdiva=["i8rdivs"]
-scilab2ccode.deps.i8rdivs=[]
-scilab2ccode.deps.i16ldiva=["i16ldivs"]
-scilab2ccode.deps.i16ldivs=[]
-scilab2ccode.deps.i16rdiva=["i16rdivs"]
-scilab2ccode.deps.i16rdivs=[]
-scilab2ccode.deps.u8ldiva=["u8ldivs"]
-scilab2ccode.deps.u8ldivs=[]
-scilab2ccode.deps.u8rdiva=["u8rdivs"]
-scilab2ccode.deps.u8rdivs=[]
-scilab2ccode.deps.u16ldiva=["u16ldivs"]
-scilab2ccode.deps.u16ldivs=[]
-scilab2ccode.deps.u16rdiva=["u16rdivs"]
-scilab2ccode.deps.u16rdivs=[]
-
-//multiplication
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
scilab2ccode.deps.cmuls=["FloatComplex"]
scilab2ccode.deps.cmula=["cmuls"]
scilab2ccode.deps.dmuls=[]
@@ -1537,34 +537,9 @@ scilab2ccode.deps.smuls=[]
scilab2ccode.deps.smula=["smuls"]
scilab2ccode.deps.zmuls=["DoubleComplex"]
scilab2ccode.deps.zmula=["zmuls"]
-<<<<<<< HEAD
//OpMinus
-=======
-scilab2ccode.deps.cmulcsv=["cmulv"]
-scilab2ccode.deps.cmulscv=["cmulv"]
-scilab2ccode.deps.cmulv=["cadds"]
-scilab2ccode.deps.dmulv=["dmuls"]
-scilab2ccode.deps.i8muls=[]
-scilab2ccode.deps.i8mula=["i8muls"]
-scilab2ccode.deps.i8mulv=["i8muls"]
-scilab2ccode.deps.i16muls=[]
-scilab2ccode.deps.i16mula=["i16muls"]
-scilab2ccode.deps.i16mulv=["i16muls"]
-scilab2ccode.deps.smulv=["smuls"]
-scilab2ccode.deps.u8muls=[]
-scilab2ccode.deps.u8mula=["u8muls"]
-scilab2ccode.deps.u8mulv=["u8muls"]
-scilab2ccode.deps.u16muls=[]
-scilab2ccode.deps.u16mula=["u16muls"]
-scilab2ccode.deps.u16mulv=["u16muls"]
-scilab2ccode.deps.zmuldzv=["dzerosa","zmulv"]
-scilab2ccode.deps.zmulzdv=["dzerosa","zmulv"]
-scilab2ccode.deps.zmulv=["zadds"]
-
-//subtraction
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
scilab2ccode.deps.cdiffs=["creals","cimags","FloatComplex"]
scilab2ccode.deps.cdiffa=["cdiffs"]
scilab2ccode.deps.ddiffs=[]
@@ -1573,17 +548,6 @@ scilab2ccode.deps.sdiffs=[]
scilab2ccode.deps.sdiffa=["sdiffs"]
scilab2ccode.deps.zdiffs=["zreals","zimags","DoubleComplex"]
scilab2ccode.deps.zdiffa=["zdiffs"]
-<<<<<<< HEAD
-=======
-scilab2ccode.deps.i8diffs=[]
-scilab2ccode.deps.i8diffa=["i8diffs"]
-scilab2ccode.deps.i16diffa=["i16diffs"]
-scilab2ccode.deps.i16diffs=[]
-scilab2ccode.deps.u8diffa=["u8diffs"]
-scilab2ccode.deps.u8diffs=[]
-scilab2ccode.deps.u16diffa=["u16diffs"]
-scilab2ccode.deps.u16diffs=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
///////////////////////////////
@@ -1617,20 +581,12 @@ scilab2ccode.deps.cfftma=["DoubleComplex","creals","cimags","zfftma","FloatCompl
scilab2ccode.deps.dfft2=["dfftbi"]
scilab2ccode.deps.dfftbi=["dfftmx"]
scilab2ccode.deps.dfftmx=[]
-<<<<<<< HEAD
-=======
-scilab2ccode.deps.dfftma=["dzerosa","zfftma","zreala"]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
scilab2ccode.deps.fft842=["r2tx","r4tx","r8tx","DoubleComplex","zreals","zimags"]
scilab2ccode.deps.r2tx=["zadds","zdiffs","DoubleComplex","zreals","zimags"]
scilab2ccode.deps.r4tx=["zadds","zdiffs","DoubleComplex","zreals","zimags"]
scilab2ccode.deps.r8tx=["zadds","zdiffs","DoubleComplex","zreals","zimags"]
scilab2ccode.deps.zfftma=["zreala","zimaga","fft842","dfft2","DoubleComplexMatrix"]
-<<<<<<< HEAD
-=======
-scilab2ccode.deps.sfftma=["szerosa","cfftma","creala"]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//hilbert
scilab2ccode.deps.dhilberts=[]
@@ -1638,23 +594,6 @@ scilab2ccode.deps.dhilberta=["DoubleComplex","zfftma","zmuls","zifftma"]
scilab2ccode.deps.shilberts=[]
scilab2ccode.deps.shilberta=["FloatComplex","cfftma","cmuls","cifftma"]
-<<<<<<< HEAD
-=======
-//fftshift
-scilab2ccode.deps.ccolumnfftshifta=[]
-scilab2ccode.deps.cfftshifta=["crowfftshifta","ccolumnfftshifta"]
-scilab2ccode.deps.crowfftshifta=[]
-scilab2ccode.deps.dcolumnfftshifta=[]
-scilab2ccode.deps.dfftshifta=["drowfftshifta","dcolumnfftshifta"]
-scilab2ccode.deps.drowfftshifta=[]
-scilab2ccode.deps.scolumnfftshifta=[]
-scilab2ccode.deps.sfftshifta=["srowfftshifta","scolumnfftshifta"]
-scilab2ccode.deps.srowfftshifta=[]
-scilab2ccode.deps.zcolumnfftshifta=[]
-scilab2ccode.deps.zfftshifta=["zrowfftshifta","zcolumnfftshifta"]
-scilab2ccode.deps.zrowfftshifta=[]
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//ifft
scilab2ccode.deps.cifftma=["DoubleComplex","creals","cimags","zifftma","FloatComplex","zreals","zimags"]
@@ -1666,22 +605,6 @@ scilab2ccode.deps.ir2tx=["zadds","zdiffs","DoubleComplex","zreals","zimags"]
scilab2ccode.deps.ir4tx=["zadds","zdiffs","DoubleComplex","zreals","zimags"]
scilab2ccode.deps.ir8tx=["zadds","zdiffs","DoubleComplex","zreals","zimags"]
scilab2ccode.deps.zifftma=["zreala","zimaga","ifft842","difft2","DoubleComplexMatrix"]
-<<<<<<< HEAD
-=======
-scilab2ccode.deps.diffbi_lavraie=[]
-scilab2ccode.deps.difftma=["dzerosa","zifftma","zreala"]
-scilab2ccode.deps.sifftma=["szerosa","cifftma","creala"]
-
-//lev
-scilab2ccode.deps.cleva=["crdivs","FloatComplex","creals","cimags","cmuls","cconjs","cdiffs","cadds"]
-scilab2ccode.deps.cleva2=["crdivs","FloatComplex","creals","cimags","cmuls","cconjs","cdiffs","cadds"]
-scilab2ccode.deps.dleva=[]
-scilab2ccode.deps.dleva2=[]
-scilab2ccode.deps.sleva=[]
-scilab2ccode.deps.sleva2=[]
-scilab2ccode.deps.zleva=["zrdivs","DoubleComplex","zreals","zimags","zmuls","zdiffs","zconjs","zadds"]
-scilab2ccode.deps.zleva2=["zrdivs","DoubleComplex","zreals","zimags","zmuls","zdiffs","zconjs","zadds"]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//levin
@@ -1707,11 +630,7 @@ scilab2ccode.deps.slevinmul2=[]
scilab2ccode.deps.sdecalage=[]
scilab2ccode.deps.slevinsub=[]
scilab2ccode.deps.slevinsig=[]
-<<<<<<< HEAD
-=======
-scilab2ccode.deps.levinUtils=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//lpc2cep
scilab2ccode.deps.clpc2cepa=["cfftma","clogma","cifftma"]
@@ -1724,28 +643,6 @@ scilab2ccode.deps.zlpc2cepa=["zfftma","zlogma","zifftma"]
////// STATISTIC FUNCTIONS //////
/////////////////////////////////
-<<<<<<< HEAD
-=======
-//max
-scilab2ccode.deps.dcolumnmaxa=[]
-scilab2ccode.deps.dmaxa=[]
-scilab2ccode.deps.drowmaxa=[]
-scilab2ccode.deps.i8columnmaxa=[]
-scilab2ccode.deps.i8maxa=[]
-scilab2ccode.deps.i8rowmaxa=[]
-scilab2ccode.deps.i16columnmaxa=[]
-scilab2ccode.deps.i16maxa=[]
-scilab2ccode.deps.i16rowmaxa=[]
-scilab2ccode.deps.scolumnmaxa=[]
-scilab2ccode.deps.smaxa=[]
-scilab2ccode.deps.srowmaxa=[]
-scilab2ccode.deps.u8columnmaxa=[]
-scilab2ccode.deps.u8maxa=[]
-scilab2ccode.deps.u8rowmaxa=[]
-scilab2ccode.deps.u16columnmaxa=[]
-scilab2ccode.deps.u16maxa=[]
-scilab2ccode.deps.u16rowmaxa=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//mean
scilab2ccode.deps.cmeana=["FloatComplex","cadds","creals","cimags"]
@@ -1761,47 +658,7 @@ scilab2ccode.deps.drowmeana=["drowsuma"]
scilab2ccode.deps.srowmeana=["srowsuma"]
scilab2ccode.deps.zrowmeana=["zrowsuma","zrdivs","DoubleComplex"]
-<<<<<<< HEAD
-
-=======
-//meanf
-scilab2ccode.deps.cmeanfa=["FloatComplex","cadds","crdivs"]
-scilab2ccode.deps.dmeanfa=[]
-scilab2ccode.deps.smeanfa=[]
-scilab2ccode.deps.zmeanfa=["DoubleComplex","zadds","zmuls","zrdivs"]
-scilab2ccode.deps.ccolumnmeanfa=["cadds","cmuls","FloatComplex","crdivs"]
-scilab2ccode.deps.dcolumnmeanfa=[]
-scilab2ccode.deps.scolumnmeanfa=[]
-scilab2ccode.deps.zcolumnmeanfa=["zmuls","zrdivs","DoubleComplex","zadds"]
-scilab2ccode.deps.crowmeanfa=["cmuls","crdivs","FloatComplex","cadds"]
-scilab2ccode.deps.drowmeanfa=["drowsuma"]
-scilab2ccode.deps.srowmeanfa=[]
-scilab2ccode.deps.zrowmeanfa=["zmuls","zrdivs","DoubleComplex","zadds"]
-scilab2ccode.deps.cmeanfcs=["szerosa","cmeanfa"]
-scilab2ccode.deps.cmeanfsc=["szerosa","cmeanfa"]
-scilab2ccode.deps.zmeanfdz=["dzerosa","zmeanfa"]
-scilab2ccode.deps.zmeanfzd=["dzerosa","zmeanfa"]
-
-//min
-scilab2ccode.deps.dcolumnmina=[]
-scilab2ccode.deps.dmina=[]
-scilab2ccode.deps.drowmina=[]
-scilab2ccode.deps.i8columnmina=[]
-scilab2ccode.deps.i8mina=[]
-scilab2ccode.deps.i8rowmina=[]
-scilab2ccode.deps.i16columnmina=[]
-scilab2ccode.deps.i16mina=[]
-scilab2ccode.deps.i16rowmina=[]
-scilab2ccode.deps.scolumnmina=[]
-scilab2ccode.deps.smina=[]
-scilab2ccode.deps.srowmina=[]
-scilab2ccode.deps.u8columnmina=[]
-scilab2ccode.deps.u8mina=[]
-scilab2ccode.deps.u8rowmina=[]
-scilab2ccode.deps.u16columnmina=[]
-scilab2ccode.deps.u16mina=[]
-scilab2ccode.deps.u16rowmina=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+
//prod
scilab2ccode.deps.cproda=["cmuls"]
scilab2ccode.deps.dproda=[]
@@ -1816,33 +673,6 @@ scilab2ccode.deps.drowproda=[]
scilab2ccode.deps.srowproda=[]
scilab2ccode.deps.zrowproda=["zmuls"]
-<<<<<<< HEAD
-=======
-//stdevf
-scilab2ccode.deps.ccolumnstdevfa=["FloatComplex","cpows","cdiffs","cmuls","cadds","sabss","creals","cimags","crdivs","csqrts"]
-scilab2ccode.deps.cstdevfa=["FloatComplex","cmeanfa","cpows","cmuls","cadds","crdivs","csqrts","cdiffs"]
-scilab2ccode.deps.crowstdevfa=["FloatComplex","crowmeanfa","cpows","cdiffs","cmuls","cadds""sabss","creals","cimags","crdivs","csqrts"]
-scilab2ccode.deps.cstdevfcs=["FloatComplex","cmeanfcs","cpows","cdiffs","cmuls","cadds","creals","cimags","csqrts"]
-scilab2ccode.deps.cstdevfsc=["szerosa","cstdevfa"]
-scilab2ccode.deps.dcolumnstdevfa=["dcolumnmeanfa","dpows","dsqrts"]
-scilab2ccode.deps.dstdevfa=[]
-scilab2ccode.deps.drowstdevfa=[]
-scilab2ccode.deps.i8columnmina=[]
-scilab2ccode.deps.i8mina=[]
-scilab2ccode.deps.i8rowmina=[]
-scilab2ccode.deps.i16columnmina=[]
-scilab2ccode.deps.i16mina=[]
-scilab2ccode.deps.i16rowmina=[]
-scilab2ccode.deps.scolumnmina=[]
-scilab2ccode.deps.smina=[]
-scilab2ccode.deps.srowmina=[]
-scilab2ccode.deps.u8columnmina=[]
-scilab2ccode.deps.u8mina=[]
-scilab2ccode.deps.u8rowmina=[]
-scilab2ccode.deps.u16columnmina=[]
-scilab2ccode.deps.u16mina=[]
-scilab2ccode.deps.u16rowmina=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//sum
scilab2ccode.deps.csuma=["cadds"]
@@ -1857,22 +687,7 @@ scilab2ccode.deps.crowsuma=["cadds"]
scilab2ccode.deps.drowsuma=[]
scilab2ccode.deps.srowsuma=[]
scilab2ccode.deps.zrowsuma=["zadds"]
-<<<<<<< HEAD
-
-=======
-scilab2ccode.deps.i8suma=["i8adds"]
-scilab2ccode.deps.i8columnsuma=["i8adds"]
-scilab2ccode.deps.i8rowsuma=["i8adds"]
-scilab2ccode.deps.i16suma=["i16adds"]
-scilab2ccode.deps.i16columnsuma=["i16adds"]
-scilab2ccode.deps.i16rowsuma=["i16adds"]
-scilab2ccode.deps.u8suma=["u8adds"]
-scilab2ccode.deps.U8columnsuma=["u8adds"]
-scilab2ccode.deps.u8rowsuma=["u8adds"]
-scilab2ccode.deps.u16suma=["u16adds"]
-scilab2ccode.deps.u16columnsuma=["u16adds"]
-scilab2ccode.deps.u16rowsuma=["u16adds"]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+
//variance
scilab2ccode.deps.cvariancea=["FloatComplex","cmeana","cdiffs","cadds","cpows","creals","cimags","crdivs"]
@@ -1888,33 +703,11 @@ scilab2ccode.deps.drowvariancea=["dtransposea","dvariancea"]
scilab2ccode.deps.srowvariancea=["stransposea","svariancea"]
scilab2ccode.deps.zrowvariancea=["ztransposea","DoubleComplex","zreals","zimags","zvariancea"]
-<<<<<<< HEAD
-=======
-//variancef
-scilab2ccode.deps.cvariancefa=["FloatComplex","cmeanfa","cdiffs","cadds","cpows","cmuls","crdivs"]
-scilab2ccode.deps.dvariancefa=["dmeanfa","dpows"]
-scilab2ccode.deps.svariancefa=["smeanfa","spows"]
-scilab2ccode.deps.zvariancefa=["DoubleComplex","zmeanfa","zdiffs","zadds","zpows","zrdivs"]
-scilab2ccode.deps.ccolumnvariancefa=["cvariancefa","ctransposea"]
-scilab2ccode.deps.dcolumnvariancefa=["dvariancefa","dtransposea"]
-scilab2ccode.deps.scolumnvariancefa=["scolumnmeanfa","spows"]
-scilab2ccode.deps.zcolumnvariancefa=["zvariancefa","ztransposea"]
-scilab2ccode.deps.crowvariancefa=["cvariancefa"]
-scilab2ccode.deps.drowvariancefa=["dvariancefa"]
-scilab2ccode.deps.srowvariancefa=["svariancefa"]
-scilab2ccode.deps.zrowvariancefa=["zvariancefa"]
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
////////////////////
////// STRING //////
////////////////////
-<<<<<<< HEAD
-=======
-//convstr
-scilab2ccode.deps.gconvstrs=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//disp
scilab2ccode.deps.cdisps=["creals","cimags"]
@@ -1925,56 +718,12 @@ scilab2ccode.deps.sdisps=[]
scilab2ccode.deps.sdispa=[]
scilab2ccode.deps.zdisps=["zreals","zimags"]
scilab2ccode.deps.zdispa=["zreals","zimags"]
-<<<<<<< HEAD
-
-=======
-scilab2ccode.deps.ddisph=[]
-scilab2ccode.deps.i8disps=[]
-scilab2ccode.deps.i8dispa=[]
-scilab2ccode.deps.i16disps=[]
-scilab2ccode.deps.i16dispa=[]
-scilab2ccode.deps.u8disps=[]
-scilab2ccode.deps.u8dispa=[]
-scilab2ccode.deps.u16disps=[]
-scilab2ccode.deps.u16dispa=[]
-
-//string
-scilab2ccode.deps.cstringa=["cstrings"]
-scilab2ccode.deps.cstrings=["creals","cimags"]
-scilab2ccode.deps.dstringa=["dstrings"]
-scilab2ccode.deps.dstrings=[]
-scilab2ccode.deps.i8stringa=["i8strings"]
-scilab2ccode.deps.i8strings=[]
-scilab2ccode.deps.i16stringa=["i16strings"]
-scilab2ccode.deps.i16strings=[]
-scilab2ccode.deps.sstringa=["sstrings"]
-scilab2ccode.deps.sstrings=[]
-scilab2ccode.deps.u8stringa=["u8strings"]
-scilab2ccode.deps.u8strings=[]
-scilab2ccode.deps.u16stringa=["u16strings"]
-scilab2ccode.deps.u16strings=[]
-scilab2ccode.deps.zstringa=["zstrings"]
-scilab2ccode.deps.zstrings=[]
-
-//strrchr
-scilab2ccode.deps.gstrrchra=[]
-
-//strrev
-scilab2ccode.deps.gstrreva=[]
-
-//strsubst
-scilab2ccode.deps.gstrsubsta=[]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+
///////////////////
////// TYPES //////
///////////////////
-<<<<<<< HEAD
-=======
-scilab2ccode.deps.floatComplex=["creals","cimags","FloatComplex","cisreals","cisimags"]
-scilab2ccode.deps.doubleComplex=["zreals","zimags","DoubleComplex","zisreals","zisimags"]
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//floatComplex
scilab2ccode.deps.creals=[]
@@ -1997,27 +746,4 @@ scilab2ccode.deps.DoubleComplexMatrix=["DoubleComplex"]
scilab2ccode.deps.zisreals=["zimags"]
scilab2ccode.deps.zisimags=["zreals"]
-<<<<<<< HEAD
-=======
-//Arduino Functions
-scilab2ccode.deps.u8cmd_analog_ins=["duint16a","duint16s","i8uint16a","i8uint16s","i16uint16a","i16uint16s","suint16a","suint16s","u8uint16a","u8uint16s"]
-scilab2ccode.deps.u8cmd_analog_in_volts=["dfloats","dfloata","i8floats","i8floata","i16floats","i16floata","sfloats","sfloata","u8floats","u8floata","u16floats","u16floata"]
-scilab2ccode.deps.u8cmd_analog_outs=[]
-scilab2ccode.deps.u8cmd_analog_out_volts=[]
-scilab2ccode.deps.u8cmd_dcmotor_releases=[]
-scilab2ccode.deps.u8cmd_dcmotor_runs=[]
-scilab2ccode.deps.u8cmd_dcmotor_setups=[]
-scilab2ccode.deps.u8cmd_digital_ins=["duint8a","duint8s","i8uint8a","i8uint8s","i16uint8a","i16uint8s","suint8a","suint8s","u16uint8a","u16uint8s"]
-scilab2ccode.deps.u8cmd_digital_outs=[]
-scilab2ccode.deps.u8cmd_i2c_devs=["duint8a","duint8s","i8uint8a","i8uint8s","i16uint8a","i16uint8s","suint8a","suint8s","u16uint8a","u16uint8s"]
-scilab2ccode.deps.u8cmd_i2c_reads=[]
-scilab2ccode.deps.u8cmd_i2c_read_registers=[]
-scilab2ccode.deps.u8cmd_i2c_writes=[]
-scilab2ccode.deps.u8cmd_i2c_write_registers=[]
-scilab2ccode.deps.u8cmd_servo_attach=[]
-scilab2ccode.deps.u8cmd_servo_move=[]
-scilab2ccode.deps.u8cmd_servo_detach=[]
-scilab2ccode.deps.u16sleeps=[]
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
endfunction
diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci
index 8e33e486..9eb019aa 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/macros/findDeps/getAllHeaders.sci
@@ -60,10 +60,6 @@ function allHeaders = getAllHeaders(SharedInfo)
"src/c/matrixOperations/includes/logm.h"
"src/c/matrixOperations/includes/ones.h"
"src/c/matrixOperations/includes/matrixSquaredMagnitude.h"
- "src/c/linearAlgebra/includes/spec.h"
-
- "src/c/matrixOperations/includes/spec.h"
-
"src/c/matrixOperations/includes/matrixTranspose.h"
"src/c/matrixOperations/includes/determ.h"
"src/c/matrixOperations/includes/matrixMultiplication.h"
diff --git a/2.3-1/macros/findDeps/getAllLibraries.sci b/2.3-1/macros/findDeps/getAllLibraries.sci
index fe894ee8..9d74bbf7 100644
--- a/2.3-1/macros/findDeps/getAllLibraries.sci
+++ b/2.3-1/macros/findDeps/getAllLibraries.sci
@@ -24,13 +24,9 @@ function allLibraries = getAllLibraries(SharedInfo)
Target = SharedInfo.Target;
//Library files required for "RasberryPi" target
RPi_libs = [
-<<<<<<< HEAD
"thirdparty/lib/raspberrypi/libRPIwfi.a"
"thirdparty/lib/raspberrypi/libwiringPi.a"
"thirdparty/lib/raspberrypi/libwiringPiDev.a"
-=======
- "thirdparty/lib/raspberrypi/libwiringPi.so"
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"thirdparty/lib/raspberrypi/libcblas.a"
"thirdparty/lib/raspberrypi/librefblas.a"
"thirdparty/lib/raspberrypi/liblapack.a"
diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index f0f4e741..209cec08 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -1448,24 +1448,10 @@ function allSources = getAllSources(SharedInfo)
"src/c/imageProcessing/cvimgproc/imcvCanny.cpp"
"src/c/imageProcessing/cvimgproc/imcvCornerHarris.cpp"];
-
if Target == "StandAlone"
allSources = Standalone_files;
elseif Target == "Arduino"
allSources = cat(1,Standalone_files, Arduino_files);
-
- if Target == "Arduino" & BuildTool == "nmake"
- Required_addrs = get_rquird_fnctns(Standalone_files,Arduino_files,SharedInfo);
- end
-
- if Target == "StandAlone"
- allSources = Standalone_files;
- elseif Target == "Arduino"
- if BuildTool == "nmake"
- allSources = Required_addrs;
- else
- allSources = cat(1,Standalone_files, Arduino_files);
- end
elseif Target == "AVR"
allSources = cat(1,Standalone_files, AVR_files);
elseif Target == "RPi"
diff --git a/2.3-1/macros/findDeps/get_rquird_fnctns.sci b/2.3-1/macros/findDeps/get_rquird_fnctns.sci
deleted file mode 100644
index 28837952..00000000
--- a/2.3-1/macros/findDeps/get_rquird_fnctns.sci
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright (C) 2017 - 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: Yash Pratap Singh Tomar
-// Organization: FOSSEE, IIT Bombay
-// Email: toolbox@scilab.in
-
-//This function creates and compares the list of functions used in scilab code to existing function list from getallSources
-function Required_addrs = get_rquird_fnctns(Standalone_files,Arduino_files,SharedInfo)
- Required_stdalon_indx = 1;
- Required_ardno_indx = 1;
- x = 1;
- y = 1;
-
-//Creating lists for stanalone C file and function
-//Some C files don't have their function name directory. So their address is being shifted to last of the list
- Standalone_files_1 = Standalone_files;
- Standalone_files_extras(1) = Standalone_files_1(76);
- Standalone_files_extras(2) = Standalone_files_1(77);
- Standalone_files_extras(3) = Standalone_files_1(1009);
- Standalone_files_extras(4) = Standalone_files_1(1010);
- Standalone_files_extras(5) = Standalone_files_1(1011);
- Standalone_files_extras(6) = Standalone_files_1(1012);
- Standalone_files_1(1012) = [];
- Standalone_files_1(1011) = [];
- Standalone_files_1(1010) = [];
- Standalone_files_1(1009) = [];
- Standalone_files_1(77) = [];
- Standalone_files_1(76) = [];
-
-//calculating the total no. of standalone files
- No_of_stdalon_files = size(Standalone_files_1);
- No_of_stdalon_files = No_of_stdalon_files(1);
-
-//This for loop is to extract function name list from address list
- for index=1:No_of_stdalon_files
- K = strsplit(Standalone_files_1(index),"/");
- Standalone_files_folders(index) = K(4);
- Standalone_C_files(index) = K(5);
- Standalone_C_files(index) = strtok(Standalone_C_files(index),".");
- end
-
-//Here, it adds the functions to the list which were earlier removed to shift to the end
- for index=1:6
- K = strsplit(Standalone_files_extras(index),"/");
- Standalone_files_folders(No_of_stdalon_files+index) = K(3);
- Standalone_C_files(No_of_stdalon_files+index) = K(4);
- Standalone_files_1(No_of_stdalon_files+index)= Standalone_files_extras(index);
- Standalone_C_files(No_of_stdalon_files+index) = strtok(Standalone_C_files(No_of_stdalon_files+index),".");
- end
-
-//Following similar procedure for Arduino
- Arduino_files_1 = Arduino_files;
- No_of_ardno_files = size(Arduino_files_1);
- No_of_ardno_files = No_of_ardno_files(1);
- for index=1:No_of_ardno_files
- K = strsplit(Arduino_files_1(index),"/");
- Arduino_files_folders(index) = K(4);
- Arduino_C_files(index) = K(5);
- Arduino_C_files(index) = strtok(Arduino_C_files(index),".");
- end
-
-//comparing
-//this compares the list of functions used in scilab file to the created standalone C files and function list
- for index = 1:SharedInfo.Function_list_index
- for k = 1:No_of_stdalon_files
- if SharedInfo.Function_list(index) == Standalone_files_folders(k)
- Required_fnctn_stdalon(Required_stdalon_indx) = k;
- Required_fnctn_stdlon_f(x) = Standalone_C_files(k);
- x = x+1;
- Required_stdalon_indx = Required_stdalon_indx + 1;
- end
- end
- end
- if x == 1
- Required_fnctn_stdlon_f = [];
- end
-//this compares the list of functions used in scilab file to the created Arduino files and function list
-Required_stdalon_indx = Required_stdalon_indx - 1;
-
- for index = 1:SharedInfo.Function_list_index
- for k = 1:No_of_ardno_files
- if SharedInfo.Function_list(index) == Arduino_files_folders(k);
- Required_fnctn_ardno(Required_ardno_indx) = k;
- Required_fnctn_ardno_f(y) = Arduino_C_files(k);
- y = y+1;
- Required_ardno_indx = Required_ardno_indx + 1;
- end
- end
- end
-
- Required_ardno_indx = Required_ardno_indx - 1;
-//Calling Scilab2CDeps structure
- scilab2ccode = Scilab2CDeps();
-
-//Looking for the depencies of the C files used on other files
- for index = 1:Required_stdalon_indx
- call = "scilab2ccode.deps." + Standalone_C_files(Required_fnctn_stdalon(index));
- call_val = eval(call);
- Required_fnctn_stdlon_f = cat(1,Required_fnctn_stdlon_f,(call_val)');
- end
-
- Required_fnctn_stdlon_f = unique(Required_fnctn_stdlon_f);
-
-//Looking for the depencies of the Arduino files used on other C or Arduino files
- for index = 1:Required_ardno_indx
- call = "scilab2ccode.deps." + Arduino_C_files(Required_fnctn_ardno(index));
- call_val = eval(call);
- Required_fnctn_ardno_f = cat(1,Required_fnctn_ardno_f,(call_val)');
- end
- Required_fnctn_ardno_f = unique(Required_fnctn_ardno_f);
-
-//Adding Standalone and Arudino files lists
- all_files_addrs = cat(1,Standalone_files_1,Arduino_files_1);
-
-//Adding Requied Standalone and Arudino files lists which are to be copied
- required_files = cat(1,Required_fnctn_stdlon_f,Required_fnctn_ardno_f);
- required_files = unique(required_files);
- no_of_required_files = size(required_files);
- no_of_required_files = no_of_required_files(1);
- no_of_all_files = size(all_files_addrs);
- no_of_all_files = no_of_all_files(1);
-
- all_files = cat(1,Standalone_C_files,Arduino_C_files);
- index = 1;
-//Creating final list which has address of files to be copied
- for i=1:no_of_required_files
- for k=1:no_of_all_files
- if required_files(i) == all_files(k)
- Required_addrs(index) = all_files_addrs(k);
- index = index + 1;
- end
- end
- end
-
-endfunction
diff --git a/2.3-1/macros/findDeps/names b/2.3-1/macros/findDeps/names
index 7b471e9e..2b8c551b 100644
--- a/2.3-1/macros/findDeps/names
+++ b/2.3-1/macros/findDeps/names
@@ -5,7 +5,3 @@ getAllInterfaces
getAllLibraries
getAllSources
getArduinoFiles
-<<<<<<< HEAD
-=======
-get_rquird_fnctns
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0