From 15fb45eb119fc80dc32911a9bd01b7df8d4b83f4 Mon Sep 17 00:00:00 2001
From: perezgonzalez-irene <iregon@noc.ac.uk>
Date: Wed, 4 Mar 2020 10:45:52 +0000
Subject: [PATCH] Decoders output type in now only object
---
common/decoders.py | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/common/decoders.py b/common/decoders.py
index af3b110..66ece67 100644
--- a/common/decoders.py
+++ b/common/decoders.py
@@ -58,17 +58,15 @@ def signed_overpunch_i(x):
class df_decoders():
def __init__(self, dtype):
- self.dtype = dtype if dtype in properties.numeric_types else 'object'
+ # Return as object, conversion to actual type in converters only!
+ self.dtype = 'object'
def signed_overpunch(self, data ):
decoded_numeric = np.vectorize(signed_overpunch_i,otypes=[float])(data)
return pd.Series(decoded_numeric,dtype = self.dtype)
def base36(self, data):
# Caution: int(str(np.nan),36) ==> 30191
- if self.dtype == 'object' :
- base10 = [ str(int(str(i), 36)) if i == i and i else np.nan for i in data ]
- else:
- base10 = [ int(str(i), 36) if i == i and i else np.nan for i in data ]
+ base10 = [ str(int(str(i), 36)) if i == i and i else np.nan for i in data ]
return pd.Series(base10,dtype = self.dtype)
--
GitLab