summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--macros/FunctionAnnotation/FA_GetOutArgInfo.sci4
-rw-r--r--src/c/auxiliaryFunctions/find2d/dfind2da.c44
-rw-r--r--src/c/auxiliaryFunctions/includes/find2d.h2
-rw-r--r--src/c/auxiliaryFunctions/interfaces/int_find.h2
-rw-r--r--src/c/elementaryFunctions/cos/Makefile.am1
-rw-r--r--src/c/elementaryFunctions/cos/Makefile.in4
-rw-r--r--src/c/elementaryFunctions/cosh/Makefile.am1
-rw-r--r--src/c/elementaryFunctions/cosh/Makefile.in4
-rw-r--r--tests/unit_tests/Moebius.tst22
9 files changed, 58 insertions, 26 deletions
diff --git a/macros/FunctionAnnotation/FA_GetOutArgInfo.sci b/macros/FunctionAnnotation/FA_GetOutArgInfo.sci
index 85929666..84640dfc 100644
--- a/macros/FunctionAnnotation/FA_GetOutArgInfo.sci
+++ b/macros/FunctionAnnotation/FA_GetOutArgInfo.sci
@@ -100,8 +100,8 @@ for counterout = 1:NOutArg
// we issue an error according to SCI2C specifications
// #RNU_RES_E
- for iterOutputPosition=1:size(FunSizeAnnot, '*')
- tmpeval = eval(FunSizeAnnot(iterOutputPosition));
+ for iterOutputPosition=1:size(FunSizeAnnot, 'c')
+ tmpeval = eval(FunSizeAnnot(counterout, iterOutputPosition));
if (IsNanSize(tmpeval))
if SharedInfo.ForExpr.OnExec == 0
EM_NanSize(ReportFileName);
diff --git a/src/c/auxiliaryFunctions/find2d/dfind2da.c b/src/c/auxiliaryFunctions/find2d/dfind2da.c
index a4df47ec..22d4cf55 100644
--- a/src/c/auxiliaryFunctions/find2d/dfind2da.c
+++ b/src/c/auxiliaryFunctions/find2d/dfind2da.c
@@ -12,25 +12,29 @@
#include "find2d.h"
-void dfind2da(double* x, int rows, int columns, double* out1,int* indiceOut1, double* out2,int* indiceOut2,int max) {
- int i = 0, j=0;
- indiceOut1[1] = 0;
-
- /* if out are empties */
- out1[0]=-1;
- out2[0]=-1;
-
- for (j = 0; j < columns ; ++j){
- for (i = 0; i < rows ; ++i) {
+void dfind2da(double* x, int rows, int columns, double* out1, double* out2, int max) {
+ int i = 0, j=0, k = 0;
+
+ /* if out are empties */
+ out1[0]=-1;
+ out2[0]=-1;
+
+ for (j = 0; j < columns ; ++j)
+ {
+ for (i = 0; i < rows ; ++i)
+ {
/*to avoid useless search if we only want to find the max first founded value */
- if (indiceOut1[1] == max ) return ;
- if (x[j*rows+i] != 0) {
-
- out1[indiceOut1[1]] = (double)(i+1);
- out2[indiceOut1[1]] = (double)(j+1);
- indiceOut1[1]++;
- }
- }
- }
- indiceOut2[1]=indiceOut1[1];
+ if (max == 0)
+ {
+ return;
+ }
+
+ if (x[j*rows+i] != 0)
+ {
+ out1[k] = (double)(i+1);
+ out2[k] = (double)(j+1);
+ k++;
+ }
+ }
+ }
}
diff --git a/src/c/auxiliaryFunctions/includes/find2d.h b/src/c/auxiliaryFunctions/includes/find2d.h
index 6e365107..2e9be6fa 100644
--- a/src/c/auxiliaryFunctions/includes/find2d.h
+++ b/src/c/auxiliaryFunctions/includes/find2d.h
@@ -30,7 +30,7 @@ EXTERN_AUXFUNCT void sfind2da(float* x, int rows, int columns, float* out1, int*
** \brief Double Find function
** max is an integer giving the maximum number of indices to return. (use -1 to search them all)
*/
-EXTERN_AUXFUNCT void dfind2da(double* x, int rows, int columns, double* out1, int* sizeOut1, double* out2, int* sizeOut2,int max);
+EXTERN_AUXFUNCT void dfind2da(double* x, int rows, int columns, double* out1, double* out2, int max);
/*
** \brief Float Complex Find function
diff --git a/src/c/auxiliaryFunctions/interfaces/int_find.h b/src/c/auxiliaryFunctions/interfaces/int_find.h
index e0244b29..737afc28 100644
--- a/src/c/auxiliaryFunctions/interfaces/int_find.h
+++ b/src/c/auxiliaryFunctions/interfaces/int_find.h
@@ -46,7 +46,7 @@
#define s2finds2s2(in,size,out1,sizeOut1,out2,sizeOut2) sfind2da(in,size[0],size[1],out1,sizeOut1,out2,sizeOut2,-1)
-#define d2findd2d2(in,size,out1,sizeOut1,out2,sizeOut2) dfind2da(in,size[0],size[1],out1,sizeOut1,out2,sizeOut2,-1)
+#define d2findd2d2(in,size,out1,out2) dfind2da(in,size[0],size[1],out1,out2,-1)
#define c2finds2s2(in,size,out1,sizeOut1,out2,sizeOut2) cfind2da(in,size[0],size[1],out1,sizeOut1,out2,sizeOut2,-1)
diff --git a/src/c/elementaryFunctions/cos/Makefile.am b/src/c/elementaryFunctions/cos/Makefile.am
index ad772a66..890675be 100644
--- a/src/c/elementaryFunctions/cos/Makefile.am
+++ b/src/c/elementaryFunctions/cos/Makefile.am
@@ -52,6 +52,7 @@ check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+ $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \
@LIBMATH@
check_PROGRAMS = testFloatCos testDoubleCos
diff --git a/src/c/elementaryFunctions/cos/Makefile.in b/src/c/elementaryFunctions/cos/Makefile.in
index 48417e2e..748b9283 100644
--- a/src/c/elementaryFunctions/cos/Makefile.in
+++ b/src/c/elementaryFunctions/cos/Makefile.in
@@ -93,7 +93,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/src/c/type/libDoubleComplex.la \
$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
- $(top_builddir)/src/c/operations/multiplication/libMultiplication.la
+ $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+ $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la
testDoubleCos_DEPENDENCIES = $(am__DEPENDENCIES_1)
testDoubleCos_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleCos_CFLAGS) \
@@ -283,6 +284,7 @@ check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+ $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \
@LIBMATH@
diff --git a/src/c/elementaryFunctions/cosh/Makefile.am b/src/c/elementaryFunctions/cosh/Makefile.am
index 6661eac5..4d28f07e 100644
--- a/src/c/elementaryFunctions/cosh/Makefile.am
+++ b/src/c/elementaryFunctions/cosh/Makefile.am
@@ -51,6 +51,7 @@ check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+ $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \
@LIBMATH@
check_PROGRAMS = testFloatCosh testDoubleCosh
diff --git a/src/c/elementaryFunctions/cosh/Makefile.in b/src/c/elementaryFunctions/cosh/Makefile.in
index f7add730..33c9a89c 100644
--- a/src/c/elementaryFunctions/cosh/Makefile.in
+++ b/src/c/elementaryFunctions/cosh/Makefile.in
@@ -93,7 +93,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/src/c/type/libDoubleComplex.la \
$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
- $(top_builddir)/src/c/operations/multiplication/libMultiplication.la
+ $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+ $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la
testDoubleCosh_DEPENDENCIES = $(am__DEPENDENCIES_1)
testDoubleCosh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleCosh_CFLAGS) \
@@ -284,6 +285,7 @@ check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+ $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \
@LIBMATH@
diff --git a/tests/unit_tests/Moebius.tst b/tests/unit_tests/Moebius.tst
new file mode 100644
index 00000000..3c9e382d
--- /dev/null
+++ b/tests/unit_tests/Moebius.tst
@@ -0,0 +1,22 @@
+//
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010-2010 - DIGITEO - Bruno JOFRET
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution. The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+//
+//
+
+// <-- ENGLISH IMPOSED -->
+
+// <-- JVM NOT MANDATORY -->
+
+global SCI2CHOME;
+scilab2c(SCI2CHOME+"/tests/unit_tests/test305_Moebius/Moebius.sci",TMPDIR, SCI2CHOME+"/tests/unit_tests/test305_Moebius");
+
+fd = mopen(TMPDIR+"/main.c");
+mgetl(fd)
+mclose(fd); \ No newline at end of file
generated by cgit (git 2.34.1) at 2025-03-13 19:20:46 +0000