-fi=open("Typ-J.csv","r")\r
+fi=open("Typ-K.csv","r")\r
lastv=0\r
v=0\r
lastt=0\r
wc=0\r
for l in fi.readlines():\r
#print(l)\r
+ l=l.replace(",",".")\r
ll=l.split(";")\r
i=0\r
for n in ll[1:10]:\r
- s=ll[0]+"."+str(i)\r
+ s=ll[0][:-1]+""+str(i)\r
lastv=v\r
lastt=t\r
v=float(n)\r
t=float(s)\r
if (int(v)!=int(lastv)):\r
- interp=lastt+(t-lastt)/(v-lastv)*(int(v)-lastv)\r
- print int(v),interp\r
+ #print v,lastv\r
+ #print t,lastt\r
+ if (lastt<0):\r
+ interp=lastt+(t-lastt)/(v-lastv)*(int(v-1)-lastv)\r
+ #print (t-lastt)/(v-lastv)*(int(v-1)-lastv)\r
+ print int(v-1),interp\r
+ else:\r
+ interp=lastt+(t-lastt)/(v-lastv)*(int(v)-lastv)\r
+ #print (t-lastt)/(v-lastv)*(int(v)-lastv)\r
+ print int(v),interp\r
rs=rs+", %f" %(interp)\r
wc=wc+1\r
- if (v==0):\r
+ if (v<=-6):\r
interp=lastt+(t-lastt)/(v-lastv)*(int(v)-lastv)\r
print int(v),interp\r
- rs="{0"\r
- wc=1\r
- \r
+ rs="{"\r
+ wc=0\r
+ if (v==0):\r
+ rs=rs+", %f" %(0)\r
+ wc=wc+1;\r
i=i+1\r
print rs+"};"\r
print wc
\ No newline at end of file