summaryrefslogtreecommitdiff
path: root/2.3-1/macros
diff options
context:
space:
mode:
Diffstat (limited to '2.3-1/macros')
-rw-r--r--2.3-1/macros/ASTManagement/AST2Ccode.sci2
-rw-r--r--2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci42
-rw-r--r--2.3-1/macros/ASTManagement/libbin1896 -> 0 bytes
-rw-r--r--2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci9
-rw-r--r--2.3-1/macros/CCodeGeneration/GetClsFileName.sci1
-rw-r--r--2.3-1/macros/CCodeGeneration/libbin992 -> 0 bytes
-rw-r--r--2.3-1/macros/ErrorMessages/libbin456 -> 0 bytes
-rw-r--r--2.3-1/macros/FunctionAnnotation/libbin4090 -> 0 bytes
-rw-r--r--2.3-1/macros/FunctionList/libbin524 -> 0 bytes
-rw-r--r--2.3-1/macros/GeneralFunctions/libbin1068 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/AVR/libbin908 -> 0 bytes
-rw-r--r--2.3-1/macros/Hardware/RasberryPi/libbin912 -> 0 bytes
-rw-r--r--2.3-1/macros/ImageProcessing/core/libbin460 -> 0 bytes
-rw-r--r--2.3-1/macros/ImageProcessing/highgui/libbin520 -> 0 bytes
-rw-r--r--2.3-1/macros/ImageProcessing/imgproc/libbin688 -> 0 bytes
-rw-r--r--2.3-1/macros/Scilab-Arduino/libbin652 -> 0 bytes
-rw-r--r--2.3-1/macros/SymbolTable/libbin688 -> 0 bytes
-rw-r--r--2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci1316
-rw-r--r--2.3-1/macros/ToolInitialization/libbin1199 -> 0 bytes
-rw-r--r--2.3-1/macros/cb_sci2c_gui.sci13
-rw-r--r--2.3-1/macros/findDeps/getAllHeaders.sci64
-rw-r--r--2.3-1/macros/findDeps/getAllInterfaces.sci60
-rw-r--r--2.3-1/macros/findDeps/getAllSources.sci157
-rw-r--r--2.3-1/macros/findDeps/libbin847 -> 0 bytes
-rw-r--r--2.3-1/macros/libbin472 -> 0 bytes
-rw-r--r--2.3-1/macros/sci2c_gui.sci4
-rw-r--r--2.3-1/macros/scilab2c.sci2
27 files changed, 931 insertions, 739 deletions
diff --git a/2.3-1/macros/ASTManagement/AST2Ccode.sci b/2.3-1/macros/ASTManagement/AST2Ccode.sci
index b1646df3..5cceaf18 100644
--- a/2.3-1/macros/ASTManagement/AST2Ccode.sci
+++ b/2.3-1/macros/ASTManagement/AST2Ccode.sci
@@ -157,7 +157,6 @@ while ~meof(fidAST)
[disp_isthere,FileInfo,SharedInfo] = AST_HandleEndGenFun(disp_isthere,FileInfo,SharedInfo,'Operation');
case 'EndFuncall' then
[disp_isthere,FileInfo,SharedInfo] = AST_HandleEndGenFun(disp_isthere,FileInfo,SharedInfo,'Funcall');
- disp(disp_isthere);
=======
[FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,'Operation');
case 'EndFuncall' then
@@ -197,7 +196,6 @@ while ~meof(fidAST)
AST_PushASTStack(treeline);
case 'Lhs :' then
<<<<<<< HEAD
- disp(disp_isthere);
if rc_count > 0 & cc_count == 0
SharedInfo.Equal.Lhs = 1;
[EqualInArgName,EqualInArgScope,EqualNInArg] = AST_HandleRC(FileInfo,SharedInfo);
diff --git a/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci b/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci
index 6c2abed3..b5208e51 100644
--- a/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci
+++ b/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci
@@ -146,11 +146,10 @@ NOutArg_mod = NOutArg
PrintStringInfo(' ',ReportFileName,'both','y');
error(9999, 'SCI2CERROR: Unexpected number of output arguments for global function.');
end
-<<<<<<< HEAD
- elseif(ASTFunName == 'raspi' | ASTFunName == 'raspi_close')
- SharedInfo.SkipNextFun = 1;
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+ //To skip the functions for Raspberry Pi connections
+ elseif(ASTFunName == 'raspi' | ASTFunName == 'raspi_close' | ASTFunName == 'i2cdetect')
+ disp_isthere=1; // Skips the corresponding Lhs argument declaration
+ return // Skips the function call
end
// #RNU_RES_B
@@ -158,17 +157,14 @@ NOutArg_mod = NOutArg
// --- Read the function annotations. ---
// --------------------------------------
// #RNU_RES_E
-<<<<<<< HEAD
if ASTFunName == '%k'
ASTFunName='modk';
end
if ASTFunName == '%sn'
ASTFunName='modsn';
- end
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
-
+ end
+
if (ASTFunName == 'OpEqual')
FunTypeAnnot = '';
FunSizeAnnot = '';
@@ -181,10 +177,7 @@ NOutArg_mod = NOutArg
// --- Search for Equal Lhs and precision specifier to be applied to the current function. ---
// -------------------------------------------------------------------------------------------
// #RNU_RES_E
-<<<<<<< HEAD
PrintStringInfo(' no of out arguments' + string(NOutArg),ReportFileName,'file','y');
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
[LhsArg,NLhsArg,FunPrecSpecifier,SharedInfo] = AST_GetPrecAndLhsArg(OutArg,NOutArg,ASTFunName,FunTypeAnnot,FunSizeAnnot,ASTFunType,FileInfo,SharedInfo);
//NUT: questa funzione contiene troppi parametri e mi sembra disordinata.
@@ -382,7 +375,6 @@ NOutArg_mod = NOutArg
OutArg(1).Name = string(OutArg(1).Value);
elseif ((ASTFunName == 'double') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number'))
OutArg(1).Name = string(OutArg(1).Value);
-<<<<<<< HEAD
//elseif ASTFunName == 'disp'
else
[OutArg,SharedInfo] = GenOutArgNames(ASTFunName,InArg,NInArg,OutArg,NOutArg,LhsArg,NLhsArg,FileInfo,SharedInfo);
@@ -390,10 +382,10 @@ NOutArg_mod = NOutArg
PrintStringInfo(' returning back due logical function',ReportFileName,'file','y');
return;
end
-=======
+
else
[OutArg,SharedInfo] = GenOutArgNames(ASTFunName,InArg,NInArg,OutArg,NOutArg,LhsArg,NLhsArg,FileInfo,SharedInfo);
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+
end
if ((ASTFunName == 'uint8') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number'))
@@ -437,11 +429,8 @@ NOutArg_mod = NOutArg
// Scope already set above.
elseif (ASTFunName == 'double' & NInArg == 1 & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number'))
// Scope already set above.
-<<<<<<< HEAD
//elseif ASTFunName == 'disp'
//do nothing
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
else
OutArg = ST_AnalyzeScope(OutArg,NOutArg,FileInfo,SharedInfo);
end
@@ -460,11 +449,8 @@ NOutArg_mod = NOutArg
//#RNUREM_ME A number is not inserted in the symbol table.
elseif ((ASTFunName == 'double') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number'))
//#RNUREM_ME A number is not inserted in the symbol table.
-<<<<<<< HEAD
//elseif ASTFunName == 'disp'
//do nothing
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
else
ST_InsOutArg(OutArg,NOutArg,FileInfo,SharedInfo,'all');
end
@@ -497,7 +483,6 @@ NOutArg_mod = NOutArg
// --------------------------------------------
//#RNU_RES_E
//disp(OutArg,InArg,ASTFunName)
-<<<<<<< HEAD
CFunName = C_GenerateFunName(ASTFunName,InArg,NInArg,OutArg,NOutArg_mod);
@@ -505,14 +490,14 @@ NOutArg_mod = NOutArg
//#RNU_RES_B
PrintStringInfo(' C Function Name: '+CFunName,ReportFileName,'file','y');
if(IsArduinoFunction(ASTFunName))
-=======
+
CFunName = C_GenerateFunName(ASTFunName,InArg,NInArg,OutArg,NOutArg_mod);
//#RNU_RES_B
PrintStringInfo(' C Function Name: '+CFunName,ReportFileName,'file','y');
if(IsArduinoFunction(ASTFunName))
//disp(ASTFunName)
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+
if(IsArduinoSetupFunction(ASTFunName))
//If current function is an arduino setup function (like 'dc_motor_setup'), it
//should not be converted and inserted here. It is inserted in a list now and
@@ -533,12 +518,8 @@ NOutArg_mod = NOutArg
else
LibTypeInfo = 'USER2C';
end
-<<<<<<< HEAD
-=======
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//#RNU_RES_B
// ------------------------------------------------------------------------------------
// --- Check whether the function has been already called in the current .sci file. ---
@@ -585,11 +566,8 @@ NOutArg_mod = NOutArg
SharedInfo.SkipNextFun > 0 | ...
((sum(mtlb_strcmp(ASTFunName,SharedInfo.Annotations.DataPrec)) > 0) & (SharedInfo.SkipNextPrec == 1)))
// Do nothing
-<<<<<<< HEAD
//elseif ASTFunName == 'disp'
// Do nothing
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
else
AST_CheckCommonInOutArgs(InArg,NInArg,OutArg,NOutArg,ReportFileName);
end
diff --git a/2.3-1/macros/ASTManagement/lib b/2.3-1/macros/ASTManagement/lib
deleted file mode 100644
index 51b54f6f..00000000
--- a/2.3-1/macros/ASTManagement/lib
+++ /dev/null
Binary files differ
diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
index e2899bd9..dbdae9d3 100644
--- a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
+++ b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
@@ -70,11 +70,7 @@ else
PrintStringInfo('CXX = arm-linux-gnueabihf-g++ ',FileInfo.MakefileFilename,'file','y','y');
PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
-<<<<<<< HEAD
- PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lwiringPi -lwiringPiDev -lrt -lpthread',FileInfo.MakefileFilename,'file','y','y');
-=======
- PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lwiringPi',FileInfo.MakefileFilename,'file','y','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+ PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lwiringPi -lwiringPiDev -lrt -lpthread -lRPIwfi',FileInfo.MakefileFilename,'file','y','y');
else
PrintStringInfo('CC = gcc',FileInfo.MakefileFilename,'file','y','y');
PrintStringInfo('CXX = g++',FileInfo.MakefileFilename,'file','y','y');
@@ -82,7 +78,6 @@ else
PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
PrintStringInfo('LDFLAGS = -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y');
end
-<<<<<<< HEAD
//If ode function is used, add libgsl.
if(size(SharedInfo.Includelist) <> 0)
@@ -102,8 +97,6 @@ else
PrintStringInfo('LDFLAGS += -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y');
end
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
if(SharedInfo.OpenCVUsed == %T)
PrintStringInfo('LDFLAGS += -lopencv_calib3d -lopencv_contrib -lopencv_features2d -lopencv_flann -lopencv_gpu',FileInfo.MakefileFilename,'file','y','y');
PrintStringInfo('LDFLAGS += -lopencv_highgui -lopencv_imgproc -lopencv_legacy -lopencv_ml -lopencv_nonfree',FileInfo.MakefileFilename,'file','y','y');
diff --git a/2.3-1/macros/CCodeGeneration/GetClsFileName.sci b/2.3-1/macros/CCodeGeneration/GetClsFileName.sci
index 4d899717..619c4931 100644
--- a/2.3-1/macros/CCodeGeneration/GetClsFileName.sci
+++ b/2.3-1/macros/CCodeGeneration/GetClsFileName.sci
@@ -90,7 +90,6 @@ elseif (SCI2Cfileexist(FileInfo.SCI2CLibSCIAnnFun,tmpannfilename))
SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName);
SCI2CClassFileName = fullfile(FileInfo.SCI2CLibSCIAnnCls,SCI2CClassName+'.acls');
end
-
if (FlagFoundAnnFile == 0)
[FlagFoundAnnFile,fullpathscifilename] = SCI2CFindFile(FileInfo.UserSciFilesPaths,FunName+'.sci');
if (FlagFoundAnnFile == 0)
diff --git a/2.3-1/macros/CCodeGeneration/lib b/2.3-1/macros/CCodeGeneration/lib
deleted file mode 100644
index 4ee8cb6c..00000000
--- a/2.3-1/macros/CCodeGeneration/lib
+++ /dev/null
Binary files differ
diff --git a/2.3-1/macros/ErrorMessages/lib b/2.3-1/macros/ErrorMessages/lib
deleted file mode 100644
index 2994abce..00000000
--- a/2.3-1/macros/ErrorMessages/lib
+++ /dev/null
Binary files differ
diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib
deleted file mode 100644
index 0e229452..00000000
--- a/2.3-1/macros/FunctionAnnotation/lib
+++ /dev/null
Binary files differ
diff --git a/2.3-1/macros/FunctionList/lib b/2.3-1/macros/FunctionList/lib
deleted file mode 100644
index 8f8320c2..00000000
--- a/2.3-1/macros/FunctionList/lib
+++ /dev/null
Binary files differ
diff --git a/2.3-1/macros/GeneralFunctions/lib b/2.3-1/macros/GeneralFunctions/lib
deleted file mode 100644
index 7fe75a20..00000000
--- a/2.3-1/macros/GeneralFunctions/lib
+++ /dev/null
Binary files differ
diff --git a/2.3-1/macros/Hardware/AVR/lib b/2.3-1/macros/Hardware/AVR/lib
deleted file mode 100644
index a3d9e10c..00000000
--- a/2.3-1/macros/Hardware/AVR/lib
+++ /dev/null
Binary files differ
diff --git a/2.3-1/macros/Hardware/RasberryPi/lib b/2.3-1/macros/Hardware/RasberryPi/lib
deleted file mode 100644
index ac87d042..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/lib
+++ /dev/null
Binary files differ
diff --git a/2.3-1/macros/ImageProcessing/core/lib b/2.3-1/macros/ImageProcessing/core/lib
deleted file mode 100644
index efaf5182..00000000
--- a/2.3-1/macros/ImageProcessing/core/lib
+++ /dev/null
Binary files differ
diff --git a/2.3-1/macros/ImageProcessing/highgui/lib b/2.3-1/macros/ImageProcessing/highgui/lib
deleted file mode 100644
index 722a1503..00000000
--- a/2.3-1/macros/ImageProcessing/highgui/lib
+++ /dev/null
Binary files differ
diff --git a/2.3-1/macros/ImageProcessing/imgproc/lib b/2.3-1/macros/ImageProcessing/imgproc/lib
deleted file mode 100644
index 1f0925a0..00000000
--- a/2.3-1/macros/ImageProcessing/imgproc/lib
+++ /dev/null
Binary files differ
diff --git a/2.3-1/macros/Scilab-Arduino/lib b/2.3-1/macros/Scilab-Arduino/lib
deleted file mode 100644
index 64a3fce4..00000000
--- a/2.3-1/macros/Scilab-Arduino/lib
+++ /dev/null
Binary files differ
diff --git a/2.3-1/macros/SymbolTable/lib b/2.3-1/macros/SymbolTable/lib
deleted file mode 100644
index 2c57d672..00000000
--- a/2.3-1/macros/SymbolTable/lib
+++ /dev/null
Binary files differ
diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 7485f045..67051512 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -302,6 +302,7 @@ PrintStringInfo('i80'+ArgSeparator+'s0',ClassFileName,'file','y');
PrintStringInfo('u160'+ArgSeparator+'s0',ClassFileName,'file','y');
PrintStringInfo('i160'+ArgSeparator+'s0',ClassFileName,'file','y');
PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('z0'+ArgSeparator+'c0',ClassFileName,'file','y');
PrintStringInfo('d2'+ArgSeparator+'s2',ClassFileName,'file','y');
PrintStringInfo('u82'+ArgSeparator+'s2',ClassFileName,'file','y');
@@ -317,7 +318,6 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file',
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
// ---------------------
// --- Class Int8. ---
// ---------------------
@@ -437,7 +437,7 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file',
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
// ---------------------
// --- Class Uint32. ---
@@ -514,8 +514,8 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file',
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// ------------------
// --- Class Sin. ---
// ------------------
@@ -923,7 +923,7 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
// -------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
// --- Class Isreal. ---
// -------------------
ClassName = 'Isreal';
@@ -1130,8 +1130,8 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
// -------------------
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Sqrt. ---
// -------------------
ClassName = 'Sqrt';
@@ -1491,13 +1491,13 @@ ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d0d0d0'+ArgSeparator+'d2',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('s0s0s0'+ArgSeparator+'s2',ClassFileName,'file','y');
PrintStringInfo('d2d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
PrintStringInfo('s2s2s0'+ArgSeparator+'s2',ClassFileName,'file','y');
-=======
+=======
PrintStringInfo('d2d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Annotation Function And Function List Function. ---
@@ -4535,6 +4535,57 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file',
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+//------------------------------------
+//---- Class TOEPLITZ ----------------
+//------------------------------------
+ClassName = 'toeplitz';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(2).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+
+
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d2d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('u82u82'+ArgSeparator+'u82',ClassFileName,'file','y');
+PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y');
+PrintStringInfo('u162u162'+ArgSeparator+'u162',ClassFileName,'file','y');
+PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');
+PrintStringInfo('g2g2'+ArgSeparator+'g2',ClassFileName,'file','y');
+PrintStringInfo('g2'+ArgSeparator+'g2',ClassFileName,'file','y');
+PrintStringInfo('z2z2'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('s2s2'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('c2c2'+ArgSeparator+'c2',ClassFileName,'file','y');
+PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');
+PrintStringInfo('i82i82'+ArgSeparator+'i82',ClassFileName,'file','y');
+PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y');
+PrintStringInfo('i162i162'+ArgSeparator+'i162',ClassFileName,'file','y');
+PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'toeplitz';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
// -------------------
// --- Class Spec. ---
// -------------------
@@ -4558,7 +4609,7 @@ PrintStringInfo('OUT(2).TP= FA_TP_COMPLEX(IN(1).TP)',ClassFileName,'file','y'
PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
// Edited by Sandeep Gupta, IITB FOSSEE Project.
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -4610,7 +4661,7 @@ PrintStringInfo('s0'+ArgSeparator+'c0',ClassFileName,'file','y');
PrintStringInfo('d0'+ArgSeparator+'z0',ClassFileName,'file','y');
PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');
-=======
+=======
// --- Function List Class. ---
//NUT: no mixed data types
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
@@ -4619,7 +4670,7 @@ PrintStringInfo('s0'+ArgSeparator+'c0',ClassFileName,'file','y');
PrintStringInfo('d0'+ArgSeparator+'z0',ClassFileName,'file','y');
PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
@@ -4640,15 +4691,15 @@ PrintStringInfo('d2'+ArgSeparator+'z2z2',ClassFileName,'file','y');
PrintStringInfo('c2'+ArgSeparator+'c2c2',ClassFileName,'file','y');
PrintStringInfo('z2'+ArgSeparator+'z2z2',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('d2d2'+ArgSeparator+'z2',ClassFileName,'file','y');
PrintStringInfo('d2d2'+ArgSeparator+'z2d2',ClassFileName,'file','y');
PrintStringInfo('d2d2'+ArgSeparator+'z2d2z2',ClassFileName,'file','y');
PrintStringInfo('d2d2'+ArgSeparator+'z2d2z2z2',ClassFileName,'file','y');
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Annotation Function And Function List Function. ---
FunctionName = 'spec'; // AS : Done AS : Float_Done
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
@@ -4843,10 +4894,10 @@ ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d0d0d0'+ArgSeparator+'',ClassFileName,'file','y');
PrintStringInfo('d0d0u80'+ArgSeparator+'',ClassFileName,'file','y');
-<<<<<<< HEAD
-=======
+<<<<<<< HEAD
+=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Annotation Function And Function List Function. ---
FunctionName = 'cmd_analog_out';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
@@ -5720,12 +5771,12 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
-<<<<<<< HEAD
-=======
+<<<<<<< HEAD
+=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//------------------------------------
//---- Class AVRUARTReceiveChar -----------
//------------------------------------
@@ -5742,11 +5793,11 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD
-=======
+<<<<<<< HEAD
+=======
//PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
//PrintStringInfo('d0d0u80'+ArgSeparator+'u80',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
@@ -5757,52 +5808,52 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class RPI_0IN_Void ----------
//------------------------------------
ClassName = 'RPI_0IN_Void';
-=======
+=======
//------------------------------------
//---- Class RPI_DigitalSetup --------
//------------------------------------
ClassName = 'RPI_DigitalSetup';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 0',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0',ClassFileName,'file','y');
-=======
+=======
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
-<<<<<<< HEAD
+<<<<<<< HEAD
FunctionName = 'RPI_gertBoardSPISetup';
-=======
+=======
FunctionName = 'RPI_DigitalSetup';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class RPI_0IN_u8 ------------
//------------------------------------
@@ -5827,47 +5878,47 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file',
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_digitalReadByte';
-=======
+=======
FunctionName = 'RPI_DigitalOut';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_HardPWMWrite';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class RPI_0IN_u32 -----------
//------------------------------------
ClassName = 'RPI_0IN_u32';
-=======
+=======
//---- Class RPI_DigitalIn -----------
//------------------------------------
ClassName = 'RPI_DigitalIn';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 0',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u32''',ClassFileName,'file','y');
-=======
+=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo(''+ArgSeparator+'u320',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
@@ -5876,19 +5927,19 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file',
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_micros';
-=======
+=======
PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_DigitalIn';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class RPI_1IN_u8_Void -------
//------------------------------------
ClassName = 'RPI_1IN_u8_Void';
@@ -5898,7 +5949,7 @@ PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0',ClassFileName,'file','y');
-=======
+=======
//---- Class RPI_DelayMilli ----------
//------------------------------------
ClassName = 'RPI_DelayMilli';
@@ -5908,15 +5959,16 @@ PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_digitalWriteByte';
@@ -5948,7 +6000,7 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file',
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_softToneStop';
-=======
+=======
//--- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
@@ -5986,45 +6038,46 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_HardPWMSetMode';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class RPI_1IN_u16_Void ------
//------------------------------------
ClassName = 'RPI_1IN_u16_Void';
-=======
+=======
//---- Class RPI_GetMilli ----------
//------------------------------------
ClassName = 'RPI_GetMilli';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
-=======
+=======
PrintStringInfo('NIN= 0',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u32''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('u160'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_pwmClock';
-=======
+=======
PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
@@ -6035,41 +6088,42 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_GetMicros';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class RPI_1IN_u32_Void ------
//------------------------------------
ClassName = 'RPI_1IN_u32_Void';
-=======
+=======
//---- Class RPI_SetupSerial ----------
//------------------------------------
ClassName = 'RPI_SetupSerial';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
-=======
+=======
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u16''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('u320'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_pwmRange';
@@ -6081,19 +6135,19 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file',
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_delayMicro';
-=======
+=======
PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_SerialSetup';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class RPI_1IN_g_Void --------
//------------------------------------
ClassName = 'RPI_1IN_g_Void';
@@ -6121,7 +6175,7 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
//---- Class RPI_1IN_u8_i8 ---------
//------------------------------------
ClassName = 'RPI_1IN_u8_i8';
-=======
+=======
//---- Class RPI_SetupClose ----------
//------------------------------------
//ClassName = 'RPI_SetupClose';
@@ -6154,27 +6208,28 @@ ClassName = 'RPI_1IN_u8_i8';
//---- Class RPI_SerialSendData ----------
//------------------------------------
ClassName = 'RPI_SerialSendData';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''i8''',ClassFileName,'file','y');
-=======
+=======
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('u80'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'i80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_I2CSetup';
@@ -6186,7 +6241,7 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file',
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_physToGpio';
-=======
+=======
PrintStringInfo('u80u80'+ArgSeparator+'u80',ClassFileName,'file','y');
PrintStringInfo('u80i80'+ArgSeparator+'u80',ClassFileName,'file','y');
@@ -6205,40 +6260,41 @@ PrintStringInfo('u80g2'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_SerialSendData';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class RPI_1IN_u16_i8 --------
//------------------------------------
ClassName = 'RPI_1IN_u16_i8';
-=======
+=======
//---- Class RPI_SerialDataAvail ----------
//------------------------------------
ClassName = 'RPI_SerialDataAvail';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''i8''',ClassFileName,'file','y');
-=======
+=======
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''i16''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('u160'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'i80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_I2CRead';
@@ -6250,7 +6306,7 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file',
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_sn3218Setup';
-=======
+=======
PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
@@ -6260,86 +6316,87 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file',
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_SerialGetChar';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class RPI_1IN_g_i8 ----------
//------------------------------------
ClassName = 'RPI_1IN_g_i8';
-=======
+=======
//------------------------------------
//---- Class RPI_ThreadCreate ----------
//------------------------------------
ClassName = 'RPI_ThreadCreate';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''i8''',ClassFileName,'file','y');
-=======
+=======
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u16''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('g2'+ArgSeparator+'i80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_pinNumbering';
-=======
+=======
PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_ThreadCreate';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class RPI_1IN_u8_u8 ---------
//------------------------------------
ClassName = 'RPI_1IN_u8_u8';
-=======
+=======
//---- Class RPI_PinISR --------------
//------------------------------------
ClassName = 'RPI_PinISR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
-=======
+=======
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''i16''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_getAlt';
@@ -6355,32 +6412,32 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file',
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_softToneCreate';
-=======
+=======
PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_PinISR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class RPI_1IN_u16_u16 -------
//------------------------------------
ClassName = 'RPI_1IN_u16_u16';
-=======
+=======
//---- Class ODE ---------------------
//------------------------------------
ClassName = 'ODE';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u16''',ClassFileName,'file','y');
@@ -6390,10 +6447,11 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u160'+ArgSeparator+'u160',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'u160',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_gertboardAnalogRead';
-=======
+=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
@@ -6458,26 +6516,26 @@ PrintStringInfo('d2d0d2d0d0fn0'+ArgSeparator+'d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'ode';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class RPI_1IN_u8_g ------
//------------------------------------
ClassName = 'RPI_1IN_u8_g';
-=======
+=======
//---- Class CUMSUM ---------------------
//------------------------------------
ClassName = 'CUMSUM';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''g''',ClassFileName,'file','y');
@@ -6487,6 +6545,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80'+ArgSeparator+'g2',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'g2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_serialGetchar';
@@ -6508,6 +6567,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80u80'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_pinModeAlt';
@@ -6572,6 +6632,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80u160'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_pwmWrite';
@@ -6604,6 +6665,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u160u160'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_gertboardAnalogWrite';
@@ -6628,6 +6690,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80g2'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0g2'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_pinMode';
@@ -6672,6 +6735,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80u320'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_softToneWrite';
@@ -6696,6 +6760,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80i160'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'i80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_waitForInterrupt';
@@ -6720,6 +6785,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u160u160'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'i80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_I2CWrite';
@@ -6752,6 +6818,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('g2u320'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('g2d0'+ArgSeparator+'i80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_serialOpen';
@@ -6776,6 +6843,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u160u80'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_pcf8574Setup';
@@ -6813,6 +6881,7 @@ PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80u80u80'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_lcdPosition';
@@ -6838,6 +6907,7 @@ PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u160u160u160'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0'+ArgSeparator+'i80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_I2CWriteReg8';
@@ -6863,6 +6933,7 @@ PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80u80u80'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_shiftIn';
@@ -6887,6 +6958,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80u160u160'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_softPwmCreate';
@@ -6911,6 +6983,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u160u160u160'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_mcp23s08Setup';
@@ -6939,6 +7012,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80u80u80u80'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_shiftOut';
@@ -6963,6 +7037,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u160u80u80u80u80'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0d0d0'+ArgSeparator+'i80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_sr595Setup';
@@ -6987,6 +7062,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80u80u80u80u80u80u80u80u80u80'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0d0d0d0d0d0d0d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_lcdCharDef';
@@ -7011,6 +7087,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80u80u80u80u80u80u80u80u80u80u80u80u80'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0d0d0d0d0d0d0d0d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_lcdInit';
@@ -7889,7 +7966,7 @@ PrintStringInfo('g2d2d2d2d0d2'+ArgSeparator+'ss2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'syslin';
-=======
+=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
@@ -7933,37 +8010,37 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'cumprod';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class schur -------------------
//------------------------------------
ClassName = 'SCHUR';
-=======
+=======
//---- Class TRIU ---------------------
//------------------------------------
ClassName = 'TRIU';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
-=======
+<<<<<<< HEAD
+=======
//Arguements specified: initial value, start time, time vector, ode function
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -8198,7 +8275,7 @@ PrintStringInfo('ss2d2d2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'obscont';
-=======
+=======
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -8248,27 +8325,336 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file',
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'tril';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+
+//------------------------------------
+//---- Class SQROOT ---------------------
+//------------------------------------
+ClassName = 'SQROOT';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'sqroot';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+
+//------------------------------------
+//---- Class GIVENS ---------------------
+//------------------------------------
+ClassName = 'GIVENS';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= ''2''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= ''2''',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= ''2''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= ''2''',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= ''2''',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= ''1''',ClassFileName,'file','y');
+
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= ''2''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= ''2''',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= ''2''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= ''2''',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= ''2''',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= ''1''',ClassFileName,'file','y');
+
+
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'d2d2',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'givens';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+
+//------------------------------------
+//---- Class HOUSEHOLDER---------------------
+//------------------------------------
+ClassName = 'HOUSEHOLDER';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
+
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('d2d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'householder';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+//------------------------------------
+//---- Class FULLRF---------------------
+//------------------------------------
+ClassName = 'FULLRF';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 3',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(2)= ''1''',ClassFileName,'file','y');
+
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 3',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d2'+ArgSeparator+'d2d2d0',ClassFileName,'file','y');
+PrintStringInfo('d2d0'+ArgSeparator+'d2d2d0',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'fullrf';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+//------------------------------------
+//---- Class ROWCOMP ---------------------
+//------------------------------------
+ClassName = 'ROWCOMP';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= ''1''',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= ''1''',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 3',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= ''1''',ClassFileName,'file','y');
+
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d2'+ArgSeparator+'d2d0',ClassFileName,'file','y');
+PrintStringInfo('d2g2'+ArgSeparator+'d2d0',ClassFileName,'file','y');
+PrintStringInfo('d2g2d0'+ArgSeparator+'d2d0',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'rowcomp';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+//------------------------------------
+//---- Class QR---------------------
+//------------------------------------
+ClassName = 'QR';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 3',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 3',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');;
+PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 4',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');;
+PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(2)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 4',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');;
+PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(2)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'d2d2d2',ClassFileName,'file','y');
+PrintStringInfo('d2g2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
+PrintStringInfo('d2g2'+ArgSeparator+'d2d2d2',ClassFileName,'file','y');
+PrintStringInfo('d2d0'+ArgSeparator+'d2d2d0d2',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'d2d2d0d2',ClassFileName,'file','y');
+
+
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'qr';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class svd ---------------------
//------------------------------------
ClassName = 'SVD';
-=======
+=======
//---- Class KRON --------------------
//------------------------------------
ClassName = 'KRON';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -8293,8 +8679,8 @@ PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(1)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(2)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
@@ -8323,11 +8709,41 @@ PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(1)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(2)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 4',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).SZ(2)= ''1''',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 4',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).TP= ''d''',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).SZ(2)= ''1''',ClassFileName,'file','y');
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
@@ -8336,10 +8752,12 @@ PrintStringInfo('d2'+ArgSeparator+'d2d2d2',ClassFileName,'file','y');
PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
PrintStringInfo('z2g2'+ArgSeparator+'z2z2z2',ClassFileName,'file','y');
PrintStringInfo('z2'+ArgSeparator+'z2z2z2',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'d2d2d2d0',ClassFileName,'file','y');
+PrintStringInfo('d2d0'+ArgSeparator+'d2d2d2d0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'svd';
-=======
+=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -8362,29 +8780,29 @@ PrintStringInfo('s2s2'+ArgSeparator+'s2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'kron';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class HESS ---------------------
//------------------------------------
ClassName = 'HESS';
-=======
+=======
//------------------------------------
//---- Class FLIPDIM -----------------
//------------------------------------
ClassName = 'FLIPDIM';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -8406,7 +8824,7 @@ PrintStringInfo('d2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'hess';
-=======
+=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -8452,31 +8870,30 @@ PrintStringInfo('i162d0d0'+ArgSeparator+'i162',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'flipdim';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
-
+<<<<<<< HEAD
//------------------------------------
//---- Class SVA ---------------------
//------------------------------------
ClassName = 'SVA';
-=======
+=======
//------------------------------------
//---- Class DIFF -----------------
//------------------------------------
ClassName = 'DIFF';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NOUT= 3',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
@@ -8492,7 +8909,7 @@ PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 3',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_SZ_U_SVA(IN(1),IN(2).VAL)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(2).SZ(1)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
PrintStringInfo('OUT(2).SZ(2)= FA_MIN(IN(1).SZ(1),IN(1).SZ(2))',ClassFileName,'file','y');
@@ -8506,7 +8923,7 @@ PrintStringInfo('d2d0'+ArgSeparator+'d2d2d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'sva';
-=======
+=======
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_DIFF(IN(1).SZ,''1'',''0''))',ClassFileName,'file','y');
@@ -8558,28 +8975,29 @@ PrintStringInfo('i162u160d0'+ArgSeparator+'i162',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'diff';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class balanc ------------------
//------------------------------------
ClassName = 'BALANC';
-=======
+=======
//---- Class NORM --------------------
//------------------------------------
ClassName = 'NORM';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
@@ -8609,7 +9027,7 @@ PrintStringInfo('d2d2'+ArgSeparator+'d2d2d2d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'balanc';
-=======
+=======
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
@@ -8637,21 +9055,21 @@ PrintStringInfo('s2g2'+ArgSeparator+'s0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'norm';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class RCOND -------------------
//------------------------------------
ClassName = 'RCOND';
-=======
+=======
//---- Class CONVSTR --------------------
//------------------------------------
ClassName = 'CONVSTR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -8659,7 +9077,7 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
@@ -8669,7 +9087,7 @@ PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'rcond';
-=======
+=======
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
@@ -8689,13 +9107,13 @@ PrintStringInfo('g2g0'+ArgSeparator+'g2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'convstr';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class CONVSTR --------------------
//------------------------------------
ClassName = 'CONVSTR';
@@ -8724,7 +9142,7 @@ PrintStringInfo('g2g2'+ArgSeparator+'g2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'convstr';
-=======
+=======
//---- Class cvCreateImage --------------------
//------------------------------------
ClassName = 'CV_CreateImage';
@@ -8744,27 +9162,27 @@ PrintStringInfo('d0d0g2d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'CV_CreateImage';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class STRSUBST --------------------
//------------------------------------
ClassName = 'STRSUBST';
-=======
+=======
//---- Class cvLoadImage --------------------
//------------------------------------
ClassName = 'CV_LoadImage';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -8785,7 +9203,7 @@ PrintStringInfo('g2g2g2g2'+ArgSeparator+'g2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'strsubst';
-=======
+=======
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
@@ -8797,29 +9215,29 @@ PrintStringInfo('g2d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'CV_LoadImage';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class STRCMP --------------------
//------------------------------------
ClassName = 'STRCMP';
-=======
+=======
//------------------------------------
//---- Class cvShowImage -------------
//------------------------------------
ClassName = 'CV_ShowImage';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -8841,7 +9259,7 @@ PrintStringInfo('g2g2g2'+ArgSeparator+'d0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'strcmp';
-=======
+=======
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
@@ -8860,19 +9278,19 @@ PrintStringInfo('mt0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'CV_ShowImage';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class STRREV --------------------
//------------------------------------
ClassName = 'STRREV';
-=======
+=======
FunctionName = 'CV_SaveImage';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
@@ -8882,13 +9300,13 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
//---- Class CV_WaitKey --------------
//------------------------------------
ClassName = 'CV_WaitKey';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -8913,7 +9331,7 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
//---- Class STRRCHR --------------------
//------------------------------------
ClassName = 'STRRCHR';
-=======
+=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
@@ -8938,13 +9356,13 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
//---- Class CV_CvtColor -------------
//------------------------------------
ClassName = 'CV_CvtColor';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -8959,7 +9377,7 @@ PrintStringInfo('g2g2'+ArgSeparator+'g2',ClassFileName,'file','y');
FunctionName = 'strrchr';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-=======
+=======
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
@@ -8972,26 +9390,26 @@ PrintStringInfo('mt0g2'+ArgSeparator+'mt0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'CV_CvtColor';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class STRCHR --------------------
//------------------------------------
ClassName = 'STRCHR';
-=======
+=======
//---- Class CV_GetImgSize -----------
//------------------------------------
ClassName = 'CV_GetImgSize';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9015,7 +9433,7 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
//---- Class STRNCPY --------------------
//------------------------------------
ClassName = 'STRNCPY';
-=======
+=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
@@ -9035,13 +9453,13 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
//---- Class CV_Threshold -----------
//------------------------------------
ClassName = 'CV_Threshold';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9065,7 +9483,7 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
//---- Class STRSPN --------------------
//------------------------------------
ClassName = 'STRSPN';
-=======
+=======
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
@@ -9085,27 +9503,27 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
//---- Class CV_AdaptiveThreshold -----------
//------------------------------------
ClassName = 'CV_AdaptiveThreshold';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
-=======
+=======
PrintStringInfo('NIN= 6',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('g2g2'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
@@ -9121,7 +9539,7 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
//---- Class STRCSPN --------------------
//------------------------------------
ClassName = 'STRCSPN';
-=======
+=======
PrintStringInfo('mt0d0g2g2d0d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
@@ -9134,27 +9552,27 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
//---- Class CV_DistanceTransform ----
//------------------------------------
ClassName = 'CV_DistanceTransform';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
-=======
+=======
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('g2g2'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
@@ -9172,7 +9590,7 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
//---- Class ASCII --------------------
//------------------------------------
ClassName = 'ASCII';
-=======
+=======
PrintStringInfo('mt0g2d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
@@ -9185,13 +9603,13 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
//---- Class CV_Blur -----------------
//------------------------------------
ClassName = 'CV_Blur';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9222,7 +9640,7 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
//---- Class DEC2BIN --------------------
//------------------------------------
ClassName = 'DEC2BIN';
-=======
+=======
PrintStringInfo('NIN= 6',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
@@ -9247,13 +9665,13 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
//---- Class CV_MedianBlur -----------------
//------------------------------------
ClassName = 'CV_MedianBlur';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9295,7 +9713,7 @@ PrintStringInfo('u162d0'+ArgSeparator+'u162',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'dec2bin';
-=======
+=======
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
@@ -9307,12 +9725,12 @@ PrintStringInfo('mt0d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'CV_MedianBlur';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
@@ -9351,7 +9769,7 @@ PrintStringInfo('s2d0d0'+ArgSeparator+'g2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'dec2base';
-=======
+=======
//------------------------------------
//---- Class CV_Dilate ---------------
//------------------------------------
@@ -9384,27 +9802,27 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'CV_Erode';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class DEC2OCT --------------------
//------------------------------------
ClassName = 'DEC2OCT';
-=======
+=======
//---- Class CV_Canny ----------------
//------------------------------------
ClassName = 'CV_Canny';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9428,7 +9846,7 @@ PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'dec2oct';
-=======
+=======
PrintStringInfo('NIN= 5',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
@@ -9447,30 +9865,30 @@ PrintStringInfo('mt0d0d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'CV_Canny';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class DEC2HEX --------------------
//------------------------------------
ClassName = 'DEC2HEX';
-=======
+=======
//------------------------------------
//---- Class CV_CornerHarris ----------------
//------------------------------------
ClassName = 'CV_CornerHarris';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9494,7 +9912,7 @@ PrintStringInfo('u162'+ArgSeparator+'g2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'dec2hex';
-=======
+=======
PrintStringInfo('NIN= 5',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
@@ -9513,29 +9931,29 @@ PrintStringInfo('mt0d0d0d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'CV_CornerHarris';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class BIN2DEC --------------------
//------------------------------------
ClassName = 'BIN2DEC';
-=======
+=======
//------------------------------------
//---- Class syslin ------------------
//------------------------------------
ClassName = 'SYSLIN';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9558,7 +9976,7 @@ PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'bin2dec';
-=======
+=======
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''ss''',ClassFileName,'file','y');
@@ -9601,21 +10019,21 @@ PrintStringInfo('g2d2d2d2d0d2'+ArgSeparator+'ss2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'syslin';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class SVD -------------------
//------------------------------------
ClassName = 'SVD';
-=======
+=======
//---- Class schur -------------------
//------------------------------------
ClassName = 'SCHUR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -9624,7 +10042,7 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
@@ -9687,7 +10105,7 @@ PrintStringInfo('NOUT= 4',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
-=======
+=======
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
@@ -9732,12 +10150,12 @@ PrintStringInfo('NOUT= 4',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
PrintStringInfo('OUT(4).TP= IN(1).TP',ClassFileName,'file','y');
@@ -9811,7 +10229,7 @@ PrintStringInfo('d2d0'+ArgSeparator+'d2d2d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'sva';
-=======
+=======
PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
PrintStringInfo('OUT(4).TP= IN(1).TP',ClassFileName,'file','y');
@@ -9893,30 +10311,30 @@ PrintStringInfo('d2d2g2'+ArgSeparator+'d2d2d2d0',ClassFileName,'file','y');
PrintStringInfo('d2d2g2'+ArgSeparator+'d2d2d2d2d0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'schur';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class OCT2DEC --------------------
//------------------------------------
ClassName = 'OCT2DEC';
-=======
+=======
//------------------------------------
//---- Class lqr ---------------------
//------------------------------------
ClassName = 'LQR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9939,7 +10357,7 @@ PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'oct2dec';
-=======
+=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
@@ -9954,27 +10372,27 @@ PrintStringInfo('ss2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'lqr';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class HEX2DEC --------------------
//------------------------------------
ClassName = 'HEX2DEC';
-=======
+=======
//---- Class lqe ---------------------
//------------------------------------
ClassName = 'LQE';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9988,7 +10406,7 @@ PrintStringInfo('g2'+ArgSeparator+'d0',ClassFileName,'file','y');
PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'hex2dec';
-=======
+=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
@@ -10003,29 +10421,29 @@ PrintStringInfo('ss2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'lqe';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class BASE2DEC --------------------
//------------------------------------
ClassName = 'BASE2DEC';
-=======
+=======
//------------------------------------
//---- Class obscont -----------------
//------------------------------------
ClassName = 'OBSCONT';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -10096,7 +10514,7 @@ PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'cotd';
-=======
+=======
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
@@ -10118,28 +10536,28 @@ PrintStringInfo('ss2d2d2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'obscont';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
// ------------------
// --- Class Coth. ---
// ------------------
ClassName = 'Coth';
-=======
+=======
//------------------------------------
//---- Class balanc ------------------
//------------------------------------
ClassName = 'BALANC';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -10225,7 +10643,7 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'cscd';
-=======
+=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
@@ -10257,29 +10675,29 @@ PrintStringInfo('d2d2'+ArgSeparator+'d2d2d2d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'balanc';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
// ------------------
// --- Class Csch. ---
// ------------------
ClassName = 'Csch';
-=======
+=======
//------------------------------------
//---- Class RCOND -------------------
//------------------------------------
ClassName = 'RCOND';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -10300,7 +10718,7 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'csch';
-=======
+=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -10313,40 +10731,40 @@ PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'rcond';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
// --- Class Sec. ---
// ------------------
ClassName = 'Sec';
-=======
+=======
//------------------------------------
//---- Class CONVSTR --------------------
//------------------------------------
ClassName = 'CONVSTR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-=======
+=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
@@ -10361,7 +10779,7 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'sec';
-=======
+=======
//PrintStringInfo('NIN= 2',ClassFileName,'file','y');
//PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
//PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -10375,41 +10793,41 @@ PrintStringInfo('g2g2'+ArgSeparator+'g2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'convstr';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
// ------------------
// --- Class Secd. ---
// ------------------
ClassName = 'Secd';
-=======
+=======
//------------------------------------
//---- Class STRSUBST --------------------
//------------------------------------
ClassName = 'STRSUBST';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-=======
+=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
@@ -10419,7 +10837,7 @@ PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'secd';
-=======
+=======
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -10433,41 +10851,41 @@ PrintStringInfo('g2g2g2g2'+ArgSeparator+'g2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'strsubst';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
// --- Class Sech. ---
// ------------------
ClassName = 'Sech';
-=======
+=======
//------------------------------------
//---- Class STRCMP --------------------
//------------------------------------
ClassName = 'STRCMP';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-=======
+=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
@@ -10482,7 +10900,7 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'sech';
-=======
+=======
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -10497,7 +10915,7 @@ PrintStringInfo('g2g2g2'+ArgSeparator+'d0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'strcmp';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
@@ -10505,15 +10923,15 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class FACTORIAL --------------------
//------------------------------------
ClassName = 'FACTORIAL';
-=======
+=======
//---- Class STRREV --------------------
//------------------------------------
ClassName = 'STRREV';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -10526,7 +10944,7 @@ PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
@@ -10537,7 +10955,7 @@ PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'factorial';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-=======
+=======
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('g2'+ArgSeparator+'g2',ClassFileName,'file','y');
@@ -10546,27 +10964,27 @@ PrintStringInfo('g2'+ArgSeparator+'g2',ClassFileName,'file','y');
FunctionName = 'strrev';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
// --- Class Interp1. ---
// ------------------
ClassName = 'Interp1';
-=======
+=======
//------------------------------------
//---- Class STRRCHR --------------------
//------------------------------------
ClassName = 'STRRCHR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
@@ -10589,7 +11007,7 @@ PrintStringInfo('d2d2d0g2'+ArgSeparator+'d0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'interp1';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-=======
+=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
@@ -10605,27 +11023,27 @@ PrintStringInfo('g2g2'+ArgSeparator+'g2',ClassFileName,'file','y');
FunctionName = 'strrchr';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
// --- Class Modk. ---
// ------------------
ClassName = 'Modk';
-=======
+=======
//------------------------------------
//---- Class DEC2BIN --------------------
//------------------------------------
ClassName = 'DEC2BIN';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
@@ -10645,7 +11063,7 @@ PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'modk';
-=======
+=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
@@ -10688,30 +11106,30 @@ PrintStringInfo('u162d0'+ArgSeparator+'u162',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'dec2bin';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class PRIMES --------------------
//------------------------------------
ClassName = 'PRIMES';
-=======
+=======
//------------------------------------
//---- Class DEC2BASE --------------------
//------------------------------------
ClassName = 'DEC2BASE';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -10726,7 +11144,7 @@ PrintStringInfo('s0'+ArgSeparator+'s2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'primes';
-=======
+=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -10754,23 +11172,23 @@ PrintStringInfo('s2d0d0'+ArgSeparator+'g2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'dec2base';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class GCD --------------------
//------------------------------------
ClassName = 'GCD';
-=======
+=======
//------------------------------------
//---- Class DEC2OCT --------------------
//------------------------------------
ClassName = 'DEC2OCT';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -10780,7 +11198,7 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
@@ -10790,7 +11208,7 @@ PrintStringInfo('u82'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'gcd';
-=======
+=======
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= FA_MUL(FA_SZ_DEC2OCT(IN(1).VAL),IN(1).SZ(1))',ClassFileName,'file','y');
@@ -10810,7 +11228,7 @@ PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'dec2oct';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
@@ -10818,15 +11236,15 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class LCM --------------------
//------------------------------------
ClassName = 'LCM';
-=======
+=======
//---- Class DEC2HEX --------------------
//------------------------------------
ClassName = 'DEC2HEX';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -10835,7 +11253,7 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
@@ -10846,7 +11264,7 @@ PrintStringInfo('u82'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'lcm';
-=======
+=======
PrintStringInfo('OUT(1).TP= ''g''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= FA_MUL(FA_SZ_DEC2HEX(IN(1).VAL),IN(1).SZ(1))',ClassFileName,'file','y');
@@ -10867,13 +11285,13 @@ PrintStringInfo('u162'+ArgSeparator+'g2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'dec2hex';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
@@ -10883,12 +11301,12 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
//---- Class FACTOR --------------------
//------------------------------------
ClassName = 'FACTOR';
-=======
+=======
//------------------------------------
//---- Class BIN2DEC --------------------
//------------------------------------
ClassName = 'BIN2DEC';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -10897,7 +11315,7 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= FA_MUL(FA_SZ_FACTOR(IN(1).VAL),IN(1).SZ(1))',ClassFileName,'file','y');
@@ -10909,7 +11327,7 @@ PrintStringInfo('s0'+ArgSeparator+'s2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'factor';
-=======
+=======
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
@@ -10929,24 +11347,24 @@ PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'bin2dec';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class GCD --------------------
//------------------------------------
ClassName = 'GCD';
-=======
+=======
//------------------------------------
//---- Class OCT2DEC --------------------
//------------------------------------
ClassName = 'OCT2DEC';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -10955,7 +11373,7 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
@@ -10966,7 +11384,7 @@ PrintStringInfo('u82'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'gcd';
-=======
+=======
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
@@ -10986,30 +11404,30 @@ PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'oct2dec';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class ZPBUTT --------------------
//------------------------------------
ClassName = 'ZPBUTT';
-=======
+=======
//------------------------------------
//---- Class HEX2DEC --------------------
//------------------------------------
ClassName = 'HEX2DEC';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
@@ -11027,7 +11445,7 @@ PrintStringInfo('d0d0'+ArgSeparator+'z2d0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'zpbutt';
-=======
+=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -11041,28 +11459,28 @@ PrintStringInfo('g2'+ArgSeparator+'d0',ClassFileName,'file','y');
PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'hex2dec';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class ZPCH1 --------------------
//------------------------------------
ClassName = 'ZPCH1';
-=======
+=======
//---- Class BASE2DEC --------------------
//------------------------------------
ClassName = 'BASE2DEC';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
@@ -11080,7 +11498,7 @@ PrintStringInfo('d0d0d0'+ArgSeparator+'z2d0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'zpch1';
-=======
+=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -11095,28 +11513,28 @@ PrintStringInfo('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y');
//PrintStringInfo('g2'+ArgSeparator+'d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'base2dec';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class ZPCH2 --------------------
//------------------------------------
ClassName = 'ZPCH2';
-=======
+=======
// ------------------
// --- Class Cosd. ---
// ------------------
ClassName = 'Cosd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
@@ -11139,7 +11557,7 @@ PrintStringInfo('d0d0d0'+ArgSeparator+'z2z2d0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'zpch2';
-=======
+=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -11155,28 +11573,28 @@ PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'cosd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class BUTTMAG --------------------
//------------------------------------
ClassName = 'BUTTMAG';
-=======
+=======
// ------------------
// --- Class Cotd. ---
// ------------------
ClassName = 'Cotd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
@@ -11195,7 +11613,7 @@ PrintStringInfo('u80u80d2'+ArgSeparator+'d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'buttmag';
-=======
+=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -11211,28 +11629,28 @@ PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'cotd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class CHEB1MAG --------------------
//------------------------------------
ClassName = 'CHEB1MAG';
-=======
+=======
// ------------------
// --- Class Coth. ---
// ------------------
ClassName = 'Coth';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
@@ -11251,7 +11669,7 @@ PrintStringInfo('d0d0d0d2'+ArgSeparator+'d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'cheb1mag';
-=======
+=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -11271,28 +11689,28 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'coth';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class CHEB2MAG --------------------
//------------------------------------
ClassName = 'CHEB2MAG';
-=======
+=======
// ------------------
// --- Class Csc. ---
// ------------------
ClassName = 'Csc';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
@@ -11311,7 +11729,7 @@ PrintStringInfo('d0d0d0d2'+ArgSeparator+'d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'cheb2mag';
-=======
+=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -11331,44 +11749,44 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'csc';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class SINC --------------------
//------------------------------------
ClassName = 'SINC';
-=======
+=======
// ------------------
// --- Class Cscd. ---
// ------------------
ClassName = 'Cscd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-=======
+=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD
+<<<<<<< HEAD
@@ -11379,7 +11797,7 @@ PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'sinc';
-=======
+=======
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
@@ -11394,30 +11812,30 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'cscd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class SINCD --------------------
//------------------------------------
ClassName = 'SINCD';
-=======
+=======
// ------------------
// --- Class Csch. ---
// ------------------
ClassName = 'Csch';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
@@ -11437,7 +11855,7 @@ PrintStringInfo('u80u80'+ArgSeparator+'d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'sincd';
-=======
+=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -11458,29 +11876,29 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'csch';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class FSFIRLIN --------------------
//------------------------------------
ClassName = 'FSFIRLIN';
-=======
+=======
// --- Class Sec. ---
// ------------------
ClassName = 'Sec';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
@@ -11499,7 +11917,7 @@ PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'fsfirlin';
-=======
+=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -11520,30 +11938,30 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'sec';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class %K --------------------
//------------------------------------
ClassName = 'modk';
-=======
+=======
// ------------------
// --- Class Secd. ---
// ------------------
ClassName = 'Secd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
@@ -11562,7 +11980,7 @@ PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'modk';
-=======
+=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -11578,28 +11996,28 @@ PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'secd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class FILT_SINC --------------------
//------------------------------------
ClassName = 'FILT_SINC';
-=======
+=======
// --- Class Sech. ---
// ------------------
ClassName = 'Sech';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
@@ -11618,7 +12036,7 @@ PrintStringInfo('d0d0'+ArgSeparator+'d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'filt_sinc';
-=======
+=======
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -11639,7 +12057,7 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'sech';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
@@ -11647,21 +12065,21 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class FFILT --------------------
//------------------------------------
ClassName = 'FFILT';
-=======
+=======
//---- Class FACTORIAL --------------------
//------------------------------------
ClassName = 'FACTORIAL';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -11679,7 +12097,7 @@ PrintStringInfo('g2d0d0d0'+ArgSeparator+'d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'ffilt';
-=======
+=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -11696,28 +12114,28 @@ PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'factorial';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class %SN --------------------
//------------------------------------
ClassName = 'modsn';
-=======
+=======
// --- Class Interp1. ---
// ------------------
ClassName = 'Interp1';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
//PrintStringInfo('NIN= 2',ClassFileName,'file','y');
@@ -11752,7 +12170,7 @@ PrintStringInfo('z2d0'+ArgSeparator+'z2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'modsn';
-=======
+=======
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
@@ -11773,34 +12191,34 @@ PrintStringInfo('d2d2d0g2'+ArgSeparator+'d0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'interp1';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
//------------------------------------
//---- Class ELL1MAG --------------------
//------------------------------------
ClassName = 'ell1mag';
-=======
+=======
//------------------------------------
//---- Class PRIMES --------------------
//------------------------------------
ClassName = 'PRIMES';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(3).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(3).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(3).SZ(2)',ClassFileName,'file','y');
@@ -11810,7 +12228,7 @@ PrintStringInfo('d0d0d2'+ArgSeparator+'d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'ell1mag';
-=======
+=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -11825,28 +12243,28 @@ PrintStringInfo('s0'+ArgSeparator+'s2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'primes';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
+<<<<<<< HEAD
//---- Class AMELL --------------------
//------------------------------------
ClassName = 'amell';
-=======
+=======
//---- Class FACTOR --------------------
//------------------------------------
ClassName = 'FACTOR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
+<<<<<<< HEAD
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -11859,7 +12277,7 @@ PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'amell';
-=======
+=======
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -11874,19 +12292,19 @@ PrintStringInfo('s0'+ArgSeparator+'s2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'factor';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
+<<<<<<< HEAD
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// ////////////////////////////////////////////
// /////PARTE INTRODOTTA DA ALBERTO MOREA
// /////////////////////////////////////////////
diff --git a/2.3-1/macros/ToolInitialization/lib b/2.3-1/macros/ToolInitialization/lib
deleted file mode 100644
index 113aba04..00000000
--- a/2.3-1/macros/ToolInitialization/lib
+++ /dev/null
Binary files differ
diff --git a/2.3-1/macros/cb_sci2c_gui.sci b/2.3-1/macros/cb_sci2c_gui.sci
index 631dc691..90dad3ba 100644
--- a/2.3-1/macros/cb_sci2c_gui.sci
+++ b/2.3-1/macros/cb_sci2c_gui.sci
@@ -203,23 +203,12 @@ elseif get(gcbo, "tag")=="convertbtn" then
// -*- DEBUG ONLY -*-
-<<<<<<< HEAD
-
//mprintf("UserScilabMainFile = {%s}\n", UserScilabMainFile);
//mprintf("UserSciFilesPaths = {%s}\n", UserSciFilesPaths);
//mprintf("UserSciCodeMainDir = {%s}\n", UserSciCodeMainDir);
//mprintf("RunMode = {%s}\n", RunMode);
//mprintf("CopySciCodeIntoCCode = {%d}\n", bool2s(CopySciCodeIntoCCode));
- //mprintf("NativeBuild = {%s}\n", NativeBuild);
-=======
-
-// mprintf("UserScilabMainFile = {%s}\n", UserScilabMainFile);
-// mprintf("UserSciFilesPaths = {%s}\n", UserSciFilesPaths);
-// mprintf("UserSciCodeMainDir = {%s}\n", UserSciCodeMainDir);
-// mprintf("RunMode = {%s}\n", RunMode);
-// mprintf("CopySciCodeIntoCCode = {%d}\n", bool2s(CopySciCodeIntoCCode));
-// mprintf("NativeBuild = {%s}\n", NativeBuild);
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+ //mprintf("NativeBuild = {%s}\n", NativeBuild);
scilab2c(UserScilabMainFile, UserSciCodeMainDir, UserSciFilesPaths, RunMode, NativeBuild,Target,Board_name);
//
// --- sci2c help ---
diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci
index ba26703a..8e33e486 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/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/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci
index 4f5a77ab..4c8475ac 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.sci
+++ b/2.3-1/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/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index d29a1eea..f0f4e741 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/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/2.3-1/macros/findDeps/lib b/2.3-1/macros/findDeps/lib
deleted file mode 100644
index 4157ab8f..00000000
--- a/2.3-1/macros/findDeps/lib
+++ /dev/null
Binary files differ
diff --git a/2.3-1/macros/lib b/2.3-1/macros/lib
deleted file mode 100644
index 3c96eeb4..00000000
--- a/2.3-1/macros/lib
+++ /dev/null
Binary files differ
diff --git a/2.3-1/macros/sci2c_gui.sci b/2.3-1/macros/sci2c_gui.sci
index bee6fe43..cad8b247 100644
--- a/2.3-1/macros/sci2c_gui.sci
+++ b/2.3-1/macros/sci2c_gui.sci
@@ -216,7 +216,7 @@ outformatlabel = uicontrol("parent", sci2cfig,...
outformatradiostalone = uicontrol("parent", sci2cfig,...
"style", "radiobutton",...
"string", gettext("Stand-alone"),...
- "position",[2*margin+widgetLabelWidth outformaty 2*radiow widgeth],...
+ "position",[2*margin+widgetLabelWidth outformaty 2*radiow-10 widgeth],...
"horizontalalignment", "left",...
"fontname", defaultfont,...
"fontunits", "points",...
@@ -309,7 +309,7 @@ runradiotranslate = uicontrol("parent", sci2cfig,...
runradiogenlib = uicontrol("parent", sci2cfig,...
"style", "radiobutton",...
"string", gettext("Generate library"),...
- "position",[2*margin+widgetLabelWidth+2*radiow runy 120 widgeth],...
+ "position",[2*margin+widgetLabelWidth+2*radiow+20 runy 150 widgeth],...
"horizontalalignment", "left",...
"fontname", defaultfont,...
"fontunits", "points",...
diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci
index f78c359e..aff3df69 100644
--- a/2.3-1/macros/scilab2c.sci
+++ b/2.3-1/macros/scilab2c.sci
@@ -60,7 +60,7 @@ function scilab2c(varargin)
RunMode = "All";
BuildTool = getNativeBuildTool();
Target = "StandAlone"
- //Board_name = "uno"
+ Board_name = "uno"
//
// scilab2c(UserScilabMainFile, CCodeOutputDir, UserSciFilesPaths, RunMode)
//
generated by cgit (git 2.34.1) at 2024-12-20 14:41:28 +0000