From 4ebc92d414c6e87cea84770f4137434b922a76ca Mon Sep 17 00:00:00 2001
From: Brijeshcr
Date: Fri, 7 Jul 2017 22:29:47 +0530
Subject: Changes to Toeplitz
---
help/en_US/master_help.xml | 91 ---------------------
help/en_US/scilab_en_US_help/index.html | 52 ------------
help/en_US/scilab_en_US_help/jhelpidx.xml | 3 -
help/en_US/scilab_en_US_help/jhelptoc.xml | 43 ----------
includes/sci2clib.h | 2 +-
jar/scilab_en_US_help.jar | Bin 90905 -> 11210 bytes
.../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 2 +-
macros/findDeps/getAllSources.sci | 4 +-
src/c/matrixOperations/toeplitz/ctoeplitza.c | 6 +-
src/c/matrixOperations/toeplitz/ztoeplitza.c | 6 +-
10 files changed, 10 insertions(+), 199 deletions(-)
delete mode 100644 help/en_US/master_help.xml
delete mode 100644 help/en_US/scilab_en_US_help/index.html
delete mode 100644 help/en_US/scilab_en_US_help/jhelpidx.xml
delete mode 100644 help/en_US/scilab_en_US_help/jhelptoc.xml
diff --git a/help/en_US/master_help.xml b/help/en_US/master_help.xml
deleted file mode 100644
index abd7c76a..00000000
--- a/help/en_US/master_help.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-]>
-
-
- Scilab 2 C Converter
-
-
-
-Scilab 2 C Converter
-&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;
-
-
diff --git a/help/en_US/scilab_en_US_help/index.html b/help/en_US/scilab_en_US_help/index.html
deleted file mode 100644
index 9028c976..00000000
--- a/help/en_US/scilab_en_US_help/index.html
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- Scilab 2 C Converter
-
-
-
-
-
-
diff --git a/help/en_US/scilab_en_US_help/jhelpidx.xml b/help/en_US/scilab_en_US_help/jhelpidx.xml
deleted file mode 100644
index aa5a66e2..00000000
--- a/help/en_US/scilab_en_US_help/jhelpidx.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/help/en_US/scilab_en_US_help/jhelptoc.xml b/help/en_US/scilab_en_US_help/jhelptoc.xml
deleted file mode 100644
index 208e02af..00000000
--- a/help/en_US/scilab_en_US_help/jhelptoc.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/includes/sci2clib.h b/includes/sci2clib.h
index ec34007e..fcaac7d7 100644
--- a/includes/sci2clib.h
+++ b/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/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar
index 2d09a139..45d5c491 100644
Binary files a/jar/scilab_en_US_help.jar and b/jar/scilab_en_US_help.jar differ
diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index dfebfdf4..2cf905f7 100644
--- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/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/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci
index ff606521..209cec08 100644
--- a/macros/findDeps/getAllSources.sci
+++ b/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/src/c/matrixOperations/toeplitz/ctoeplitza.c b/src/c/matrixOperations/toeplitz/ctoeplitza.c
index 048a367a..56c3ef84 100644
--- a/src/c/matrixOperations/toeplitz/ctoeplitza.c
+++ b/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