From 9d267a4afe646fa86a2fcd4d81cd14636dc0b443 Mon Sep 17 00:00:00 2001 From: Marcel Nijenhof Date: Thu, 27 Feb 2020 17:12:47 +0100 Subject: [PATCH] Support voor nuphy resultaat toegevoegd --- ddapioper.py | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/ddapioper.py b/ddapioper.py index 86e1ba5..617ab6a 100644 --- a/ddapioper.py +++ b/ddapioper.py @@ -15,6 +15,7 @@ See: import logging import requests +import numpy as np from datetime import datetime, timedelta from dateutil.parser import isoparse @@ -255,7 +256,7 @@ Returns the source metadata Returns the values as a ittorator of tupples. - (datetime, value, (quality, additinalInfo)) + (datetime, value, (quality, addiotinalInfo)) (datetime, value, ...) Note: @@ -278,6 +279,31 @@ Note: else: yield (dt, v) + def np(self, index=0, quality=False, additionalInfo=False): + """np(index=0, quality=False, additionalInfo=False) + +Returns the values as a numpy array + + (datetime, value, (quality, additionalInfo)) + (datetime, value, ...) + +Note: + Is this the correct return data format?? + This may change! +""" +# c = 2 +# if quality: +# c+=1 +# if additionalInfo: +# c+=1 +# l = len(self.result()["events"]) +# res = np.empty((c, l)) +# i = 0 + res = [] + for elem in self.values(index, quality, additionalInfo): + res.append(elem) + return(np.array(res).T) + def sip(self, index=0): """sip(index)