sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

dataprep

Browse Source
This commit is contained in:
Sander Roosendaal
2017-02-24 15:59:51 +01:00
parent 97189ef02b
commit 0db945ee39
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rowers/dataprep.py
View File

@@ -774,13 +774,14 @@ def smalldataprep(therows,xparam,yparam1,yparam2):
return df return df
# data fusion # data fusion
def datafusion(id1,id2,column,offset): def datafusion(id1,id2,columns,offset):
df1 = getrowdata_db(id=id1) df1 = getrowdata_db(id=id1)
columns = ['time',column] columns = ['time']+columns
df2 = getsmallrowdata_db(columns,ids=[id2]) df2 = getsmallrowdata_db(columns,ids=[id2])
keep1 = set(df1.columns) keep1 = set(df1.columns)
keep1.pop(column) for c in columns:
keep1.pop(c)
for c in df1.columns: for c in df1.columns:
if not c in keep1: if not c in keep1: