fixed merge

Merge branch 'master' of github.com:CfSOtago/evAnalysis # Conflicts: # docs/EVBB_report_v1_final_EVBB_processed_all_v2.0_20190604.html # reports/fullReport/v1_final/EVBB_report.Rmd
CfSOtago · Oct 24, 2019 · e61b9d0 · e61b9d0
2 parents 97f3346 + 092fb9b
commit e61b9d0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/docs/EVBB_report_v1_final_EVBB_processed_all_v2.0_20190604.html b/docs/EVBB_report_v1_final_EVBB_processed_all_v2.0_20190604.html
@@ -263,7 +263,7 @@
 <h1 class="title toc-ignore">Analysis of electric vehicle usage patterns in New Zealand</h1>
 <h3 class="subtitle">Statistical report using Flip The Fleet data</h3>
 <h4 class="author">Rafferty Parker and Ben Anderson (<a href="https://www.otago.ac.nz/centre-sustainability/">Centre for Sustainability</a>, University of Otago, <a href="mailto:[email protected]" class="email">[email protected]</a>); Daniel Myall (Flip The Fleet, <a href="mailto:[email protected]" class="email">[email protected]</a>)</h4>
-<h4 class="date">Last run at: 2019-10-24 13:59:58</h4>
+<h4 class="date">Last run at: 2019-10-24 14:17:46</h4>
 
 </div>
 

diff --git a/reports/fullReport/v1_final/EVBB_report.Rmd b/reports/fullReport/v1_final/EVBB_report.Rmd
@@ -849,7 +849,6 @@ p + labs(x = "Time of day", y = "Count per 15 minutes",
 p + scale_y_log10() + annotation_logticks() # so we can see rapid charge patterns
 ```
 
-
 Figure \@ref(fig:chargeTimeDensity) extends this analysis by showing charging and non-charging observations at different times of day by weekday vs weekends using a density plot to show relative distributions over time within each type. The plot clearly shows non-charging during day-time use and also shows a bi-model distribution for rapid charging (non-corrected categorisation). Standard charging also shows a bi-modal distribution with a peak around 22:00 on weekdays and another at 01:00 presumably indicating the use of timed or 'smart' charging or trickle events.
 
 ```{r chargeTimeDensity, fig.cap="Density plot of charging start times during weekdays"}