summaryrefslogtreecommitdiff
path: root/macros/findDeps
diff options
context:
space:
mode:
Diffstat (limited to 'macros/findDeps')
-rw-r--r--macros/findDeps/Scilab2CDeps.sci1306
-rw-r--r--macros/findDeps/getAllHeaders.sci47
-rw-r--r--macros/findDeps/getAllInterfaces.sci47
-rw-r--r--macros/findDeps/getAllLibraries.sci4
-rw-r--r--macros/findDeps/getAllSources.sci130
-rw-r--r--macros/findDeps/get_rquird_fnctns.sci140
-rw-r--r--macros/findDeps/names4
7 files changed, 1662 insertions, 16 deletions
diff --git a/macros/findDeps/Scilab2CDeps.sci b/macros/findDeps/Scilab2CDeps.sci
index 8044e27..cb278b4 100644
--- a/macros/findDeps/Scilab2CDeps.sci
+++ b/macros/findDeps/Scilab2CDeps.sci
@@ -7,16 +7,25 @@
// 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"]
@@ -26,8 +35,19 @@ 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"]
@@ -39,7 +59,28 @@ 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"]
@@ -78,9 +119,31 @@ 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"]
@@ -91,11 +154,62 @@ 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 //////
@@ -111,6 +225,14 @@ 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"]
@@ -122,6 +244,79 @@ 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"]
@@ -132,6 +327,16 @@ 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"]
@@ -160,6 +365,14 @@ 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"]
@@ -171,6 +384,58 @@ 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"]
@@ -181,7 +446,18 @@ 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"]
@@ -192,6 +468,17 @@ 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
@@ -203,7 +490,18 @@ 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"]
@@ -215,6 +513,83 @@ 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"]
@@ -253,6 +628,12 @@ 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"]
@@ -263,7 +644,36 @@ 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"]
@@ -274,6 +684,17 @@ 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
@@ -285,6 +706,17 @@ 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
@@ -307,6 +739,17 @@ 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
@@ -318,13 +761,294 @@ 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=[]
@@ -355,14 +1079,95 @@ 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"]
@@ -374,6 +1179,31 @@ 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"]
@@ -401,7 +1231,14 @@ 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"]
@@ -409,10 +1246,25 @@ 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"]
@@ -426,10 +1278,26 @@ 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"]
@@ -447,21 +1315,70 @@ 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"]
@@ -479,6 +1396,13 @@ 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
@@ -486,16 +1410,54 @@ 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=[]
@@ -504,9 +1466,23 @@ 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=[]
@@ -515,9 +1491,12 @@ 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=[]
@@ -526,9 +1505,30 @@ 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=[]
@@ -537,9 +1537,34 @@ 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=[]
@@ -548,6 +1573,17 @@ 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
///////////////////////////////
@@ -581,12 +1617,20 @@ 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=[]
@@ -594,6 +1638,23 @@ 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"]
@@ -605,6 +1666,22 @@ 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
@@ -630,7 +1707,11 @@ scilab2ccode.deps.slevinmul2=[]
scilab2ccode.deps.sdecalage=[]
scilab2ccode.deps.slevinsub=[]
scilab2ccode.deps.slevinsig=[]
+<<<<<<< HEAD
+=======
+scilab2ccode.deps.levinUtils=[]
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//lpc2cep
scilab2ccode.deps.clpc2cepa=["cfftma","clogma","cifftma"]
@@ -643,6 +1724,28 @@ 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"]
@@ -658,7 +1761,47 @@ 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=[]
@@ -673,6 +1816,33 @@ 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"]
@@ -687,7 +1857,22 @@ 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"]
@@ -703,11 +1888,33 @@ 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"]
@@ -718,12 +1925,56 @@ 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=[]
@@ -746,4 +1997,27 @@ 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/macros/findDeps/getAllHeaders.sci b/macros/findDeps/getAllHeaders.sci
index 0435976..ba26703 100644
--- a/macros/findDeps/getAllHeaders.sci
+++ b/macros/findDeps/getAllHeaders.sci
@@ -60,7 +60,11 @@ function allHeaders = getAllHeaders(SharedInfo)
"src/c/matrixOperations/includes/logm.h"
"src/c/matrixOperations/includes/ones.h"
"src/c/matrixOperations/includes/matrixSquaredMagnitude.h"
+<<<<<<< HEAD
"src/c/linearAlgebra/includes/spec.h"
+=======
+ "src/c/matrixOperations/includes/spec.h"
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/matrixOperations/includes/matrixTranspose.h"
"src/c/matrixOperations/includes/determ.h"
"src/c/matrixOperations/includes/matrixMultiplication.h"
@@ -72,10 +76,13 @@ function allHeaders = getAllHeaders(SharedInfo)
"src/c/matrixOperations/includes/kron.h"
"src/c/matrixOperations/includes/flipdim.h"
"src/c/matrixOperations/includes/norm.h"
+<<<<<<< HEAD
"src/c/interpolation/includes/interp1.h"
"src/c/elementaryFunctions/includes/nextpow2.h"
"src/c/elementaryFunctions/includes/gcd.h"
"src/c/elementaryFunctions/includes/isreal.h"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/elementaryFunctions/includes/cos.h"
"src/c/elementaryFunctions/includes/fix.h"
"src/c/elementaryFunctions/includes/exp.h"
@@ -115,8 +122,11 @@ function allHeaders = getAllHeaders(SharedInfo)
"src/c/elementaryFunctions/includes/int8.h"
"src/c/elementaryFunctions/includes/uint16.h"
"src/c/elementaryFunctions/includes/int16.h"
+<<<<<<< HEAD
"src/c/elementaryFunctions/includes/uint32.h"
"src/c/elementaryFunctions/includes/int32.h"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/elementaryFunctions/includes/acosd.h"
"src/c/elementaryFunctions/includes/acot.h"
"src/c/elementaryFunctions/includes/acotd.h"
@@ -146,9 +156,12 @@ function allHeaders = getAllHeaders(SharedInfo)
"src/c/string/includes/dynlib_string.h"
"src/c/string/includes/disp.h"
"src/c/string/includes/str.h"
+<<<<<<< HEAD
"src/c/signalProcessing/includes/modk.h"
"src/c/signalProcessing/includes/idct.h"
"src/c/signalProcessing/includes/dct.h"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/signalProcessing/fft/fft_internal.h"
"src/c/signalProcessing/ifft/ifft_internal.h"
"src/c/signalProcessing/levin/levinUtils.h"
@@ -163,6 +176,7 @@ function allHeaders = getAllHeaders(SharedInfo)
"src/c/signalProcessing/includes/lpc2cep.h"
"src/c/signalProcessing/includes/dynlib_signalprocessing.h"
"src/c/signalProcessing/includes/crossCorr.h"
+<<<<<<< HEAD
"src/c/signalProcessing/includes/zpbutt.h"
"src/c/signalProcessing/includes/zpch1.h"
"src/c/signalProcessing/includes/zpch2.h"
@@ -177,6 +191,8 @@ function allHeaders = getAllHeaders(SharedInfo)
"src/c/signalProcessing/includes/modsn.h"
"src/c/signalProcessing/includes/ell1mag.h"
"src/c/signalProcessing/includes/amell.h"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/implicitList/dynlib_implicitlist.h"
"src/c/implicitList/implicitList.h"
"src/c/differential_calculus/includes/ode.h"
@@ -187,11 +203,14 @@ function allHeaders = getAllHeaders(SharedInfo)
//"src/c/string/includes/strcmp.h"
"src/c/string/includes/strrev.h"
"src/c/string/includes/strrchr.h"
+<<<<<<< HEAD
"src/c/string/includes/strchr.h"
"src/c/string/includes/ascii.h"
"src/c/string/includes/strspn.h"
"src/c/string/includes/strcspn.h"
"src/c/string/includes/strncpy.h"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/elementaryFunctions/includes/dec2bin.h"
"src/c/elementaryFunctions/includes/dec2hex.h"
"src/c/elementaryFunctions/includes/dec2oct.h"
@@ -213,13 +232,17 @@ function allHeaders = getAllHeaders(SharedInfo)
"src/c/elementaryFunctions/includes/factorial.h"
"src/c/elementaryFunctions/includes/primes.h"
"src/c/elementaryFunctions/includes/factor.h"
+<<<<<<< HEAD
"src/c/elementaryFunctions/includes/gcd.h"
"src/c/elementaryFunctions/includes/lcm.h"
"src/c/elementaryFunctions/includes/sinc.h"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/CACSD/includes/syslin.h"
"src/c/CACSD/includes/lqr.h"
"src/c/CACSD/includes/lqe.h"
"src/c/CACSD/includes/obscont.h"
+<<<<<<< HEAD
"src/c/linearAlgebra/includes/sva.h"
"src/c/linearAlgebra/includes/svd.h"
"src/c/linearAlgebra/includes/schur.h"
@@ -229,6 +252,12 @@ function allHeaders = getAllHeaders(SharedInfo)
"src/c/linearAlgebra/includes/sva.h"
"src/c/linearAlgebra/includes/rcond.h"];
+=======
+ "src/c/linearAlgebra/includes/schur.h"
+ "src/c/linearAlgebra/includes/balanc.h"
+ "src/c/linearAlgebra/includes/rcond.h"];
+
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//Header files required for "Arduino" output
Arduino_headers = [
@@ -258,6 +287,7 @@ function allHeaders = getAllHeaders(SharedInfo)
"src/c/hardware/avr/includes/AVRUtil.h"
"src/c/hardware/avr/includes/AVRPeripheralTimer.h"
"src/c/hardware/avr/includes/AVRPeripheralUART.h"
+<<<<<<< HEAD
];
RPi_headers = [
@@ -299,6 +329,20 @@ function allHeaders = getAllHeaders(SharedInfo)
"src/c/hardware/rasberrypi/includes/RPIPeripheralSoft.h"
"src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h"
];
+=======
+ ];
+
+ RPi_headers = [
+ "thirdparty/includes/WiringPi/wiringPi.h"
+ "thirdparty/includes/WiringPi/wiringSerial.h"
+ "src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h"
+ "src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h"
+ "src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h"
+ "src/c/hardware/rasberrypi/includes/RPIPeripheralThreading.h"
+ "src/c/hardware/rasberrypi/includes/RPIPeripheralPinISR.h"
+ "src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h"
+ ];
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
OpenCV_headers = [
"src/c/imageProcessing/includes/cvcore.hpp"
@@ -320,9 +364,12 @@ function allHeaders = getAllHeaders(SharedInfo)
allHeaders = cat(1,allHeaders,OpenCV_headers);
end
+<<<<<<< HEAD
if(size(SharedInfo.Includelist) <> 0 & (mtlb_strcmp(part(SharedInfo.Includelist(1),1:5),'odefn') == %T))
disp("Hi")
allHeaders = cat(1,allHeaders,"thirdparty/includes/GSL");
end
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
endfunction
diff --git a/macros/findDeps/getAllInterfaces.sci b/macros/findDeps/getAllInterfaces.sci
index e629779..4f5a77a 100644
--- a/macros/findDeps/getAllInterfaces.sci
+++ b/macros/findDeps/getAllInterfaces.sci
@@ -32,7 +32,11 @@ function allInterfaces = getAllInterfaces(SharedInfo)
"src/c/type/int_real.h"
"src/c/matrixOperations/interfaces/int_vmagn.h"
"src/c/matrixOperations/interfaces/int_ones.h"
+<<<<<<< HEAD
"src/c/linearAlgebra/interfaces/int_spec.h"
+=======
+ "src/c/matrixOperations/interfaces/int_spec.h"
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/matrixOperations/interfaces/int_cat.h"
"src/c/matrixOperations/interfaces/int_zeros.h"
"src/c/matrixOperations/interfaces/int_OpBackSlash.h"
@@ -61,10 +65,13 @@ function allInterfaces = getAllInterfaces(SharedInfo)
"src/c/matrixOperations/interfaces/int_flipdim.h"
"src/c/matrixOperations/interfaces/int_permute.h"
"src/c/matrixOperations/interfaces/int_norm.h"
+<<<<<<< HEAD
"src/c/interpolation/interfaces/int_interp1.h"
"src/c/elementaryFunctions/interfaces/int_nextpow2.h"
"src/c/elementaryFunctions/interfaces/int_gcd.h"
"src/c/elementaryFunctions/interfaces/int_isreal.h"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/elementaryFunctions/interfaces/int_asinh.h"
"src/c/elementaryFunctions/interfaces/int_atanh.h"
"src/c/elementaryFunctions/interfaces/int_sinh.h"
@@ -94,18 +101,29 @@ function allInterfaces = getAllInterfaces(SharedInfo)
"src/c/elementaryFunctions/interfaces/int_bitand.h"
"src/c/elementaryFunctions/interfaces/int_bitor.h"
"src/c/elementaryFunctions/interfaces/int_bitxor.h"
+<<<<<<< HEAD
"src/c/elementaryFunctions/interfaces/int_bitcmp.h"
"src/c/elementaryFunctions/interfaces/int_bitset.h"
"src/c/elementaryFunctions/interfaces/int_bitget.h"
"src/c/elementaryFunctions/interfaces/int_linspace.h"
"src/c/elementaryFunctions/interfaces/int_logspace.h"
+=======
+ "src/c/elementaryFunctions/interfaces/int_bitcmp.h"
+ "src/c/elementaryFunctions/interfaces/int_bitset.h"
+ "src/c/elementaryFunctions/interfaces/int_bitget.h"
+ "src/c/elementaryFunctions/interfaces/int_linspace.h"
+ "src/c/elementaryFunctions/interfaces/int_logspace.h"
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/elementaryFunctions/interfaces/int_cosh.h"
"src/c/elementaryFunctions/interfaces/int_uint8.h"
"src/c/elementaryFunctions/interfaces/int_int8.h"
"src/c/elementaryFunctions/interfaces/int_uint16.h"
"src/c/elementaryFunctions/interfaces/int_int16.h"
+<<<<<<< HEAD
"src/c/elementaryFunctions/interfaces/int_uint32.h"
"src/c/elementaryFunctions/interfaces/int_int32.h"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/elementaryFunctions/interfaces/int_acosd.h"
"src/c/elementaryFunctions/interfaces/int_acot.h"
"src/c/elementaryFunctions/interfaces/int_acotd.h"
@@ -118,8 +136,11 @@ function allInterfaces = getAllInterfaces(SharedInfo)
"src/c/elementaryFunctions/interfaces/int_asech.h"
"src/c/elementaryFunctions/interfaces/int_asind.h"
"src/c/elementaryFunctions/interfaces/int_atand.h"
+<<<<<<< HEAD
"src/c/elementaryFunctions/interfaces/int_gcd.h"
"src/c/elementaryFunctions/interfaces/int_lcm.h"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/statisticsFunctions/interfaces/int_mean.h"
"src/c/statisticsFunctions/interfaces/int_meanf.h"
"src/c/statisticsFunctions/interfaces/int_stdevf.h"
@@ -148,9 +169,12 @@ function allInterfaces = getAllInterfaces(SharedInfo)
"src/c/operations/interfaces/int_OpIns.h"
"src/c/string/interfaces/int_disp.h"
"src/c/string/interfaces/int_string.h"
+<<<<<<< HEAD
"src/c/signalProcessing/interfaces/int_modk.h"
"src/c/signalProcessing/interfaces/int_idct.h"
"src/c/signalProcessing/interfaces/int_dct.h"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/signalProcessing/interfaces/int_ifft.h"
"src/c/signalProcessing/interfaces/int_lpc2cep.h"
"src/c/signalProcessing/interfaces/int_cepstrum.h"
@@ -161,6 +185,7 @@ function allInterfaces = getAllInterfaces(SharedInfo)
"src/c/signalProcessing/interfaces/int_fftshift.h"
"src/c/signalProcessing/interfaces/int_fft.h"
"src/c/signalProcessing/interfaces/int_lev.h"
+<<<<<<< HEAD
"src/c/signalProcessing/interfaces/int_zpbutt.h"
"src/c/signalProcessing/interfaces/int_zpch1.h"
"src/c/signalProcessing/interfaces/int_zpch2.h"
@@ -175,6 +200,8 @@ function allInterfaces = getAllInterfaces(SharedInfo)
"src/c/signalProcessing/interfaces/int_modsn.h"
"src/c/signalProcessing/interfaces/int_ell1mag.h"
"src/c/signalProcessing/interfaces/int_amell.h"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/implicitList/int_OpColon.h"
"src/c/differential_calculus/interfaces/int_ode.h"
"src/c/differential_calculus/interfaces/int_diffc.h"
@@ -184,11 +211,14 @@ function allInterfaces = getAllInterfaces(SharedInfo)
//"src/c/string/interfaces/int_strcmp.h"
"src/c/string/interfaces/int_strrev.h"
"src/c/string/interfaces/int_strrchr.h"
+<<<<<<< HEAD
"src/c/string/interfaces/int_strchr.h"
"src/c/string/interfaces/int_ascii.h"
"src/c/string/interfaces/int_strspn.h"
"src/c/string/interfaces/int_strcspn.h"
"src/c/string/interfaces/int_strncpy.h"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/elementaryFunctions/interfaces/int_dec2base.h"
"src/c/elementaryFunctions/interfaces/int_base2dec.h"
"src/c/elementaryFunctions/interfaces/int_dec2bin.h"
@@ -210,11 +240,15 @@ function allInterfaces = getAllInterfaces(SharedInfo)
"src/c/elementaryFunctions/interfaces/int_factorial.h"
"src/c/elementaryFunctions/interfaces/int_primes.h"
"src/c/elementaryFunctions/interfaces/int_factor.h"
+<<<<<<< HEAD
"src/c/elementaryFunctions/interfaces/int_sinc.h"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/CACSD/interfaces/int_syslin.h"
"src/c/CACSD/interfaces/int_lqr.h"
"src/c/CACSD/interfaces/int_lqe.h"
"src/c/CACSD/interfaces/int_obscont.h"
+<<<<<<< HEAD
"src/c/linearAlgebra/interfaces/int_sva.h"
"src/c/linearAlgebra/interfaces/int_svd.h"
"src/c/linearAlgebra/interfaces/int_schur.h"
@@ -222,6 +256,10 @@ function allInterfaces = getAllInterfaces(SharedInfo)
"src/c/linearAlgebra/interfaces/int_svd.h"
"src/c/linearAlgebra/interfaces/int_hess.h"
"src/c/linearAlgebra/interfaces/int_sva.h"
+=======
+ "src/c/linearAlgebra/interfaces/int_schur.h"
+ "src/c/linearAlgebra/interfaces/int_balanc.h"
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/linearAlgebra/interfaces/int_rcond.h"];
@@ -254,6 +292,7 @@ function allInterfaces = getAllInterfaces(SharedInfo)
RPI_interfaces = [
"src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralDigital.h"
+<<<<<<< HEAD
"src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralGertboard.h"
"src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralI2C.h"
"src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralInterrupt.h"
@@ -271,6 +310,14 @@ function allInterfaces = getAllInterfaces(SharedInfo)
"src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSoft.h"
"src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h"
];
+=======
+ "src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h"
+ "src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSerial.h"
+ "src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralThreading.h"
+ "src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPinISR.h"
+ "src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPWM.h"
+ ];
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
OpenCV_interfaces = [
"src/c/imageProcessing/interfaces/int_cvcore.hpp"
diff --git a/macros/findDeps/getAllLibraries.sci b/macros/findDeps/getAllLibraries.sci
index 9d74bbf..fe894ee 100644
--- a/macros/findDeps/getAllLibraries.sci
+++ b/macros/findDeps/getAllLibraries.sci
@@ -24,9 +24,13 @@ 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/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci
index 0891aef..d29a1ee 100644
--- a/macros/findDeps/getAllSources.sci
+++ b/macros/findDeps/getAllSources.sci
@@ -10,7 +10,11 @@
//
//
+<<<<<<< HEAD
function allSources = getAllSources(SharedInfo)
+=======
+function allSources = getAllSources(SharedInfo,BuildTool)
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
Target = SharedInfo.Target;
//Files common to types of output format
@@ -95,10 +99,13 @@ function allSources = getAllSources(SharedInfo)
"src/c/matrixOperations/cat/dcats.c"
"src/c/matrixOperations/cat/scata.c"
"src/c/matrixOperations/cat/scats.c"
+<<<<<<< HEAD
"src/c/matrixOperations/cat/zcata.c"
"src/c/matrixOperations/cat/zcats.c"
"src/c/matrixOperations/cat/ccata.c"
"src/c/matrixOperations/cat/ccats.c"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/matrixOperations/cat/u8cats.c"
"src/c/matrixOperations/cat/u8cata.c"
"src/c/matrixOperations/cat/u16cats.c"
@@ -155,18 +162,32 @@ function allSources = getAllSources(SharedInfo)
"src/c/matrixOperations/powm/spowma.c"
"src/c/matrixOperations/powm/zpowma.c"
"src/c/matrixOperations/powm/cpowma.c"
+<<<<<<< HEAD
"src/c/linearAlgebra/spec/cspeca.c"
"src/c/linearAlgebra/spec/dspeca.c"
"src/c/linearAlgebra/spec/sspeca.c"
"src/c/linearAlgebra/spec/zspeca.c"
+=======
+ "src/c/matrixOperations/spec/cspeca.c"
+ "src/c/matrixOperations/spec/dspeca.c"
+ "src/c/matrixOperations/spec/sspeca.c"
+ "src/c/matrixOperations/spec/zspeca.c"
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/matrixOperations/transpose/ztransposea.c"
"src/c/matrixOperations/transpose/stransposea.c"
"src/c/matrixOperations/transpose/ctransposea.c"
"src/c/matrixOperations/transpose/dtransposea.c"
+<<<<<<< HEAD
"src/c/linearAlgebra/spec2/zspec2a.c"
"src/c/linearAlgebra/spec2/sspec2a.c"
"src/c/linearAlgebra/spec2/dspec2a.c"
"src/c/linearAlgebra/spec2/cspec2a.c"
+=======
+ "src/c/matrixOperations/spec2/zspec2a.c"
+ "src/c/matrixOperations/spec2/sspec2a.c"
+ "src/c/matrixOperations/spec2/dspec2a.c"
+ "src/c/matrixOperations/spec2/cspec2a.c"
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/matrixOperations/trace/stracea.c"
"src/c/matrixOperations/trace/dtracea.c"
"src/c/matrixOperations/trace/ctracea.c"
@@ -334,9 +355,12 @@ function allSources = getAllSources(SharedInfo)
"src/c/matrixOperations/kron/skrona.c"
"src/c/matrixOperations/norm/dnormv.c"
"src/c/matrixOperations/norm/dnorma.c"
+<<<<<<< HEAD
"src/c/elementaryFunctions/nextpow2/dnextpow2a.c"
"src/c/elementaryFunctions/isreal/sisreals.c"
"src/c/elementaryFunctions/isreal/disreals.c"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/elementaryFunctions/cos/dcosa.c"
"src/c/elementaryFunctions/cos/dcoss.c"
"src/c/elementaryFunctions/cos/scosa.c"
@@ -623,6 +647,7 @@ function allSources = getAllSources(SharedInfo)
"src/c/elementaryFunctions/round/i16rounds.c"
"src/c/elementaryFunctions/lnp1m1/slnp1m1s.c"
"src/c/elementaryFunctions/lnp1m1/dlnp1m1s.c"
+<<<<<<< HEAD
"src/c/elementaryFunctions/float/dfloats.c"
"src/c/elementaryFunctions/float/dfloata.c"
@@ -637,6 +662,8 @@ function allSources = getAllSources(SharedInfo)
"src/c/elementaryFunctions/float/i16floats.c"
"src/c/elementaryFunctions/float/i16floata.c"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/elementaryFunctions/uint8/duint8s.c"
"src/c/elementaryFunctions/uint8/duint8a.c"
"src/c/elementaryFunctions/uint8/suint8s.c"
@@ -647,6 +674,21 @@ function allSources = getAllSources(SharedInfo)
"src/c/elementaryFunctions/uint8/u16uint8a.c"
"src/c/elementaryFunctions/uint8/i16uint8s.c"
"src/c/elementaryFunctions/uint8/i16uint8a.c"
+<<<<<<< HEAD
+=======
+ "src/c/elementaryFunctions/float/dfloats.c"
+ "src/c/elementaryFunctions/float/dfloata.c"
+ "src/c/elementaryFunctions/float/sfloats.c"
+ "src/c/elementaryFunctions/float/sfloata.c"
+ "src/c/elementaryFunctions/float/u8floats.c"
+ "src/c/elementaryFunctions/float/u8floata.c"
+ "src/c/elementaryFunctions/float/i8floats.c"
+ "src/c/elementaryFunctions/float/i8floata.c"
+ "src/c/elementaryFunctions/float/u16floats.c"
+ "src/c/elementaryFunctions/float/u16floata.c"
+ "src/c/elementaryFunctions/float/i16floats.c"
+ "src/c/elementaryFunctions/float/i16floata.c"
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/elementaryFunctions/int8/dint8s.c"
"src/c/elementaryFunctions/int8/dint8a.c"
"src/c/elementaryFunctions/int8/sint8s.c"
@@ -677,6 +719,7 @@ function allSources = getAllSources(SharedInfo)
"src/c/elementaryFunctions/int16/i8int16a.c"
"src/c/elementaryFunctions/int16/u16int16s.c"
"src/c/elementaryFunctions/int16/u16int16a.c"
+<<<<<<< HEAD
"src/c/elementaryFunctions/uint32/duint32s.c"
"src/c/elementaryFunctions/uint32/duint32a.c"
"src/c/elementaryFunctions/uint32/suint32s.c"
@@ -706,6 +749,8 @@ function allSources = getAllSources(SharedInfo)
"src/c/elementaryFunctions/int32/u32int32s.c"
"src/c/elementaryFunctions/int32/u32int32a.c"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/elementaryFunctions/bitand/u8bitands.c"
"src/c/elementaryFunctions/bitand/u8bitanda.c"
"src/c/elementaryFunctions/bitand/u16bitands.c"
@@ -726,8 +771,11 @@ function allSources = getAllSources(SharedInfo)
"src/c/elementaryFunctions/bitset/u16bitsets.c"
"src/c/elementaryFunctions/bitget/u8bitgets.c"
"src/c/elementaryFunctions/bitget/u16bitgets.c"
+<<<<<<< HEAD
"src/c/elementaryFunctions/linspace/slinspacea.c"
"src/c/elementaryFunctions/linspace/slinspaces.c"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/elementaryFunctions/linspace/dlinspaces.c"
"src/c/elementaryFunctions/linspace/dlinspacea.c"
"src/c/elementaryFunctions/logspace/dlogspaces.c"
@@ -792,8 +840,11 @@ function allSources = getAllSources(SharedInfo)
"src/c/elementaryFunctions/atand/datands.c"
"src/c/elementaryFunctions/atand/satanda.c"
"src/c/elementaryFunctions/atand/satands.c"
+<<<<<<< HEAD
"src/c/elementaryFunctions/discrete_mathematics/gcd/u8gcda.c"
"src/c/elementaryFunctions/discrete_mathematics/lcm/u8lcma.c"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/statisticsFunctions/max/dmaxa.c"
"src/c/statisticsFunctions/max/smaxa.c"
"src/c/statisticsFunctions/max/srowmaxa.c"
@@ -999,6 +1050,7 @@ function allSources = getAllSources(SharedInfo)
"src/c/string/string/u16strings.c"
"src/c/string/string/i16stringa.c"
"src/c/string/string/i16strings.c"
+<<<<<<< HEAD
"src/c/signalProcessing/modk/dmodka.c"
"src/c/signalProcessing/transforms/idct/sidcta.c"
"src/c/signalProcessing/transforms/idct/cidcta.c"
@@ -1008,6 +1060,8 @@ function allSources = getAllSources(SharedInfo)
"src/c/signalProcessing/transforms/dct/cdcta.c"
"src/c/signalProcessing/transforms/dct/zdcta.c"
"src/c/signalProcessing/transforms/dct/ddcta.c"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/signalProcessing/fft/dfft2.c"
"src/c/signalProcessing/fft/cfftma.c"
"src/c/signalProcessing/fft/r2tx.c"
@@ -1073,6 +1127,7 @@ function allSources = getAllSources(SharedInfo)
"src/c/signalProcessing/hilbert/shilberts.c"
"src/c/signalProcessing/hilbert/dhilberta.c"
"src/c/signalProcessing/hilbert/dhilberts.c"
+<<<<<<< HEAD
"src/c/signalProcessing/zpbutt/dzpbutts.c"
"src/c/signalProcessing/zpch1/dzpch1s.c"
"src/c/signalProcessing/zpch2/dzpch2s.c"
@@ -1093,6 +1148,8 @@ function allSources = getAllSources(SharedInfo)
"src/c/signalProcessing/ell1mag/dell1maga.c"
"src/c/signalProcessing/amell/damells.c"
"src/c/signalProcessing/amell/damella.c"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/implicitList/zimplicitLists.c"
"src/c/implicitList/dimplicitLists.c"
"src/c/implicitList/cimplicitLists.c"
@@ -1117,6 +1174,7 @@ function allSources = getAllSources(SharedInfo)
"src/c/Files/mput/u16mputa.c"
"src/c/Files/mput/i16mputa.c"
"src/c/string/convstr/gconvstrs.c"
+<<<<<<< HEAD
"src/c/string/strsubst/gstrsubsta.c"
//"src/c/string/strcmp/gstrcmps.c"
"src/c/string/strrev/gstrreva.c"
@@ -1127,6 +1185,12 @@ function allSources = getAllSources(SharedInfo)
"src/c/string/strspn/gstrspna.c"
"src/c/string/strcspn/gstrcspna.c"
"src/c/string/strncpy/gstrncpya.c"
+=======
+ "src/c/string/strsubst/gstrsubsta.c"
+ //"src/c/string/strcmp/gstrcmps.c"
+ "src/c/string/strrev/gstrreva.c"
+ "src/c/string/strrchr/gstrrchra.c"
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/elementaryFunctions/radix_conversions/dec2bin/ddec2bins.c"
"src/c/elementaryFunctions/radix_conversions/dec2bin/i8dec2bins.c"
"src/c/elementaryFunctions/radix_conversions/dec2bin/i16dec2bins.c"
@@ -1245,12 +1309,15 @@ function allSources = getAllSources(SharedInfo)
"src/c/elementaryFunctions/Trigonometry/sech/zsechs.c"
"src/c/elementaryFunctions/Trigonometry/sech/csecha.c"
"src/c/elementaryFunctions/Trigonometry/sech/csechs.c"
+<<<<<<< HEAD
"src/c/interpolation/interp1/sinterp13a.c"
"src/c/interpolation/interp1/dinterp13a.c"
"src/c/elementaryFunctions/discrete_mathematics/gcd/u8gcds.c"
"src/c/elementaryFunctions/Trigonometry/sinc/dsinca.c"
"src/c/elementaryFunctions/Trigonometry/sinc/zsinca.c"
"src/c/elementaryFunctions/discrete_mathematics/gcd/dgcda.c"
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/elementaryFunctions/discrete_mathematics/factorial/dfactorials.c"
"src/c/elementaryFunctions/discrete_mathematics/factorial/dfactoriala.c"
"src/c/elementaryFunctions/discrete_mathematics/factorial/sfactorials.c"
@@ -1263,6 +1330,7 @@ function allSources = getAllSources(SharedInfo)
"src/c/CACSD/lqr/dlqra.c"
"src/c/CACSD/lqe/dlqea.c"
"src/c/CACSD/obscont/dobsconta.c"
+<<<<<<< HEAD
"src/c/linearAlgebra/sva/dsvaa.c"
"src/c/linearAlgebra/svd/dsvda.c"
"src/c/linearAlgebra/schur/dschura.c"
@@ -1273,6 +1341,11 @@ function allSources = getAllSources(SharedInfo)
"src/c/linearAlgebra/hess/dhessa.c"
"src/c/linearAlgebra/sva/dsvaa.c"
"src/c/linearAlgebra/spec/dspec1a.c"
+=======
+ "src/c/linearAlgebra/schur/dschura.c"
+ "src/c/linearAlgebra/schur/dgschura.c"
+ "src/c/linearAlgebra/balanc/dbalanca.c"
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"src/c/linearAlgebra/rcond/drconda.c"];
//Files to be inserted only if output format selected is 'Arduino'.
@@ -1331,6 +1404,7 @@ function allSources = getAllSources(SharedInfo)
];
RPI_files = [
+<<<<<<< HEAD
"/src/c/hardware/rasberrypi/Digital/RPI_digitalReadByte.c"
"/src/c/hardware/rasberrypi/Digital/u8RPI_digitalReads.c"
"/src/c/hardware/rasberrypi/Digital/u8RPI_digitalWriteBytes.c"
@@ -1418,6 +1492,40 @@ function allSources = getAllSources(SharedInfo)
"/src/c/hardware/rasberrypi/Timing/RPI_millis.c"
"/src/c/hardware/rasberrypi/Timing/u32RPI_delayMicros.c"
"/src/c/hardware/rasberrypi/Timing/u32RPI_delays.c"
+=======
+ "src/c/hardware/rasberrypi/gpio/u8RPIDigitalSetups.c"
+ "src/c/hardware/rasberrypi/gpio/u8RPIDigitalOuts.c"
+ "src/c/hardware/rasberrypi/gpio/u8RPIDigitalIns.c"
+ "src/c/hardware/rasberrypi/timing/u16RPIDelayMillis.c"
+ "src/c/hardware/rasberrypi/timing/u16RPIDelayMicros.c"
+ "src/c/hardware/rasberrypi/timing/u32RPIGetMillis.c"
+ "src/c/hardware/rasberrypi/timing/u32RPIGetMicros.c"
+ "src/c/hardware/rasberrypi/serial/u16RPISerialSetups.c"
+ "src/c/hardware/rasberrypi/serial/u8RPISerialCloses.c"
+ "src/c/hardware/rasberrypi/serial/u8RPISerialSendChars.c"
+ "src/c/hardware/rasberrypi/serial/u8RPISerialSendDatas.c"
+ "src/c/hardware/rasberrypi/serial/i8RPISerialSendDatas.c"
+ "src/c/hardware/rasberrypi/serial/u16RPISerialSendDatas.c"
+ "src/c/hardware/rasberrypi/serial/i16RPISerialSendDatas.c"
+ "src/c/hardware/rasberrypi/serial/u8RPISerialSendDataa.c"
+ "src/c/hardware/rasberrypi/serial/i8RPISerialSendDataa.c"
+ "src/c/hardware/rasberrypi/serial/u16RPISerialSendDataa.c"
+ "src/c/hardware/rasberrypi/serial/i16RPISerialSendDataa.c"
+ "src/c/hardware/rasberrypi/serial/sRPISerialSendDatas.c"
+ "src/c/hardware/rasberrypi/serial/dRPISerialSendDatas.c"
+ "src/c/hardware/rasberrypi/serial/sRPISerialSendDataa.c"
+ "src/c/hardware/rasberrypi/serial/dRPISerialSendDataa.c"
+ "src/c/hardware/rasberrypi/serial/gRPISerialSendDatas.c"
+ "src/c/hardware/rasberrypi/serial/i16RPISerialDataAvails.c"
+ "src/c/hardware/rasberrypi/serial/i16RPISerialGetChars.c"
+ "src/c/hardware/rasberrypi/serial/u8RPISerialFlushs.c"
+ "src/c/hardware/rasberrypi/threading/u16RPIThreadCreates.c"
+ "src/c/hardware/rasberrypi/pwm/u8RPIHardPWMWrites.c"
+ "src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetRanges.c"
+ "src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetModes.c"
+ "src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetClocks.c"
+ "src/c/hardware/rasberrypi/ISR/i16RPIPinISRs.c"
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
];
OpenCV_files = [
@@ -1435,10 +1543,25 @@ function allSources = getAllSources(SharedInfo)
"src/c/imageProcessing/cvimgproc/imcvCanny.cpp"
"src/c/imageProcessing/cvimgproc/imcvCornerHarris.cpp"];
+<<<<<<< HEAD
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
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
elseif Target == "AVR"
allSources = cat(1,Standalone_files, AVR_files);
elseif Target == "RPi"
@@ -1449,5 +1572,12 @@ function allSources = getAllSources(SharedInfo)
allSources = cat(1,allSources,OpenCV_files);
end
+<<<<<<< HEAD
+=======
+ //"src/c/matrixOperations/cat/zcata.c"
+ // "src/c/matrixOperations/cat/zcats.c"
+ // "src/c/matrixOperations/cat/ccata.c"
+ //"src/c/matrixOperations/cat/ccats.c"
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
endfunction
diff --git a/macros/findDeps/get_rquird_fnctns.sci b/macros/findDeps/get_rquird_fnctns.sci
new file mode 100644
index 0000000..2883795
--- /dev/null
+++ b/macros/findDeps/get_rquird_fnctns.sci
@@ -0,0 +1,140 @@
+// 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/macros/findDeps/names b/macros/findDeps/names
index 2b8c551..7b471e9 100644
--- a/macros/findDeps/names
+++ b/macros/findDeps/names
@@ -5,3 +5,7 @@ getAllInterfaces
getAllLibraries
getAllSources
getArduinoFiles
+<<<<<<< HEAD
+=======
+get_rquird_fnctns
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0