summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--2.3-1/includes/sci2clib.h2
-rw-r--r--2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci2
-rw-r--r--2.3-1/macros/findDeps/getAllSources.sci4
-rw-r--r--2.3-1/src/c/matrixOperations/toeplitz/ctoeplitza.c6
-rw-r--r--2.3-1/src/c/matrixOperations/toeplitz/ztoeplitza.c6
5 files changed, 10 insertions, 10 deletions
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/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index a588ec59..7269e98f 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];
}
}