projects
/
talweg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
'update'
[talweg.git]
/
pkg
/
R
/
plot.R
diff --git
a/pkg/R/plot.R
b/pkg/R/plot.R
index
95dc0f7
..
372abf0
100644
(file)
--- a/
pkg/R/plot.R
+++ b/
pkg/R/plot.R
@@
-9,7
+9,7
@@
plotCurves <- function(data, indices=seq_len(data$getSize()))
{
series = data$getSeries(indices)
plotCurves <- function(data, indices=seq_len(data$getSize()))
{
series = data$getSeries(indices)
- yrange = quantile(series, probs=c(0.0
5,0.9
5), na.rm=TRUE)
+ yrange = quantile(series, probs=c(0.0
25,0.97
5), na.rm=TRUE)
par(mar=c(4.7,5,1,1), cex.axis=1.5, cex.lab=1.5)
for (i in seq_along(indices))
{
par(mar=c(4.7,5,1,1), cex.axis=1.5, cex.lab=1.5)
for (i in seq_along(indices))
{
@@
-182,7
+182,7
@@
computeFilaments <- function(data, index, limit=60, plot=TRUE)
# Complete series with (past and present) tomorrows
ref_serie = c(ref_serie,data$getCenteredSerie(index+1))
centered_series = rbind( centered_series, data$getCenteredSeries(fdays+1) )
# Complete series with (past and present) tomorrows
ref_serie = c(ref_serie,data$getCenteredSerie(index+1))
centered_series = rbind( centered_series, data$getCenteredSeries(fdays+1) )
- yrange = quantile(cbind(ref_serie,centered_series), probs=c(0.0
5,0.9
5), na.rm=TRUE)
+ yrange = quantile(cbind(ref_serie,centered_series), probs=c(0.0
25,0.97
5), na.rm=TRUE)
par(mar=c(4.7,5,1,1), cex.axis=1.5, cex.lab=1.5, lwd=2)
for (i in nn:1)
{
par(mar=c(4.7,5,1,1), cex.axis=1.5, cex.lab=1.5, lwd=2)
for (i in nn:1)
{
@@
-192,7
+192,7
@@
computeFilaments <- function(data, index, limit=60, plot=TRUE)
}
# Also plot ref curve, in red
plot(ref_serie, ylim=yrange, type="l", col="#FF0000", xlab="", ylab="")
}
# Also plot ref curve, in red
plot(ref_serie, ylim=yrange, type="l", col="#FF0000", xlab="", ylab="")
- abline(v=24, lty=2, col=colors()[56])
+ abline(v=24, lty=2, col=colors()[56]
, lwd=1
)
}
list("index"=index,"neighb_indices"=fdays[sorted_distances$ix[1:nn]],"colors"=colors)
}
list("index"=index,"neighb_indices"=fdays[sorted_distances$ix[1:nn]],"colors"=colors)
@@
-222,8
+222,9
@@
plotFilamentsBox = function(data, fil, ...)
usr <- par("usr")
yr <- (usr[4] - usr[3]) / 27
par(new=TRUE)
usr <- par("usr")
yr <- (usr[4] - usr[3]) / 27
par(new=TRUE)
- plot(
data$getSerie(fil$index
), type="l", lwd=2, lty=2,
+ plot(
c(data$getSerie(fil$index),data$getSerie(fil$index+1)
), type="l", lwd=2, lty=2,
ylim=c(usr[3] + yr, usr[4] - yr), xlab="", ylab="")
ylim=c(usr[3] + yr, usr[4] - yr), xlab="", ylab="")
+ abline(v=24, lty=2, col=colors()[56])
}
#' Plot relative conditional variability / absolute variability
}
#' Plot relative conditional variability / absolute variability