summaryrefslogtreecommitdiff
path: root/macros/findDeps
diff options
context:
space:
mode:
Diffstat (limited to 'macros/findDeps')
-rw-r--r--macros/findDeps/getAllHeaders.sci64
-rw-r--r--macros/findDeps/getAllInterfaces.sci60
-rw-r--r--macros/findDeps/getAllSources.sci157
-rw-r--r--macros/findDeps/libbin847 -> 0 bytes
4 files changed, 49 insertions, 232 deletions
diff --git a/macros/findDeps/getAllHeaders.sci b/macros/findDeps/getAllHeaders.sci
index ba26703a..8e33e486 100644
--- a/macros/findDeps/getAllHeaders.sci
+++ b/macros/findDeps/getAllHeaders.sci
@@ -60,11 +60,10 @@ 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"
@@ -76,13 +75,11 @@ 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/matrixOperations/includes/toeplitz.h"
"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"
@@ -122,11 +119,8 @@ 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"
@@ -156,12 +150,9 @@ 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"
@@ -176,7 +167,6 @@ 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"
@@ -191,8 +181,6 @@ 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"
@@ -203,14 +191,11 @@ 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"
@@ -232,32 +217,27 @@ 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"
"src/c/linearAlgebra/includes/balanc.h"
"src/c/linearAlgebra/includes/svd.h"
- "src/c/linearAlgebra/includes/hess.h"
- "src/c/linearAlgebra/includes/sva.h"
- "src/c/linearAlgebra/includes/rcond.h"];
+ "src/c/linearAlgebra/includes/hess.h"
+ "src/c/linearAlgebra/includes/sva.h"
+ "src/c/linearAlgebra/includes/sqroot.h"
+ "src/c/linearAlgebra/includes/givens.h"
+ "src/c/linearAlgebra/includes/householder.h"
+ "src/c/linearAlgebra/includes/fullrf.h"
+ "src/c/linearAlgebra/includes/rowcomp.h"
+ "src/c/linearAlgebra/includes/rcond.h"
+ "src/c/linearAlgebra/includes/qr.h"
+ "src/c/linearAlgebra/includes/spec.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 = [
@@ -287,7 +267,6 @@ 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 = [
@@ -329,20 +308,6 @@ 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"
@@ -364,12 +329,9 @@ 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 4f5a77ab..4c8475ac 100644
--- a/macros/findDeps/getAllInterfaces.sci
+++ b/macros/findDeps/getAllInterfaces.sci
@@ -32,11 +32,6 @@ 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"
@@ -65,13 +60,11 @@ 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/matrixOperations/interfaces/int_toeplitz.h"
"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"
@@ -101,29 +94,18 @@ 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"
@@ -136,11 +118,8 @@ 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"
@@ -169,12 +148,9 @@ 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"
@@ -185,7 +161,6 @@ 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"
@@ -200,8 +175,6 @@ 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"
@@ -211,14 +184,11 @@ 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"
@@ -240,26 +210,23 @@ 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_spec.h"
"src/c/linearAlgebra/interfaces/int_schur.h"
"src/c/linearAlgebra/interfaces/int_balanc.h"
"src/c/linearAlgebra/interfaces/int_svd.h"
+ "src/c/linearAlgebra/interfaces/int_sqroot.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_sva.h"
+ "src/c/linearAlgebra/interfaces/int_givens.h"
+ "src/c/linearAlgebra/interfaces/int_householder.h"
+ "src/c/linearAlgebra/interfaces/int_fullrf.h"
+ "src/c/linearAlgebra/interfaces/int_rowcomp.h"
+ "src/c/linearAlgebra/interfaces/int_qr.h";
"src/c/linearAlgebra/interfaces/int_rcond.h"];
@@ -292,7 +259,6 @@ 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"
@@ -310,14 +276,6 @@ 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/getAllSources.sci b/macros/findDeps/getAllSources.sci
index d29a1eea..f0f4e741 100644
--- a/macros/findDeps/getAllSources.sci
+++ b/macros/findDeps/getAllSources.sci
@@ -10,11 +10,7 @@
//
//
-<<<<<<< HEAD
function allSources = getAllSources(SharedInfo)
-=======
-function allSources = getAllSources(SharedInfo,BuildTool)
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
Target = SharedInfo.Target;
//Files common to types of output format
@@ -99,13 +95,10 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"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"
@@ -162,32 +155,10 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"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"
@@ -355,12 +326,18 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"src/c/matrixOperations/kron/skrona.c"
"src/c/matrixOperations/norm/dnormv.c"
"src/c/matrixOperations/norm/dnorma.c"
-<<<<<<< HEAD
+ "src/c/matrixOperations/toeplitz/dtoeplitza.c"
+ "src/c/matrixOperations/toeplitz/u8toeplitza.c"
+ "src/c/matrixOperations/toeplitz/u16toeplitza.c"
+ "src/c/matrixOperations/toeplitz/gtoeplitza.c"
+ "src/c/matrixOperations/toeplitz/ztoeplitza.c"
+ "src/c/matrixOperations/toeplitz/stoeplitza.c"
+ "src/c/matrixOperations/toeplitz/ctoeplitza.c"
+ "src/c/matrixOperations/toeplitz/i8toeplitza.c"
+ "src/c/matrixOperations/toeplitz/i16toeplitza.c"
"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"
@@ -647,11 +624,10 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"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/dfloats.c"
"src/c/elementaryFunctions/float/dfloata.c"
- "src/c/elementaryFunctions/float/sfloats.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"
@@ -662,8 +638,6 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"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"
@@ -674,21 +648,6 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"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"
@@ -719,7 +678,6 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"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"
@@ -749,8 +707,6 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"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"
@@ -771,11 +727,8 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"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"
@@ -840,11 +793,8 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"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"
@@ -1050,7 +1000,6 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"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"
@@ -1060,8 +1009,6 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"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"
@@ -1127,7 +1074,6 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"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"
@@ -1148,8 +1094,6 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"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"
@@ -1174,7 +1118,6 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"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"
@@ -1185,12 +1128,6 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"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"
@@ -1309,15 +1246,12 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"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"
@@ -1330,22 +1264,28 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"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/spec2/zspec2a.c"
+ "src/c/linearAlgebra/spec2/sspec2a.c"
+ "src/c/linearAlgebra/spec2/dspec2a.c"
+ "src/c/linearAlgebra/spec2/cspec2a.c"
+ "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/linearAlgebra/schur/dschura.c"
"src/c/linearAlgebra/schur/dgschura.c"
"src/c/linearAlgebra/balanc/dbalanca.c"
"src/c/linearAlgebra/svd/dsvda.c"
"src/c/linearAlgebra/svd/zsvda.c"
+ "src/c/linearAlgebra/sqroot/dsqroota.c"
"src/c/linearAlgebra/hess/dhessa.c"
+ "src/c/linearAlgebra/givens/dgivensa.c"
+ "src/c/linearAlgebra/householder/dhouseholdera.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/fullrf/dfullrfa.c"
+ "src/c/linearAlgebra/rowcomp/drowcompa.c"
+ "src/c/linearAlgebra/qr/dqra.c"
"src/c/linearAlgebra/rcond/drconda.c"];
//Files to be inserted only if output format selected is 'Arduino'.
@@ -1404,7 +1344,6 @@ function allSources = getAllSources(SharedInfo,BuildTool)
];
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"
@@ -1492,40 +1431,6 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"/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 = [
@@ -1543,12 +1448,12 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"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
@@ -1561,7 +1466,6 @@ function allSources = getAllSources(SharedInfo,BuildTool)
else
allSources = cat(1,Standalone_files, Arduino_files);
end
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
elseif Target == "AVR"
allSources = cat(1,Standalone_files, AVR_files);
elseif Target == "RPi"
@@ -1572,12 +1476,5 @@ function allSources = getAllSources(SharedInfo,BuildTool)
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/lib b/macros/findDeps/lib
deleted file mode 100644
index 4157ab8f..00000000
--- a/macros/findDeps/lib
+++ /dev/null
Binary files differ
generated by cgit (git 2.34.1) at 2025-03-13 14:17:14 +0000