bugfix

bug fix in one or two data

BBmarge.R

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 BB.marge <- function(csv.text,xts=FALSE){
 	if(!is.character(csv.text)){
 		stop("\ncsv.text縺ｮ蠑墓焚縺ｯ譁�ｭ怜�縺ｮ縺ｿ縺ｧ縺")	
@@ -11,19 +12,62 @@ BB.marge <- function(csv.text,xts=FALSE){
 	x = x[-1,]
 	n.col = ncol(x)
 
+=======
+BB.marge <- function(cvs.text,xts=FALSE){
+	if(xts){
+		library(xts)
+	}
+
+	if(length(grep("csv＼＼>",cvs.text))==0){
+		stop("＼ncsvのファイル名を入力してください")
+	}
+
+	x = read.csv(cvs.text)
+
+	if(ncol(x)==2){
+		cat("データが一つであるため整形のみを行いました＼n")
+		x = x[-1,]
+		x.name = colnames(x)[1]
+		Date.name = as.Date(x[,1])
+		x = data.frame(as.numeric(as.character(x[,-1])))
+		colnames(x) = x.name
+		rownames(x) = Date.name
+		if(xts){
+			x = as.xts(x)
+		}
+		return(x)
+	}
+
+	x = x[,-seq(3,ncol(x),by=3)]
+	x = x[-1,]
+	n.col=ncol(x)
+
+
+
+>>>>>>> bugfix
 	x.name = colnames(x)[-seq(2,n.col,by=2)]
 	colnames(x)[seq(1,n.col,by=2)] = "Date"
 	x = apply(x,2,function(x) replace(x,which(x==""),NA))
-	
+
 	if(n.col==2){
+<<<<<<< HEAD
 		cat("縺薙�繝��繧ｿ縺ｯmarge縺吶ｋ蠢�ｦ√′縺ゅｊ縺ｾ縺帙ｓ縺ｧ縺励◆\n")
+=======
+		cat("このデータはmargeする必要がありませんでした＼n")
+>>>>>>> bugfix
 		return(x)
 	}
 
 	tmp  = merge(na.omit(x[,1:2]),na.omit(x[,3:4]),by="Date",all=TRUE)
 	data = tmp[order(as.Date(tmp$Date)),]
 
 	if(n.col==4){
+		browser()
+		Date.name = data$Date
+		data = data[,-1]
+		data = apply(data,2,function(x) as.numeric(as.character(x)))
+		colnames(data) = x.name
+		rownames(data) = Date.name
 		return(data)
 	}
 
@@ -41,10 +85,18 @@ BB.marge <- function(csv.text,xts=FALSE){
 	colnames(data) = x.name
 	rownames(data) = Date.name
 
+<<<<<<< HEAD
 	if(xts)	data = as.xts(data)
 
 	data
 }
 
 
 
+=======
+	if(xts){
+		data = as.xts(data)
+	}
+	data
+}
+>>>>>>> bugfix