* Bug 16622 fixed: inv() now overloadable for hypermat of doubles

  http://bugzilla.scilab.org/16622

  Test:

  inv(rand(2,2,2))

  should display:
  Function not defined for given argument type(s),
  check arguments or define function %s_inv for overloading.

Change-Id: I81284ea373149add6d6c55f3522c556a24f0c55a

diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md
index 506007d..4387dc4 100644 (file)
--- a/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@ -353,6 +353,7 @@ Bug Fixes
 * [#16553](https://bugzilla.scilab.org/16553): `unique(["" ""])` returned `["" ""]`.
 * [#16557](https://bugzilla.scilab.org/16557): `macr2tree` + `tree2code` translated `e={2}` into `"e=1"` and `e={2,"ab"}` into `"e=[2,"ab"]"`.
 * [#16559](https://bugzilla.scilab.org/16553): `isempty(A)` was true for sparse matrix of dimension 2^16 or larger.
+* [#16622](https://bugzilla.scilab.org/16622): `inv` could no longer be overloaded for hypermatrices of decimal or complex numbers.
 * [#16623](https://bugzilla.scilab.org/16623): `rand(2,2,2)^2` yielded a wrong result instead of trying to call the `%s_p_s` overload for input hypermatrices.
 * [#16644](https://bugzilla.scilab.org/16644): `input("message:")` yielded a wrong error message about `mprintf` in case of non-interpretable input.
 

diff --git a/scilab/modules/linear_algebra/sci_gateway/cpp/sci_inv.cpp b/scilab/modules/linear_algebra/sci_gateway/cpp/sci_inv.cpp
index e86c699..c7c1cc3 100644 (file)
--- a/scilab/modules/linear_algebra/sci_gateway/cpp/sci_inv.cpp
+++ b/scilab/modules/linear_algebra/sci_gateway/cpp/sci_inv.cpp
@@ -37,7 +37,7 @@ types::Function::ReturnValue sci_inv(types::typed_list &in, int _iRetCount, type
     double* pData       = NULL;
     int ret             = 0;
 
-    if (in.size() != 1)
+    if (in.size() < 1)
     {
         Scierror(77, _("%s: Wrong number of input argument(s): %d expected.\n"), "inv", 1);
         return types::Function::Error;
@@ -51,9 +51,15 @@ types::Function::ReturnValue sci_inv(types::typed_list &in, int _iRetCount, type
 
     pDbl = in[0]->getAs<types::Double>()->clone()->getAs<types::Double>(); // input data will be modified
 
-    if (pDbl->getRows() != pDbl->getCols())
+    if (pDbl->getDims() > 2)
+    {
+        std::wstring wstFuncName = L"%s_inv";
+        return Overload::call(wstFuncName, in, _iRetCount, out);
+    }
+
+    if (in.size() > 1)
     {
-        Scierror(20, _("%s: Wrong type for argument %d: Square matrix expected.\n"), "inv", 1);
+        Scierror(77, _("%s: Wrong number of input argument(s): %d expected.\n"), "inv", 1);
         return types::Function::Error;
     }
 
@@ -63,6 +69,12 @@ types::Function::ReturnValue sci_inv(types::typed_list &in, int _iRetCount, type
         return types::Function::OK;
     }
 
+    if (pDbl->getRows() != pDbl->getCols())
+    {
+        Scierror(20, _("%s: Argument %d: Square matrix expected. Please use pinv() otherwise.\n"), "inv", 1);
+        return types::Function::Error;
+    }
+
     if (pDbl->isComplex())
     {
         /* c -> z */