Changes to Toeplitz

10 files changed, 10 insertions, 199 deletions

diff --git a/2.3-1/help/en_US/master_help.xml b/2.3-1/help/en_US/master_help.xml
deleted file mode 100644
index abd7c76a..00000000
--- a/2.3-1/help/en_US/master_help.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book [
-<!--Begin Entities-->
-<!ENTITY abf5eb4336f7978e2bc4017989d154afb SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/AVRADCSetup.xml">
-<!ENTITY aed10677e0502ee2877ffc2498d862be1 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/AVRDigitalIn.xml">
-<!ENTITY a3f6735d8ead1d4b547fed7bc7cec4e3c SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/AVRDigitalOut.xml">
-<!ENTITY a9c0af79d1951ad927d4b4cda0fc839f3 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/AVRDigitalPortSetup.xml">
-<!ENTITY a90e4d4dc900d2a710585019e2f50f35f SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/AVRDigitalSetup.xml">
-<!ENTITY a5edbdd39a5a38295854ee4621edcc302 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/AVRGetTimerValue.xml">
-<!ENTITY acb3bd011084d86870086e7cb793430a7 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/AVRPWM0SetDuty.xml">
-<!ENTITY a8b8449b0b64fa9262cf85cb0f0385375 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/AVRPWM0Setup.xml">
-<!ENTITY acf1d0b59f1e078172ec70e39485123ee SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/AVRPWM1SetDuty.xml">
-<!ENTITY ad06111198ac5e255b76a0d7b5b80eba2 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/AVRPWM1Setup.xml">
-<!ENTITY a194317ceefcee27c762f924f7b31af62 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/AVRPWM2SetDuty.xml">
-<!ENTITY a5bd48906fbc0ca46007a7a1d44c3d2e5 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/AVRPWM2Setup.xml">
-<!ENTITY a02142a89613c200b95e7061c5b2f0e9b SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/AVRReadADC.xml">
-<!ENTITY aca4745d5be5b7529f3e40304762360ad SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/AVRSleep.xml">
-<!ENTITY a27b1714eb1a8bf6c69d232a6640b5eef SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/AVRTimerSetup.xml">
-<!ENTITY a04027e98539526beb2380c3bc61e9b06 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/AVRUARTReceive.xml">
-<!ENTITY a55d253ed8a905a53d7c683f8544b5665 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/AVRUARTSetup.xml">
-<!ENTITY a9945fbfe18c91a35a19ccaac34697520 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/AVRUARTTransmit.xml">
-<!ENTITY ae6923fb362d91912cb023a91b774515f SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/CV_AdaptiveThreshold.xml">
-<!ENTITY a2523c586af5c0defff4a0a51dea9ff10 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/CV_Blur.xml">
-<!ENTITY a3e1b8be0f1a5b1c01f691732b4ec30c5 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/CV_Canny.xml">
-<!ENTITY a4a7e919bc00d6e103b86f9cb36f10c67 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/CV_CornerHarris.xml">
-<!ENTITY a57794acc6e678d1eb698283984f17e93 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/CV_CreateImage.xml">
-<!ENTITY aa60d03d6d7ef9bc7b77fb2d282c0b0c9 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/CV_CvtColor.xml">
-<!ENTITY ac5ca2eb1a688575f20e6607b823b8997 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/CV_Dilate.xml">
-<!ENTITY ab7c7e4fbe76cbc249878f36b053e5c45 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/CV_DistanceTransform.xml">
-<!ENTITY ac5791559173bd200677253ab6df68ecd SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/CV_Erode.xml">
-<!ENTITY a67423111a016016d07e4590f5b03b2d0 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/CV_GaussianBlur.xml">
-<!ENTITY a49cb7bdf7618cfece9526849258b6f1f SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/CV_GetImgSize.xml">
-<!ENTITY a241f575a6f5e716de201efbd19d93007 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/CV_LoadImage.xml">
-<!ENTITY a753016c5f750d880320da414ec4d76c5 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/CV_MedianBlur.xml">
-<!ENTITY acaf9301d0fd30d3eebfa145100c06f35 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/CV_SaveImage.xml">
-<!ENTITY a9196ab0b5f705820f401303b56e319e5 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/CV_ShowImage.xml">
-<!ENTITY a31edeca687a3d689b167e593f1ee31c3 SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/CV_Threshold.xml">
-<!ENTITY ae504a4e996af1d738a2ba4cae4177f5a SYSTEM "/home/brijeshcr/Documents/New_Sci2c/Scilab2C/2.3-1/help/en_US/CV_WaitKey.xml">
-<!--End Entities-->
-]>
-<book version="5.0-subset Scilab" xml:lang="en_US"
-      xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xmlns:svg="http://www.w3.org/2000/svg"
-      xmlns:mml="http://www.w3.org/1998/Math/MathML"
-      xmlns:html="http://www.w3.org/1999/xhtml"
-      xmlns:db="http://docbook.org/ns/docbook">
-  <info xml:id='scilab_2_c_converter_manual'>
-    <title>Scilab 2 C Converter</title>
-  </info>
-
-<part xml:id='section_009504e67ab100d6991ada9db2f321bb'>
-<title>Scilab 2 C Converter</title>
-&abf5eb4336f7978e2bc4017989d154afb;
-&aed10677e0502ee2877ffc2498d862be1;
-&a3f6735d8ead1d4b547fed7bc7cec4e3c;
-&a9c0af79d1951ad927d4b4cda0fc839f3;
-&a90e4d4dc900d2a710585019e2f50f35f;
-&a5edbdd39a5a38295854ee4621edcc302;
-&acb3bd011084d86870086e7cb793430a7;
-&a8b8449b0b64fa9262cf85cb0f0385375;
-&acf1d0b59f1e078172ec70e39485123ee;
-&ad06111198ac5e255b76a0d7b5b80eba2;
-&a194317ceefcee27c762f924f7b31af62;
-&a5bd48906fbc0ca46007a7a1d44c3d2e5;
-&a02142a89613c200b95e7061c5b2f0e9b;
-&aca4745d5be5b7529f3e40304762360ad;
-&a27b1714eb1a8bf6c69d232a6640b5eef;
-&a04027e98539526beb2380c3bc61e9b06;
-&a55d253ed8a905a53d7c683f8544b5665;
-&a9945fbfe18c91a35a19ccaac34697520;
-&ae6923fb362d91912cb023a91b774515f;
-&a2523c586af5c0defff4a0a51dea9ff10;
-&a3e1b8be0f1a5b1c01f691732b4ec30c5;
-&a4a7e919bc00d6e103b86f9cb36f10c67;
-&a57794acc6e678d1eb698283984f17e93;
-&aa60d03d6d7ef9bc7b77fb2d282c0b0c9;
-&ac5ca2eb1a688575f20e6607b823b8997;
-&ab7c7e4fbe76cbc249878f36b053e5c45;
-&ac5791559173bd200677253ab6df68ecd;
-&a67423111a016016d07e4590f5b03b2d0;
-&a49cb7bdf7618cfece9526849258b6f1f;
-&a241f575a6f5e716de201efbd19d93007;
-&a753016c5f750d880320da414ec4d76c5;
-&acaf9301d0fd30d3eebfa145100c06f35;
-&a9196ab0b5f705820f401303b56e319e5;
-&a31edeca687a3d689b167e593f1ee31c3;
-&ae504a4e996af1d738a2ba4cae4177f5a;
-</part>
-</book>
diff --git a/2.3-1/help/en_US/scilab_en_US_help/index.html b/2.3-1/help/en_US/scilab_en_US_help/index.html
deleted file mode 100644
index 9028c976..00000000
--- a/2.3-1/help/en_US/scilab_en_US_help/index.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<html><head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title></title>
-    <style type="text/css" media="all">
-      @import url("scilab_code.css");
-      @import url("xml_code.css");
-      @import url("c_code.css");
-      @import url("style.css");
-    </style>
-  </head>
-  <body>
-    <div class="manualnavbar">
-    <table width="100%"><tr>
-      <td width="30%">
-    	
-      </td>
-      <td width="40%" class="center">
-      	
-      </td>
-      <td width="30%" class="next">
-      	
-      </td>
-    </tr></table>
-      <hr />
-    </div>
-
-
-
-    
-    <br /><br />
-    <h3 class="book-title">Scilab 2 C Converter</h3>
-<ul class="list-part"><a name="scilab_2_c_converter_manual"></a><div class="info"></div></ul>
-    <br />
-
-    <div class="manualnavbar">
-    <table width="100%">
-    <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr>
-<tr>
-      <td width="30%">
-    	
-      </td>
-      <td width="40%" class="center">
-      	
-      </td>
-      <td width="30%" class="next">
-      	
-      </td>
-    </tr></table>
-      <hr />
-    </div>
-  </body>
-</html>
diff --git a/2.3-1/help/en_US/scilab_en_US_help/jhelpidx.xml b/2.3-1/help/en_US/scilab_en_US_help/jhelpidx.xml
deleted file mode 100644
index aa5a66e2..00000000
--- a/2.3-1/help/en_US/scilab_en_US_help/jhelpidx.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE index PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Index Version 1.0//EN" "http://java.sun.com/products/javahelp/index_1_0.dtd">
-<index version="1.0"/>
\ No newline at end of file
diff --git a/2.3-1/help/en_US/scilab_en_US_help/jhelptoc.xml b/2.3-1/help/en_US/scilab_en_US_help/jhelptoc.xml
deleted file mode 100644
index 208e02af..00000000
--- a/2.3-1/help/en_US/scilab_en_US_help/jhelptoc.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" "http://java.sun.com/products/javahelp/toc_1_0.dtd">
-<toc version="1.0">
-<tocitem target="index" text="Scilab 2 C Converter">
-<tocitem target="section_009504e67ab100d6991ada9db2f321bb" text="Scilab 2 C Converter">
-<tocitem target="AVRADCSetup" text="AVRADCSetup"/>
-<tocitem target="AVRDigitalIn" text="AVRDigitalIn"/>
-<tocitem target="AVRDigitalOut" text="AVRDigitalOut"/>
-<tocitem target="AVRDigitalPortSetup" text="AVRDigitalPortSetup"/>
-<tocitem target="AVRDigitalSetup" text="AVRDigitalSetup"/>
-<tocitem target="AVRGetTimerValue" text="AVRGetTimerValue"/>
-<tocitem target="AVRPWM0SetDuty" text="AVRPWM0SetDuty"/>
-<tocitem target="AVRPWM0Setup" text="AVRPWM0Setup"/>
-<tocitem target="AVRPWM1SetDuty" text="AVRPWM1SetDuty"/>
-<tocitem target="AVRPWM1Setup" text="AVRPWM1Setup"/>
-<tocitem target="AVRPWM2SetDuty" text="AVRPWM2SetDuty"/>
-<tocitem target="AVRPWM2Setup" text="AVRPWM2Setup"/>
-<tocitem target="AVRReadADC" text="AVRReadADC"/>
-<tocitem target="AVRSleep" text="AVRSleep"/>
-<tocitem target="AVRTimerSetup" text="AVRTimerSetup"/>
-<tocitem target="AVRUARTReceive" text="AVRUARTReceive"/>
-<tocitem target="AVRUARTSetup" text="AVRUARTSetup"/>
-<tocitem target="AVRUARTTransmit" text="AVRUARTTransmit"/>
-<tocitem target="CV_AdaptiveThreshold" text="CV_AdaptiveThreshold"/>
-<tocitem target="CV_Blur" text="CV_Blur"/>
-<tocitem target="CV_Canny" text="CV_Canny"/>
-<tocitem target="CV_CornerHarris" text="CV_CornerHarris"/>
-<tocitem target="CV_CreateImage" text="CV_CreateImage"/>
-<tocitem target="CV_CvtColor" text="CV_CvtColor"/>
-<tocitem target="CV_Dilate" text="CV_Dilate"/>
-<tocitem target="CV_DistanceTransform" text="CV_DistanceTransform"/>
-<tocitem target="CV_Erode" text="CV_Erode"/>
-<tocitem target="CV_GaussianBlur" text="CV_GaussianBlur"/>
-<tocitem target="CV_GetImgSize" text="CV_GetImgSize"/>
-<tocitem target="CV_LoadImage" text="CV_LoadImage"/>
-<tocitem target="CV_MedianBlur" text="CV_MedianBlur"/>
-<tocitem target="CV_SaveImage" text="CV_SaveImage"/>
-<tocitem target="CV_ShowImage" text="CV_ShowImage"/>
-<tocitem target="CV_Threshold" text="CV_Threshold"/>
-<tocitem target="CV_WaitKey" text="CV_WaitKey"/>
-</tocitem>
-</tocitem>
-</toc>
\ No newline at end of file
diff --git a/2.3-1/includes/sci2clib.h b/2.3-1/includes/sci2clib.h
index ec34007e..fcaac7d7 100644
--- a/2.3-1/includes/sci2clib.h
+++ b/2.3-1/includes/sci2clib.h
@@ -318,7 +318,7 @@ extern "C" {
 #include "int_secd.h"
 
 /*interfacing float*/
-#include "float.h"
+#include "get_float.h"
 #include "int_float.h"
 
 /*interfacing factorial*/
diff --git a/2.3-1/jar/scilab_en_US_help.jar b/2.3-1/jar/scilab_en_US_help.jar
index 2d09a139..45d5c491 100644
--- a/2.3-1/jar/scilab_en_US_help.jar
+++ b/2.3-1/jar/scilab_en_US_help.jar
diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index dfebfdf4..2cf905f7 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -302,6 +302,7 @@ PrintStringInfo('i80'+ArgSeparator+'s0',ClassFileName,'file','y');
 PrintStringInfo('u160'+ArgSeparator+'s0',ClassFileName,'file','y');

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

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

+PrintStringInfo('z0'+ArgSeparator+'c0',ClassFileName,'file','y');

 

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

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

@@ -317,7 +318,6 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

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

 

-

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

 // --- Class Int8. ---

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

diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index ff606521..209cec08 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -625,9 +625,9 @@ function allSources = getAllSources(SharedInfo)
       "src/c/elementaryFunctions/lnp1m1/slnp1m1s.c"
       "src/c/elementaryFunctions/lnp1m1/dlnp1m1s.c"
 
-	"src/c/elementaryFunctions/float/dfloats.c"
+      "src/c/elementaryFunctions/float/dfloats.c"
       "src/c/elementaryFunctions/float/dfloata.c"
-	"src/c/elementaryFunctions/float/sfloats.c"
+      "src/c/elementaryFunctions/float/sfloats.c"
       "src/c/elementaryFunctions/float/sfloata.c"
       "src/c/elementaryFunctions/float/u8floats.c"
       "src/c/elementaryFunctions/float/u8floata.c"
diff --git a/2.3-1/src/c/matrixOperations/toeplitz/ctoeplitza.c b/2.3-1/src/c/matrixOperations/toeplitz/ctoeplitza.c
index 048a367a..56c3ef84 100644
--- a/2.3-1/src/c/matrixOperations/toeplitz/ctoeplitza.c
+++ b/2.3-1/src/c/matrixOperations/toeplitz/ctoeplitza.c
@@ -9,14 +9,14 @@
 
 void ctoeplitza(floatComplex* inp1,int size1,floatComplex* inp2,int size2,floatComplex* oup)
 {
-    if (inp1[0]!=inp2[0])
+    if ((creals(inp1[0])!=creals(inp2[0]))&&(cimags(inp1[0])!=cimags(inp2[0])))
     {
         printf("Error!The first elements of the Vectors are not equal."); // First element of both input vectors must be equal for Toeplitz.
         return;
     }
     int i, j;
 
-    for(i=0;i<size1*size2;i++) oup[i] = 0;       // Initializing the output matrix with zeros.
+    for(i=0;i<size1*size2;i++) oup[i] = FloatComplex(0,0);       // Initializing the output matrix with zeros.
 
     for (i = 0; i<size1; i++)
     {
@@ -28,7 +28,7 @@ void ctoeplitza(floatComplex* inp1,int size1,floatComplex* inp2,int size2,floatC
     }
     for (i = size2+1; i<size1*size2; i++)        // Loop to build the rest of the Toeplitz matrix.
     {
-        if (oup[i] == 0)
+        if (creals(oup[i]) == 0 && cimags(oup[i]) == 0)
         oup[i] = oup[i-size2-1];
     }		
 }
diff --git a/2.3-1/src/c/matrixOperations/toeplitz/ztoeplitza.c b/2.3-1/src/c/matrixOperations/toeplitz/ztoeplitza.c
index d47c5e15..117f8189 100644
--- a/2.3-1/src/c/matrixOperations/toeplitz/ztoeplitza.c
+++ b/2.3-1/src/c/matrixOperations/toeplitz/ztoeplitza.c
@@ -11,14 +11,14 @@
 
 void ztoeplitza(doubleComplex* inp1,int size1,doubleComplex* inp2,int size2,doubleComplex* oup)
 {
-    if (inp1[0]!=inp2[0])
+    if ((zreals(inp1[0])!=zreals(inp2[0]))&&(zimags(inp1[0])!=zimags(inp2[0])))
     {
         printf("Error!The first elements of the Vectors are not equal.");	// First element of both input vectors must be equal for Toeplitz.
         return;
     }
     int i, j;
 
-    for(i=0;i<size1*size2;i++) oup[i] = DoubleComplex(0,0);	// Initializing the output matrix with zeros.
+    for(i=0;i<size1*size2;i++) oup[i] = 0;	// Initializing the output matrix with zeros.
 
     for (i = 0; i<size1; i++)
     {
@@ -30,7 +30,7 @@ void ztoeplitza(doubleComplex* inp1,int size1,doubleComplex* inp2,int size2,doub
     }
     for (i = size2+1; i<size1*size2; i++)	// Loop to build the rest of the Toeplitz matrix.
     {
-        if (oup[i] == DoubleComplex(0,0))
+        if (zreals(oup[i]) == 0 && zimags(oup[i]) == 0)
         oup[i] = oup[i-size2-1];
     }	
 }