changes after changing branch to master

4 files changed, 89 insertions, 0 deletions

diff --git a/2.3-1/src/c/elementaryFunctions/includes/linspace.h b/2.3-1/src/c/elementaryFunctions/includes/linspace.h
index 92fe10e5..62d45015 100644
--- a/2.3-1/src/c/elementaryFunctions/includes/linspace.h
+++ b/2.3-1/src/c/elementaryFunctions/includes/linspace.h
@@ -21,8 +21,11 @@ extern "C" {
 
 EXTERN_ELEMFUNCT void  dlinspaces(double low_limit,double up_limit,double range_num, double* out);
 
+EXTERN_ELEMFUNCT void  slinspaces(float low_limit,float up_limit,float range_num, float* out);
+
 EXTERN_ELEMFUNCT void  dlinspacea(double *low_limit,int row,double *up_limit,double range_num, double* out);
 
+EXTERN_ELEMFUNCT void  slinspacea(float *low_limit,int row,float *up_limit,float range_num, float* out);
 
 
 
diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_linspace.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_linspace.h
index f8af947a..15ea2696 100644
--- a/2.3-1/src/c/elementaryFunctions/interfaces/int_linspace.h
+++ b/2.3-1/src/c/elementaryFunctions/interfaces/int_linspace.h
@@ -15,6 +15,10 @@
 
 #define d0d0d0linspaced2(in1,in2,in3,out) dlinspaces(in1,in2,in3,out)
 
+#define s0s0s0linspaces2(in1,in2,in3,out) slinspaces(in1,in2,in3,out)
+
 #define d2d2d0linspaced2(in1,size1,in2,size2,in3,out) dlinspacea(in1,size1[0],in2,in3,out)
 
+#define s2s2s0linspaces2(in1,size1,in2,size2,in3,out) slinspacea(in1,size1[0],in2,in3,out)
+
 #endif 
diff --git a/2.3-1/src/c/elementaryFunctions/linspace/slinspacea.c b/2.3-1/src/c/elementaryFunctions/linspace/slinspacea.c
new file mode 100644
index 00000000..38af3942
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/linspace/slinspacea.c
@@ -0,0 +1,49 @@
+/* Copyright (C) 2016 - IIT Bombay - FOSSEE
+
+ 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
+ Author: Ukasha Noor
+ Organization: FOSSEE, IIT Bombay
+ Email: toolbox@scilab.in
+*/
+#include <stdlib.h>
+#include "linspace.h"
+
+void slinspacea(float *low_limit,int _row,float *up_limit,float range_num,float *out)
+{
+   int i,j,k;
+   float temp;
+   float *step_iterate;  /* for each row the spacing between two values is different.*/
+   step_iterate = (float*) malloc((float)_row*sizeof(float));
+   for(i=0;i<_row;i++)
+   {
+    
+     step_iterate[i] = (up_limit[i]-low_limit[i])/(range_num-1);
+     
+   }
+   for(j=0;j < _row;j++)
+   {
+     out[j] = low_limit[j];  /* For every row first element is the first value of low_limit array*/
+     temp = low_limit[j];
+     for(k=1;k < (float)range_num;k++ )
+      {
+          out[(_row*k)+j] = temp + step_iterate[j];  /* Output matrix positions for 3 X 5 matrix are [0 3 6 9 12;1 4 7 10 13;2 5 8 11 14] so (_row*k)+j) used*/
+          temp = out[(_row*k)+j];
+          if(k == (float)range_num-1 )
+         {
+            out[(_row*k)+j] = (float)up_limit[j];  /* Last value of output is equal to first value of up_limit array*/
+         }  
+
+      }
+     
+ 
+   }
+   
+   
+     
+
+}
+
diff --git a/2.3-1/src/c/elementaryFunctions/linspace/slinspaces.c b/2.3-1/src/c/elementaryFunctions/linspace/slinspaces.c
new file mode 100644
index 00000000..2404f4de
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/linspace/slinspaces.c
@@ -0,0 +1,33 @@
+/* Copyright (C) 2016 - IIT Bombay - FOSSEE
+
+ 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
+ Author: Ukasha Noor
+ Organization: FOSSEE, IIT Bombay
+ Email: toolbox@scilab.in
+*/
+
+#include "linspace.h"
+void slinspaces(float low_limit,float up_limit,float range_num,float *out)
+{
+   int j;
+   float temp = low_limit;
+   float step_iterate = (up_limit-low_limit)/(range_num-1);
+   out[0] = low_limit;   /*First value of output is equal to low_limit value*/
+   for(j=1; j<(float)range_num; j++) 
+   { 
+     out[j] = temp + step_iterate;
+     temp = out[j];
+     if(j == (float)range_num-1 )
+     {
+         out[j] = (float)up_limit;  /* Last value of output is equal to up_limit value*/
+     }
+   }
+   
+         
+
+}
+