1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
|
--- ./sci_gateway/c/swt_common.h.orig
+++ ./sci_gateway/c/swt_common.h
@@ -323,10 +323,10 @@
//extern int is_scalar (int row, int col);
//extern int is_vector (int row, int col);
//extern int is_matrix (int row, int col);
-extern void void_check (int number, int *type);
-extern void scalar_check (int number, int *type);
-extern void vector_check (int number, int *type);
-extern void matrix_check (int number, int *type);
+extern int void_check (int number, int *type);
+extern int scalar_check (int number, int *type);
+extern int vector_check (int number, int *type);
+extern int matrix_check (int number, int *type);
extern void real_or_complex (int number, int *type);
extern int sci_matrix_vector_real (int number);
extern int sci_matrix_vector_complex (int number);
@@ -341,8 +341,8 @@
extern int scalar_string_check(char *l, char c);
extern int length_check(int number, int leng);
extern int vector_length_check(int number1, int number2);
-extern void vector_length_compare(int number, int leng, int *res);
-extern void matrix_length_compare(int number, int rowLeng,
+extern int vector_length_compare(int number, int leng, int *res);
+extern int matrix_length_compare(int number, int rowLeng,
int colLeng, int *resRow,
int *resCol);
extern int matrix_length_check (int number1, int number2);
--- ./sci_gateway/c/validate.c.orig
+++ ./sci_gateway/c/validate.c
@@ -42,7 +42,7 @@
/*-------------------------------------------
* Dimension Checking
*-----------------------------------------*/
-void void_check (int number, int *type)
+int void_check (int number, int *type)
{
int row, col;
GetMatrixdims(number,&row,&col);
@@ -50,10 +50,10 @@
*type = 1;
else
*type = 0;
- //return;
+ return 1;
}
-void scalar_check (int number, int *type)
+int scalar_check (int number, int *type)
{
int row, col;
GetMatrixdims(number,&row,&col);
@@ -61,10 +61,10 @@
*type = 1;
else
*type = 0;
- //return;
+ return 1;
}
-void vector_check (int number, int *type)
+int vector_check (int number, int *type)
{
int row, col;
GetMatrixdims(number,&row,&col);
@@ -74,10 +74,10 @@
*type = 1;
else
*type = 0;
- //return;
+ return 1;
}
-void matrix_check (int number, int *type)
+int matrix_check (int number, int *type)
{
int row, col;
GetMatrixdims(number,&row,&col);
@@ -85,7 +85,7 @@
*type = 1;
else
*type = 0;
- //return;
+ return 1;
}
void real_or_complex (int number, int *type)
@@ -234,7 +234,7 @@
return 0;
}
-void vector_length_compare(int number, int leng, int *res)
+int vector_length_compare(int number, int leng, int *res)
{
int row, col;
GetMatrixdims(number,&row,&col);
@@ -244,10 +244,10 @@
*res = 1;
else
*res = -1;
- return;
+ return 1;
}
-void matrix_length_compare(int number, int rowLeng, int colLeng,
+int matrix_length_compare(int number, int rowLeng, int colLeng,
int *resRow, int *resCol)
{
int row, col;
@@ -264,7 +264,7 @@
*resCol = 1;
else
*resCol = -1;
- return;
+ return 1;
}
int
|
