Update documentation

r-spatial · Oct 1, 2015 · 9774dbe · 9774dbe
1 parent 6542226
commit 9774dbe
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 9 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -7,6 +7,8 @@ corinho.R
 .git
 .gitignore
 ^README\.Rmd$
+^figure$
+^.*\.png$
 ^README-.*\.png$
 ^cran-comments\.md
 ^NEWS\.md$
diff --git a/R/class-dtwSat.R b/R/class-dtwSat.R
@@ -138,7 +138,7 @@ setMethod("show",
           signature = signature(object="dtwSat"),
           definition = function(object){
             cat("Time-Weighted DTW alignment object\n")
-            cat("Alignments:\n")
+            cat("Number of alignments:",nrow(getAlignments(object)),"\n")
             print(head(getAlignments(object)))
             invisible(NULL)
           }

diff --git a/README-alig.png b/README-alig.png
diff --git a/README-classify.png b/README-classify.png
diff --git a/README-filter.png b/README-filter.png
diff --git a/README-path.png b/README-path.png
diff --git a/README.Rmd b/README.Rmd
@@ -104,7 +104,6 @@ df2 = melt(data.frame(Time=index(sy), sy), id="Time")
 gp2 = ggplot(df2, aes(x=Time, y=value, group=variable, colour=variable)) +
    		geom_line() + 
   		ylab("Value") 
-gp2
 
 grid.arrange(gp1,gp2,nrow=2)
 ```

diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ print(alig)
 
 ```
 ## Time-Weighted DTW alignment object
-## Alignments:
+## Number of alignments: 4 
 ##   query       from         to distance normalizedDistance
 ## 1     1 2011-10-04 2012-01-28 3.956483         0.03140066
 ## 2     1 2012-10-06 2013-02-15 4.008838         0.03181617
@@ -140,16 +140,11 @@ df2 = melt(data.frame(Time=index(sy), sy), id="Time")
 gp2 = ggplot(df2, aes(x=Time, y=value, group=variable, colour=variable)) +
    		geom_line() + 
   		ylab("Value") 
-gp2
-```
-
-![plot of chunk define-demo-plot-smoothing](figure/define-demo-plot-smoothing-1.png) 
 
-```r
 grid.arrange(gp1,gp2,nrow=2)
 ```
 
-![plot of chunk define-demo-plot-smoothing](figure/define-demo-plot-smoothing-2.png) 
+![plot of chunk define-demo-plot-smoothing](figure/define-demo-plot-smoothing-1.png) 
 
 
 

diff --git a/figure/define-demo-code-1.png b/figure/define-demo-code-1.png
diff --git a/figure/define-demo-plot-smoothing-1.png b/figure/define-demo-plot-smoothing-1.png
diff --git a/figure/define-demo-plot-smoothing-2.png b/figure/define-demo-plot-smoothing-2.png