From 39874e472e540ca1bb923b97b52900e1d60439cc Mon Sep 17 00:00:00 2001 From: Brijeshcr Date: Sat, 8 Jul 2017 20:18:17 +0530 Subject: Revert "SCi2cDeps updated, Windows compatibility resolved" --- .../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 2207 +------------------- .../ToolInitialization/ManageNextConversion.sci | 3 - 2 files changed, 40 insertions(+), 2170 deletions(-) (limited to '2.3-1/macros/ToolInitialization') diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 67051512..7269e98f 100644 --- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -437,7 +437,6 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD // --------------------- // --- Class Uint32. --- @@ -514,8 +513,6 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // ------------------ // --- Class Sin. --- // ------------------ @@ -923,7 +920,6 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); // ------------------- -<<<<<<< HEAD // --- Class Isreal. --- // ------------------- ClassName = 'Isreal'; @@ -1130,8 +1126,6 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex // ------------------- -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Sqrt. --- // ------------------- ClassName = 'Sqrt'; @@ -1491,13 +1485,9 @@ ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('d0d0d0'+ArgSeparator+'d2',ClassFileName,'file','y'); -<<<<<<< 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 // --- Annotation Function And Function List Function. --- @@ -4609,7 +4599,6 @@ 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 // Edited by Sandeep Gupta, IITB FOSSEE Project. PrintStringInfo('NIN= 2',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); @@ -4661,16 +4650,6 @@ 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); - -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 PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y'); PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); @@ -4691,15 +4670,12 @@ PrintStringInfo('d2'+ArgSeparator+'z2z2',ClassFileName,'file','y'); PrintStringInfo('c2'+ArgSeparator+'c2c2',ClassFileName,'file','y'); PrintStringInfo('z2'+ArgSeparator+'z2z2',ClassFileName,'file','y'); -<<<<<<< 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 // --- Annotation Function And Function List Function. --- FunctionName = 'spec'; // AS : Done AS : Float_Done PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); @@ -4894,10 +4870,6 @@ ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('d0d0d0'+ArgSeparator+'',ClassFileName,'file','y'); PrintStringInfo('d0d0u80'+ArgSeparator+'',ClassFileName,'file','y'); -<<<<<<< HEAD -======= - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Annotation Function And Function List Function. --- FunctionName = 'cmd_analog_out'; PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); @@ -5771,12 +5743,6 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex -<<<<<<< HEAD -======= - - - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //------------------------------------ //---- Class AVRUARTReceiveChar ----------- //------------------------------------ @@ -5793,11 +5759,6 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -<<<<<<< HEAD -======= -//PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); -//PrintStringInfo('d0d0u80'+ArgSeparator+'u80',ClassFileName,'file','y'); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- @@ -5808,52 +5769,32 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex -<<<<<<< HEAD //------------------------------------ //---- Class RPI_0IN_Void ---------- //------------------------------------ ClassName = 'RPI_0IN_Void'; -======= -//------------------------------------ -//---- Class RPI_DigitalSetup -------- -//------------------------------------ -ClassName = 'RPI_DigitalSetup'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< 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 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 -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- -<<<<<<< HEAD FunctionName = 'RPI_gertBoardSPISetup'; -======= -FunctionName = 'RPI_DigitalSetup'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class RPI_0IN_u8 ------------ //------------------------------------ @@ -5878,47 +5819,26 @@ 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 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); //------------------------------------ -<<<<<<< HEAD //---- Class RPI_0IN_u32 ----------- //------------------------------------ ClassName = 'RPI_0IN_u32'; -======= -//---- Class RPI_DigitalIn ----------- -//------------------------------------ -ClassName = 'RPI_DigitalIn'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< 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 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 PrintStringInfo(''+ArgSeparator+'u320',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- @@ -5927,19 +5847,11 @@ 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 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); //------------------------------------ -<<<<<<< HEAD //---- Class RPI_1IN_u8_Void ------- //------------------------------------ ClassName = 'RPI_1IN_u8_Void'; @@ -5949,22 +5861,10 @@ 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'; - -//--- Class Annotation. --- -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 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 // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u80'+ArgSeparator+'',ClassFileName,'file','y'); @@ -6000,128 +5900,51 @@ 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); - -PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'RPI_DelayMilli'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - -FunctionName = 'RPI_DelayMicro'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - -FunctionName = 'RPI_SerialClose'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - -FunctionName = 'RPI_SerialFlush'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - -FunctionName = 'RPI_HardPWMSetRange'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - -FunctionName = 'RPI_HardPWMSetClock'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - -FunctionName = 'RPI_HardPWMSetMode'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); //------------------------------------ -<<<<<<< HEAD //---- Class RPI_1IN_u16_Void ------ //------------------------------------ ClassName = 'RPI_1IN_u16_Void'; -======= -//---- Class RPI_GetMilli ---------- -//------------------------------------ -ClassName = 'RPI_GetMilli'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< 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 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 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'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'RPI_GetMillis'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - -FunctionName = 'RPI_GetMicros'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); //------------------------------------ -<<<<<<< HEAD //---- Class RPI_1IN_u32_Void ------ //------------------------------------ ClassName = 'RPI_1IN_u32_Void'; -======= -//---- Class RPI_SetupSerial ---------- -//------------------------------------ -ClassName = 'RPI_SetupSerial'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< 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 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 PrintStringInfo('u320'+ArgSeparator+'',ClassFileName,'file','y'); PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y'); @@ -6135,19 +5958,11 @@ 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 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); //------------------------------------ -<<<<<<< HEAD //---- Class RPI_1IN_g_Void -------- //------------------------------------ ClassName = 'RPI_1IN_g_Void'; @@ -6175,59 +5990,18 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class RPI_1IN_u8_i8 --------- //------------------------------------ ClassName = 'RPI_1IN_u8_i8'; -======= -//---- Class RPI_SetupClose ---------- -//------------------------------------ -//ClassName = 'RPI_SetupClose'; - -// --- 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= ''u8''',ClassFileName,'file','y'); -//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); - -//PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -//FunctionName = 'RPI_SerialClose'; -//PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -//INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -//INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -//FunctionName = 'RPI_SerialFlush'; -//PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -//INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -//INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - -//------------------------------------ -//---- Class RPI_SerialSendData ---------- -//------------------------------------ -ClassName = 'RPI_SerialSendData'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< 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 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 PrintStringInfo('u80'+ArgSeparator+'i80',ClassFileName,'file','y'); PrintStringInfo('d0'+ArgSeparator+'i80',ClassFileName,'file','y'); @@ -6241,58 +6015,26 @@ 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'); -PrintStringInfo('u80u160'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('u80i160'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('u80s0'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('u80d0'+ArgSeparator+'u80',ClassFileName,'file','y'); - -PrintStringInfo('u80u82'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('u80i82'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('u80u162'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('u80i162'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('u80s2'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('u80d2'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('u80g2'+ArgSeparator+'u80',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'RPI_SerialSendData'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); //------------------------------------ -<<<<<<< HEAD //---- Class RPI_1IN_u16_i8 -------- //------------------------------------ ClassName = 'RPI_1IN_u16_i8'; -======= -//---- Class RPI_SerialDataAvail ---------- -//------------------------------------ -ClassName = 'RPI_SerialDataAvail'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 1',ClassFileName,'file','y'); -<<<<<<< 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 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 PrintStringInfo('u160'+ArgSeparator+'i80',ClassFileName,'file','y'); PrintStringInfo('d0'+ArgSeparator+'i80',ClassFileName,'file','y'); @@ -6306,95 +6048,50 @@ 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'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'RPI_SerialDataAvail'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -FunctionName = 'RPI_SerialGetChar'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class RPI_1IN_g_i8 ---------- //------------------------------------ ClassName = 'RPI_1IN_g_i8'; -======= - -//------------------------------------ -//---- Class RPI_ThreadCreate ---------- -//------------------------------------ -ClassName = 'RPI_ThreadCreate'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 1',ClassFileName,'file','y'); -<<<<<<< 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 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 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 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); //------------------------------------ -<<<<<<< HEAD //---- Class RPI_1IN_u8_u8 --------- //------------------------------------ ClassName = 'RPI_1IN_u8_u8'; -======= -//---- Class RPI_PinISR -------------- -//------------------------------------ -ClassName = 'RPI_PinISR'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< 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 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 PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y'); PrintStringInfo('d0'+ArgSeparator+'u80',ClassFileName,'file','y'); @@ -6412,32 +6109,18 @@ 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 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); //------------------------------------ -<<<<<<< HEAD //---- Class RPI_1IN_u16_u16 ------- //------------------------------------ ClassName = 'RPI_1IN_u16_u16'; -======= -//---- Class ODE --------------------- -//------------------------------------ -ClassName = 'ODE'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 1',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''u16''',ClassFileName,'file','y'); @@ -6451,91 +6134,18 @@ 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'); -PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= FA_MUL(IN(1).SZ(2),IN(3).SZ(2))',ClassFileName,'file','y'); - -//Arguements specified: initial value, start time, end time, ode function -PrintStringInfo('NIN= 4',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(3).SZ(1)',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= IN(3).SZ(2)',ClassFileName,'file','y'); - -//Arguements specified: solver type, initial value, start time, end time, ode function -PrintStringInfo('NIN= 5',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).TP= IN(2).TP',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= FA_MUL(IN(2).SZ(2),IN(4).SZ(2))',ClassFileName,'file','y'); - -//Arguements specified: solver type, initial value, start time, end time, ode function -PrintStringInfo('NIN= 5',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).TP= IN(2).TP',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(1)= IN(4).SZ(1)',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= IN(4).SZ(2)',ClassFileName,'file','y'); - -//Arguements specified: initial value, start time, end time, relative tolerance, -// absolute tolerance, ode function -PrintStringInfo('NIN= 6',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= FA_MUL(IN(1).SZ(2),IN(3).SZ(2))',ClassFileName,'file','y'); - -//Arguements specified: initial value, start time, end time, relative tolerance, -// absolute tolerance, ode function -PrintStringInfo('NIN= 6',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(3).SZ(1)',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= IN(3).SZ(2)',ClassFileName,'file','y'); - -// --- Function List Class. --- -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0d0d0fn0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('d2d0d0fn0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('d0d0d2fn0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('d2d0d2fn0'+ArgSeparator+'d2',ClassFileName,'file','y'); - -PrintStringInfo('g2d0d0d0fn0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('g2d2d0d0fn0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('g2d0d0d2fn0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('g2d2d0d2fn0'+ArgSeparator+'d2',ClassFileName,'file','y'); - -PrintStringInfo('d0d0d0d0d0fn0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('d2d0d0d0d0fn0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('d0d0d2d0d0fn0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('d2d0d2d0d0fn0'+ArgSeparator+'d2',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'ode'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); //------------------------------------ -<<<<<<< HEAD //---- Class RPI_1IN_u8_g ------ //------------------------------------ ClassName = 'RPI_1IN_u8_g'; -======= -//---- Class CUMSUM --------------------- -//------------------------------------ -ClassName = 'CUMSUM'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 1',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''g''',ClassFileName,'file','y'); @@ -7966,104 +7576,48 @@ PrintStringInfo('g2d2d2d2d0d2'+ArgSeparator+'ss2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'syslin'; -======= +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + +//------------------------------------ +//---- Class schur ------------------- +//------------------------------------ +ClassName = 'SCHUR'; + +// --- Class Annotation. --- +PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); +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'); 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('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(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('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)= IN(1).SZ(2)',ClassFileName,'file','y'); -// --- Function List Class. --- -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); -PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('i80'+ArgSeparator+'i80',ClassFileName,'file','y'); -PrintStringInfo('u160'+ArgSeparator+'u160',ClassFileName,'file','y'); -PrintStringInfo('i160'+ArgSeparator+'i160',ClassFileName,'file','y'); - -PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y'); -PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y'); -PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y'); - -PrintStringInfo('d2g2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('s2g2'+ArgSeparator+'s2',ClassFileName,'file','y'); -PrintStringInfo('u82g2'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('i82g2'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('u162g2'+ArgSeparator+'u162',ClassFileName,'file','y'); -PrintStringInfo('i162g2'+ArgSeparator+'i162',ClassFileName,'file','y'); -// --- Annotation Function And Function List Function. --- -FunctionName = 'cumsum'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - -FunctionName = 'cumprod'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - -//------------------------------------ -<<<<<<< HEAD -//---- Class schur ------------------- -//------------------------------------ -ClassName = 'SCHUR'; -======= -//---- Class TRIU --------------------- -//------------------------------------ -ClassName = 'TRIU'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 - -// --- Class Annotation. --- -PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); -ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); - -<<<<<<< HEAD -======= -//Arguements specified: initial value, start time, time vector, ode function ->>>>>>> 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 -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(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('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)= 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)= IN(1).SZ(2)',ClassFileName,'file','y'); -PrintStringInfo('OUT(2).TP= FA_SCHUR_TP(IN(2).TP)',ClassFileName,'file','y'); -PrintStringInfo('OUT(2).SZ(1)= FA_SCHUR_SZ(IN(2).TP,IN(1).SZ(1))',ClassFileName,'file','y'); -PrintStringInfo('OUT(2).SZ(2)= FA_SCHUR_SZ(IN(2).TP,IN(1).SZ(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(2)',ClassFileName,'file','y'); +PrintStringInfo('OUT(2).TP= FA_SCHUR_TP(IN(2).TP)',ClassFileName,'file','y'); +PrintStringInfo('OUT(2).SZ(1)= FA_SCHUR_SZ(IN(2).TP,IN(1).SZ(1))',ClassFileName,'file','y'); +PrintStringInfo('OUT(2).SZ(2)= FA_SCHUR_SZ(IN(2).TP,IN(1).SZ(1))',ClassFileName,'file','y'); PrintStringInfo('NIN= 2',ClassFileName,'file','y'); PrintStringInfo('NOUT= 3',ClassFileName,'file','y'); @@ -8275,57 +7829,6 @@ 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'); -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('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); -PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('i80'+ArgSeparator+'i80',ClassFileName,'file','y'); -PrintStringInfo('u160'+ArgSeparator+'u160',ClassFileName,'file','y'); -PrintStringInfo('i160'+ArgSeparator+'i160',ClassFileName,'file','y'); - -PrintStringInfo('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('s0s0'+ArgSeparator+'s0',ClassFileName,'file','y'); -PrintStringInfo('u80u80'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('i80i80'+ArgSeparator+'i80',ClassFileName,'file','y'); -PrintStringInfo('u160u160'+ArgSeparator+'u160',ClassFileName,'file','y'); -PrintStringInfo('i160i160'+ArgSeparator+'i160',ClassFileName,'file','y'); -PrintStringInfo('u80d0'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('i80d0'+ArgSeparator+'i80',ClassFileName,'file','y'); -PrintStringInfo('u160d0'+ArgSeparator+'u160',ClassFileName,'file','y'); -PrintStringInfo('i160d0'+ArgSeparator+'i160',ClassFileName,'file','y'); - -PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y'); -PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y'); -PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y'); - -PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('s2s0'+ArgSeparator+'s2',ClassFileName,'file','y'); -PrintStringInfo('u82u80'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('i82i80'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('u162u160'+ArgSeparator+'u162',ClassFileName,'file','y'); -PrintStringInfo('i162i160'+ArgSeparator+'i162',ClassFileName,'file','y'); -PrintStringInfo('u82d0'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('i82d0'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('u162d0'+ArgSeparator+'u162',ClassFileName,'file','y'); -PrintStringInfo('i162d0'+ArgSeparator+'i162',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'triu'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -FunctionName = 'tril'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); @@ -8640,21 +8143,14 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //------------------------------------ -<<<<<<< HEAD //---- Class svd --------------------- //------------------------------------ ClassName = 'SVD'; -======= -//---- Class KRON -------------------- -//------------------------------------ -ClassName = 'KRON'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 1',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); @@ -8757,52 +8253,20 @@ 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'); -PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(1)= FA_MUL(IN(1).SZ(1),IN(2).SZ(1))',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= FA_MUL(IN(1).SZ(2),IN(2).SZ(2))',ClassFileName,'file','y'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('s0s0'+ArgSeparator+'s0',ClassFileName,'file','y'); - -PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('s2s0'+ArgSeparator+'s2',ClassFileName,'file','y'); - -PrintStringInfo('d0d2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('s0s2'+ArgSeparator+'s2',ClassFileName,'file','y'); - -PrintStringInfo('d2d2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('s2s2'+ArgSeparator+'s2',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'kron'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class HESS --------------------- //------------------------------------ ClassName = 'HESS'; -======= -//------------------------------------ -//---- Class FLIPDIM ----------------- -//------------------------------------ -ClassName = 'FLIPDIM'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 1',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); @@ -8824,76 +8288,21 @@ 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'); -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('NIN= 3',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('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('s0s0'+ArgSeparator+'s0',ClassFileName,'file','y'); -PrintStringInfo('u80u80'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('i80i80'+ArgSeparator+'i80',ClassFileName,'file','y'); -PrintStringInfo('u160u160'+ArgSeparator+'u160',ClassFileName,'file','y'); -PrintStringInfo('i160i160'+ArgSeparator+'i160',ClassFileName,'file','y'); - -PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('s2s0'+ArgSeparator+'s2',ClassFileName,'file','y'); -PrintStringInfo('u82u80'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('i82i80'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('u162u160'+ArgSeparator+'u162',ClassFileName,'file','y'); -PrintStringInfo('i162i160'+ArgSeparator+'i162',ClassFileName,'file','y'); -PrintStringInfo('u82d0'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('i82d0'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('u162d0'+ArgSeparator+'u162',ClassFileName,'file','y'); -PrintStringInfo('i162d0'+ArgSeparator+'i162',ClassFileName,'file','y'); - -PrintStringInfo('d2d0d0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('s2s0d0'+ArgSeparator+'s2',ClassFileName,'file','y'); -PrintStringInfo('u82u80u80'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('i82i80u80'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('u162u160u160'+ArgSeparator+'u162',ClassFileName,'file','y'); -PrintStringInfo('i162i160i160'+ArgSeparator+'i162',ClassFileName,'file','y'); -PrintStringInfo('u82d0d0'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('i82d0d0'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('u162d0d0'+ArgSeparator+'u162',ClassFileName,'file','y'); -PrintStringInfo('i162d0d0'+ArgSeparator+'i162',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'flipdim'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class SVA --------------------- //------------------------------------ ClassName = 'SVA'; -======= -//------------------------------------ -//---- Class DIFF ----------------- -//------------------------------------ -ClassName = 'DIFF'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 1',ClassFileName,'file','y'); -<<<<<<< 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'); @@ -8923,81 +8332,21 @@ 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'); -PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_DIFF(IN(1).SZ,''1'',''0''))',ClassFileName,'file','y'); - -PrintStringInfo('NIN= 2',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_DIFF(IN(1).SZ,IN(2).VAL,''0''))',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_DIFF(IN(1).SZ,IN(2).VAL,''0''))',ClassFileName,'file','y'); - -PrintStringInfo('NIN= 3',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_DIFF(IN(1).SZ,IN(2).VAL, IN(3).VAL))',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_DIFF(IN(1).SZ,IN(2).VAL, IN(3).VAL))',ClassFileName,'file','y'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y'); -PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y'); -PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y'); - -PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('s2s0'+ArgSeparator+'s2',ClassFileName,'file','y'); -PrintStringInfo('s2d0'+ArgSeparator+'s2',ClassFileName,'file','y'); -PrintStringInfo('u82u80'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('u82d0'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('i82u80'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('i82d0'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('u162u160'+ArgSeparator+'u162',ClassFileName,'file','y'); -PrintStringInfo('u162d0'+ArgSeparator+'u162',ClassFileName,'file','y'); -PrintStringInfo('i162u160'+ArgSeparator+'i162',ClassFileName,'file','y'); -PrintStringInfo('i162d0'+ArgSeparator+'i162',ClassFileName,'file','y'); - -PrintStringInfo('d2d0d0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('s2d0d0'+ArgSeparator+'s2',ClassFileName,'file','y'); -PrintStringInfo('s2s0d0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('u82d0d0'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('u82u80d0'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('i82d0d0'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('i82u80d0'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('u162d0d0'+ArgSeparator+'u162',ClassFileName,'file','y'); -PrintStringInfo('u162u160d0'+ArgSeparator+'u162',ClassFileName,'file','y'); -PrintStringInfo('i162d0d0'+ArgSeparator+'i162',ClassFileName,'file','y'); -PrintStringInfo('i162u160d0'+ArgSeparator+'i162',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'diff'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); //------------------------------------ -<<<<<<< HEAD //---- Class balanc ------------------ //------------------------------------ ClassName = 'BALANC'; -======= -//---- Class NORM -------------------- -//------------------------------------ -ClassName = 'NORM'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 1',ClassFileName,'file','y'); -<<<<<<< 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'); @@ -9027,49 +8376,14 @@ 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'); -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)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); - - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); -PrintStringInfo('s2'+ArgSeparator+'s0',ClassFileName,'file','y'); - -PrintStringInfo('d2d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('s2s0'+ArgSeparator+'s0',ClassFileName,'file','y'); -PrintStringInfo('s2d0'+ArgSeparator+'s0',ClassFileName,'file','y'); - -PrintStringInfo('d2g2'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('s2g2'+ArgSeparator+'s0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'norm'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); //------------------------------------ -<<<<<<< HEAD //---- Class RCOND ------------------- //------------------------------------ ClassName = 'RCOND'; -======= -//---- Class CONVSTR -------------------- -//------------------------------------ -ClassName = 'CONVSTR'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); @@ -9077,7 +8391,6 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 1',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); -<<<<<<< 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'); @@ -9087,33 +8400,11 @@ 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'); - -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)= IN(1).SZ(1)',ClassFileName,'file','y'); - - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('g0'+ArgSeparator+'g0',ClassFileName,'file','y'); -PrintStringInfo('g2'+ArgSeparator+'g2',ClassFileName,'file','y'); -PrintStringInfo('g0g0'+ArgSeparator+'g0',ClassFileName,'file','y'); -PrintStringInfo('g2g0'+ArgSeparator+'g2',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'convstr'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); //------------------------------------ -<<<<<<< HEAD //---- Class CONVSTR -------------------- //------------------------------------ ClassName = 'CONVSTR'; @@ -9142,47 +8433,19 @@ PrintStringInfo('g2g2'+ArgSeparator+'g2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'convstr'; -======= -//---- Class cvCreateImage -------------------- -//------------------------------------ -ClassName = 'CV_CreateImage'; - -// --- Class Annotation. --- -PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); -ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); - -PrintStringInfo('NIN= 4',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0d0g2d0'+ArgSeparator+'mt0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'CV_CreateImage'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); //------------------------------------ -<<<<<<< HEAD //---- Class STRSUBST -------------------- //------------------------------------ ClassName = 'STRSUBST'; -======= -//---- Class cvLoadImage -------------------- -//------------------------------------ -ClassName = 'CV_LoadImage'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD //Arguements specified: initial value, start time, time vector, ode function PrintStringInfo('NIN= 3',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); @@ -9203,41 +8466,20 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('g2d0'+ArgSeparator+'mt0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'CV_LoadImage'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class STRCMP -------------------- //------------------------------------ ClassName = 'STRCMP'; -======= -//------------------------------------ -//---- Class cvShowImage ------------- -//------------------------------------ -ClassName = 'CV_ShowImage'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD //Arguements specified: initial value, start time, time vector, ode function PrintStringInfo('NIN= 2',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); @@ -9259,54 +8501,21 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); - -PrintStringInfo('NIN= 1',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 0',ClassFileName,'file','y'); -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'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('g2mt0'+ArgSeparator+'',ClassFileName,'file','y'); -PrintStringInfo('mt0'+ArgSeparator+'',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'CV_ShowImage'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class STRREV -------------------- //------------------------------------ ClassName = 'STRREV'; -======= -FunctionName = 'CV_SaveImage'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - -//------------------------------------ -//---- Class CV_WaitKey -------------- -//------------------------------------ -ClassName = 'CV_WaitKey'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD //Arguements specified: initial value, start time, time vector, ode function PrintStringInfo('NIN= 1',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); @@ -9331,38 +8540,11 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y'); -PrintStringInfo('s0'+ArgSeparator+'',ClassFileName,'file','y'); -PrintStringInfo('u80'+ArgSeparator+'',ClassFileName,'file','y'); -PrintStringInfo('i80'+ArgSeparator+'',ClassFileName,'file','y'); -PrintStringInfo('u160'+ArgSeparator+'',ClassFileName,'file','y'); -PrintStringInfo('i160'+ArgSeparator+'',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'CV_WaitKey'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - -//------------------------------------ -//---- Class CV_CvtColor ------------- -//------------------------------------ -ClassName = 'CV_CvtColor'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD //Arguements specified: initial value, start time, time vector, ode function PrintStringInfo('NIN= 2',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); @@ -9377,39 +8559,18 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('mt0g2'+ArgSeparator+'mt0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'CV_CvtColor'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); //------------------------------------ -<<<<<<< HEAD //---- Class STRCHR -------------------- //------------------------------------ ClassName = 'STRCHR'; -======= -//---- Class CV_GetImgSize ----------- -//------------------------------------ -ClassName = 'CV_GetImgSize'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD //Arguements specified: initial value, start time, time vector, ode function PrintStringInfo('NIN= 2',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); @@ -9433,33 +8594,11 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= ''2''',ClassFileName,'file','y'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('mt0'+ArgSeparator+'d2',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'CV_GetImgSize'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - -//------------------------------------ -//---- Class CV_Threshold ----------- -//------------------------------------ -ClassName = 'CV_Threshold'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD //Arguements specified: initial value, start time, time vector, ode function PrintStringInfo('NIN= 2',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); @@ -9483,47 +8622,19 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('mt0d0d0g2'+ArgSeparator+'mt0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'CV_Threshold'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - -//------------------------------------ -//---- Class CV_AdaptiveThreshold ----------- -//------------------------------------ -ClassName = 'CV_AdaptiveThreshold'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< 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 PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -<<<<<<< HEAD PrintStringInfo('g2g2'+ArgSeparator+'u80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- @@ -9539,40 +8650,19 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class STRCSPN -------------------- //------------------------------------ ClassName = 'STRCSPN'; -======= -PrintStringInfo('mt0d0g2g2d0d0'+ArgSeparator+'mt0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'CV_AdaptiveThreshold'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - -//------------------------------------ -//---- Class CV_DistanceTransform ---- -//------------------------------------ -ClassName = 'CV_DistanceTransform'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< 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 PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -<<<<<<< HEAD PrintStringInfo('g2g2'+ArgSeparator+'u80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- @@ -9590,26 +8680,11 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class ASCII -------------------- //------------------------------------ ClassName = 'ASCII'; -======= -PrintStringInfo('mt0g2d0'+ArgSeparator+'mt0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'CV_DistanceTransform'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - -//------------------------------------ -//---- Class CV_Blur ----------------- -//------------------------------------ -ClassName = 'CV_Blur'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD //Arguements specified: initial value, start time, time vector, ode function PrintStringInfo('NIN= 1',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); @@ -9640,38 +8715,11 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('mt0d0d0d0d0g2'+ArgSeparator+'mt0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'CV_Blur'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - -FunctionName = 'CV_GaussianBlur'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - -//------------------------------------ -//---- Class CV_MedianBlur ----------------- -//------------------------------------ -ClassName = 'CV_MedianBlur'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD //Arguements specified: initial value, start time, time vector, ode function PrintStringInfo('NIN= 1',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); @@ -9713,24 +8761,10 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('mt0d0'+ArgSeparator+'mt0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'CV_MedianBlur'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ @@ -9769,60 +8803,19 @@ PrintStringInfo('s2d0d0'+ArgSeparator+'g2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'dec2base'; -======= +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + //------------------------------------ -//---- Class CV_Dilate --------------- -//------------------------------------ -ClassName = 'CV_Dilate'; - -// --- Class Annotation. --- -PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); -ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); - -PrintStringInfo('NIN= 3',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); - -PrintStringInfo('NIN= 6',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('mt0g2d0'+ArgSeparator+'mt0',ClassFileName,'file','y'); -PrintStringInfo('mt0g2d0d0g2d0'+ArgSeparator+'mt0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'CV_Dilate'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - -FunctionName = 'CV_Erode'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); -INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); - -//------------------------------------ -<<<<<<< HEAD //---- Class DEC2OCT -------------------- //------------------------------------ ClassName = 'DEC2OCT'; -======= -//---- Class CV_Canny ---------------- -//------------------------------------ -ClassName = 'CV_Canny'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD //Arguements specified: initial value, start time, time vector, ode function PrintStringInfo('NIN= 1',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); @@ -9846,49 +8839,21 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); - -PrintStringInfo('NIN= 3',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('mt0d0d0d0d0'+ArgSeparator+'mt0',ClassFileName,'file','y'); -PrintStringInfo('mt0d0d0'+ArgSeparator+'mt0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'CV_Canny'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class DEC2HEX -------------------- //------------------------------------ ClassName = 'DEC2HEX'; -======= -//------------------------------------ -//---- Class CV_CornerHarris ---------------- -//------------------------------------ -ClassName = 'CV_CornerHarris'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD //Arguements specified: initial value, start time, time vector, ode function PrintStringInfo('NIN= 1',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); @@ -9912,48 +8877,20 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); - -PrintStringInfo('NIN= 4',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('mt0d0d0d0g2'+ArgSeparator+'mt0',ClassFileName,'file','y'); -PrintStringInfo('mt0d0d0d0'+ArgSeparator+'mt0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'CV_CornerHarris'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class BIN2DEC -------------------- //------------------------------------ ClassName = 'BIN2DEC'; -======= -//------------------------------------ -//---- Class syslin ------------------ -//------------------------------------ -ClassName = 'SYSLIN'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD //Arguements specified: initial value, start time, time vector, ode function PrintStringInfo('NIN= 1',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); @@ -9976,64 +8913,14 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= FA_ADD(IN(2).SZ(1),IN(4).SZ(1))',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= FA_ADD(FA_ADD(IN(2).SZ(2),IN(3).SZ(2)), ''2'')',ClassFileName,'file','y'); - -PrintStringInfo('NIN= 5',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).TP= ''ss''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(1)= FA_ADD(IN(2).SZ(1),IN(4).SZ(1))',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= FA_ADD(FA_ADD(IN(2).SZ(2),IN(3).SZ(2)), ''2'')',ClassFileName,'file','y'); - -PrintStringInfo('NIN= 6',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).TP= ''ss''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(1)= FA_ADD(IN(2).SZ(1),IN(4).SZ(1))',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= FA_ADD(FA_ADD(IN(2).SZ(2),IN(3).SZ(2)), ''2'')',ClassFileName,'file','y'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('g2d2d2d2'+ArgSeparator+'ss2',ClassFileName,'file','y'); -PrintStringInfo('g2d2d2d2d2'+ArgSeparator+'ss2',ClassFileName,'file','y'); -PrintStringInfo('g2d2d2d2d2d2'+ArgSeparator+'ss2',ClassFileName,'file','y'); - -PrintStringInfo('g2d0d0d0'+ArgSeparator+'ss2',ClassFileName,'file','y'); -PrintStringInfo('g2d0d2d0'+ArgSeparator+'ss2',ClassFileName,'file','y'); -PrintStringInfo('g2d0d0d2'+ArgSeparator+'ss2',ClassFileName,'file','y'); -PrintStringInfo('g2d0d2d2'+ArgSeparator+'ss2',ClassFileName,'file','y'); - -PrintStringInfo('g2d0d0d0d0'+ArgSeparator+'ss2',ClassFileName,'file','y'); -PrintStringInfo('g2d0d2d0d2'+ArgSeparator+'ss2',ClassFileName,'file','y'); -PrintStringInfo('g2d0d0d2d2'+ArgSeparator+'ss2',ClassFileName,'file','y'); -PrintStringInfo('g2d0d2d2d2'+ArgSeparator+'ss2',ClassFileName,'file','y'); -PrintStringInfo('g2d2d2d2d0'+ArgSeparator+'ss2',ClassFileName,'file','y'); - -PrintStringInfo('g2d0d0d0d0d0'+ArgSeparator+'ss2',ClassFileName,'file','y'); -PrintStringInfo('g2d0d2d0d2d0'+ArgSeparator+'ss2',ClassFileName,'file','y'); -PrintStringInfo('g2d0d0d2d2d0'+ArgSeparator+'ss2',ClassFileName,'file','y'); -PrintStringInfo('g2d0d2d2d2d0'+ArgSeparator+'ss2',ClassFileName,'file','y'); -PrintStringInfo('g2d2d2d2d0d2'+ArgSeparator+'ss2',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'syslin'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); //------------------------------------ -<<<<<<< HEAD //---- Class SVD ------------------- //------------------------------------ ClassName = 'SVD'; -======= -//---- Class schur ------------------- -//------------------------------------ -ClassName = 'SCHUR'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); @@ -10042,7 +8929,6 @@ 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 PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); @@ -10105,57 +8991,10 @@ 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'); - -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(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('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)= 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)= IN(1).SZ(2)',ClassFileName,'file','y'); -PrintStringInfo('OUT(2).TP= FA_SCHUR_TP(IN(2).TP)',ClassFileName,'file','y'); -PrintStringInfo('OUT(2).SZ(1)= FA_SCHUR_SZ(IN(2).TP,IN(1).SZ(1))',ClassFileName,'file','y'); -PrintStringInfo('OUT(2).SZ(2)= FA_SCHUR_SZ(IN(2).TP,IN(1).SZ(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(2)',ClassFileName,'file','y'); -PrintStringInfo('OUT(2).TP= ''d''',ClassFileName,'file','y'); -PrintStringInfo('OUT(2).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(2).SZ(2)= ''1''',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'); - -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(2)',ClassFileName,'file','y'); ->>>>>>> 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 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'); @@ -10229,112 +9068,21 @@ 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'); -PrintStringInfo('OUT(4).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y'); -PrintStringInfo('OUT(4).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y'); - -PrintStringInfo('NIN= 3',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); -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'); - -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(2)',ClassFileName,'file','y'); -PrintStringInfo('OUT(2).TP= ''d''',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= 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= ''d''',ClassFileName,'file','y'); -PrintStringInfo('OUT(3).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(3).SZ(2)= ''1''',ClassFileName,'file','y'); - -PrintStringInfo('NIN= 3',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(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)= IN(1).SZ(1)',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'); - -PrintStringInfo('NIN= 3',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 5',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)= 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'); -PrintStringInfo('OUT(4).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y'); -PrintStringInfo('OUT(4).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y'); -PrintStringInfo('OUT(5).TP= ''d''',ClassFileName,'file','y'); -PrintStringInfo('OUT(5).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(5).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('d2g2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('d2g2'+ArgSeparator+'d2d0',ClassFileName,'file','y'); -PrintStringInfo('d2g2'+ArgSeparator+'d2d0d2',ClassFileName,'file','y'); -PrintStringInfo('d2d2'+ArgSeparator+'d2d2',ClassFileName,'file','y'); -PrintStringInfo('d2d2'+ArgSeparator+'d2d2d2d2',ClassFileName,'file','y'); -PrintStringInfo('d2d2g2'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('d2d2g2'+ArgSeparator+'d2d0',ClassFileName,'file','y'); -PrintStringInfo('d2d2g2'+ArgSeparator+'d2d2d0',ClassFileName,'file','y'); -PrintStringInfo('d2d2g2'+ArgSeparator+'d2d2d2d0',ClassFileName,'file','y'); -PrintStringInfo('d2d2g2'+ArgSeparator+'d2d2d2d2d0',ClassFileName,'file','y'); -// --- Annotation Function And Function List Function. --- -FunctionName = 'schur'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class OCT2DEC -------------------- //------------------------------------ ClassName = 'OCT2DEC'; -======= -//------------------------------------ -//---- Class lqr --------------------- -//------------------------------------ -ClassName = 'LQR'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD //Arguements specified: initial value, start time, time vector, ode function PrintStringInfo('NIN= 1',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); @@ -10357,42 +9105,19 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= FA_SZ_1(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y'); -PrintStringInfo('OUT(2).TP= ''d''',ClassFileName,'file','y'); -PrintStringInfo('OUT(2).SZ(1)= FA_SZ_2(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y'); -PrintStringInfo('OUT(2).SZ(2)= FA_SZ_1(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('ss2'+ArgSeparator+'d2d2',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'lqr'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); //------------------------------------ -<<<<<<< HEAD //---- Class HEX2DEC -------------------- //------------------------------------ ClassName = 'HEX2DEC'; -======= -//---- Class lqe --------------------- -//------------------------------------ -ClassName = 'LQE'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD //Arguements specified: initial value, start time, time vector, ode function PrintStringInfo('NIN= 1',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); @@ -10406,44 +9131,20 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_LQE(IN(1).VAL,IN(1).SZ(1)))',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= FA_SZ_1(FA_SZ_LQE(IN(1).VAL,IN(1).SZ(1)))',ClassFileName,'file','y'); -PrintStringInfo('OUT(2).TP= ''d''',ClassFileName,'file','y'); -PrintStringInfo('OUT(2).SZ(1)= FA_SZ_1(FA_SZ_LQE(IN(1).VAL,IN(1).SZ(1)))',ClassFileName,'file','y'); -PrintStringInfo('OUT(2).SZ(2)= FA_SZ_2(FA_SZ_LQE(IN(1).VAL,IN(1).SZ(1)))',ClassFileName,'file','y'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('ss2'+ArgSeparator+'d2d2',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'lqe'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class BASE2DEC -------------------- //------------------------------------ ClassName = 'BASE2DEC'; -======= -//------------------------------------ -//---- Class obscont ----------------- -//------------------------------------ -ClassName = 'OBSCONT'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD //Arguements specified: initial value, start time, time vector, ode function PrintStringInfo('NIN= 2',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); @@ -10514,50 +9215,19 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1),IN(1).SZ(2),NOutArg))',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1),IN(1).SZ(2),NOutArg))',ClassFileName,'file','y'); - -PrintStringInfo('NIN= 3',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 2',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1),IN(1).SZ(2),NOutArg))',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1),IN(1).SZ(2),NOutArg))',ClassFileName,'file','y'); -PrintStringInfo('OUT(2).TP= ''d''',ClassFileName,'file','y'); -PrintStringInfo('OUT(2).SZ(1)= ''1''',ClassFileName,'file','y'); -PrintStringInfo('OUT(2).SZ(2)= ''2''',ClassFileName,'file','y'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('ss2d2d2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('ss2d2d2'+ArgSeparator+'d2d2',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'obscont'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD // ------------------ // --- Class Coth. --- // ------------------ ClassName = 'Coth'; -======= -//------------------------------------ -//---- Class balanc ------------------ -//------------------------------------ -ClassName = 'BALANC'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 1',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); @@ -10643,61 +9313,20 @@ 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'); -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('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(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)= 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'); -PrintStringInfo('OUT(4).SZ(1)= IN(1).SZ(1)',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('d2d2'+ArgSeparator+'d2d2d2d2',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'balanc'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD // ------------------ // --- Class Csch. --- // ------------------ ClassName = 'Csch'; -======= -//------------------------------------ -//---- Class RCOND ------------------- -//------------------------------------ -ClassName = 'RCOND'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 1',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); @@ -10718,53 +9347,24 @@ 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'); -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'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'rcond'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD // --- Class Sec. --- // ------------------ ClassName = 'Sec'; -======= -//------------------------------------ -//---- Class CONVSTR -------------------- -//------------------------------------ -ClassName = 'CONVSTR'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< 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 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 // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); @@ -10779,55 +9379,25 @@ 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'); -//PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y'); -//PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y'); - - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -//PrintStringInfo('g2'+ArgSeparator+'g2',ClassFileName,'file','y'); -PrintStringInfo('g2g2'+ArgSeparator+'g2',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'convstr'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD // ------------------ // --- Class Secd. --- // ------------------ ClassName = 'Secd'; -======= -//------------------------------------ -//---- Class STRSUBST -------------------- -//------------------------------------ -ClassName = 'STRSUBST'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< 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 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 // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); @@ -10837,55 +9407,25 @@ 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'); -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('g2g2g2'+ArgSeparator+'g2',ClassFileName,'file','y'); -PrintStringInfo('g2g2g2g2'+ArgSeparator+'g2',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'strsubst'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD // --- Class Sech. --- // ------------------ ClassName = 'Sech'; -======= -//------------------------------------ -//---- Class STRCMP -------------------- -//------------------------------------ -ClassName = 'STRCMP'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< 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 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 // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); @@ -10900,22 +9440,6 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y'); - - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -//PrintStringInfo('g2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('g2g2'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('g2g2g2'+ArgSeparator+'d0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'strcmp'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); @@ -10923,15 +9447,9 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //------------------------------------ -<<<<<<< HEAD //---- Class FACTORIAL -------------------- //------------------------------------ -ClassName = 'FACTORIAL'; -======= -//---- Class STRREV -------------------- -//------------------------------------ -ClassName = 'STRREV'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +ClassName = 'FACTORIAL'; // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); @@ -10944,7 +9462,6 @@ 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 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); @@ -10955,36 +9472,17 @@ 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'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'strrev'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD // --- Class Interp1. --- // ------------------ ClassName = 'Interp1'; -======= - -//------------------------------------ -//---- Class STRRCHR -------------------- -//------------------------------------ -ClassName = 'STRRCHR'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 4',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y'); @@ -11007,43 +9505,17 @@ 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'); -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('g2g2'+ArgSeparator+'g2',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'strrchr'; -PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD // --- Class Modk. --- // ------------------ ClassName = 'Modk'; -======= - -//------------------------------------ -//---- Class DEC2BIN -------------------- -//------------------------------------ -ClassName = 'DEC2BIN'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 1',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y'); @@ -11063,73 +9535,20 @@ 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'); -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)= FA_MUL(FA_SZ_DEC2BIN(IN(1).VAL),IN(1).SZ(2))',ClassFileName,'file','y'); - -PrintStringInfo('NIN= 2',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= FA_MUL(IN(2).VAL,IN(1).SZ(2))',ClassFileName,'file','y'); - - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('i80'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('i160'+ArgSeparator+'i162',ClassFileName,'file','y'); -PrintStringInfo('u80'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('u160'+ArgSeparator+'u162',ClassFileName,'file','y'); - -PrintStringInfo('d0d0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('i80d0'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('i160d0'+ArgSeparator+'i162',ClassFileName,'file','y'); -PrintStringInfo('u80d0'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('u160d0'+ArgSeparator+'u162',ClassFileName,'file','y'); - -PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y'); -PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y'); - -PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('i82d0'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('i162d0'+ArgSeparator+'i162',ClassFileName,'file','y'); -PrintStringInfo('u82d0'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('u162d0'+ArgSeparator+'u162',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'dec2bin'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class PRIMES -------------------- //------------------------------------ ClassName = 'PRIMES'; -======= - -//------------------------------------ -//---- Class DEC2BASE -------------------- -//------------------------------------ -ClassName = 'DEC2BASE'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD //Arguements specified: initial value, start time, time vector, ode function PrintStringInfo('NIN= 1',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); @@ -11144,51 +9563,15 @@ 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'); -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_DEC2BASE(IN(1).VAL,IN(2).VAL),IN(1).SZ(2))',ClassFileName,'file','y'); - -PrintStringInfo('NIN= 3',ClassFileName,'file','y'); -PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); -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(IN(2).VAL,IN(1).SZ(2))',ClassFileName,'file','y'); - - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0d0'+ArgSeparator+'g2',ClassFileName,'file','y'); -PrintStringInfo('d2d0'+ArgSeparator+'g2',ClassFileName,'file','y'); -PrintStringInfo('s0d0'+ArgSeparator+'g2',ClassFileName,'file','y'); -PrintStringInfo('s2d0'+ArgSeparator+'g2',ClassFileName,'file','y'); - -PrintStringInfo('d0d0d0'+ArgSeparator+'g2',ClassFileName,'file','y'); -PrintStringInfo('d2d0d0'+ArgSeparator+'g2',ClassFileName,'file','y'); -PrintStringInfo('s0d0d0'+ArgSeparator+'g2',ClassFileName,'file','y'); -PrintStringInfo('s2d0d0'+ArgSeparator+'g2',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'dec2base'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class GCD -------------------- //------------------------------------ ClassName = 'GCD'; -======= -//------------------------------------ -//---- Class DEC2OCT -------------------- -//------------------------------------ -ClassName = 'DEC2OCT'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); @@ -11198,7 +9581,6 @@ 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 PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); @@ -11208,27 +9590,6 @@ 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'); - - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('i80'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('i160'+ArgSeparator+'i162',ClassFileName,'file','y'); -PrintStringInfo('u80'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('u160'+ArgSeparator+'u162',ClassFileName,'file','y'); - -PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y'); -PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'dec2oct'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); @@ -11236,15 +9597,9 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //------------------------------------ -<<<<<<< HEAD //---- Class LCM -------------------- //------------------------------------ ClassName = 'LCM'; -======= -//---- Class DEC2HEX -------------------- -//------------------------------------ -ClassName = 'DEC2HEX'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); @@ -11253,7 +9608,6 @@ 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 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'); @@ -11264,34 +9618,11 @@ 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'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0'+ArgSeparator+'g2',ClassFileName,'file','y'); -PrintStringInfo('i80'+ArgSeparator+'g2',ClassFileName,'file','y'); -PrintStringInfo('i160'+ArgSeparator+'g2',ClassFileName,'file','y'); -PrintStringInfo('u80'+ArgSeparator+'g2',ClassFileName,'file','y'); -PrintStringInfo('u160'+ArgSeparator+'g2',ClassFileName,'file','y'); - -PrintStringInfo('d2'+ArgSeparator+'g2',ClassFileName,'file','y'); -PrintStringInfo('i82'+ArgSeparator+'g2',ClassFileName,'file','y'); -PrintStringInfo('i162'+ArgSeparator+'g2',ClassFileName,'file','y'); -PrintStringInfo('u82'+ArgSeparator+'g2',ClassFileName,'file','y'); -PrintStringInfo('u162'+ArgSeparator+'g2',ClassFileName,'file','y'); - - -// --- Annotation Function And Function List Function. --- -FunctionName = 'dec2hex'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD @@ -11301,12 +9632,6 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class FACTOR -------------------- //------------------------------------ ClassName = 'FACTOR'; -======= -//------------------------------------ -//---- Class BIN2DEC -------------------- -//------------------------------------ -ClassName = 'BIN2DEC'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); @@ -11315,7 +9640,6 @@ 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 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'); @@ -11327,44 +9651,16 @@ 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'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('i80'+ArgSeparator+'i80',ClassFileName,'file','y'); -PrintStringInfo('i160'+ArgSeparator+'i160',ClassFileName,'file','y'); -PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('u160'+ArgSeparator+'u160',ClassFileName,'file','y'); - -PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y'); -PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'bin2dec'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class GCD -------------------- //------------------------------------ ClassName = 'GCD'; -======= -//------------------------------------ -//---- Class OCT2DEC -------------------- -//------------------------------------ -ClassName = 'OCT2DEC'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); @@ -11373,7 +9669,6 @@ 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 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'); @@ -11384,50 +9679,21 @@ 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'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('i80'+ArgSeparator+'i80',ClassFileName,'file','y'); -PrintStringInfo('i160'+ArgSeparator+'i160',ClassFileName,'file','y'); -PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('u160'+ArgSeparator+'u160',ClassFileName,'file','y'); - -PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y'); -PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y'); -PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y'); -PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'oct2dec'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class ZPBUTT -------------------- //------------------------------------ ClassName = 'ZPBUTT'; -======= -//------------------------------------ -//---- Class HEX2DEC -------------------- -//------------------------------------ -ClassName = 'HEX2DEC'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 2',ClassFileName,'file','y'); PrintStringInfo('NOUT= 2',ClassFileName,'file','y'); @@ -11445,42 +9711,20 @@ 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'); -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'); - - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('g2'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -// --- Annotation Function And Function List Function. --- -FunctionName = 'hex2dec'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); //------------------------------------ -<<<<<<< HEAD //---- Class ZPCH1 -------------------- //------------------------------------ ClassName = 'ZPCH1'; -======= -//---- Class BASE2DEC -------------------- -//------------------------------------ -ClassName = 'BASE2DEC'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 3',ClassFileName,'file','y'); PrintStringInfo('NOUT= 2',ClassFileName,'file','y'); @@ -11498,43 +9742,19 @@ 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'); -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'); - - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('g2d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -//PrintStringInfo('g2'+ArgSeparator+'d2',ClassFileName,'file','y'); -// --- Annotation Function And Function List Function. --- -FunctionName = 'base2dec'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class ZPCH2 -------------------- //------------------------------------ ClassName = 'ZPCH2'; -======= -// ------------------ -// --- Class Cosd. --- -// ------------------ -ClassName = 'Cosd'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 3',ClassFileName,'file','y'); @@ -11552,49 +9772,24 @@ PrintStringInfo('OUT(3).SZ(2)= ''1''',ClassFileName,'file','y'); ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -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'); -PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y'); - -// --- Function List Class. --- -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y'); -PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); +PrintStringInfo('d0d0d0'+ArgSeparator+'z2z2d0',ClassFileName,'file','y'); + // --- Annotation Function And Function List Function. --- -FunctionName = 'cosd'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 +FunctionName = 'zpch2'; PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class BUTTMAG -------------------- //------------------------------------ ClassName = 'BUTTMAG'; -======= -// ------------------ -// --- Class Cotd. --- -// ------------------ -ClassName = 'Cotd'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 3',ClassFileName,'file','y'); @@ -11613,44 +9808,19 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y'); - -// --- Function List Class. --- -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y'); -PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'cotd'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class CHEB1MAG -------------------- //------------------------------------ ClassName = 'CHEB1MAG'; -======= -// ------------------ -// --- Class Coth. --- -// ------------------ -ClassName = 'Coth'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 4',ClassFileName,'file','y'); @@ -11669,48 +9839,18 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y'); - -// --- Function List Class. --- -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y'); -PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); -PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y'); -PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y'); -PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y'); -PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'coth'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class CHEB2MAG -------------------- //------------------------------------ ClassName = 'CHEB2MAG'; -======= - -// ------------------ -// --- Class Csc. --- -// ------------------ -ClassName = 'Csc'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 4',ClassFileName,'file','y'); @@ -11729,64 +9869,30 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y'); - -// --- Function List Class. --- -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); -PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y'); -PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y'); -PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y'); -PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y'); -PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'csc'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class SINC -------------------- //------------------------------------ ClassName = 'SINC'; -======= -// ------------------ -// --- Class Cscd. --- -// ------------------ -ClassName = 'Cscd'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< 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 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 @@ -11797,45 +9903,21 @@ 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'); -PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y'); -PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); - -PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y'); -PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y'); -PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y'); -PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'cscd'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class SINCD -------------------- //------------------------------------ ClassName = 'SINCD'; -======= -// ------------------ -// --- Class Csch. --- -// ------------------ -ClassName = 'Csch'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 2',ClassFileName,'file','y'); @@ -11855,50 +9937,21 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y'); - -// --- Function List Class. --- -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); -PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y'); - -PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y'); -PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y'); -PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y'); -PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'csch'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class FSFIRLIN -------------------- //------------------------------------ ClassName = 'FSFIRLIN'; -======= -// --- Class Sec. --- -// ------------------ -ClassName = 'Sec'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 2',ClassFileName,'file','y'); @@ -11917,51 +9970,21 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y'); - -// --- Function List Class. --- -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); -PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y'); - -PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y'); -PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y'); -PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y'); -PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'sec'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class %K -------------------- //------------------------------------ ClassName = 'modk'; -======= -// ------------------ -// --- Class Secd. --- -// ------------------ -ClassName = 'Secd'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 1',ClassFileName,'file','y'); @@ -11980,44 +10003,20 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y'); - -// --- Function List Class. --- -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y'); -PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'secd'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class FILT_SINC -------------------- //------------------------------------ ClassName = 'FILT_SINC'; -======= -// --- Class Sech. --- -// ------------------ -ClassName = 'Sech'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 2',ClassFileName,'file','y'); @@ -12036,28 +10035,6 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y'); - -// --- Function List Class. --- -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); -PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y'); - -PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y'); -PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y'); -PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y'); -PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'sech'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); @@ -12065,21 +10042,14 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //------------------------------------ -<<<<<<< HEAD //---- Class FFILT -------------------- //------------------------------------ ClassName = 'FFILT'; -======= -//---- Class FACTORIAL -------------------- -//------------------------------------ -ClassName = 'FACTORIAL'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 4',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); @@ -12097,45 +10067,20 @@ 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'); -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('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); - -PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'factorial'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class %SN -------------------- //------------------------------------ ClassName = 'modsn'; -======= -// --- Class Interp1. --- -// ------------------ -ClassName = 'Interp1'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD //PrintStringInfo('NIN= 2',ClassFileName,'file','y'); @@ -12170,52 +10115,22 @@ 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'); -PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); - -// --- Function List Class. --- -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d2d2d0g2'+ArgSeparator+'d0',ClassFileName,'file','y'); -//PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); -//PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); -//PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y'); - -//PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y'); -//PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y'); -//PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y'); -//PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); - -// --- Annotation Function And Function List Function. --- -FunctionName = 'interp1'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD //------------------------------------ //---- Class ELL1MAG -------------------- //------------------------------------ ClassName = 'ell1mag'; -======= -//------------------------------------ -//---- Class PRIMES -------------------- -//------------------------------------ -ClassName = 'PRIMES'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 3',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y'); @@ -12228,43 +10143,20 @@ 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'); -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_PRIMES(IN(1).VAL)',ClassFileName,'file','y'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('s0'+ArgSeparator+'s2',ClassFileName,'file','y'); - - -// --- Annotation Function And Function List Function. --- -FunctionName = 'primes'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); //------------------------------------ -<<<<<<< HEAD //---- Class AMELL -------------------- //------------------------------------ ClassName = 'amell'; -======= -//---- Class FACTOR -------------------- -//------------------------------------ -ClassName = 'FACTOR'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -<<<<<<< HEAD PrintStringInfo('NIN= 2',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); @@ -12277,34 +10169,15 @@ 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'); -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'); - -ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0'+ArgSeparator+'d2',ClassFileName,'file','y'); -PrintStringInfo('s0'+ArgSeparator+'s2',ClassFileName,'file','y'); - - -// --- Annotation Function And Function List Function. --- -FunctionName = 'factor'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); -<<<<<<< HEAD -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // //////////////////////////////////////////// // /////PARTE INTRODOTTA DA ALBERTO MOREA // ///////////////////////////////////////////// diff --git a/2.3-1/macros/ToolInitialization/ManageNextConversion.sci b/2.3-1/macros/ToolInitialization/ManageNextConversion.sci index 2073ed3e..b0d4337b 100644 --- a/2.3-1/macros/ToolInitialization/ManageNextConversion.sci +++ b/2.3-1/macros/ToolInitialization/ManageNextConversion.sci @@ -44,11 +44,8 @@ FlagContinueTranslation = 0; // --- Finalize the current C code. --- // ------------------------------------ C_FinalizeCode(FileInfo,SharedInfo); -<<<<<<< HEAD //PrintStringInfo(' hello',ReportFileName,'file','y'); -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // ------------------------------------------------ // --- Identify the next function to translate. --- -- cgit