success: call octave with one input vector/scalar with func name and opt string args

2 files changed, 45 insertions, 9 deletions

diff --git a/sci_gateway/cpp/libscilab_toolbox.so b/sci_gateway/cpp/libscilab_toolbox.so
index 523db58..5e204b2 100755
--- a/sci_gateway/cpp/libscilab_toolbox.so
+++ b/sci_gateway/cpp/libscilab_toolbox.so
diff --git a/sci_gateway/cpp/sci_matrix.cpp b/sci_gateway/cpp/sci_matrix.cpp
index f2622b8..c2da80c 100644
--- a/sci_gateway/cpp/sci_matrix.cpp
+++ b/sci_gateway/cpp/sci_matrix.cpp
@@ -21,24 +21,53 @@ static const char fname[] = "octave_fun";
 int sci_octave_fun(scilabEnv env, int nin, scilabVar* in, int nopt, scilabOpt* opt, int nout, scilabVar* out)
 
 {
+/*
+	printf("%d\n", nin);
+	int row = 0;
+  int col = 0;
+  int size = 0;
+	size = scilab_getDim2d(env, in[0], &row, &col);
+	printf("%d\n", row);
+	printf("%d\n", col);
+	int i=3;
+*/
+///////////////////First Input/////////////////////	
+	double* n = NULL;
+	int row = 0;
+  int col = 0;
+  int size = 0;
+	size = scilab_getDim2d(env, in[0], &row, &col);
+	scilab_getDoubleArray(env, in[0], &n);
+	double ar[(int)n[0]];
+	
+//	if((int)n[0]!=NULL)
+//	if(in[i]!=NULL)
+//		printf("\nInput %d is not null\n",i);
 
-	double* out1 = NULL;
-	double* n;
 
+////////////////Second Input/////////////////////
 	wchar_t* in1 = 0;
 
 	char str[20];
 
-	scilab_getDoubleArray(env, in[0], &n);
-	double ar[(int)n[0]];
-
   scilab_getString(env, in[1], &in1);
 	//printf("%S\n", in1);
 
 	 wcstombs(str, in1, sizeof(str));
 	//printf("%s\n", str);
 
-	
+////////////////Third Input/////////////////////
+	wchar_t* in4 = 0;
+
+	char str2[20];
+
+  scilab_getString(env, in[2], &in4);
+	//printf("%S\n", in1);
+
+	 wcstombs(str2, in4, sizeof(str2));
+	//printf("%s\n", str);
+
+
 
 //if (nin != 0)
 //    {
@@ -52,11 +81,18 @@ if (nout != 1)
         return 1;
     }
 
-		fun(ar, n[0],str);
-		*out = scilab_createDoubleMatrix2d(env, n[0], 1, 0);
+		double inp[col];
 
-   	scilab_getDoubleArray(env, out[0], &out1);
+		for(int i=0; i<col; i++)
+		{
+			inp[i] = n[i];//.float_value();
+		}
 
+		fun(ar, inp, col, str, str2);
+		out[0] = scilab_createDoubleMatrix2d(env, n[0], 1, 0);
+
+		double* out1 = NULL;
+   	scilab_getDoubleArray(env, out[0], &out1);
 
 		for(int i=0; i<n[0]; i++)
 		{