Merge pull request #20 from avinashlalotra/masterHEADmaster

Winter Internship 2024 work done by Abinash Singh

1 files changed, 45 insertions, 37 deletions

diff --git a/macros/postpad.sci b/macros/postpad.sci
index f8042be..3797e08 100644
--- a/macros/postpad.sci
+++ b/macros/postpad.sci
@@ -1,49 +1,57 @@
 // Copyright (C) 2018 - 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:Sonu Sharma, RGIT Mumbai
+// Author: Abinash Singh Under FOSSEE Internship
+// Modifieded by: Abinash Singh Under FOSSEE Internship
+// Last Modified on : 3 Feb 2024
 // Organization: FOSSEE, IIT Bombay
 // Email: toolbox@scilab.in
-
-// This is a supporting function
-
-function y = postpad(x, n, varargin)
-
-    //Calling Sequences
-    // Y = postpad (X, L)
-    // Y = postpad (X, L, C)
-
-    // Description :
-    // Append the scalar value C to the vector X until it is of length L.
-    // If C is not given, a value of 0 is used.
-    //
-    // If 'length (X) > L', elements from the end of X are removed until a
-    // vector of length L is obtained.
-
-    //Example :
-    //x = [1 2 3];
-    //L = 6;
-    //y = postpad(x, L)
-    //Output :
-    // y  =
-    //
-    //    1.    2.    3.    0.    0.    0.
-
-    funcprot(0);
-    if argn(2) > 3 | argn(2) < 2  then
-        error("postpad : wrong number of input argument ")
-    elseif argn(2) == 2
+/*
+Calling Sequence :
+    postpad (x, l)
+    postpad (x, l, c)
+    postpad (x, l, c, dim)
+Append the scalar value c to the vector x until it is of length l. If c is not given, a value of 0 is used.
+If length (x) > l, elements from the end of x are removed until a vector of length l is obtained.
+If x is a matrix, elements are appended or removed from each row.
+If the optional argument dim is given, operate along this dimension.
+If dim is larger than the dimensions of x, the result will have dim dimensions.
+*/
+function res = postpad(x,l,c,dim)
+    if nargin < 2 then 
+        error("Usage :  postpad(x,l,c(optional),dim(optional))")
+    end
+    if nargin < 3 then 
         c = 0 ;
-    else
-        c = varargin(1);
     end
-
-    y = x;
-    for i = 1:(n-length(x))
-        y = [y c];
+    if nargin <= 4 then 
+        if size(x,1) == 1 then
+            dim = 1 ;
+        elseif size(x,2) == 1 then 
+            dim = 2 ;
+        else
+            dim = 2 ; // FIXME dim functionality not implemented
+        end
+    end
+    if l < size(x,dim) then
+        error("l must be greater then dimension of x")
+    end
+    
+    select dim
+    case 1 then
+        res = [x c*ones(size(x,1),l-size(x,2))];
+    case 2 then
+        res = [x;c*ones(l-size(x,1),size(x,2))];
     end
 endfunction
+
+/*
+#test for row vectors
+postpad([1 2 3 4],6) //passed
+postpad([1 ;2 ;3 ;4],6) // passed
+postpad([1 2 3 4;5 6 7 8;9 10 11 12],6) // passed
+postpad([1 2 ;3 4;5 6],6,-1) //passed
+*/
\ No newline at end of file