Remove SCI2Cisnum wrapping around isnum function

1 files changed, 52 insertions, 52 deletions

diff --git a/macros/FunctionAnnotation/FA_MAX.sci b/macros/FunctionAnnotation/FA_MAX.sci
index 2ecfc6ac..c725dd23 100644
--- a/macros/FunctionAnnotation/FA_MAX.sci
+++ b/macros/FunctionAnnotation/FA_MAX.sci
@@ -1,52 +1,52 @@
-function opout = FA_MAX(in1,in2)

-// function opout = FA_MAX(in1,in2)

-// -----------------------------------------------------------------

-// Maximum function for Function Annotations.

-// When in1 and in2 are both symbols this function returns

-// in1.

-//

-// Input data:

-// in1: string specifying a number or a symbol.

-// in2: string specifying a number or a symbol.

-//

-// Output data:

-// opout: string containing the computed result.

-//

-// Status:

-// 26-Oct-2007 -- Raffaele Nutricato: Author.

-// 26-Oct-2007 -- Alberto Morea: Test Ok.

-//

-// Copyright 2008 Raffaele Nutricato & Alberto Morea.

-// Contact: raffaele.nutricato@tiscali.it

-// -----------------------------------------------------------------

-

-// ------------------------------

-// --- Check input arguments. ---

-// ------------------------------

-SCI2CNInArgCheck(argn(2),2,2);

-

-//SCI2Cerror('Not allowed to use FA_MAX in this release.');

-

-// ------------------------

-// --- Generate Output. ---

-// ------------------------

-if (SCI2Cisnum(in1))

-   in1num = eval(in1);

-   if (SCI2Cisnum(in2))

-      in2num = eval(in2);

-      outnum = max(in1num,in2num);

-      if isnan(outnum)

-         opout  = '__SCI2CNANSIZE';

-      else

-         opout  = string(outnum);

-      end

-   else

-      if (in1num == 1)

-         opout  = string(in2);

-      end

-   end

-else

-   opout  = string(in1);

-end   
-

-endfunction

+function opout = FA_MAX(in1,in2)
+// function opout = FA_MAX(in1,in2)
+// -----------------------------------------------------------------
+// Maximum function for Function Annotations.
+// When in1 and in2 are both symbols this function returns
+// in1.
+//
+// Input data:
+// in1: string specifying a number or a symbol.
+// in2: string specifying a number or a symbol.
+//
+// Output data:
+// opout: string containing the computed result.
+//
+// Status:
+// 26-Oct-2007 -- Raffaele Nutricato: Author.
+// 26-Oct-2007 -- Alberto Morea: Test Ok.
+//
+// Copyright 2008 Raffaele Nutricato & Alberto Morea.
+// Contact: raffaele.nutricato@tiscali.it
+// -----------------------------------------------------------------
+
+// ------------------------------
+// --- Check input arguments. ---
+// ------------------------------
+SCI2CNInArgCheck(argn(2),2,2);
+
+//SCI2Cerror('Not allowed to use FA_MAX in this release.');
+
+// ------------------------
+// --- Generate Output. ---
+// ------------------------
+if (isnum(in1))
+   in1num = eval(in1);
+   if (isnum(in2))
+      in2num = eval(in2);
+      outnum = max(in1num,in2num);
+      if isnan(outnum)
+         opout  = '__SCI2CNANSIZE';
+      else
+         opout  = string(outnum);
+      end
+   else
+      if (in1num == 1)
+         opout  = string(in2);
+      end
+   end
+else
+   opout  = string(in1);
+end
+
+endfunction