From b351d686f57f85cbe923132164ce718704bcdfa2 Mon Sep 17 00:00:00 2001
From: jofret
Date: Thu, 17 Jun 2010 10:10:04 +0000
Subject: Remove SCI2Cisnum wrapping around isnum function

---
 macros/FunctionAnnotation/FA_MIN.sci | 88 ++++++++++++++++++------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

(limited to 'macros/FunctionAnnotation/FA_MIN.sci')

diff --git a/macros/FunctionAnnotation/FA_MIN.sci b/macros/FunctionAnnotation/FA_MIN.sci
index 874cee8a..e1539103 100644
--- a/macros/FunctionAnnotation/FA_MIN.sci
+++ b/macros/FunctionAnnotation/FA_MIN.sci
@@ -1,45 +1,45 @@
-function opout = FA_MIN(in1,in2)
-// function opout = FA_MIN(in1,in2)
-// -----------------------------------------------------------------
-// Minimum 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.
-
-// -----------------------------------------------------------------
-
-// ------------------------------
-// --- Check input arguments. ---
-// ------------------------------
-SCI2CNInArgCheck(argn(2),2,2);
-
-
-// ------------------------
-// --- Generate Output. ---
-// ------------------------
-if (SCI2Cisnum(in1))
-   in1num = eval(in1);
-   if (SCI2Cisnum(in2))
-      in2num = eval(in2);
-      outnum = min(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   
-
+function opout = FA_MIN(in1,in2)
+// function opout = FA_MIN(in1,in2)
+// -----------------------------------------------------------------
+// Minimum 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.
+
+// -----------------------------------------------------------------
+
+// ------------------------------
+// --- Check input arguments. ---
+// ------------------------------
+SCI2CNInArgCheck(argn(2),2,2);
+
+
+// ------------------------
+// --- Generate Output. ---
+// ------------------------
+if (isnum(in1))
+   in1num = eval(in1);
+   if (isnum(in2))
+      in2num = eval(in2);
+      outnum = min(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
-- 
cgit