Changeset 787

Timestamp:

04/10/07 12:03:01 (2 years ago)

Author:

rij

Message:

Added code to make the real() and int() functions more robust.
Fixes Ticket #61 "PyRAF isn't as forgiving as the cl in implementing the
'real' function"

Files:

• trunk/lib/iraffunctions.py (modified) (2 diffs)

trunk/lib/iraffunctions.py

@@ -998 +998 @@
-def real(x):
-    """Return real/float representation of x"""
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return float(x)
-    except ValueError:
-        #...handle the special a:b:c case here...
-        f = map(float,x.split(":"))
-        if x.find('-') >= 0:
-            sign = -1
-            f = map(abs, f)
-        else:
-            sign = 1
-        return sign*clSexagesimal(*f)
-
-def integer(x):
@@ -1015 +1029 @@
-    if x==INDEF:
-        return INDEF
+    elif isinstance(x, str):
+        x = x.strip()
+        i = 0
+        j = len(x)
+        if x[0] in ["+", "-"]:
+            i = 1
+        x = _re.sub("[EdD]", "e", x, count=1)
+        m = _re.search(r"[^0-9.e+-]", x[i:])
+        if m:
+            j = i + m.start()
+        return int(float(x[:j]))
-    else:
-        return int(x)