change import
parent
5007ccba05
commit
cf30354648
15
import_sql.r
15
import_sql.r
|
@ -1,6 +1,6 @@
|
||||||
library(foreach)
|
library(foreach)
|
||||||
|
|
||||||
indata<-read.table("/home/pi/rasolar/data_433046.txt",fill=TRUE,stringsAsFactors=FALSE)
|
indata<-read.table("/home/ademant/src/rasolar/data/data_433058.txt",fill=TRUE,stringsAsFactors=FALSE)
|
||||||
|
|
||||||
raw_dat=unlist(sapply(1:nrow(indata),function(i){return(strsplit(indata[i,],";")[[1]])}))
|
raw_dat=unlist(sapply(1:nrow(indata),function(i){return(strsplit(indata[i,],";")[[1]])}))
|
||||||
var_names=unique(sapply(1:length(raw_dat),function(i){return(head(strsplit(raw_dat[i],":")[[1]],1))}))
|
var_names=unique(sapply(1:length(raw_dat),function(i){return(head(strsplit(raw_dat[i],":")[[1]],1))}))
|
||||||
|
@ -10,10 +10,15 @@ names(raw_row)<-var_names
|
||||||
|
|
||||||
intable<-foreach(i=1:nrow(indata),.combine=rbind)%do%{
|
intable<-foreach(i=1:nrow(indata),.combine=rbind)%do%{
|
||||||
tid<-strsplit(indata[i,],";")[[1]]
|
tid<-strsplit(indata[i,],";")[[1]]
|
||||||
tout<-raw_row
|
tout<-as.data.frame(t(sapply(tid,function(i){return(strsplit(i,":")[[1]])})))
|
||||||
for(j in tid){
|
tout[,2]<-as.numeric(as.character(tout[,2]))
|
||||||
ttid<-strsplit(j,":")[[1]]
|
tout[,1]<-as.character(tout[,1])
|
||||||
tout[ttid[1]]<-as.numeric(ttid[2])
|
names(tout)<-c("var","val")
|
||||||
|
tout$time<-NA
|
||||||
|
if("time"%in%tout$var){
|
||||||
|
tout$time<-head(tout[tout$var=="time","val"],1)
|
||||||
|
tout<-tout[tout$var!="time",]
|
||||||
}
|
}
|
||||||
return(tout)
|
return(tout)
|
||||||
}
|
}
|
||||||
|
solar_table<-rbind(solar_table,intable)
|
||||||
|
|
Loading…
Reference in New Issue