typo

DESCRIPTION

 Package: friendlyts
 Type: Package
-Version: 0.2.2
+Version: 0.2.3
 Authors@R: c(person("Jean-Marie", "Lepioufle", , "jml@nilu.no", role=c("aut","cre")),
              person("NILU",role="cph"))
 Title: friendlyts

R/as_tbl_friendlyts.R

@@ -104,20 +104,29 @@ as_tbl_friendlyts_ <- function(df,date_col,precision,date_type=c("friendlyts","p
   if (precision == "yearly") {
     res$wday  <- as.integer(as.character(res$wday))
     res$YEAR  <- as.integer(as.character(res$YEAR))
-    res <- res %>% arrange(wday,YEAR)
+    res <- res %>% arrange(YEAR)
+    res$wday  <- as.factor(res$wday)
+    res$YEAR  <- as.factor(res$YEAR)
   }
   if (precision == "monthly") {
     res$wday  <- as.integer(as.character(res$wday))
     res$YEAR  <- as.integer(as.character(res$YEAR))
     res$MONTH <- as.integer(as.character(res$MONTH))
-    res <- res %>% arrange(wday,YEAR,MONTH)
+    res <- res %>% arrange(YEAR,MONTH)
+    res$wday  <- as.factor(res$wday)
+    res$YEAR  <- as.factor(res$YEAR)
+    res$MONTH <- as.factor(res$MONTH)
   }
   if (precision == "daily") {
     res$wday  <- as.integer(as.character(res$wday))
     res$YEAR  <- as.integer(as.character(res$YEAR))
     res$MONTH <- as.integer(as.character(res$MONTH))
     res$DAY   <- as.integer(as.character(res$DAY))
-    res <- res %>% arrange(wday,YEAR,MONTH,DAY)
+    res <- res %>% arrange(YEAR,MONTH,DAY)
+    res$wday  <- as.factor(res$wday)
+    res$YEAR  <- as.factor(res$YEAR)
+    res$MONTH <- as.factor(res$MONTH)
+    res$DAY   <- as.factor(res$DAY)
   }
   if (precision == "hourly") {
     res$wday  <- as.integer(as.character(res$wday))
@@ -125,7 +134,12 @@ as_tbl_friendlyts_ <- function(df,date_col,precision,date_type=c("friendlyts","p
     res$MONTH <- as.integer(as.character(res$MONTH))
     res$DAY   <- as.integer(as.character(res$DAY))
     res$HOUR  <- as.integer(as.character(res$HOUR))
-    res <- res %>% arrange(wday,YEAR,MONTH,DAY,HOUR)
+    res <- res %>% arrange(YEAR,MONTH,DAY,HOUR)
+    res$wday  <- as.factor(res$wday)
+    res$YEAR  <- as.factor(res$YEAR)
+    res$MONTH <- as.factor(res$MONTH)
+    res$DAY   <- as.factor(res$DAY)
+    res$HOUR  <- as.factor(res$HOUR)
   }
   if (precision == "minute") {
     res$wday  <- as.integer(as.character(res$wday))
@@ -134,7 +148,13 @@ as_tbl_friendlyts_ <- function(df,date_col,precision,date_type=c("friendlyts","p
     res$DAY   <- as.integer(as.character(res$DAY))
     res$HOUR  <- as.integer(as.character(res$HOUR))
     res$MINUTE  <- as.integer(as.character(res$MINUTE))
-    res <- res %>% arrange(wday,YEAR,MONTH,DAY,HOUR,MINUTE)
+    res <- res %>% arrange(YEAR,MONTH,DAY,HOUR,MINUTE)
+    res$wday  <- as.factor(res$wday)
+    res$YEAR  <- as.factor(res$YEAR)
+    res$MONTH <- as.factor(res$MONTH)
+    res$DAY   <- as.factor(res$DAY)
+    res$HOUR  <- as.factor(res$HOUR)
+    res$MINUTE  <- as.factor(res$MINUTE)
   }
   if (precision == "second") {
     res$wday  <- as.integer(as.character(res$wday))
@@ -144,41 +164,7 @@ as_tbl_friendlyts_ <- function(df,date_col,precision,date_type=c("friendlyts","p
     res$HOUR  <- as.integer(as.character(res$HOUR))
     res$MINUTE  <- as.integer(as.character(res$MINUTE))
     res$SECOND  <- as.integer(as.character(res$SECOND))
-    res <- res %>% arrange(wday,YEAR,MONTH,DAY,HOUR,MINUTE,SECOND)
-  }
-
-  # time related colums as factors
-  if (precision == "yearly") {
-    res$wday  <- as.factor(res$wday)
-    res$YEAR  <- as.factor(res$YEAR)
-  }
-  if (precision == "monthly") {
-    res$wday  <- as.factor(res$wday)
-    res$YEAR  <- as.factor(res$YEAR)
-    res$MONTH <- as.factor(res$MONTH)
-  }
-  if (precision == "daily") {
-    res$wday  <- as.factor(res$wday)
-    res$YEAR  <- as.factor(res$YEAR)
-    res$MONTH <- as.factor(res$MONTH)
-    res$DAY   <- as.factor(res$DAY)
-  }
-  if (precision == "hourly") {
-    res$wday  <- as.factor(res$wday)
-    res$YEAR  <- as.factor(res$YEAR)
-    res$MONTH <- as.factor(res$MONTH)
-    res$DAY   <- as.factor(res$DAY)
-    res$HOUR  <- as.factor(res$HOUR)
-  }
-  if (precision == "minute") {
-    res$wday  <- as.factor(res$wday)
-    res$YEAR  <- as.factor(res$YEAR)
-    res$MONTH <- as.factor(res$MONTH)
-    res$DAY   <- as.factor(res$DAY)
-    res$HOUR  <- as.factor(res$HOUR)
-    res$MINUTE  <- as.factor(res$MINUTE)
-  }
-  if (precision == "second") {
+    res <- res %>% arrange(YEAR,MONTH,DAY,HOUR,MINUTE,SECOND)
     res$wday  <- as.factor(res$wday)
     res$YEAR  <- as.factor(res$YEAR)
     res$MONTH <- as.factor(res$MONTH)
@@ -188,6 +174,7 @@ as_tbl_friendlyts_ <- function(df,date_col,precision,date_type=c("friendlyts","p
     res$SECOND  <- as.factor(res$SECOND)
   }
 
+
   class(res) <- c("tbl_friendlyts", class(res))
   return(res)
 }