Merge pull request #29 from abhinavdronamraju/masterHEADmaster

Merged and added functions

2 files changed, 120 insertions, 0 deletions

diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index ec5e6f6b..daa5734e 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -2377,6 +2377,11 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

+FunctionName = 'strange'; // BJ : Done AS : Float_Done

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

 FunctionName = 'st_deviation'; // BJ : Not implemented

 PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

@@ -11296,6 +11301,121 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
 

 

 //------------------------------------

+//---- Class KALM --------------------

+//------------------------------------

+ClassName = 'KALM';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+

+PrintStringInfo('NIN=         8',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(4).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(2).SZ(2)',ClassFileName,'file','y');

+

+PrintStringInfo('OUT(2).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(2).SZ(1)= IN(4).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(2).SZ(2)= IN(4).SZ(1)',ClassFileName,'file','y');

+

+PrintStringInfo('OUT(3).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(3).SZ(1)= IN(2).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(3).SZ(2)= IN(2).SZ(2)',ClassFileName,'file','y');

+

+PrintStringInfo('OUT(4).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(4).SZ(1)= IN(3).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(4).SZ(2)= IN(3).SZ(2)',ClassFileName,'file','y');

+

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d2d2d2d2d2d2d2d2'+ArgSeparator+'d2d2d2d2',ClassFileName,'file','y');

+PrintStringInfo('z2z2z2z2z2z2z2z2'+ArgSeparator+'z2z2z2z2',ClassFileName,'file','y');

+

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'kalm'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'wiener'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+//------------------------------------

+//---- Class MVCORREL --------------------

+//------------------------------------

+ClassName = 'MVCORREL';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+

+PrintStringInfo('NIN=         1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');

+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');

+PrintStringInfo('s2'+ArgSeparator+'s0',ClassFileName,'file','y');

+

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'mvcorrel'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+//------------------------------------

+//---- Class FAURRE --------------------

+//------------------------------------

+ClassName = 'FAURRE';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+

+

+PrintStringInfo('NIN=         5',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(4).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(4).SZ(1)',ClassFileName,'file','y');

+

+PrintStringInfo('OUT(2).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(2).SZ(1)= IN(5).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(2).SZ(2)= IN(5).SZ(2)',ClassFileName,'file','y');

+

+PrintStringInfo('OUT(3).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(3).SZ(1)= IN(4).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(3).SZ(2)= IN(5).SZ(1)',ClassFileName,'file','y');

+

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d0d2d2d2d2'+ArgSeparator+'d2d2d2',ClassFileName,'file','y');

+PrintStringInfo('z0z2z2z2z2'+ArgSeparator+'z2z2z2',ClassFileName,'file','y');

+

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'faurre'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+//------------------------------------

 //---- Class CHEB1MAG --------------------

 //------------------------------------

 ClassName = 'CHEB1MAG';

diff --git a/2.3-1/macros/ToolInitialization/lib b/2.3-1/macros/ToolInitialization/lib
deleted file mode 100644
index 670a52e0..00000000
--- a/2.3-1/macros/ToolInitialization/lib
+++ /dev/null