diff --git a/impetusModel/impetusModel.html b/impetusModel/impetusModel.html
index 1b0d4330d07500e03453b969b4067e3ae0fa9b66..02d429c8532b7c97e8ca4f7ceb54de67c45b0659 100644
--- a/impetusModel/impetusModel.html
+++ b/impetusModel/impetusModel.html
@@ -266,7 +266,7 @@ div.tocify {
<h1 class="title toc-ignore">A household level daily consumption estimation microsimulation model</h1>
<h4 class="author">Ben Anderson (<a href="mailto:b.anderson@soton.ac.uk" class="email">b.anderson@soton.ac.uk</a>, <code>@dataknut</code>), Despoina Manouseli (<a href="mailto:d.manouseli@soton.ac.uk" class="email">d.manouseli@soton.ac.uk</a>) & Magesh Nagarajan (<a href="mailto:m.nagarajan@soton.ac.uk" class="email">m.nagarajan@soton.ac.uk</a>)</h4>
-<h4 class="date">Last run at: 2021-03-15 15:16:59</h4>
+<h4 class="date">Last run at: 2021-03-15 15:54:47</h4>
</div>
@@ -2250,21 +2250,21 @@ kable(caption = "Check % metered distribution",
<tbody>
<tr class="odd">
<td align="left">Metered</td>
-<td align="right">40.7</td>
-<td align="right">40.2</td>
-<td align="right">37.4</td>
-<td align="right">42.3</td>
-<td align="right">41.5</td>
-<td align="right">37.3</td>
+<td align="right">38.2</td>
+<td align="right">39.7</td>
+<td align="right">43</td>
+<td align="right">41.7</td>
+<td align="right">42.6</td>
+<td align="right">36.1</td>
</tr>
<tr class="even">
<td align="left">Not metered</td>
-<td align="right">59.3</td>
-<td align="right">59.8</td>
-<td align="right">62.6</td>
-<td align="right">57.7</td>
-<td align="right">58.5</td>
-<td align="right">62.7</td>
+<td align="right">61.8</td>
+<td align="right">60.3</td>
+<td align="right">57</td>
+<td align="right">58.3</td>
+<td align="right">57.4</td>
+<td align="right">63.9</td>
</tr>
</tbody>
</table>
@@ -2810,69 +2810,69 @@ kable(caption = "Test Basin & Bath l/day as modelled using rsnorm()&quo
<tbody>
<tr class="odd">
<td align="left"></td>
-<td align="left">Min. :12.30</td>
-<td align="left">Min. : 35.52</td>
-<td align="left">Min. :19.94</td>
+<td align="left">Min. :12.01</td>
+<td align="left">Min. : 37.54</td>
+<td align="left">Min. :19.81</td>
<td align="left">Min. : 0.00</td>
-<td align="left">Min. :27.34</td>
-<td align="left">Min. :21.98</td>
-<td align="left">Min. : 47.47</td>
-<td align="left">Min. : 56.03</td>
+<td align="left">Min. :27.28</td>
+<td align="left">Min. :21.11</td>
+<td align="left">Min. : 42.40</td>
+<td align="left">Min. : 55.62</td>
</tr>
<tr class="even">
<td align="left"></td>
-<td align="left">1st Qu.:17.54</td>
-<td align="left">1st Qu.: 56.57</td>
-<td align="left">1st Qu.:22.61</td>
-<td align="left">1st Qu.:10.87</td>
-<td align="left">1st Qu.:32.47</td>
-<td align="left">1st Qu.:31.80</td>
-<td align="left">1st Qu.: 80.41</td>
-<td align="left">1st Qu.: 72.78</td>
+<td align="left">1st Qu.:17.45</td>
+<td align="left">1st Qu.: 56.79</td>
+<td align="left">1st Qu.:22.63</td>
+<td align="left">1st Qu.:10.80</td>
+<td align="left">1st Qu.:32.31</td>
+<td align="left">1st Qu.:31.86</td>
+<td align="left">1st Qu.: 80.16</td>
+<td align="left">1st Qu.: 73.16</td>
</tr>
<tr class="odd">
<td align="left"></td>
<td align="left">Median :24.13</td>
-<td align="left">Median : 74.25</td>
-<td align="left">Median :23.80</td>
-<td align="left">Median :15.78</td>
-<td align="left">Median :43.08</td>
-<td align="left">Median :36.70</td>
-<td align="left">Median : 99.95</td>
-<td align="left">Median : 81.89</td>
+<td align="left">Median : 74.20</td>
+<td align="left">Median :23.95</td>
+<td align="left">Median :15.64</td>
+<td align="left">Median :43.06</td>
+<td align="left">Median :36.17</td>
+<td align="left">Median :100.04</td>
+<td align="left">Median : 82.05</td>
</tr>
<tr class="even">
<td align="left"></td>
-<td align="left">Mean :22.98</td>
-<td align="left">Mean : 71.85</td>
-<td align="left">Mean :24.17</td>
-<td align="left">Mean :15.66</td>
-<td align="left">Mean :40.40</td>
-<td align="left">Mean :36.55</td>
-<td align="left">Mean : 98.60</td>
-<td align="left">Mean : 84.27</td>
+<td align="left">Mean :23.05</td>
+<td align="left">Mean : 71.97</td>
+<td align="left">Mean :24.14</td>
+<td align="left">Mean :15.48</td>
+<td align="left">Mean :40.30</td>
+<td align="left">Mean :36.22</td>
+<td align="left">Mean : 98.92</td>
+<td align="left">Mean : 84.51</td>
</tr>
<tr class="odd">
<td align="left"></td>
-<td align="left">3rd Qu.:27.15</td>
-<td align="left">3rd Qu.: 83.95</td>
-<td align="left">3rd Qu.:25.50</td>
-<td align="left">3rd Qu.:22.28</td>
-<td align="left">3rd Qu.:46.25</td>
-<td align="left">3rd Qu.:40.87</td>
-<td align="left">3rd Qu.:114.21</td>
-<td align="left">3rd Qu.: 93.32</td>
+<td align="left">3rd Qu.:27.24</td>
+<td align="left">3rd Qu.: 83.91</td>
+<td align="left">3rd Qu.:25.40</td>
+<td align="left">3rd Qu.:21.90</td>
+<td align="left">3rd Qu.:46.03</td>
+<td align="left">3rd Qu.:40.48</td>
+<td align="left">3rd Qu.:114.38</td>
+<td align="left">3rd Qu.: 93.75</td>
</tr>
<tr class="even">
<td align="left"></td>
-<td align="left">Max. :42.95</td>
-<td align="left">Max. :125.57</td>
-<td align="left">Max. :33.55</td>
-<td align="left">Max. :52.37</td>
-<td align="left">Max. :63.99</td>
-<td align="left">Max. :59.18</td>
-<td align="left">Max. :170.06</td>
-<td align="left">Max. :145.30</td>
+<td align="left">Max. :41.40</td>
+<td align="left">Max. :123.04</td>
+<td align="left">Max. :32.94</td>
+<td align="left">Max. :55.25</td>
+<td align="left">Max. :59.57</td>
+<td align="left">Max. :61.54</td>
+<td align="left">Max. :168.86</td>
+<td align="left">Max. :158.55</td>
</tr>
</tbody>
</table>
@@ -2893,14 +2893,14 @@ kable(caption = "Test Basin & Bath l/day as modelled using rsnorm()&quo
kable(caption = "Metered vs un-metered estimates (mean)",
t
)</code></pre>
-<table>
+<table style="width:100%;">
<caption>Metered vs un-metered estimates (mean)</caption>
<colgroup>
<col width="12%" />
<col width="9%" />
<col width="9%" />
<col width="11%" />
-<col width="10%" />
+<col width="9%" />
<col width="12%" />
<col width="9%" />
<col width="10%" />
@@ -2922,31 +2922,31 @@ kable(caption = "Metered vs un-metered estimates (mean)",
<tbody>
<tr class="odd">
<td align="left">Metered</td>
-<td align="right">16.91258</td>
-<td align="right">55.13962</td>
-<td align="right">22.93975</td>
-<td align="right">9.969381</td>
-<td align="right">31.96897</td>
-<td align="right">31.09094</td>
-<td align="right">77.28764</td>
-<td align="right">77.97218</td>
+<td align="right">16.98809</td>
+<td align="right">54.93408</td>
+<td align="right">22.87862</td>
+<td align="right">10.05473</td>
+<td align="right">31.86393</td>
+<td align="right">30.86775</td>
+<td align="right">77.88797</td>
+<td align="right">78.33949</td>
</tr>
<tr class="even">
<td align="left">Not metered</td>
-<td align="right">27.02584</td>
-<td align="right">82.98633</td>
-<td align="right">24.98664</td>
-<td align="right">19.456815</td>
-<td align="right">46.02308</td>
-<td align="right">40.18888</td>
-<td align="right">112.80513</td>
-<td align="right">88.46967</td>
+<td align="right">27.08962</td>
+<td align="right">83.32810</td>
+<td align="right">24.98581</td>
+<td align="right">19.10479</td>
+<td align="right">45.91949</td>
+<td align="right">39.78876</td>
+<td align="right">112.94105</td>
+<td align="right">88.62439</td>
</tr>
</tbody>
</table>
<pre class="r"><code>wmMetered <- t[metered == "Metered", WC]
wmNonMetered <- t[metered == "Not metered", WC]</code></pre>
-<p>% difference between means for washing machine: 31.49.</p>
+<p>% difference between means for washing machine: 31.04.</p>
</div>
<div id="occupancy-based-adjustment" class="section level3">
<h3><span class="header-section-number">8.4.3</span> Occupancy based adjustment</h3>
@@ -3206,98 +3206,98 @@ kable(caption = "Test monthly fixed and occupancy adjusted l/day", sum
<tr class="odd">
<td align="left">Metered</td>
<td align="right">1</td>
-<td align="right">17.07</td>
-<td align="right">2.74</td>
-<td align="right">54.78</td>
-<td align="right">10.27</td>
+<td align="right">16.88</td>
+<td align="right">3.07</td>
+<td align="right">55.58</td>
+<td align="right">9.87</td>
</tr>
<tr class="even">
<td align="left">Metered</td>
<td align="right">2</td>
-<td align="right">18.37</td>
-<td align="right">2.98</td>
-<td align="right">57.75</td>
-<td align="right">10.02</td>
+<td align="right">18.65</td>
+<td align="right">3.12</td>
+<td align="right">56.38</td>
+<td align="right">9.73</td>
</tr>
<tr class="odd">
<td align="left">Metered</td>
<td align="right">3</td>
-<td align="right">19.13</td>
-<td align="right">2.83</td>
-<td align="right">54.83</td>
-<td align="right">9.74</td>
+<td align="right">19.21</td>
+<td align="right">3.23</td>
+<td align="right">56.38</td>
+<td align="right">9.52</td>
</tr>
<tr class="even">
<td align="left">Metered</td>
<td align="right">4</td>
-<td align="right">19.02</td>
-<td align="right">2.25</td>
-<td align="right">57.78</td>
-<td align="right">11.06</td>
+<td align="right">19.32</td>
+<td align="right">2.38</td>
+<td align="right">55.16</td>
+<td align="right">9.12</td>
</tr>
<tr class="odd">
<td align="left">Metered</td>
<td align="right">5</td>
-<td align="right">19.85</td>
-<td align="right">2.85</td>
-<td align="right">53.21</td>
-<td align="right">9.08</td>
+<td align="right">19.52</td>
+<td align="right">3.45</td>
+<td align="right">54.44</td>
+<td align="right">9.20</td>
</tr>
<tr class="even">
<td align="left">Metered</td>
<td align="right">6</td>
-<td align="right">17.79</td>
-<td align="right">3.00</td>
-<td align="right">58.93</td>
-<td align="right">9.08</td>
+<td align="right">17.70</td>
+<td align="right">2.62</td>
+<td align="right">59.13</td>
+<td align="right">11.07</td>
</tr>
<tr class="odd">
<td align="left">Not metered</td>
<td align="right">1</td>
-<td align="right">27.27</td>
-<td align="right">3.32</td>
-<td align="right">82.58</td>
-<td align="right">9.67</td>
+<td align="right">27.08</td>
+<td align="right">3.09</td>
+<td align="right">84.02</td>
+<td align="right">10.62</td>
</tr>
<tr class="even">
<td align="left">Not metered</td>
<td align="right">2</td>
-<td align="right">28.27</td>
-<td align="right">2.80</td>
-<td align="right">84.10</td>
-<td align="right">9.77</td>
+<td align="right">28.39</td>
+<td align="right">2.99</td>
+<td align="right">83.95</td>
+<td align="right">9.94</td>
</tr>
<tr class="odd">
<td align="left">Not metered</td>
<td align="right">3</td>
-<td align="right">29.57</td>
-<td align="right">3.01</td>
-<td align="right">86.01</td>
-<td align="right">9.45</td>
+<td align="right">29.43</td>
+<td align="right">3.16</td>
+<td align="right">85.63</td>
+<td align="right">10.06</td>
</tr>
<tr class="even">
<td align="left">Not metered</td>
<td align="right">4</td>
-<td align="right">29.50</td>
-<td align="right">2.90</td>
-<td align="right">85.16</td>
-<td align="right">10.26</td>
+<td align="right">30.21</td>
+<td align="right">3.17</td>
+<td align="right">85.19</td>
+<td align="right">10.32</td>
</tr>
<tr class="odd">
<td align="left">Not metered</td>
<td align="right">5</td>
-<td align="right">29.65</td>
-<td align="right">2.92</td>
-<td align="right">87.24</td>
-<td align="right">11.11</td>
+<td align="right">30.21</td>
+<td align="right">3.82</td>
+<td align="right">85.81</td>
+<td align="right">8.91</td>
</tr>
<tr class="even">
<td align="left">Not metered</td>
<td align="right">6</td>
-<td align="right">30.25</td>
-<td align="right">3.54</td>
-<td align="right">85.79</td>
-<td align="right">8.50</td>
+<td align="right">30.41</td>
+<td align="right">2.85</td>
+<td align="right">87.72</td>
+<td align="right">8.82</td>
</tr>
</tbody>
</table>
@@ -6266,17 +6266,17 @@ hhDataFinalDaily_v1_3fDT <- hhDataFinalDaily_v1_3DT[, .(hhid, occupancy, mete
hhDataFinalDaily_v1_3fDT <- hhDataFinalDaily_v1_3fDT[, model := "v1_3"]
st <- str(hhDataFinalDaily_v1_3fDT)</code></pre>
<pre><code>## Classes 'data.table' and 'data.frame': 1800 obs. of 12 variables:
-## $ hhid : int 8 15 22 28 30 41 43 52 64 66 ...
+## $ hhid : int 15 17 21 22 28 40 41 52 59 63 ...
## $ occupancy : int 1 1 1 1 1 1 1 1 1 1 ...
## $ metered : chr "Metered" "Metered" "Metered" "Metered" ...
-## $ Basin.baseline : num 16.8 21.7 14.4 21.8 13.8 ...
-## $ Bath.baseline : num 54.1 60.7 59.7 76.3 48.7 ...
-## $ Dishwasher.baseline : num 24.5 24.5 24.6 26.5 22.3 ...
-## $ KitchenSink.baseline : num 33.5 33.7 29.9 31.4 31.9 ...
-## $ Shower.baseline : num 40.5 25.3 38.5 28.2 32.3 ...
-## $ WC.baseline : num 85.1 62.8 70.3 68.7 88.4 ...
-## $ WashingMachine.baseline: num 100.2 83.5 75.3 65.8 61.4 ...
-## $ External.baseline : num 16.2 0 11.4 0 0 ...
+## $ Basin.baseline : num 16.9 15.2 22.1 15.7 14.6 ...
+## $ Bath.baseline : num 55.2 45.2 47.3 54.9 47.5 ...
+## $ Dishwasher.baseline : num 21.8 24.1 27 23.5 21.1 ...
+## $ KitchenSink.baseline : num 29.3 32.7 29.3 28.3 32.2 ...
+## $ Shower.baseline : num 25.6 39.8 31 29.4 37.3 ...
+## $ WC.baseline : num 78.1 81.8 75.5 85.6 61.3 ...
+## $ WashingMachine.baseline: num 81.7 127 69.8 89.5 66.2 ...
+## $ External.baseline : num 16.8 0 0 13.4 0 ...
## $ model : chr "v1_3" "v1_3" "v1_3" "v1_3" ...
## - attr(*, ".internal.selfref")=<externalptr>
## - attr(*, "sorted")= chr [1:2] "metered" "occupancy"</code></pre>
@@ -6631,15 +6631,15 @@ kable(caption = "Summary of final household data (litres/day) - model v1_3&
<td align="left">Min. : 1.000</td>
<td align="left">Length:433800</td>
<td align="left">Min. :1.000</td>
-<td align="left">Min. :261.3</td>
-<td align="left">Min. :12.61</td>
-<td align="left">Min. : 33.87</td>
-<td align="left">Min. :13.51</td>
+<td align="left">Min. :254.7</td>
+<td align="left">Min. :12.35</td>
+<td align="left">Min. : 38.24</td>
+<td align="left">Min. :13.80</td>
<td align="left">Min. :-2.511</td>
-<td align="left">Min. :27.51</td>
-<td align="left">Min. :22.05</td>
-<td align="left">Min. : 52.98</td>
-<td align="left">Min. : 56.05</td>
+<td align="left">Min. :27.49</td>
+<td align="left">Min. :22.15</td>
+<td align="left">Min. : 50.87</td>
+<td align="left">Min. : 55.36</td>
</tr>
<tr class="even">
<td align="left"></td>
@@ -6647,15 +6647,15 @@ kable(caption = "Summary of final household data (litres/day) - model v1_3&
<td align="left">1st Qu.: 4.000</td>
<td align="left">Class :character</td>
<td align="left">1st Qu.:1.000</td>
-<td align="left">1st Qu.:346.2</td>
-<td align="left">1st Qu.:19.05</td>
-<td align="left">1st Qu.: 57.57</td>
-<td align="left">1st Qu.:20.97</td>
-<td align="left">1st Qu.:11.343</td>
-<td align="left">1st Qu.:34.70</td>
-<td align="left">1st Qu.:33.18</td>
-<td align="left">1st Qu.: 86.77</td>
-<td align="left">1st Qu.: 74.80</td>
+<td align="left">1st Qu.:346.4</td>
+<td align="left">1st Qu.:19.10</td>
+<td align="left">1st Qu.: 57.60</td>
+<td align="left">1st Qu.:20.93</td>
+<td align="left">1st Qu.:11.085</td>
+<td align="left">1st Qu.:34.73</td>
+<td align="left">1st Qu.:33.04</td>
+<td align="left">1st Qu.: 86.78</td>
+<td align="left">1st Qu.: 74.97</td>
</tr>
<tr class="odd">
<td align="left"></td>
@@ -6663,15 +6663,15 @@ kable(caption = "Summary of final household data (litres/day) - model v1_3&
<td align="left">Median : 7.000</td>
<td align="left">Mode :character</td>
<td align="left">Median :2.000</td>
-<td align="left">Median :429.0</td>
-<td align="left">Median :25.60</td>
-<td align="left">Median : 73.96</td>
-<td align="left">Median :22.28</td>
-<td align="left">Median :16.323</td>
-<td align="left">Median :44.75</td>
-<td align="left">Median :37.43</td>
-<td align="left">Median :110.17</td>
-<td align="left">Median : 83.54</td>
+<td align="left">Median :426.0</td>
+<td align="left">Median :25.63</td>
+<td align="left">Median : 73.68</td>
+<td align="left">Median :22.34</td>
+<td align="left">Median :16.267</td>
+<td align="left">Median :44.71</td>
+<td align="left">Median :37.01</td>
+<td align="left">Median :109.68</td>
+<td align="left">Median : 83.64</td>
</tr>
<tr class="even">
<td align="left"></td>
@@ -6680,14 +6680,14 @@ kable(caption = "Summary of final household data (litres/day) - model v1_3&
<td align="left">NA</td>
<td align="left">Mean :2.407</td>
<td align="left">Mean :408.9</td>
-<td align="left">Mean :24.51</td>
-<td align="left">Mean : 71.85</td>
-<td align="left">Mean :22.59</td>
-<td align="left">Mean :16.087</td>
-<td align="left">Mean :42.25</td>
-<td align="left">Mean :37.53</td>
-<td align="left">Mean :108.00</td>
-<td align="left">Mean : 86.09</td>
+<td align="left">Mean :24.58</td>
+<td align="left">Mean : 71.96</td>
+<td align="left">Mean :22.56</td>
+<td align="left">Mean :15.908</td>
+<td align="left">Mean :42.15</td>
+<td align="left">Mean :37.22</td>
+<td align="left">Mean :108.24</td>
+<td align="left">Mean : 86.33</td>
</tr>
<tr class="odd">
<td align="left"></td>
@@ -6695,15 +6695,15 @@ kable(caption = "Summary of final household data (litres/day) - model v1_3&
<td align="left">3rd Qu.:10.000</td>
<td align="left">NA</td>
<td align="left">3rd Qu.:3.000</td>
-<td align="left">3rd Qu.:460.7</td>
-<td align="left">3rd Qu.:28.77</td>
-<td align="left">3rd Qu.: 83.48</td>
-<td align="left">3rd Qu.:24.06</td>
-<td align="left">3rd Qu.:22.982</td>
-<td align="left">3rd Qu.:47.93</td>
-<td align="left">3rd Qu.:41.63</td>
-<td align="left">3rd Qu.:126.73</td>
-<td align="left">3rd Qu.: 95.34</td>
+<td align="left">3rd Qu.:460.6</td>
+<td align="left">3rd Qu.:28.82</td>
+<td align="left">3rd Qu.: 83.51</td>
+<td align="left">3rd Qu.:23.98</td>
+<td align="left">3rd Qu.:22.532</td>
+<td align="left">3rd Qu.:47.67</td>
+<td align="left">3rd Qu.:41.31</td>
+<td align="left">3rd Qu.:126.21</td>
+<td align="left">3rd Qu.: 95.23</td>
</tr>
<tr class="even">
<td align="left"></td>
@@ -6711,15 +6711,15 @@ kable(caption = "Summary of final household data (litres/day) - model v1_3&
<td align="left">Max. :12.000</td>
<td align="left">NA</td>
<td align="left">Max. :6.000</td>
-<td align="left">Max. :561.7</td>
-<td align="left">Max. :46.99</td>
-<td align="left">Max. :128.95</td>
-<td align="left">Max. :32.75</td>
-<td align="left">Max. :54.270</td>
-<td align="left">Max. :66.99</td>
-<td align="left">Max. :61.82</td>
-<td align="left">Max. :185.19</td>
-<td align="left">Max. :149.06</td>
+<td align="left">Max. :569.7</td>
+<td align="left">Max. :44.17</td>
+<td align="left">Max. :123.92</td>
+<td align="left">Max. :35.26</td>
+<td align="left">Max. :57.154</td>
+<td align="left">Max. :62.15</td>
+<td align="left">Max. :62.88</td>
+<td align="left">Max. :189.30</td>
+<td align="left">Max. :158.51</td>
</tr>
</tbody>
</table>
@@ -7073,14 +7073,14 @@ kable(caption = "Summary statistics",t)</code></pre>
<tr class="odd">
<td align="left">v1_3</td>
<td align="left">Not metered</td>
-<td align="right">455.4451</td>
-<td align="right">251.3669</td>
+<td align="right">454.8590</td>
+<td align="right">254.4799</td>
</tr>
<tr class="even">
<td align="left">v1_3</td>
<td align="left">Metered</td>
-<td align="right">339.1046</td>
-<td align="right">188.6442</td>
+<td align="right">340.0453</td>
+<td align="right">186.0782</td>
</tr>
<tr class="odd">
<td align="left">v2_0</td>
@@ -7184,15 +7184,15 @@ m2Plot</code></pre>
</div>
<div id="introduction-3" class="section level1">
<h1><span class="header-section-number">12</span> Introduction</h1>
-<p>Now we add the basline water efficiency uptake to each of the two models</p>
-<div id="add-baseline-we-uptake" class="section level2">
-<h2><span class="header-section-number">12.1</span> Add baseline WE uptake</h2>
-<p>This has to be done after the expansion to months as it is a monthly uptake model. how this works:</p>
-<ul>
-<li>Add baseline WE uptake rates of dual flush WC & low flow shower head uptake and adjust l/day/hh for WCs and showers accordingly</li>
-</ul>
-<div id="backwards-estimation-of-water-efficiency-uptake" class="section level3">
-<h3><span class="header-section-number">12.1.1</span> Backwards estimation of water efficiency uptake</h3>
+<p>Now we add the baseline water efficiency uptake to each of the two models. This has to be done after the expansion to months as it is a monthly uptake model.</p>
+<blockquote>
+<p>Summary: add baseline WE uptake rates of dual flush WC & low flow shower head uptake and adjust l/day/hh for WCs and showers accordingly</p>
+</blockquote>
+</div>
+<div id="model-we-uptake" class="section level1">
+<h1><span class="header-section-number">13</span> Model WE uptake</h1>
+<div id="backwards-estimation-of-water-efficiency-uptake" class="section level2">
+<h2><span class="header-section-number">13.1</span> Backwards estimation of water efficiency uptake</h2>
<p>The first step is to allocate households to dual-flush/no dual-flush status and low-flow/no low-flow shower heads for all years. The logic applied is as follows:</p>
<ul>
<li>dual-flush/no dual-flush WC:
@@ -7378,7 +7378,21 @@ ggplot(dt, aes(x=obsDate, colour = factor(loFlowShower))) +
y = "%",
x = "Date") </code></pre>
<p><img src="impetusModel_files/figure-html/check%20uptake%20rates-3.png" /><!-- --></p>
+</div>
+<div id="update-litresday" class="section level2">
+<h2><span class="header-section-number">13.2</span> Update litres/day</h2>
<p>Next we use the water use reduction values given at the start of the section to update the l/day/hh for those who have the dual flush WCs or low flow showers.</p>
+<pre class="r"><code># before
+hhFinalDataComboExpandedDT[, .(mean_sumDaily = mean(sumDaily.baseline.madj, na.rm = TRUE),
+ mean_WC = mean(WC.baseline.madj, na.rm = TRUE),
+ mean_shower = mean(Shower.baseline.madj, na.rm = TRUE)
+ ), keyby = .(model, metered)
+ ]</code></pre>
+<pre><code>## model metered mean_sumDaily mean_WC mean_shower
+## 1: v1_3 Not metered 454.8590 124.26245 40.41450
+## 2: v1_3 Metered 340.0453 84.19414 32.42067
+## 3: v2_0 Not metered 362.7737 92.13191 109.05040
+## 4: v2_0 Metered 336.4506 83.91561 102.24988</code></pre>
<pre class="r"><code># wc ----
hhFinalDataComboExpandedDT <- hhFinalDataComboExpandedDT[, WC.baseline.madj.we := ifelse(dualFlushWC == "Dual flush", WC.baseline.madj * dfWCReduction, WC.baseline.madj)
]
@@ -7396,10 +7410,21 @@ hhFinalDataComboExpandedDT <- hhFinalDataComboExpandedDT[, sumDaily.baseline.
Shower.baseline.madj.we +
WC.baseline.madj.we +
WashingMachine.baseline.madj
- ]</code></pre>
+ ]
+# after
+hhFinalDataComboExpandedDT[, .(mean_sumDaily = mean(sumDaily.baseline.madj.we, na.rm = TRUE),
+ mean_WC = mean(WC.baseline.madj.we, na.rm = TRUE),
+ mean_shower = mean(Shower.baseline.madj.we, na.rm = TRUE)
+ ), keyby = .(model, metered)
+ ]</code></pre>
+<pre><code>## model metered mean_sumDaily mean_WC mean_shower
+## 1: v1_3 Not metered 438.7207 110.48887 38.04978
+## 2: v1_3 Metered 328.7714 74.81573 30.52523
+## 3: v2_0 Not metered 346.1385 81.90826 102.68525
+## 4: v2_0 Metered 321.1576 74.54604 96.28288</code></pre>
</div>
-<div id="compare-effects" class="section level3">
-<h3><span class="header-section-number">12.1.2</span> Compare effects</h3>
+<div id="compare-effects-by-model" class="section level2">
+<h2><span class="header-section-number">13.3</span> Compare effects by model</h2>
<p>Check the effects on each model</p>
<pre class="r"><code>plotDT <- hhFinalDataComboExpandedDT[, .(meanSh = mean(Shower.baseline.madj, na.rm = TRUE),
meanShWE = mean(Shower.baseline.madj.we, na.rm = TRUE),
@@ -7431,8 +7456,10 @@ ggplot(plotDT, aes(x = obsDate,)) +
<p>Well that seems to have an effect!</p>
</div>
</div>
+<div id="baseline-we-results" class="section level1">
+<h1><span class="header-section-number">14</span> Baseline WE Results</h1>
<div id="model-1-synthetic-results" class="section level2">
-<h2><span class="header-section-number">12.2</span> Model 1 (synthetic) results</h2>
+<h2><span class="header-section-number">14.1</span> Model 1 (synthetic) results</h2>
<p>Now re-draw final baseline charts for papers</p>
<pre class="r"><code>myTitle <- "All uses (2012 only)"
myCaption <- "IMPETUS model: synthetic households (n = 1800 per month)\nModel v1\nBaseline water efficiency uptake"
@@ -7582,7 +7609,7 @@ dt <- hhFinalDataComboExpandedDT[model == "v1_3"]
<pre class="r"><code> ggsave(paste0("plots_v1/baselineMadjWeMonthlyByYearMetering.pdf"), dpi = 480)</code></pre>
</div>
<div id="model-2-sprg-practices-results" class="section level2">
-<h2><span class="header-section-number">12.3</span> Model 2 (SPRG practices) results</h2>
+<h2><span class="header-section-number">14.2</span> Model 2 (SPRG practices) results</h2>
<p>Now redraw final baseline charts for papers</p>
<pre class="r"><code>myTitle <- "All uses (2012 only)"
myCaption <- "IMPETUS model: SPRG households (n = 1800)\nModel v2\nBaseline water efficiency uptake"
@@ -7744,9 +7771,9 @@ dt <- hhFinalDataComboExpandedDT[model == "v2_0"]
</div>
</div>
<div id="drought-response-water-efficiency-model" class="section level1">
-<h1><span class="header-section-number">13</span> Drought Response Water Efficiency Model</h1>
+<h1><span class="header-section-number">15</span> Drought Response Water Efficiency Model</h1>
<div id="introduction-4" class="section level2">
-<h2><span class="header-section-number">13.1</span> Introduction</h2>
+<h2><span class="header-section-number">15.1</span> Introduction</h2>
<p>In this section we introduce a basic water efficiency model that links efficiency interventions to the CEH drought history for the Colne. It is based on a model implemented in Netlogo first presented at <a href="https://speakerdeck.com/dataknut/modeling-water-demand-in-droughts-in-england-and-wales">IMA Europe 2016</a>.</p>
<pre class="r"><code>weModelVersion <- "v1_0"</code></pre>
<pre class="r"><code>print(paste0("User: ",userName))</code></pre>
@@ -7773,7 +7800,7 @@ dt <- hhFinalDataComboExpandedDT[model == "v2_0"]
</ul>
</div>
<div id="how-it-works-3" class="section level2">
-<h2><span class="header-section-number">13.2</span> How it works</h2>
+<h2><span class="header-section-number">15.2</span> How it works</h2>
<p>How this works:</p>
<ul>
<li>Import CEH seasonal drought phases</li>
@@ -7789,7 +7816,7 @@ dt <- hhFinalDataComboExpandedDT[model == "v2_0"]
</ul>
</div>
<div id="attach-ceh-reconstructed-drought-history" class="section level2">
-<h2><span class="header-section-number">13.3</span> Attach CEH reconstructed drought history</h2>
+<h2><span class="header-section-number">15.3</span> Attach CEH reconstructed drought history</h2>
<p>This requires hhFinalDataComboExpandedDT to exist. Does it?</p>
<pre class="r"><code>is.data.table(hhFinalDataComboExpandedDT)</code></pre>
<p>[1] TRUE</p>
@@ -7946,16 +7973,16 @@ Basin.baseline
815,303
</td>
<td>
-39.698
+39.732
</td>
<td>
-39.828
+39.819
</td>
<td>
10.400
</td>
<td>
-21.241
+21.391
</td>
<td>
39.720
@@ -7972,10 +7999,10 @@ Bath.baseline
827,353
</td>
<td>
-54.959
+55.014
</td>
<td>
-26.311
+26.412
</td>
<td>
0.000
@@ -7984,10 +8011,10 @@ Bath.baseline
26.400
</td>
<td>
-77.175
+77.063
</td>
<td>
-128.861
+123.826
</td>
</tr>
<tr>
@@ -7998,10 +8025,10 @@ Dishwasher.baseline
827,353
</td>
<td>
-13.347
+13.332
</td>
<td>
-10.795
+10.776
</td>
<td>
0.000
@@ -8010,10 +8037,10 @@ Dishwasher.baseline
0.000
</td>
<td>
-23.076
+23.158
</td>
<td>
-32.913
+35.262
</td>
</tr>
<tr>
@@ -8024,10 +8051,10 @@ KitchenSink.baseline
827,353
</td>
<td>
-31.464
+31.413
</td>
<td>
-14.210
+14.164
</td>
<td>
7.570
@@ -8036,7 +8063,7 @@ KitchenSink.baseline
15.140
</td>
<td>
-45.127
+45.106
</td>
<td>
75.700
@@ -8050,16 +8077,16 @@ Shower.baseline
815,785
</td>
<td>
-69.098
+68.933
</td>
<td>
-62.523
+62.602
</td>
<td>
0.000
</td>
<td>
-34.427
+34.123
</td>
<td>
93.600
@@ -8076,10 +8103,10 @@ WC.baseline
814,580
</td>
<td>
-99.928
+100.052
</td>
<td>
-38.972
+39.172
</td>
<td>
25.000
@@ -8088,7 +8115,7 @@ WC.baseline
75.000
</td>
<td>
-125.489
+125.092
</td>
<td>
262.500
@@ -8102,10 +8129,10 @@ WashingMachine.baseline
818,918
</td>
<td>
-56.907
+57.033
</td>
<td>
-35.323
+35.406
</td>
<td>
0.000
@@ -8114,10 +8141,10 @@ WashingMachine.baseline
16.667
</td>
<td>
-85.311
+85.192
</td>
<td>
-149.099
+158.547
</td>
</tr>
<tr>
@@ -8128,19 +8155,19 @@ External.baseline
787,106
</td>
<td>
-18.086
+17.987
</td>
<td>
-15.017
+15.066
</td>
<td>
-1.229
</td>
<td>
-2.576
+1.288
</td>
<td>
-25.883
+25.695
</td>
<td>
97.504
@@ -8362,19 +8389,19 @@ Basin.baseline.madj
815,303
</td>
<td>
-39.828
+39.862
</td>
<td>
-39.825
+39.817
</td>
<td>
10.328
</td>
<td>
-21.406
+21.594
</td>
<td>
-39.819
+39.826
</td>
<td>
463.651
@@ -8388,10 +8415,10 @@ Bath.baseline.madj
827,353
</td>
<td>
-53.770
+53.825
</td>
<td>
-26.058
+26.157
</td>
<td>
-3.955
@@ -8400,10 +8427,10 @@ Bath.baseline.madj
26.202
</td>
<td>
-75.394
+75.225
</td>
<td>
-128.952
+123.917
</td>
</tr>
<tr>
@@ -8414,10 +8441,10 @@ Dishwasher.baseline.madj
827,353
</td>
<td>
-12.689
+12.674
</td>
<td>
-10.774
+10.755
</td>
<td>
-2.179
@@ -8426,10 +8453,10 @@ Dishwasher.baseline.madj
-0.045
</td>
<td>
-22.431
+22.473
</td>
<td>
-32.752
+35.262
</td>
</tr>
<tr>
@@ -8440,19 +8467,19 @@ External.baseline.madj
787,106
</td>
<td>
-18.208
+18.109
</td>
<td>
-15.060
+15.107
</td>
<td>
-2.511
</td>
<td>
-2.416
+1.854
</td>
<td>
-26.016
+25.846
</td>
<td>
98.172
@@ -8466,10 +8493,10 @@ KitchenSink.baseline.madj
827,353
</td>
<td>
-31.621
+31.569
</td>
<td>
-14.208
+14.162
</td>
<td>
7.469
@@ -8478,7 +8505,7 @@ KitchenSink.baseline.madj
15.468
</td>
<td>
-45.301
+45.231
</td>
<td>
76.121
@@ -8492,16 +8519,16 @@ Shower.baseline.madj
815,785
</td>
<td>
-69.525
+69.360
</td>
<td>
-62.529
+62.608
</td>
<td>
-0.244
</td>
<td>
-34.858
+34.554
</td>
<td>
93.587
@@ -8518,19 +8545,19 @@ WC.baseline.madj
814,580
</td>
<td>
-98.785
+98.909
</td>
<td>
-38.677
+38.883
</td>
<td>
20.638
</td>
<td>
-73.268
+73.191
</td>
<td>
-124.337
+124.030
</td>
<td>
262.811
@@ -8544,10 +8571,10 @@ WashingMachine.baseline.madj
818,918
</td>
<td>
-56.633
+56.759
</td>
<td>
-35.140
+35.227
</td>
<td>
-3.245
@@ -8556,10 +8583,10 @@ WashingMachine.baseline.madj
18.342
</td>
<td>
-84.638
+84.823
</td>
<td>
-149.063
+158.511
</td>
</tr>
<tr>
@@ -8570,19 +8597,19 @@ sumDaily.baseline.madj
787,106
</td>
<td>
-382.704
+382.717
</td>
<td>
-134.180
+134.188
</td>
<td>
53.528
</td>
<td>
-309.701
+309.341
</td>
<td>
-462.286
+462.663
</td>
<td>
1,153.147
@@ -8674,19 +8701,19 @@ WC.baseline.madj.we
814,580
</td>
<td>
-87.808
+87.918
</td>
<td>
-41.292
+41.466
</td>
<td>
9.814
</td>
<td>
-55.413
+55.127
</td>
<td>
-117.150
+117.016
</td>
<td>
262.811
@@ -8700,22 +8727,22 @@ Shower.baseline.madj.we
815,785
</td>
<td>
-65.457
+65.309
</td>
<td>
-60.286
+60.378
</td>
<td>
-0.244
</td>
<td>
-32.086
+32.045
</td>
<td>
-85.461
+85.413
</td>
<td>
-515.302
+515.301
</td>
</tr>
<tr>
@@ -8726,19 +8753,19 @@ sumDaily.baseline.madj.we
787,106
</td>
<td>
-367.700
+367.708
</td>
<td>
-131.472
+131.499
</td>
<td>
35.986
</td>
<td>
-291.249
+292.246
</td>
<td>
-450.079
+449.356
</td>
<td>
1,152.909
@@ -9396,7 +9423,7 @@ myPlot</code></pre>
<p><img src="impetusModel_files/figure-html/test%20Colne%20drought%20history%20and%20climate%20data-4.png" /><!-- --></p>
</div>
<div id="apply-additional-we-interventions-by-drought-phase" class="section level2">
-<h2><span class="header-section-number">13.4</span> Apply additional WE interventions by drought phase</h2>
+<h2><span class="header-section-number">15.4</span> Apply additional WE interventions by drought phase</h2>
<p>In this section we apply the following additional water efficiency interventions in the relevant drought phases:</p>
<ul>
<li>Normal - no additional measures;</li>
@@ -9420,7 +9447,7 @@ myPlot</code></pre>
<p>Need to find ways to speed up these loops</p>
</blockquote>
<div id="dual-flush-wc" class="section level3">
-<h3><span class="header-section-number">13.4.1</span> Dual flush WC</h3>
+<h3><span class="header-section-number">15.4.1</span> Dual flush WC</h3>
<p>Add the additional dual flush WCs.</p>
<pre class="r"><code># this needs to loop month by month to force the additional uptake to be cumulative - once a household has dual flush there is no way back!
@@ -9652,7 +9679,7 @@ for(y in minYear:maxYear){
<pre><code>##
## Dual flush Single flush
## Dual flush 139980 0
-## Single flush 109392 492156</code></pre>
+## Single flush 109634 491914</code></pre>
<pre class="r"><code># > test ----
plotOrigDT <- hhFinalDataComboExpandedCEHDT[model == "v1_3", .(nHHs = .N,
pcHHs = .N/1800), by = .(obsDate, flush = dualFlushWC)]
@@ -9674,7 +9701,7 @@ ggplot(plotDT, aes(x = obsDate, y = pcHHs, colour = flush)) +
<p><img src="impetusModel_files/figure-html/Drought%20model%20-%20WC-1.png" /><!-- --></p>
</div>
<div id="low-flow-shower" class="section level3">
-<h3><span class="header-section-number">13.4.2</span> Low flow shower</h3>
+<h3><span class="header-section-number">15.4.2</span> Low flow shower</h3>
<p>Now add the additional shower uptake.</p>
<pre class="r"><code># as above
hhFinalDataComboExpandedCEHDT$loFlowShowerDr <- hhFinalDataComboExpandedCEHDT$loFlowShower # initialise as original ready for updating
@@ -9761,231 +9788,231 @@ for(y in minYear:maxYear){
## [1] "Updating low flow shower uptake for year: 1995 & month 5 (2. Developing)"
## [1] "N cases selected: 3238"
## [1] "Updating low flow shower uptake for year: 1995 & month 6 (2. Developing)"
-## [1] "N cases selected: 3231"
+## [1] "N cases selected: 3232"
## [1] "Updating low flow shower uptake for year: 1995 & month 7 (2. Developing)"
-## [1] "N cases selected: 3222"
+## [1] "N cases selected: 3225"
## [1] "Updating low flow shower uptake for year: 1995 & month 8 (2. Developing)"
-## [1] "N cases selected: 3216"
+## [1] "N cases selected: 3215"
## [1] "Updating low flow shower uptake for year: 1995 & month 9 (3. Drought)"
-## [1] "N cases selected: 3211"
+## [1] "N cases selected: 3208"
## [1] "Updating low flow shower uptake for year: 1995 & month 10 (3. Drought)"
-## [1] "N cases selected: 3199"
+## [1] "N cases selected: 3200"
## [1] "Updating low flow shower uptake for year: 1995 & month 11 (3. Drought)"
-## [1] "N cases selected: 3191"
+## [1] "N cases selected: 3186"
## [1] "Updating low flow shower uptake for year: 1995 & month 12 (2. Developing)"
-## [1] "N cases selected: 3180"
+## [1] "N cases selected: 3177"
## [1] "Year: 1996"
## [1] "Updating low flow shower uptake for year: 1996 & month 1 (2. Developing)"
-## [1] "N cases selected: 3171"
+## [1] "N cases selected: 3170"
## [1] "Updating low flow shower uptake for year: 1996 & month 2 (2. Developing)"
-## [1] "N cases selected: 3166"
+## [1] "N cases selected: 3162"
## [1] "Updating low flow shower uptake for year: 1996 & month 3 (3. Drought)"
-## [1] "N cases selected: 3156"
+## [1] "N cases selected: 3155"
## [1] "Updating low flow shower uptake for year: 1996 & month 4 (3. Drought)"
-## [1] "N cases selected: 3145"
+## [1] "N cases selected: 3148"
## [1] "Updating low flow shower uptake for year: 1996 & month 5 (3. Drought)"
-## [1] "N cases selected: 3138"
+## [1] "N cases selected: 3133"
## [1] "Updating low flow shower uptake for year: 1996 & month 6 (3. Drought)"
## [1] "N cases selected: 3128"
## [1] "Updating low flow shower uptake for year: 1996 & month 7 (3. Drought)"
-## [1] "N cases selected: 3119"
+## [1] "N cases selected: 3116"
## [1] "Updating low flow shower uptake for year: 1996 & month 8 (3. Drought)"
-## [1] "N cases selected: 3110"
+## [1] "N cases selected: 3106"
## [1] "Updating low flow shower uptake for year: 1996 & month 9 (3. Drought)"
-## [1] "N cases selected: 3103"
+## [1] "N cases selected: 3102"
## [1] "Updating low flow shower uptake for year: 1996 & month 10 (3. Drought)"
-## [1] "N cases selected: 3095"
+## [1] "N cases selected: 3100"
## [1] "Updating low flow shower uptake for year: 1996 & month 11 (3. Drought)"
-## [1] "N cases selected: 3088"
+## [1] "N cases selected: 3086"
## [1] "Updating low flow shower uptake for year: 1996 & month 12 (4. Severe Drought)"
-## [1] "N cases selected: 3077"
+## [1] "N cases selected: 3076"
## [1] "Year: 1997"
## [1] "Updating low flow shower uptake for year: 1997 & month 1 (4. Severe Drought)"
-## [1] "N cases selected: 3065"
+## [1] "N cases selected: 3061"
## [1] "Updating low flow shower uptake for year: 1997 & month 2 (4. Severe Drought)"
-## [1] "N cases selected: 3046"
+## [1] "N cases selected: 3048"
## [1] "Updating low flow shower uptake for year: 1997 & month 3 (4. Severe Drought)"
-## [1] "N cases selected: 3032"
+## [1] "N cases selected: 3043"
## [1] "Updating low flow shower uptake for year: 1997 & month 4 (4. Severe Drought)"
## [1] "N cases selected: 3022"
## [1] "Updating low flow shower uptake for year: 1997 & month 5 (4. Severe Drought)"
-## [1] "N cases selected: 3011"
+## [1] "N cases selected: 3006"
## [1] "Updating low flow shower uptake for year: 1997 & month 6 (5. Recovering)"
-## [1] "N cases selected: 3005"
+## [1] "N cases selected: 3003"
## [1] "Updating low flow shower uptake for year: 1997 & month 7 (5. Recovering)"
-## [1] "N cases selected: 2989"
+## [1] "N cases selected: 2987"
## [1] "Updating low flow shower uptake for year: 1997 & month 8 (5. Recovering)"
-## [1] "N cases selected: 2989"
+## [1] "N cases selected: 2985"
## [1] "Updating low flow shower uptake for year: 1997 & month 9 (4. Severe Drought)"
-## [1] "N cases selected: 2983"
+## [1] "N cases selected: 2980"
## [1] "Updating low flow shower uptake for year: 1997 & month 10 (4. Severe Drought)"
-## [1] "N cases selected: 2967"
+## [1] "N cases selected: 2970"
## [1] "Updating low flow shower uptake for year: 1997 & month 11 (4. Severe Drought)"
-## [1] "N cases selected: 2963"
+## [1] "N cases selected: 2961"
## [1] "Updating low flow shower uptake for year: 1997 & month 12 (5. Recovering)"
-## [1] "N cases selected: 2945"
+## [1] "N cases selected: 2944"
## [1] "Year: 1998"
## [1] "Updating low flow shower uptake for year: 1998 & month 1 (5. Recovering)"
-## [1] "N cases selected: 2943"
+## [1] "N cases selected: 2944"
## [1] "Updating low flow shower uptake for year: 1998 & month 2 (5. Recovering)"
-## [1] "N cases selected: 2934"
+## [1] "N cases selected: 2928"
## [1] "Updating low flow shower uptake for year: 1998 & month 3 (5. Recovering)"
-## [1] "N cases selected: 2932"
+## [1] "N cases selected: 2931"
## [1] "Updating low flow shower uptake for year: 1998 & month 4 (5. Recovering)"
-## [1] "N cases selected: 2922"
+## [1] "N cases selected: 2923"
## [1] "Updating low flow shower uptake for year: 1998 & month 5 (5. Recovering)"
-## [1] "N cases selected: 2914"
-## [1] "Updating low flow shower uptake for year: 1998 & month 6 (5. Recovering)"
## [1] "N cases selected: 2912"
+## [1] "Updating low flow shower uptake for year: 1998 & month 6 (5. Recovering)"
+## [1] "N cases selected: 2902"
## [1] "Updating low flow shower uptake for year: 1998 & month 7 (5. Recovering)"
-## [1] "N cases selected: 2907"
+## [1] "N cases selected: 2890"
## [1] "Updating low flow shower uptake for year: 1998 & month 8 (5. Recovering)"
-## [1] "N cases selected: 2899"
+## [1] "N cases selected: 2902"
## [1] "Updating low flow shower uptake for year: 1998 & month 9 (5. Recovering)"
-## [1] "N cases selected: 2888"
+## [1] "N cases selected: 2893"
## [1] "Updating low flow shower uptake for year: 1998 & month 10 (5. Recovering)"
-## [1] "N cases selected: 2888"
+## [1] "N cases selected: 2885"
## [1] "Updating low flow shower uptake for year: 1998 & month 11 (5. Recovering)"
-## [1] "N cases selected: 2875"
+## [1] "N cases selected: 2883"
## [1] "Year: 1999"
## [1] "Year: 2000"
## [1] "Year: 2001"
## [1] "Year: 2002"
## [1] "Year: 2003"
## [1] "Updating low flow shower uptake for year: 2003 & month 3 (2. Developing)"
-## [1] "N cases selected: 2740"
+## [1] "N cases selected: 2727"
## [1] "Updating low flow shower uptake for year: 2003 & month 4 (2. Developing)"
-## [1] "N cases selected: 2737"
+## [1] "N cases selected: 2724"
## [1] "Updating low flow shower uptake for year: 2003 & month 5 (2. Developing)"
## [1] "N cases selected: 2723"
## [1] "Updating low flow shower uptake for year: 2003 & month 6 (2. Developing)"
-## [1] "N cases selected: 2706"
+## [1] "N cases selected: 2724"
## [1] "Updating low flow shower uptake for year: 2003 & month 7 (2. Developing)"
-## [1] "N cases selected: 2723"
+## [1] "N cases selected: 2714"
## [1] "Updating low flow shower uptake for year: 2003 & month 8 (2. Developing)"
-## [1] "N cases selected: 2712"
+## [1] "N cases selected: 2714"
## [1] "Updating low flow shower uptake for year: 2003 & month 9 (3. Drought)"
-## [1] "N cases selected: 2709"
+## [1] "N cases selected: 2703"
## [1] "Updating low flow shower uptake for year: 2003 & month 10 (3. Drought)"
-## [1] "N cases selected: 2699"
+## [1] "N cases selected: 2689"
## [1] "Updating low flow shower uptake for year: 2003 & month 11 (3. Drought)"
-## [1] "N cases selected: 2683"
+## [1] "N cases selected: 2691"
## [1] "Updating low flow shower uptake for year: 2003 & month 12 (5. Recovering)"
-## [1] "N cases selected: 2674"
+## [1] "N cases selected: 2678"
## [1] "Year: 2004"
## [1] "Updating low flow shower uptake for year: 2004 & month 1 (5. Recovering)"
-## [1] "N cases selected: 2680"
+## [1] "N cases selected: 2671"
## [1] "Updating low flow shower uptake for year: 2004 & month 2 (5. Recovering)"
-## [1] "N cases selected: 2675"
+## [1] "N cases selected: 2662"
## [1] "Updating low flow shower uptake for year: 2004 & month 12 (2. Developing)"
-## [1] "N cases selected: 2630"
+## [1] "N cases selected: 2648"
## [1] "Year: 2005"
## [1] "Updating low flow shower uptake for year: 2005 & month 1 (2. Developing)"
-## [1] "N cases selected: 2633"
+## [1] "N cases selected: 2631"
## [1] "Updating low flow shower uptake for year: 2005 & month 2 (2. Developing)"
-## [1] "N cases selected: 2629"
+## [1] "N cases selected: 2621"
## [1] "Updating low flow shower uptake for year: 2005 & month 3 (2. Developing)"
-## [1] "N cases selected: 2613"
+## [1] "N cases selected: 2621"
## [1] "Updating low flow shower uptake for year: 2005 & month 4 (2. Developing)"
-## [1] "N cases selected: 2618"
+## [1] "N cases selected: 2614"
## [1] "Updating low flow shower uptake for year: 2005 & month 5 (2. Developing)"
-## [1] "N cases selected: 2609"
+## [1] "N cases selected: 2598"
## [1] "Updating low flow shower uptake for year: 2005 & month 6 (5. Recovering)"
-## [1] "N cases selected: 2602"
+## [1] "N cases selected: 2611"
## [1] "Updating low flow shower uptake for year: 2005 & month 7 (5. Recovering)"
-## [1] "N cases selected: 2590"
+## [1] "N cases selected: 2589"
## [1] "Updating low flow shower uptake for year: 2005 & month 8 (5. Recovering)"
-## [1] "N cases selected: 2576"
+## [1] "N cases selected: 2595"
## [1] "Updating low flow shower uptake for year: 2005 & month 9 (2. Developing)"
-## [1] "N cases selected: 2568"
+## [1] "N cases selected: 2578"
## [1] "Updating low flow shower uptake for year: 2005 & month 10 (2. Developing)"
-## [1] "N cases selected: 2579"
+## [1] "N cases selected: 2565"
## [1] "Updating low flow shower uptake for year: 2005 & month 11 (2. Developing)"
-## [1] "N cases selected: 2576"
+## [1] "N cases selected: 2559"
## [1] "Updating low flow shower uptake for year: 2005 & month 12 (3. Drought)"
-## [1] "N cases selected: 2564"
+## [1] "N cases selected: 2566"
## [1] "Year: 2006"
## [1] "Updating low flow shower uptake for year: 2006 & month 1 (3. Drought)"
-## [1] "N cases selected: 2554"
+## [1] "N cases selected: 2546"
## [1] "Updating low flow shower uptake for year: 2006 & month 2 (3. Drought)"
-## [1] "N cases selected: 2557"
+## [1] "N cases selected: 2548"
## [1] "Updating low flow shower uptake for year: 2006 & month 3 (3. Drought)"
-## [1] "N cases selected: 2539"
+## [1] "N cases selected: 2543"
## [1] "Updating low flow shower uptake for year: 2006 & month 4 (3. Drought)"
-## [1] "N cases selected: 2530"
+## [1] "N cases selected: 2537"
## [1] "Updating low flow shower uptake for year: 2006 & month 5 (3. Drought)"
-## [1] "N cases selected: 2530"
-## [1] "Updating low flow shower uptake for year: 2006 & month 6 (5. Recovering)"
## [1] "N cases selected: 2527"
+## [1] "Updating low flow shower uptake for year: 2006 & month 6 (5. Recovering)"
+## [1] "N cases selected: 2515"
## [1] "Updating low flow shower uptake for year: 2006 & month 7 (5. Recovering)"
-## [1] "N cases selected: 2516"
+## [1] "N cases selected: 2519"
## [1] "Updating low flow shower uptake for year: 2006 & month 8 (5. Recovering)"
-## [1] "N cases selected: 2500"
+## [1] "N cases selected: 2510"
## [1] "Updating low flow shower uptake for year: 2006 & month 9 (5. Recovering)"
-## [1] "N cases selected: 2507"
+## [1] "N cases selected: 2501"
## [1] "Updating low flow shower uptake for year: 2006 & month 10 (5. Recovering)"
-## [1] "N cases selected: 2503"
+## [1] "N cases selected: 2490"
## [1] "Updating low flow shower uptake for year: 2006 & month 11 (5. Recovering)"
-## [1] "N cases selected: 2487"
+## [1] "N cases selected: 2479"
## [1] "Updating low flow shower uptake for year: 2006 & month 12 (5. Recovering)"
-## [1] "N cases selected: 2498"
+## [1] "N cases selected: 2487"
## [1] "Year: 2007"
## [1] "Updating low flow shower uptake for year: 2007 & month 1 (5. Recovering)"
-## [1] "N cases selected: 2486"
+## [1] "N cases selected: 2478"
## [1] "Updating low flow shower uptake for year: 2007 & month 2 (5. Recovering)"
-## [1] "N cases selected: 2472"
+## [1] "N cases selected: 2474"
## [1] "Year: 2008"
## [1] "Year: 2009"
## [1] "Updating low flow shower uptake for year: 2009 & month 3 (2. Developing)"
-## [1] "N cases selected: 2405"
+## [1] "N cases selected: 2414"
## [1] "Updating low flow shower uptake for year: 2009 & month 4 (2. Developing)"
-## [1] "N cases selected: 2409"
+## [1] "N cases selected: 2399"
## [1] "Updating low flow shower uptake for year: 2009 & month 5 (2. Developing)"
-## [1] "N cases selected: 2406"
+## [1] "N cases selected: 2410"
## [1] "Updating low flow shower uptake for year: 2009 & month 6 (2. Developing)"
-## [1] "N cases selected: 2407"
-## [1] "Updating low flow shower uptake for year: 2009 & month 7 (2. Developing)"
## [1] "N cases selected: 2388"
+## [1] "Updating low flow shower uptake for year: 2009 & month 7 (2. Developing)"
+## [1] "N cases selected: 2401"
## [1] "Updating low flow shower uptake for year: 2009 & month 8 (2. Developing)"
-## [1] "N cases selected: 2367"
+## [1] "N cases selected: 2381"
## [1] "Updating low flow shower uptake for year: 2009 & month 9 (3. Drought)"
-## [1] "N cases selected: 2369"
+## [1] "N cases selected: 2367"
## [1] "Updating low flow shower uptake for year: 2009 & month 10 (3. Drought)"
-## [1] "N cases selected: 2371"
+## [1] "N cases selected: 2354"
## [1] "Updating low flow shower uptake for year: 2009 & month 11 (3. Drought)"
-## [1] "N cases selected: 2362"
+## [1] "N cases selected: 2371"
## [1] "Updating low flow shower uptake for year: 2009 & month 12 (5. Recovering)"
-## [1] "N cases selected: 2353"
+## [1] "N cases selected: 2363"
## [1] "Year: 2010"
## [1] "Updating low flow shower uptake for year: 2010 & month 1 (5. Recovering)"
-## [1] "N cases selected: 2355"
+## [1] "N cases selected: 2339"
## [1] "Updating low flow shower uptake for year: 2010 & month 2 (5. Recovering)"
## [1] "N cases selected: 2350"
## [1] "Updating low flow shower uptake for year: 2010 & month 9 (2. Developing)"
-## [1] "N cases selected: 2328"
-## [1] "Updating low flow shower uptake for year: 2010 & month 10 (2. Developing)"
## [1] "N cases selected: 2327"
+## [1] "Updating low flow shower uptake for year: 2010 & month 10 (2. Developing)"
+## [1] "N cases selected: 2310"
## [1] "Updating low flow shower uptake for year: 2010 & month 11 (2. Developing)"
-## [1] "N cases selected: 2325"
+## [1] "N cases selected: 2312"
## [1] "Updating low flow shower uptake for year: 2010 & month 12 (2. Developing)"
-## [1] "N cases selected: 2300"
+## [1] "N cases selected: 2319"
## [1] "Year: 2011"
## [1] "Updating low flow shower uptake for year: 2011 & month 1 (2. Developing)"
-## [1] "N cases selected: 2301"
+## [1] "N cases selected: 2307"
## [1] "Updating low flow shower uptake for year: 2011 & month 2 (2. Developing)"
-## [1] "N cases selected: 2310"
+## [1] "N cases selected: 2294"
## [1] "Updating low flow shower uptake for year: 2011 & month 3 (3. Drought)"
-## [1] "N cases selected: 2310"
+## [1] "N cases selected: 2324"
## [1] "Updating low flow shower uptake for year: 2011 & month 4 (3. Drought)"
-## [1] "N cases selected: 2282"
+## [1] "N cases selected: 2303"
## [1] "Updating low flow shower uptake for year: 2011 & month 5 (3. Drought)"
-## [1] "N cases selected: 2291"
+## [1] "N cases selected: 2293"
## [1] "Updating low flow shower uptake for year: 2011 & month 6 (5. Recovering)"
-## [1] "N cases selected: 2275"
+## [1] "N cases selected: 2280"
## [1] "Updating low flow shower uptake for year: 2011 & month 7 (5. Recovering)"
-## [1] "N cases selected: 2263"
+## [1] "N cases selected: 2276"
## [1] "Updating low flow shower uptake for year: 2011 & month 8 (5. Recovering)"
-## [1] "N cases selected: 2269"
+## [1] "N cases selected: 2275"
## [1] "Year: 2012"</code></pre>
<pre class="r"><code>print("After model applied")</code></pre>
<pre><code>## [1] "After model applied"</code></pre>
@@ -9993,7 +10020,7 @@ for(y in minYear:maxYear){
<pre><code>##
## Low flow Normal flow
## Low flow 103304 0
-## Normal flow 60609 577615</code></pre>
+## Normal flow 60500 577724</code></pre>
<pre class="r"><code># > test ----
plotOrigDT <- hhFinalDataComboExpandedCEHDT[model == "v1_3", .(nHHs = .N,
pcHHs = .N/1800), by = .(obsDate, flow = loFlowShower)]
@@ -10015,7 +10042,7 @@ ggplot(plotDT, aes(x = obsDate, y = pcHHs, colour = flow)) +
<p><img src="impetusModel_files/figure-html/Drought%20model%20-%20shower-1.png" /><!-- --></p>
</div>
<div id="temporary-use-ban" class="section level3">
-<h3><span class="header-section-number">13.4.3</span> Temporary Use Ban</h3>
+<h3><span class="header-section-number">15.4.3</span> Temporary Use Ban</h3>
<p>Now apply the TUB. This one does need to be done by model as it uses a cut point in external consumption which will differ.</p>
<blockquote>
<p>We also shoud use the ‘no garden to water’ data in the SPRG survey in the process for v2?</p>
@@ -10085,8 +10112,8 @@ for(y in minYear:maxYear){
<pre><code>## [1] "Year: 1994"
## [1] "Year: 1995"
## [1] "Applying TUB for year: 1995, month 9 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.7789407941206"
-## [1] "Top 28% cut: 21.7098024058121"
+## [1] "Top 14% cut: 26.1056634495389"
+## [1] "Top 28% cut: 21.2423134841836"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1995, month 9 & model v2_0 (3. Drought)"
@@ -10095,8 +10122,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1995, month 10 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.782703901865"
-## [1] "Top 28% cut: 21.8131787169248"
+## [1] "Top 14% cut: 26.2820053934784"
+## [1] "Top 28% cut: 21.3807199968011"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1995, month 10 & model v2_0 (3. Drought)"
@@ -10105,8 +10132,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1995, month 11 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.6659672351983"
-## [1] "Top 28% cut: 21.7100395402379"
+## [1] "Top 14% cut: 26.1652687268117"
+## [1] "Top 28% cut: 21.287864999319"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1995, month 11 & model v2_0 (3. Drought)"
@@ -10116,8 +10143,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected for TUB: 90"
## [1] "Year: 1996"
## [1] "Applying TUB for year: 1996, month 3 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.0940476883038"
-## [1] "Top 28% cut: 22.1270694605266"
+## [1] "Top 14% cut: 26.5728704902076"
+## [1] "Top 28% cut: 21.6906279447291"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1996, month 3 & model v2_0 (3. Drought)"
@@ -10126,8 +10153,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1996, month 4 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.2561876883038"
-## [1] "Top 28% cut: 22.2926379967517"
+## [1] "Top 14% cut: 26.7447915748942"
+## [1] "Top 28% cut: 21.8705783302517"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1996, month 4 & model v2_0 (3. Drought)"
@@ -10136,8 +10163,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1996, month 5 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.4819374607873"
-## [1] "Top 28% cut: 22.4430440212947"
+## [1] "Top 14% cut: 26.8743837187252"
+## [1] "Top 28% cut: 21.9759103275388"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1996, month 5 & model v2_0 (3. Drought)"
@@ -10146,8 +10173,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1996, month 6 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 28.0896174607873"
-## [1] "Top 28% cut: 23.0507240212947"
+## [1] "Top 14% cut: 27.4908795187252"
+## [1] "Top 28% cut: 22.5871181176804"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1996, month 6 & model v2_0 (3. Drought)"
@@ -10156,8 +10183,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1996, month 7 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.9501941274539"
-## [1] "Top 28% cut: 22.9113006879614"
+## [1] "Top 14% cut: 27.2790357278516"
+## [1] "Top 28% cut: 22.4184405844019"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1996, month 7 & model v2_0 (3. Drought)"
@@ -10166,8 +10193,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1996, month 8 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.3510998949124"
-## [1] "Top 28% cut: 22.2809991672844"
+## [1] "Top 14% cut: 26.6781918860185"
+## [1] "Top 28% cut: 21.870190526396"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1996, month 8 & model v2_0 (3. Drought)"
@@ -10176,8 +10203,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1996, month 9 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.1992343549705"
-## [1] "Top 28% cut: 22.2096337271932"
+## [1] "Top 14% cut: 26.6694160838929"
+## [1] "Top 28% cut: 21.7958146113958"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1996, month 9 & model v2_0 (3. Drought)"
@@ -10186,8 +10213,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1996, month 10 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.6040541955786"
-## [1] "Top 28% cut: 21.6144159632859"
+## [1] "Top 14% cut: 26.112522060145"
+## [1] "Top 28% cut: 21.1993087977289"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1996, month 10 & model v2_0 (3. Drought)"
@@ -10196,8 +10223,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1996, month 11 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.4167043549705"
-## [1] "Top 28% cut: 21.4413093271932"
+## [1] "Top 14% cut: 25.895218429553"
+## [1] "Top 28% cut: 21.0132846113958"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1996, month 11 & model v2_0 (3. Drought)"
@@ -10206,8 +10233,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1996, month 12 & model v1_3 (4. Severe Drought)"
-## [1] "Top 14% cut: 26.8217583979764"
-## [1] "Top 28% cut: 21.8416013300851"
+## [1] "Top 14% cut: 26.341907880803"
+## [1] "Top 28% cut: 21.4292354643956"
## [1] "N cases selected: 504"
## [1] "N cases selected for TUB: 221"
## [1] "Applying TUB for year: 1996, month 12 & model v2_0 (4. Severe Drought)"
@@ -10217,8 +10244,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected for TUB: 180"
## [1] "Year: 1997"
## [1] "Applying TUB for year: 1997, month 1 & model v1_3 (4. Severe Drought)"
-## [1] "Top 14% cut: 26.925223901865"
-## [1] "Top 28% cut: 21.9556987169248"
+## [1] "Top 14% cut: 26.4245253934784"
+## [1] "Top 28% cut: 21.5124495968011"
## [1] "N cases selected: 504"
## [1] "N cases selected for TUB: 221"
## [1] "Applying TUB for year: 1997, month 1 & model v2_0 (4. Severe Drought)"
@@ -10227,8 +10254,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 411"
## [1] "N cases selected for TUB: 180"
## [1] "Applying TUB for year: 1997, month 2 & model v1_3 (4. Severe Drought)"
-## [1] "Top 14% cut: 27.0454243549705"
-## [1] "Top 28% cut: 22.0818746634184"
+## [1] "Top 14% cut: 26.5391584879907"
+## [1] "Top 28% cut: 21.663395874687"
## [1] "N cases selected: 504"
## [1] "N cases selected for TUB: 221"
## [1] "Applying TUB for year: 1997, month 2 & model v2_0 (4. Severe Drought)"
@@ -10237,8 +10264,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 411"
## [1] "N cases selected for TUB: 180"
## [1] "Applying TUB for year: 1997, month 3 & model v1_3 (4. Severe Drought)"
-## [1] "Top 14% cut: 27.3708251472368"
-## [1] "Top 28% cut: 22.3558549579495"
+## [1] "Top 14% cut: 26.7832043505596"
+## [1] "Top 28% cut: 21.9240035916594"
## [1] "N cases selected: 504"
## [1] "N cases selected for TUB: 221"
## [1] "Applying TUB for year: 1997, month 3 & model v2_0 (4. Severe Drought)"
@@ -10247,8 +10274,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 411"
## [1] "N cases selected for TUB: 180"
## [1] "Applying TUB for year: 1997, month 4 & model v1_3 (4. Severe Drought)"
-## [1] "Top 14% cut: 27.2761743549705"
-## [1] "Top 28% cut: 22.3108209271932"
+## [1] "Top 14% cut: 26.7549971568743"
+## [1] "Top 28% cut: 21.8727546113958"
## [1] "N cases selected: 504"
## [1] "N cases selected for TUB: 221"
## [1] "Applying TUB for year: 1997, month 4 & model v2_0 (4. Severe Drought)"
@@ -10257,8 +10284,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 411"
## [1] "N cases selected for TUB: 180"
## [1] "Applying TUB for year: 1997, month 5 & model v1_3 (4. Severe Drought)"
-## [1] "Top 14% cut: 27.6131574607873"
-## [1] "Top 28% cut: 22.4938796391352"
+## [1] "Top 14% cut: 26.9216488292586"
+## [1] "Top 28% cut: 22.0719324783234"
## [1] "N cases selected: 504"
## [1] "N cases selected for TUB: 221"
## [1] "Applying TUB for year: 1997, month 5 & model v2_0 (4. Severe Drought)"
@@ -10267,8 +10294,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 411"
## [1] "N cases selected for TUB: 180"
## [1] "Applying TUB for year: 1997, month 9 & model v1_3 (4. Severe Drought)"
-## [1] "Top 14% cut: 27.3354210216372"
-## [1] "Top 28% cut: 22.3185349579495"
+## [1] "Top 14% cut: 26.7720025505596"
+## [1] "Top 28% cut: 21.9170535916594"
## [1] "N cases selected: 504"
## [1] "N cases selected for TUB: 221"
## [1] "Applying TUB for year: 1997, month 9 & model v2_0 (4. Severe Drought)"
@@ -10277,8 +10304,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 411"
## [1] "N cases selected for TUB: 180"
## [1] "Applying TUB for year: 1997, month 10 & model v1_3 (4. Severe Drought)"
-## [1] "Top 14% cut: 26.5627576883038"
-## [1] "Top 28% cut: 21.5992079967517"
+## [1] "Top 14% cut: 26.0723667183396"
+## [1] "Top 28% cut: 21.1817363950688"
## [1] "N cases selected: 504"
## [1] "N cases selected for TUB: 221"
## [1] "Applying TUB for year: 1997, month 10 & model v2_0 (4. Severe Drought)"
@@ -10287,8 +10314,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 411"
## [1] "N cases selected for TUB: 180"
## [1] "Applying TUB for year: 1997, month 11 & model v1_3 (4. Severe Drought)"
-## [1] "Top 14% cut: 26.546723901865"
-## [1] "Top 28% cut: 21.5678029721609"
+## [1] "Top 14% cut: 26.0460253934784"
+## [1] "Top 28% cut: 21.1328121310623"
## [1] "N cases selected: 504"
## [1] "N cases selected for TUB: 221"
## [1] "Applying TUB for year: 1997, month 11 & model v2_0 (4. Severe Drought)"
@@ -10303,8 +10330,8 @@ for(y in minYear:maxYear){
## [1] "Year: 2002"
## [1] "Year: 2003"
## [1] "Applying TUB for year: 2003, month 9 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.3805074607873"
-## [1] "Top 28% cut: 22.3720080069854"
+## [1] "Top 14% cut: 26.7827631433838"
+## [1] "Top 28% cut: 21.9158864251545"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2003, month 9 & model v2_0 (3. Drought)"
@@ -10313,8 +10340,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 2003, month 10 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.6409454764492"
-## [1] "Top 28% cut: 21.6511068603488"
+## [1] "Top 14% cut: 26.146592060145"
+## [1] "Top 28% cut: 21.2333787977289"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2003, month 10 & model v2_0 (3. Drought)"
@@ -10323,8 +10350,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 2003, month 11 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.4280910216372"
-## [1] "Top 28% cut: 21.4645413300851"
+## [1] "Top 14% cut: 25.9257317183396"
+## [1] "Top 28% cut: 21.0460625413537"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2003, month 11 & model v2_0 (3. Drought)"
@@ -10335,8 +10362,8 @@ for(y in minYear:maxYear){
## [1] "Year: 2004"
## [1] "Year: 2005"
## [1] "Applying TUB for year: 2005, month 12 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.8903364764492"
-## [1] "Top 28% cut: 21.9011730299525"
+## [1] "Top 14% cut: 26.397642060145"
+## [1] "Top 28% cut: 21.4844287977289"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2005, month 12 & model v2_0 (3. Drought)"
@@ -10346,8 +10373,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected for TUB: 90"
## [1] "Year: 2006"
## [1] "Applying TUB for year: 2006, month 1 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.9300372351983"
-## [1] "Top 28% cut: 21.9605120502581"
+## [1] "Top 14% cut: 26.4293387268117"
+## [1] "Top 28% cut: 21.5221133301344"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2006, month 1 & model v2_0 (3. Drought)"
@@ -10356,8 +10383,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 2006, month 2 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.0947096646431"
-## [1] "Top 28% cut: 22.1173246634184"
+## [1] "Top 14% cut: 26.6153947183396"
+## [1] "Top 28% cut: 21.7049587977289"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2006, month 2 & model v2_0 (3. Drought)"
@@ -10366,8 +10393,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 2006, month 3 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.1376774607873"
-## [1] "Top 28% cut: 22.136219073652"
+## [1] "Top 14% cut: 26.5399331433838"
+## [1] "Top 28% cut: 21.6851885900171"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2006, month 3 & model v2_0 (3. Drought)"
@@ -10376,8 +10403,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 2006, month 4 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.1374976883038"
-## [1] "Top 28% cut: 22.1499034605266"
+## [1] "Top 14% cut: 26.6100759505596"
+## [1] "Top 28% cut: 21.7340779447291"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2006, month 4 & model v2_0 (3. Drought)"
@@ -10386,8 +10413,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 2006, month 5 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.2061041274539"
-## [1] "Top 28% cut: 22.0907239058019"
+## [1] "Top 14% cut: 26.5238014017263"
+## [1] "Top 28% cut: 21.6648791449901"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2006, month 5 & model v2_0 (3. Drought)"
@@ -10399,8 +10426,8 @@ for(y in minYear:maxYear){
## [1] "Year: 2008"
## [1] "Year: 2009"
## [1] "Applying TUB for year: 2009, month 9 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.2965143549705"
-## [1] "Top 28% cut: 22.3177881271932"
+## [1] "Top 14% cut: 26.7743806962196"
+## [1] "Top 28% cut: 21.8930946113958"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2009, month 9 & model v2_0 (3. Drought)"
@@ -10409,8 +10436,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 2009, month 10 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.482213901865"
-## [1] "Top 28% cut: 21.5178850103286"
+## [1] "Top 14% cut: 25.9815153934784"
+## [1] "Top 28% cut: 21.0854373682863"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2009, month 10 & model v2_0 (3. Drought)"
@@ -10419,8 +10446,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 2009, month 11 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.3748776883038"
-## [1] "Top 28% cut: 21.4113279967517"
+## [1] "Top 14% cut: 25.8537004902076"
+## [1] "Top 28% cut: 20.9714579447291"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2009, month 11 & model v2_0 (3. Drought)"
@@ -10431,8 +10458,8 @@ for(y in minYear:maxYear){
## [1] "Year: 2010"
## [1] "Year: 2011"
## [1] "Applying TUB for year: 2011, month 3 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.3260143549705"
-## [1] "Top 28% cut: 22.3624646634184"
+## [1] "Top 14% cut: 26.8048371568743"
+## [1] "Top 28% cut: 21.9284609992966"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2011, month 3 & model v2_0 (3. Drought)"
@@ -10441,8 +10468,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 2011, month 4 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.4912310216372"
-## [1] "Top 28% cut: 22.5276813300851"
+## [1] "Top 14% cut: 26.9700538235409"
+## [1] "Top 28% cut: 22.0878112780625"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2011, month 4 & model v2_0 (3. Drought)"
@@ -10451,8 +10478,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 2011, month 5 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.7271207941206"
-## [1] "Top 28% cut: 22.688227354628"
+## [1] "Top 14% cut: 27.1140930520585"
+## [1] "Top 28% cut: 22.2210936608721"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2011, month 5 & model v2_0 (3. Drought)"
@@ -10504,7 +10531,7 @@ myAnotPlot</code></pre>
</blockquote>
</div>
<div id="update-water-demand" class="section level3">
-<h3><span class="header-section-number">13.4.4</span> Update water demand</h3>
+<h3><span class="header-section-number">15.4.4</span> Update water demand</h3>
<p>No need to run this separately for each model.</p>
<p>First, based on revised dual flush WC uptake.</p>
<pre class="r"><code># adjust the WC volumes
@@ -10526,10 +10553,10 @@ hhFinalDataComboExpandedCEHDT <- hhFinalDataComboExpandedCEHDT[, sumDaily.bas
</div>
</div>
<div id="test-intervention-effects-by-model" class="section level2">
-<h2><span class="header-section-number">13.5</span> Test intervention effects by model</h2>
+<h2><span class="header-section-number">15.5</span> Test intervention effects by model</h2>
<p>i.e. compare baseline madj with we to baseline madj with we and dr</p>
<div id="wc" class="section level3">
-<h3><span class="header-section-number">13.5.1</span> WC</h3>
+<h3><span class="header-section-number">15.5.1</span> WC</h3>
<pre class="r"><code>plotDT <- hhFinalDataComboExpandedCEHDT[, .(meanBaselineWeWC = mean(WC.baseline.madj.we, na.rm = TRUE),
meanBaselineDrWC = mean(WC.baseline.madj.we.dr, na.rm = TRUE),
sdBaselineWeWC = sd(WC.baseline.madj.we, na.rm = TRUE),
@@ -10572,7 +10599,7 @@ ba_IMPETUSaddDroughtPhases(myPlot, minY, maxY)</code></pre>
<p><img src="impetusModel_files/figure-html/Compare%20WC-2.png" /><!-- --></p>
</div>
<div id="shower" class="section level3">
-<h3><span class="header-section-number">13.5.2</span> Shower</h3>
+<h3><span class="header-section-number">15.5.2</span> Shower</h3>
<pre class="r"><code>plotDT <- hhFinalDataComboExpandedCEHDT[, .(meanBaselineWeSh = mean(Shower.baseline.madj.we, na.rm = TRUE),
meanBaselineDrSh = mean(Shower.baseline.madj.we.dr, na.rm = TRUE)
)
@@ -10608,7 +10635,7 @@ ba_IMPETUSaddDroughtPhases(myPlot, minY, maxY)</code></pre>
<p><img src="impetusModel_files/figure-html/Compare%20shower-2.png" /><!-- --></p>
</div>
<div id="external" class="section level3">
-<h3><span class="header-section-number">13.5.3</span> External</h3>
+<h3><span class="header-section-number">15.5.3</span> External</h3>
<pre class="r"><code>plotDT <- hhFinalDataComboExpandedCEHDT[, .(meanBaselineWeExternal = mean(External.baseline.madj, na.rm = TRUE),
meanBaselineDrExternal = mean(External.baseline.madj.we.dr, na.rm = TRUE)
)
@@ -10643,7 +10670,7 @@ ba_IMPETUSaddDroughtPhases(myPlot, minY, maxY)</code></pre>
<p><img src="impetusModel_files/figure-html/Compare%20External-2.png" /><!-- --></p>
</div>
<div id="total" class="section level3">
-<h3><span class="header-section-number">13.5.4</span> Total</h3>
+<h3><span class="header-section-number">15.5.4</span> Total</h3>
<p>hhFinalDataComboExpandedCEHDT contains all the data</p>
<p>we have two models</p>
<p>388800, 352728</p>
@@ -10654,30 +10681,30 @@ ba_IMPETUSaddDroughtPhases(myPlot, minY, maxY)</code></pre>
<p>for both we have madj (monthly adjusted) we (water efficiency uptake) and dr (drought) scenarios:</p>
<pre class="r"><code>hhFinalDataComboExpandedCEHDT[, .(mean = mean(sumDaily.baseline.madj.we.dr, na.rm = TRUE)), keyby = .(model, currMonS)]</code></pre>
<pre><code>## model currMonS mean
-## 1: v1_3 01 387.2585
-## 2: v1_3 02 387.4656
-## 3: v1_3 03 387.3794
-## 4: v1_3 04 387.9222
-## 5: v1_3 05 386.1899
-## 6: v1_3 06 387.1292
-## 7: v1_3 07 386.1118
-## 8: v1_3 08 384.5214
-## 9: v1_3 09 384.9712
-## 10: v1_3 10 384.3970
-## 11: v1_3 11 384.4273
-## 12: v1_3 12 387.8681
-## 13: v2_0 01 325.6255
-## 14: v2_0 02 326.1925
-## 15: v2_0 03 325.9451
-## 16: v2_0 04 326.4447
-## 17: v2_0 05 324.9236
-## 18: v2_0 06 325.9839
-## 19: v2_0 07 325.1323
-## 20: v2_0 08 323.6261
-## 21: v2_0 09 323.5310
-## 22: v2_0 10 323.2584
-## 23: v2_0 11 322.9130
-## 24: v2_0 12 326.4166
+## 1: v1_3 01 387.1253
+## 2: v1_3 02 387.4301
+## 3: v1_3 03 387.3790
+## 4: v1_3 04 387.9507
+## 5: v1_3 05 386.3003
+## 6: v1_3 06 387.0475
+## 7: v1_3 07 386.0797
+## 8: v1_3 08 384.6640
+## 9: v1_3 09 385.0259
+## 10: v1_3 10 384.4516
+## 11: v1_3 11 384.2612
+## 12: v1_3 12 387.9064
+## 13: v2_0 01 325.7575
+## 14: v2_0 02 326.1426
+## 15: v2_0 03 325.8387
+## 16: v2_0 04 326.6616
+## 17: v2_0 05 324.9912
+## 18: v2_0 06 326.0791
+## 19: v2_0 07 325.3053
+## 20: v2_0 08 323.7215
+## 21: v2_0 09 323.6663
+## 22: v2_0 10 323.0139
+## 23: v2_0 11 322.8619
+## 24: v2_0 12 326.7568
## model currMonS mean</code></pre>
<pre class="r"><code>plotTotalDT <- hhFinalDataComboExpandedCEHDT[, .(
meanBaselineWeSum = mean(sumDaily.baseline.madj.we, na.rm = TRUE),
@@ -10697,9 +10724,9 @@ plotTotalDT <- plotTotalDT[, ymaxDr := meanBaselineDrSum + qnorm(0.975)*(sdBa
<p>Let’s compare the baseline we with baseline we + dr results for each version of the model</p>
</div>
<div id="per-model-reporting" class="section level3">
-<h3><span class="header-section-number">13.5.5</span> Per-model reporting</h3>
+<h3><span class="header-section-number">15.5.5</span> Per-model reporting</h3>
<div id="model-v1_3-synthetic" class="section level4">
-<h4><span class="header-section-number">13.5.5.1</span> Model v1_3 (synthetic)</h4>
+<h4><span class="header-section-number">15.5.5.1</span> Model v1_3 (synthetic)</h4>
<p>Model 1 - synthetic</p>
<pre class="r"><code>myPlot <- ggplot(plotTotalDT[model == "v1_3"], aes(x = obsDate)) +
# don't use CI
@@ -10753,7 +10780,7 @@ paperPlot</code></pre>
<p>Now compare model v2 - enhanced we uptake rates</p>
</div>
<div id="model-v2-sprg-based" class="section level4">
-<h4><span class="header-section-number">13.5.5.2</span> Model v2 (SPRG based)</h4>
+<h4><span class="header-section-number">15.5.5.2</span> Model v2 (SPRG based)</h4>
<pre class="r"><code>myPlot <- ggplot(plotTotalDT[model == "v2_0"], aes(x = obsDate)) +
# don't use CI
# geom_ribbon(aes(ymin = yminWE, ymax = ymaxWE, fill = "Baseline 95% CI", group = metered),alpha = 0.5) +
@@ -10780,7 +10807,7 @@ ggsave(paste0("plots_v2/compareBaselineWEDroughtWE_v2_0.pdf"), height
</div>
</div>
<div id="compare-models" class="section level3">
-<h3><span class="header-section-number">13.5.6</span> Compare models</h3>
+<h3><span class="header-section-number">15.5.6</span> Compare models</h3>
<p>The table below shows the mean and maximum savings over the period for each model.</p>
<pre class="r"><code>plotTotalDT[, pcSaved := 100*(meanBaselineWeSum - meanBaselineDrSum)/meanBaselineWeSum]
@@ -10805,29 +10832,29 @@ kable(caption = "Model affects (% total reduced)", t)</code></pre>
<td align="left">v1_3</td>
<td align="left">Not metered</td>
<td align="right">0</td>
-<td align="right">2.47</td>
-<td align="right">3.80</td>
+<td align="right">2.62</td>
+<td align="right">4.05</td>
</tr>
<tr class="even">
<td align="left">v1_3</td>
<td align="left">Metered</td>
<td align="right">0</td>
-<td align="right">2.50</td>
-<td align="right">3.59</td>
+<td align="right">2.23</td>
+<td align="right">3.27</td>
</tr>
<tr class="odd">
<td align="left">v2_0</td>
<td align="left">Not metered</td>
<td align="right">0</td>
-<td align="right">3.31</td>
-<td align="right">5.34</td>
+<td align="right">3.10</td>
+<td align="right">4.95</td>
</tr>
<tr class="even">
<td align="left">v2_0</td>
<td align="left">Metered</td>
<td align="right">0</td>
-<td align="right">3.24</td>
-<td align="right">5.40</td>
+<td align="right">3.46</td>
+<td align="right">5.59</td>
</tr>
</tbody>
</table>
@@ -10840,9 +10867,9 @@ baseline2Red <- baseline2Start - plotTotalDT[model == "v2_0" &
model2Red <- plotTotalDT[model == "v2_0" & obsDate == min(obsDate), meanBaselineDrSum] - plotTotalDT[model == "v2_0" & obsDate == max(obsDate), meanBaselineDrSum]</code></pre>
<p>Overall from 1994-12-15 to 2012-11-15:</p>
<ul>
-<li>the baseline model showed a reduction of 6.28, 5.48%</li>
-<li>model v1_3 showed a reduction of 9.02, 8.74%</li>
-<li>model v2_0 showed a reduction of 8.01, 12.14%</li>
+<li>the baseline model showed a reduction of 6.27, 5.69%</li>
+<li>model v1_3 showed a reduction of 9.11, 8.43%</li>
+<li>model v2_0 showed a reduction of 8.15, 12.13%</li>
</ul>
<p>This is clearly shown in the chart below where:</p>
<ul>
@@ -10929,148 +10956,846 @@ ggplot(droughtPhaseDT, aes(x = phase, y = V1, fill = phase)) +
<pre class="r"><code>ggsave(paste0("plots_v1/Fig4_5_DroughtPlotKey.pdf"), dpi = 400)</code></pre>
</div>
</div>
-<div id="extract-drought-we-adjusted-hot-water-volumes-for-becc-2017-paper" class="section level2">
-<h2><span class="header-section-number">13.6</span> Extract drought & WE-adjusted hot water volumes (for BECC 2017 paper)</h2>
-<p>Use: hhFinalDataComboExpandedCEHDT</p>
-<pre class="r"><code>summary(hhFinalDataComboExpandedCEHDT)</code></pre>
-<pre><code>## hhid model obsDate currYear
-## Min. : 1 Length:741528 Min. :1994-12-15 Min. :1994
-## 1st Qu.: 859 Class :character 1st Qu.:1999-06-07 1st Qu.:1999
-## Median : 1717 Mode :character Median :2003-11-30 Median :2003
-## Mean :398103841 Mean :2003-11-30 Mean :2003
-## 3rd Qu.:836920446 3rd Qu.:2008-05-22 3rd Qu.:2008
-## Max. :836965495 Max. :2012-11-15 Max. :2012
-##
-## currMon metered occupancy Basin.baseline
-## Min. : 1.00 Not metered:419904 Min. : 1.000 Min. : 10.40
-## 1st Qu.: 3.75 Metered :321624 1st Qu.: 1.000 1st Qu.: 21.24
-## Median : 6.50 Median : 2.000 Median : 26.79
-## Mean : 6.50 Mean : 2.503 Mean : 39.70
-## 3rd Qu.: 9.25 3rd Qu.: 3.000 3rd Qu.: 39.72
-## Max. :12.00 Max. :10.000 Max. :463.20
-## NA's :10800
-## Bath.baseline Dishwasher.baseline KitchenSink.baseline Shower.baseline
-## Min. : 0.00 Min. : 0.00 Min. : 7.57 Min. : 0.00
-## 1st Qu.: 26.40 1st Qu.: 0.00 1st Qu.:15.14 1st Qu.: 34.43
-## Median : 56.91 Median :19.90 Median :32.23 Median : 41.29
-## Mean : 54.96 Mean :13.35 Mean :31.46 Mean : 69.10
-## 3rd Qu.: 77.17 3rd Qu.:23.08 3rd Qu.:45.13 3rd Qu.: 93.60
-## Max. :128.86 Max. :32.91 Max. :75.70 Max. :513.83
-## NA's :10368
-## WC.baseline WashingMachine.baseline External.baseline Basin
-## Min. : 25.00 Min. : 0.00 Min. :-1.23 Min. :-0.0908
-## 1st Qu.: 75.00 1st Qu.: 16.67 1st Qu.: 2.58 1st Qu.: 0.0569
-## Median :100.00 Median : 66.34 Median :16.76 Median : 0.1282
-## Mean : 99.93 Mean : 56.91 Mean :18.09 Mean : 0.1280
-## 3rd Qu.:125.49 3rd Qu.: 85.31 3rd Qu.:25.88 3rd Qu.: 0.1720
-## Max. :262.50 Max. :149.10 Max. :97.50 Max. : 0.4506
-## NA's :11448 NA's :7560 NA's :36072
-## Bath Dishwasher External KitchenSink
-## Min. :-3.9549 Min. :-2.1795 Min. :-1.2822 Min. :-0.1007
-## 1st Qu.:-1.9531 1st Qu.:-1.0282 1st Qu.:-0.2348 1st Qu.: 0.0538
-## Median :-0.8934 Median :-0.5674 Median : 0.0353 Median : 0.1401
-## Mean :-1.1987 Mean :-0.6474 Mean : 0.1192 Mean : 0.1544
-## 3rd Qu.:-0.2953 3rd Qu.:-0.1228 3rd Qu.: 0.4962 3rd Qu.: 0.2572
-## Max. : 0.0909 Max. : 0.0000 Max. : 1.4791 Max. : 0.4951
-##
-## Shower WC WashingMachine Basin.baseline.madj
-## Min. :-0.24362 Min. :-4.3623 Min. :-3.2449 Min. : 10.33
-## 1st Qu.: 0.03801 1st Qu.:-2.1414 1st Qu.:-1.6484 1st Qu.: 21.40
-## Median : 0.29058 Median :-0.9099 Median :-0.8081 Median : 26.91
-## Mean : 0.41485 Mean :-1.1507 Mean :-0.2277 Mean : 39.83
-## 3rd Qu.: 0.63342 3rd Qu.:-0.2718 3rd Qu.: 1.1919 3rd Qu.: 39.82
-## Max. : 1.46176 Max. : 0.2867 Max. : 3.4392 Max. :463.65
-## NA's :10800
-## Bath.baseline.madj Dishwasher.baseline.madj External.baseline.madj
-## Min. : -3.955 Min. :-2.17945 Min. :-2.51
-## 1st Qu.: 26.196 1st Qu.:-0.04467 1st Qu.: 2.42
-## Median : 55.468 Median :19.03439 Median :16.92
-## Mean : 53.760 Mean :12.69926 Mean :18.21
-## 3rd Qu.: 75.373 3rd Qu.:22.44115 3rd Qu.:26.02
-## Max. :128.952 Max. :32.75192 Max. :98.17
-## NA's :36072
-## KitchenSink.baseline.madj Shower.baseline.madj WC.baseline.madj
-## Min. : 7.469 Min. : -0.244 Min. : 20.64
-## 1st Qu.:15.466 1st Qu.: 34.849 1st Qu.: 73.26
-## Median :32.420 Median : 41.842 Median : 99.08
-## Mean :31.619 Mean : 69.514 Mean : 98.77
-## 3rd Qu.:45.299 3rd Qu.: 93.573 3rd Qu.:124.33
-## Max. :76.121 Max. :515.287 Max. :262.79
-## NA's :10368 NA's :11448
-## WashingMachine.baseline.madj sumDaily.baseline.madj currMonS
-## Min. : -3.245 Min. : 53.53 Length:741528
-## 1st Qu.: 18.377 1st Qu.: 309.71 Class :character
-## Median : 67.546 Median : 389.36 Mode :character
-## Mean : 56.675 Mean : 382.72
-## 3rd Qu.: 84.686 3rd Qu.: 462.32
-## Max. :149.063 Max. :1153.15
-## NA's :7560 NA's :36072
-## occRed loWC loSh dualFlushWC loFlowShower
-## Min. :1.0 Min. :0 Min. :0 Length:741528 Length:741528
-## 1st Qu.:1.0 1st Qu.:0 1st Qu.:0 Class :character Class :character
-## Median :2.0 Median :0 Median :0 Mode :character Mode :character
-## Mean :2.5 Mean :0 Mean :0
-## 3rd Qu.:3.0 3rd Qu.:0 3rd Qu.:0
-## Max. :6.0 Max. :0 Max. :0
-##
-## WC.baseline.madj.we Shower.baseline.madj.we sumDaily.baseline.madj.we
-## Min. : 9.814 Min. : -0.244 Min. : 36.94
-## 1st Qu.: 57.982 1st Qu.: 32.409 1st Qu.: 292.79
-## Median : 81.724 Median : 40.664 Median : 370.09
-## Mean : 88.888 Mean : 65.732 Mean : 369.09
-## 3rd Qu.:118.154 3rd Qu.: 85.720 3rd Qu.: 451.33
-## Max. :262.787 Max. :515.287 Max. :1152.91
-## NA's :11448 NA's :10368 NA's :36072
-## yearOrig currSeason yrStr seasonStr
-## Min. :1994 Spring:185382 Length:741528 Length:741528
-## 1st Qu.:1999 Summer:185382 Class :character Class :character
-## Median :2003 Autumn:185382 Mode :character Mode :character
-## Mean :2003 Winter:185382
-## 3rd Qu.:2008
-## Max. :2012
-##
-## Colne Gt_Stour Mole dualFlushWCdr
-## Length:741528 Length:741528 Length:741528 Length:741528
-## Class :character Class :character Class :character Class :character
-## Mode :character Mode :character Mode :character Mode :character
-##
-##
-##
-##
-## dualFlushWCupdated loFlowShowerDr loFlowShowerUpdated applyTUB
-## Min. :0.0000 Length:741528 Min. :0.00000 Min. :0.00000
-## 1st Qu.:0.0000 Class :character 1st Qu.:0.00000 1st Qu.:0.00000
-## Median :0.0000 Mode :character Median :0.00000 Median :0.00000
-## Mean :0.1908 Mean :0.09715 Mean :0.01215
-## 3rd Qu.:0.0000 3rd Qu.:0.00000 3rd Qu.:0.00000
-## Max. :1.0000 Max. :1.00000 Max. :1.00000
-##
-## WC.baseline.madj.we.dr Shower.baseline.madj.we.dr External.baseline.madj.we.dr
-## Min. : 9.70 Min. : -0.244 Min. :-2.51
-## 1st Qu.: 47.74 1st Qu.: 29.997 1st Qu.: 2.42
-## Median : 73.88 Median : 39.972 Median :16.57
-## Mean : 81.26 Mean : 63.460 Mean :17.77
-## 3rd Qu.:112.29 3rd Qu.: 80.536 3rd Qu.:25.46
-## Max. :262.79 Max. :515.287 Max. :98.17
-## NA's :11448 NA's :10368 NA's :36072
-## sumDaily.baseline.madj.we.dr
-## Min. : 35.06
-## 1st Qu.: 282.44
-## Median : 362.51
-## Mean : 358.79
-## 3rd Qu.: 441.63
-## Max. :1152.50
-## NA's :36072</code></pre>
</div>
+<div id="enhanced-we-model" class="section level1">
+<h1><span class="header-section-number">16</span> Enhanced WE model?</h1>
+</div>
+<div id="summary-of-final-data" class="section level1">
+<h1><span class="header-section-number">17</span> Summary of final data</h1>
+<pre class="r"><code>skimr::skim(hhFinalDataComboExpandedCEHDT)</code></pre>
+<table>
+<caption>Data summary</caption>
+<tbody>
+<tr class="odd">
+<td align="left">Name</td>
+<td align="left">hhFinalDataComboExpandedC…</td>
+</tr>
+<tr class="even">
+<td align="left">Number of rows</td>
+<td align="left">741528</td>
+</tr>
+<tr class="odd">
+<td align="left">Number of columns</td>
+<td align="left">57</td>
+</tr>
+<tr class="even">
+<td align="left">_______________________</td>
+<td align="left"></td>
+</tr>
+<tr class="odd">
+<td align="left">Column type frequency:</td>
+<td align="left"></td>
+</tr>
+<tr class="even">
+<td align="left">character</td>
+<td align="left">11</td>
+</tr>
+<tr class="odd">
+<td align="left">Date</td>
+<td align="left">1</td>
+</tr>
+<tr class="even">
+<td align="left">factor</td>
+<td align="left">2</td>
+</tr>
+<tr class="odd">
+<td align="left">numeric</td>
+<td align="left">43</td>
+</tr>
+<tr class="even">
+<td align="left">________________________</td>
+<td align="left"></td>
+</tr>
+<tr class="odd">
+<td align="left">Group variables</td>
+<td align="left">None</td>
+</tr>
+</tbody>
+</table>
+<p><strong>Variable type: character</strong></p>
+<table>
+<thead>
+<tr class="header">
+<th align="left">skim_variable</th>
+<th align="right">n_missing</th>
+<th align="right">complete_rate</th>
+<th align="right">min</th>
+<th align="right">max</th>
+<th align="right">empty</th>
+<th align="right">n_unique</th>
+<th align="right">whitespace</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td align="left">model</td>
+<td align="right">0</td>
+<td align="right">1</td>
+<td align="right">4</td>
+<td align="right">4</td>
+<td align="right">0</td>
+<td align="right">2</td>
+<td align="right">0</td>
+</tr>
+<tr class="even">
+<td align="left">currMonS</td>
+<td align="right">0</td>
+<td align="right">1</td>
+<td align="right">2</td>
+<td align="right">2</td>
+<td align="right">0</td>
+<td align="right">12</td>
+<td align="right">0</td>
+</tr>
+<tr class="odd">
+<td align="left">dualFlushWC</td>
+<td align="right">0</td>
+<td align="right">1</td>
+<td align="right">10</td>
+<td align="right">12</td>
+<td align="right">0</td>
+<td align="right">2</td>
+<td align="right">0</td>
+</tr>
+<tr class="even">
+<td align="left">loFlowShower</td>
+<td align="right">0</td>
+<td align="right">1</td>
+<td align="right">8</td>
+<td align="right">11</td>
+<td align="right">0</td>
+<td align="right">2</td>
+<td align="right">0</td>
+</tr>
+<tr class="odd">
+<td align="left">yrStr</td>
+<td align="right">0</td>
+<td align="right">1</td>
+<td align="right">4</td>
+<td align="right">7</td>
+<td align="right">0</td>
+<td align="right">36</td>
+<td align="right">0</td>
+</tr>
+<tr class="even">
+<td align="left">seasonStr</td>
+<td align="right">0</td>
+<td align="right">1</td>
+<td align="right">6</td>
+<td align="right">6</td>
+<td align="right">0</td>
+<td align="right">4</td>
+<td align="right">0</td>
+</tr>
+<tr class="odd">
+<td align="left">Colne</td>
+<td align="right">0</td>
+<td align="right">1</td>
+<td align="right">9</td>
+<td align="right">17</td>
+<td align="right">0</td>
+<td align="right">5</td>
+<td align="right">0</td>
+</tr>
+<tr class="even">
+<td align="left">Gt_Stour</td>
+<td align="right">0</td>
+<td align="right">1</td>
+<td align="right">9</td>
+<td align="right">17</td>
+<td align="right">0</td>
+<td align="right">5</td>
+<td align="right">0</td>
+</tr>
+<tr class="odd">
+<td align="left">Mole</td>
+<td align="right">0</td>
+<td align="right">1</td>
+<td align="right">9</td>
+<td align="right">17</td>
+<td align="right">0</td>
+<td align="right">5</td>
+<td align="right">0</td>
+</tr>
+<tr class="even">
+<td align="left">dualFlushWCdr</td>
+<td align="right">0</td>
+<td align="right">1</td>
+<td align="right">10</td>
+<td align="right">12</td>
+<td align="right">0</td>
+<td align="right">2</td>
+<td align="right">0</td>
+</tr>
+<tr class="odd">
+<td align="left">loFlowShowerDr</td>
+<td align="right">0</td>
+<td align="right">1</td>
+<td align="right">8</td>
+<td align="right">11</td>
+<td align="right">0</td>
+<td align="right">2</td>
+<td align="right">0</td>
+</tr>
+</tbody>
+</table>
+<p><strong>Variable type: Date</strong></p>
+<table>
+<thead>
+<tr class="header">
+<th align="left">skim_variable</th>
+<th align="right">n_missing</th>
+<th align="right">complete_rate</th>
+<th align="left">min</th>
+<th align="left">max</th>
+<th align="left">median</th>
+<th align="right">n_unique</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td align="left">obsDate</td>
+<td align="right">0</td>
+<td align="right">1</td>
+<td align="left">1994-12-15</td>
+<td align="left">2012-11-15</td>
+<td align="left">2003-11-30</td>
+<td align="right">216</td>
+</tr>
+</tbody>
+</table>
+<p><strong>Variable type: factor</strong></p>
+<table>
+<thead>
+<tr class="header">
+<th align="left">skim_variable</th>
+<th align="right">n_missing</th>
+<th align="right">complete_rate</th>
+<th align="left">ordered</th>
+<th align="right">n_unique</th>
+<th align="left">top_counts</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td align="left">metered</td>
+<td align="right">0</td>
+<td align="right">1</td>
+<td align="left">FALSE</td>
+<td align="right">2</td>
+<td align="left">Not: 419904, Met: 321624</td>
+</tr>
+<tr class="even">
+<td align="left">currSeason</td>
+<td align="right">0</td>
+<td align="right">1</td>
+<td align="left">FALSE</td>
+<td align="right">4</td>
+<td align="left">Spr: 185382, Sum: 185382, Aut: 185382, Win: 185382</td>
+</tr>
+</tbody>
+</table>
+<p><strong>Variable type: numeric</strong></p>
+<table style="width:100%;">
+<colgroup>
+<col width="21%" />
+<col width="7%" />
+<col width="10%" />
+<col width="9%" />
+<col width="8%" />
+<col width="5%" />
+<col width="5%" />
+<col width="5%" />
+<col width="9%" />
+<col width="9%" />
+<col width="4%" />
+</colgroup>
+<thead>
+<tr class="header">
+<th align="left">skim_variable</th>
+<th align="right">n_missing</th>
+<th align="right">complete_rate</th>
+<th align="right">mean</th>
+<th align="right">sd</th>
+<th align="right">p0</th>
+<th align="right">p25</th>
+<th align="right">p50</th>
+<th align="right">p75</th>
+<th align="right">p100</th>
+<th align="left">hist</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td align="left">hhid</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">398103840.53</td>
+<td align="right">4.17964e+08</td>
+<td align="right">1.00</td>
+<td align="right">859.00</td>
+<td align="right">1717.00</td>
+<td align="right">836920446.00</td>
+<td align="right">836965495.00</td>
+<td align="left">▇▁▁▁▇</td>
+</tr>
+<tr class="even">
+<td align="left">currYear</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">2003.42</td>
+<td align="right">5.20000e+00</td>
+<td align="right">1994.00</td>
+<td align="right">1999.00</td>
+<td align="right">2003.00</td>
+<td align="right">2008.00</td>
+<td align="right">2012.00</td>
+<td align="left">▆▇▆▇▇</td>
+</tr>
+<tr class="odd">
+<td align="left">currMon</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">6.50</td>
+<td align="right">3.45000e+00</td>
+<td align="right">1.00</td>
+<td align="right">3.75</td>
+<td align="right">6.50</td>
+<td align="right">9.25</td>
+<td align="right">12.00</td>
+<td align="left">▇▅▅▅▇</td>
+</tr>
+<tr class="even">
+<td align="left">occupancy</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">2.50</td>
+<td align="right">1.36000e+00</td>
+<td align="right">1.00</td>
+<td align="right">1.00</td>
+<td align="right">2.00</td>
+<td align="right">3.00</td>
+<td align="right">10.00</td>
+<td align="left">▇▃▁▁▁</td>
+</tr>
+<tr class="odd">
+<td align="left">Basin.baseline</td>
+<td align="right">10800</td>
+<td align="right">0.99</td>
+<td align="right">39.73</td>
+<td align="right">3.98200e+01</td>
+<td align="right">10.40</td>
+<td align="right">21.39</td>
+<td align="right">26.72</td>
+<td align="right">39.72</td>
+<td align="right">463.20</td>
+<td align="left">▇▁▁▁▁</td>
+</tr>
+<tr class="even">
+<td align="left">Bath.baseline</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">55.01</td>
+<td align="right">2.64100e+01</td>
+<td align="right">0.00</td>
+<td align="right">26.40</td>
+<td align="right">56.91</td>
+<td align="right">77.06</td>
+<td align="right">123.83</td>
+<td align="left">▃▇▇▇▁</td>
+</tr>
+<tr class="odd">
+<td align="left">Dishwasher.baseline</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">13.33</td>
+<td align="right">1.07800e+01</td>
+<td align="right">0.00</td>
+<td align="right">0.00</td>
+<td align="right">19.85</td>
+<td align="right">23.16</td>
+<td align="right">35.26</td>
+<td align="left">▇▁▂▇▁</td>
+</tr>
+<tr class="even">
+<td align="left">KitchenSink.baseline</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">31.41</td>
+<td align="right">1.41600e+01</td>
+<td align="right">7.57</td>
+<td align="right">15.14</td>
+<td align="right">32.06</td>
+<td align="right">45.11</td>
+<td align="right">75.70</td>
+<td align="left">▆▇▇▂▁</td>
+</tr>
+<tr class="odd">
+<td align="left">Shower.baseline</td>
+<td align="right">10368</td>
+<td align="right">0.99</td>
+<td align="right">68.93</td>
+<td align="right">6.26000e+01</td>
+<td align="right">0.00</td>
+<td align="right">34.12</td>
+<td align="right">40.90</td>
+<td align="right">93.60</td>
+<td align="right">513.82</td>
+<td align="left">▇▂▁▁▁</td>
+</tr>
+<tr class="even">
+<td align="left">WC.baseline</td>
+<td align="right">11448</td>
+<td align="right">0.98</td>
+<td align="right">100.05</td>
+<td align="right">3.91700e+01</td>
+<td align="right">25.00</td>
+<td align="right">75.00</td>
+<td align="right">100.00</td>
+<td align="right">125.09</td>
+<td align="right">262.50</td>
+<td align="left">▃▇▅▁▁</td>
+</tr>
+<tr class="odd">
+<td align="left">WashingMachine.baseline</td>
+<td align="right">7560</td>
+<td align="right">0.99</td>
+<td align="right">57.03</td>
+<td align="right">3.54100e+01</td>
+<td align="right">0.00</td>
+<td align="right">16.67</td>
+<td align="right">67.32</td>
+<td align="right">85.19</td>
+<td align="right">158.55</td>
+<td align="left">▇▂▇▃▁</td>
+</tr>
+<tr class="even">
+<td align="left">External.baseline</td>
+<td align="right">36072</td>
+<td align="right">0.95</td>
+<td align="right">17.99</td>
+<td align="right">1.50700e+01</td>
+<td align="right">-1.23</td>
+<td align="right">1.29</td>
+<td align="right">16.87</td>
+<td align="right">25.70</td>
+<td align="right">97.50</td>
+<td align="left">▇▅▁▁▁</td>
+</tr>
+<tr class="odd">
+<td align="left">Basin</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">0.13</td>
+<td align="right">1.10000e-01</td>
+<td align="right">-0.09</td>
+<td align="right">0.06</td>
+<td align="right">0.13</td>
+<td align="right">0.17</td>
+<td align="right">0.45</td>
+<td align="left">▅▇▇▂▂</td>
+</tr>
+<tr class="even">
+<td align="left">Bath</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">-1.20</td>
+<td align="right">1.02000e+00</td>
+<td align="right">-3.95</td>
+<td align="right">-1.95</td>
+<td align="right">-0.89</td>
+<td align="right">-0.30</td>
+<td align="right">0.09</td>
+<td align="left">▁▂▂▃▇</td>
+</tr>
+<tr class="odd">
+<td align="left">Dishwasher</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">-0.65</td>
+<td align="right">5.90000e-01</td>
+<td align="right">-2.18</td>
+<td align="right">-1.03</td>
+<td align="right">-0.57</td>
+<td align="right">-0.12</td>
+<td align="right">0.00</td>
+<td align="left">▁▂▃▃▇</td>
+</tr>
+<tr class="even">
+<td align="left">External</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">0.12</td>
+<td align="right">5.30000e-01</td>
+<td align="right">-1.28</td>
+<td align="right">-0.23</td>
+<td align="right">0.04</td>
+<td align="right">0.50</td>
+<td align="right">1.48</td>
+<td align="left">▁▅▇▅▂</td>
+</tr>
+<tr class="odd">
+<td align="left">KitchenSink</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">0.15</td>
+<td align="right">1.30000e-01</td>
+<td align="right">-0.10</td>
+<td align="right">0.05</td>
+<td align="right">0.14</td>
+<td align="right">0.26</td>
+<td align="right">0.50</td>
+<td align="left">▅▇▆▆▁</td>
+</tr>
+<tr class="even">
+<td align="left">Shower</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">0.41</td>
+<td align="right">4.80000e-01</td>
+<td align="right">-0.24</td>
+<td align="right">0.04</td>
+<td align="right">0.29</td>
+<td align="right">0.63</td>
+<td align="right">1.46</td>
+<td align="left">▇▇▂▂▃</td>
+</tr>
+<tr class="odd">
+<td align="left">WC</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">-1.15</td>
+<td align="right">1.09000e+00</td>
+<td align="right">-4.36</td>
+<td align="right">-2.14</td>
+<td align="right">-0.91</td>
+<td align="right">-0.27</td>
+<td align="right">0.29</td>
+<td align="left">▁▂▃▃▇</td>
+</tr>
+<tr class="even">
+<td align="left">WashingMachine</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">-0.23</td>
+<td align="right">1.69000e+00</td>
+<td align="right">-3.24</td>
+<td align="right">-1.65</td>
+<td align="right">-0.81</td>
+<td align="right">1.19</td>
+<td align="right">3.44</td>
+<td align="left">▃▇▃▅▃</td>
+</tr>
+<tr class="odd">
+<td align="left">Basin.baseline.madj</td>
+<td align="right">10800</td>
+<td align="right">0.99</td>
+<td align="right">39.86</td>
+<td align="right">3.98200e+01</td>
+<td align="right">10.33</td>
+<td align="right">21.59</td>
+<td align="right">26.88</td>
+<td align="right">39.82</td>
+<td align="right">463.65</td>
+<td align="left">▇▁▁▁▁</td>
+</tr>
+<tr class="even">
+<td align="left">Bath.baseline.madj</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">53.82</td>
+<td align="right">2.61500e+01</td>
+<td align="right">-3.95</td>
+<td align="right">26.20</td>
+<td align="right">55.54</td>
+<td align="right">75.21</td>
+<td align="right">123.92</td>
+<td align="left">▃▇▇▆▁</td>
+</tr>
+<tr class="odd">
+<td align="left">Dishwasher.baseline.madj</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">12.69</td>
+<td align="right">1.07500e+01</td>
+<td align="right">-2.18</td>
+<td align="right">-0.04</td>
+<td align="right">19.04</td>
+<td align="right">22.48</td>
+<td align="right">35.26</td>
+<td align="left">▇▂▂▇▁</td>
+</tr>
+<tr class="even">
+<td align="left">External.baseline.madj</td>
+<td align="right">36072</td>
+<td align="right">0.95</td>
+<td align="right">18.11</td>
+<td align="right">1.51100e+01</td>
+<td align="right">-2.51</td>
+<td align="right">1.85</td>
+<td align="right">17.00</td>
+<td align="right">25.85</td>
+<td align="right">98.17</td>
+<td align="left">▇▆▁▁▁</td>
+</tr>
+<tr class="odd">
+<td align="left">KitchenSink.baseline.madj</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">31.57</td>
+<td align="right">1.41600e+01</td>
+<td align="right">7.47</td>
+<td align="right">15.47</td>
+<td align="right">32.22</td>
+<td align="right">45.23</td>
+<td align="right">76.12</td>
+<td align="left">▆▇▇▂▁</td>
+</tr>
+<tr class="even">
+<td align="left">Shower.baseline.madj</td>
+<td align="right">10368</td>
+<td align="right">0.99</td>
+<td align="right">69.35</td>
+<td align="right">6.26100e+01</td>
+<td align="right">-0.24</td>
+<td align="right">34.54</td>
+<td align="right">41.49</td>
+<td align="right">93.57</td>
+<td align="right">515.29</td>
+<td align="left">▇▂▁▁▁</td>
+</tr>
+<tr class="odd">
+<td align="left">WC.baseline.madj</td>
+<td align="right">11448</td>
+<td align="right">0.98</td>
+<td align="right">98.90</td>
+<td align="right">3.88900e+01</td>
+<td align="right">20.64</td>
+<td align="right">73.17</td>
+<td align="right">99.44</td>
+<td align="right">124.03</td>
+<td align="right">262.79</td>
+<td align="left">▃▇▅▁▁</td>
+</tr>
+<tr class="even">
+<td align="left">WashingMachine.baseline.madj</td>
+<td align="right">7560</td>
+<td align="right">0.99</td>
+<td align="right">56.80</td>
+<td align="right">3.52300e+01</td>
+<td align="right">-3.24</td>
+<td align="right">18.38</td>
+<td align="right">68.50</td>
+<td align="right">84.87</td>
+<td align="right">158.51</td>
+<td align="left">▇▂▇▃▁</td>
+</tr>
+<tr class="odd">
+<td align="left">sumDaily.baseline.madj</td>
+<td align="right">36072</td>
+<td align="right">0.95</td>
+<td align="right">382.73</td>
+<td align="right">1.34190e+02</td>
+<td align="right">53.53</td>
+<td align="right">309.36</td>
+<td align="right">390.00</td>
+<td align="right">462.70</td>
+<td align="right">1153.15</td>
+<td align="left">▂▇▂▁▁</td>
+</tr>
+<tr class="even">
+<td align="left">occRed</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">2.50</td>
+<td align="right">1.35000e+00</td>
+<td align="right">1.00</td>
+<td align="right">1.00</td>
+<td align="right">2.00</td>
+<td align="right">3.00</td>
+<td align="right">6.00</td>
+<td align="left">▇▂▂▁▁</td>
+</tr>
+<tr class="odd">
+<td align="left">loWC</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">0.00</td>
+<td align="right">0.00000e+00</td>
+<td align="right">0.00</td>
+<td align="right">0.00</td>
+<td align="right">0.00</td>
+<td align="right">0.00</td>
+<td align="right">0.00</td>
+<td align="left">▁▁▇▁▁</td>
+</tr>
+<tr class="even">
+<td align="left">loSh</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">0.00</td>
+<td align="right">0.00000e+00</td>
+<td align="right">0.00</td>
+<td align="right">0.00</td>
+<td align="right">0.00</td>
+<td align="right">0.00</td>
+<td align="right">0.00</td>
+<td align="left">▁▁▇▁▁</td>
+</tr>
+<tr class="odd">
+<td align="left">WC.baseline.madj.we</td>
+<td align="right">11448</td>
+<td align="right">0.98</td>
+<td align="right">89.01</td>
+<td align="right">4.13600e+01</td>
+<td align="right">9.81</td>
+<td align="right">57.78</td>
+<td align="right">82.02</td>
+<td align="right">117.92</td>
+<td align="right">262.79</td>
+<td align="left">▅▇▆▁▁</td>
+</tr>
+<tr class="even">
+<td align="left">Shower.baseline.madj.we</td>
+<td align="right">10368</td>
+<td align="right">0.99</td>
+<td align="right">65.58</td>
+<td align="right">6.05500e+01</td>
+<td align="right">-0.24</td>
+<td align="right">32.30</td>
+<td align="right">40.36</td>
+<td align="right">85.66</td>
+<td align="right">515.29</td>
+<td align="left">▇▂▁▁▁</td>
+</tr>
+<tr class="odd">
+<td align="left">sumDaily.baseline.madj.we</td>
+<td align="right">36072</td>
+<td align="right">0.95</td>
+<td align="right">369.11</td>
+<td align="right">1.31780e+02</td>
+<td align="right">36.75</td>
+<td align="right">293.70</td>
+<td align="right">370.66</td>
+<td align="right">450.65</td>
+<td align="right">1152.91</td>
+<td align="left">▂▇▂▁▁</td>
+</tr>
+<tr class="even">
+<td align="left">yearOrig</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">2003.42</td>
+<td align="right">5.20000e+00</td>
+<td align="right">1994.00</td>
+<td align="right">1999.00</td>
+<td align="right">2003.00</td>
+<td align="right">2008.00</td>
+<td align="right">2012.00</td>
+<td align="left">▆▇▆▇▇</td>
+</tr>
+<tr class="odd">
+<td align="left">dualFlushWCupdated</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">0.19</td>
+<td align="right">3.90000e-01</td>
+<td align="right">0.00</td>
+<td align="right">0.00</td>
+<td align="right">0.00</td>
+<td align="right">0.00</td>
+<td align="right">1.00</td>
+<td align="left">▇▁▁▁▂</td>
+</tr>
+<tr class="even">
+<td align="left">loFlowShowerUpdated</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">0.10</td>
+<td align="right">3.00000e-01</td>
+<td align="right">0.00</td>
+<td align="right">0.00</td>
+<td align="right">0.00</td>
+<td align="right">0.00</td>
+<td align="right">1.00</td>
+<td align="left">▇▁▁▁▁</td>
+</tr>
+<tr class="odd">
+<td align="left">applyTUB</td>
+<td align="right">0</td>
+<td align="right">1.00</td>
+<td align="right">0.01</td>
+<td align="right">1.10000e-01</td>
+<td align="right">0.00</td>
+<td align="right">0.00</td>
+<td align="right">0.00</td>
+<td align="right">0.00</td>
+<td align="right">1.00</td>
+<td align="left">▇▁▁▁▁</td>
+</tr>
+<tr class="even">
+<td align="left">WC.baseline.madj.we.dr</td>
+<td align="right">11448</td>
+<td align="right">0.98</td>
+<td align="right">81.43</td>
+<td align="right">4.19800e+01</td>
+<td align="right">9.81</td>
+<td align="right">48.05</td>
+<td align="right">73.92</td>
+<td align="right">112.12</td>
+<td align="right">262.79</td>
+<td align="left">▇▇▅▁▁</td>
+</tr>
+<tr class="odd">
+<td align="left">Shower.baseline.madj.we.dr</td>
+<td align="right">10368</td>
+<td align="right">0.99</td>
+<td align="right">63.38</td>
+<td align="right">5.91000e+01</td>
+<td align="right">-0.24</td>
+<td align="right">29.81</td>
+<td align="right">39.53</td>
+<td align="right">80.61</td>
+<td align="right">515.15</td>
+<td align="left">▇▂▁▁▁</td>
+</tr>
+<tr class="even">
+<td align="left">External.baseline.madj.we.dr</td>
+<td align="right">36072</td>
+<td align="right">0.95</td>
+<td align="right">17.67</td>
+<td align="right">1.48900e+01</td>
+<td align="right">-2.51</td>
+<td align="right">1.85</td>
+<td align="right">16.59</td>
+<td align="right">25.40</td>
+<td align="right">98.17</td>
+<td align="left">▇▆▁▁▁</td>
+</tr>
+<tr class="odd">
+<td align="left">sumDaily.baseline.madj.we.dr</td>
+<td align="right">36072</td>
+<td align="right">0.95</td>
+<td align="right">358.82</td>
+<td align="right">1.29210e+02</td>
+<td align="right">36.75</td>
+<td align="right">283.92</td>
+<td align="right">360.27</td>
+<td align="right">440.73</td>
+<td align="right">1152.91</td>
+<td align="left">▂▇▁▁▁</td>
+</tr>
+</tbody>
+</table>
</div>
<div id="about" class="section level1">
-<h1><span class="header-section-number">14</span> About</h1>
+<h1><span class="header-section-number">18</span> About</h1>
<p>This work was supported by the NERC funded IMPETUS (Improving Predictions of Drought for User Decision-Making) project:</p>
<ul>
<li><a href="http://gotw.nerc.ac.uk/list_split.asp?awardref=NE%2FL010216%2F1">http://gotw.nerc.ac.uk/list_split.asp?awardref=NE%2FL010216%2F1</a></li>
</ul>
<div id="contributions" class="section level2">
-<h2><span class="header-section-number">14.1</span> Contributions</h2>
+<h2><span class="header-section-number">18.1</span> Contributions</h2>
<p>Please note that authorship is alphabetical. Contributions are listed below.</p>
<p>Ben Anderson (<a href="mailto:b.anderson@soton.ac.uk" class="email">b.anderson@soton.ac.uk</a> <code>@dataknut</code>)</p>
<ul>
@@ -11095,13 +11820,13 @@ ggplot(droughtPhaseDT, aes(x = phase, y = V1, fill = phase)) +
</ul>
</div>
<div id="code" class="section level2">
-<h2><span class="header-section-number">14.2</span> Code</h2>
+<h2><span class="header-section-number">18.2</span> Code</h2>
<ul>
<li><a href="https://github.com/dataknut/IMPETUS" class="uri">https://github.com/dataknut/IMPETUS</a> (currently private)</li>
</ul>
</div>
<div id="citation" class="section level2">
-<h2><span class="header-section-number">14.3</span> Citation</h2>
+<h2><span class="header-section-number">18.3</span> Citation</h2>
<p>If you wish to refer to any of the material from this report please cite as:</p>
<ul>
<li>Anderson, B., Manouseli, D. & Nagarajan, M. (2021) <em>A household level daily consumption estimation microsimulation model</em>, University of Southampton: Southampton, UK.</li>
@@ -11109,11 +11834,11 @@ ggplot(droughtPhaseDT, aes(x = phase, y = V1, fill = phase)) +
</div>
</div>
<div id="runtime" class="section level1">
-<h1><span class="header-section-number">15</span> Runtime</h1>
+<h1><span class="header-section-number">19</span> Runtime</h1>
<pre class="r"><code>t <- proc.time() - startTime
elapsed <- t[[3]]</code></pre>
-<p>Analysis completed in 316.864 seconds ( 5.28 minutes) using <a href="https://cran.r-project.org/package=knitr">knitr</a> in <a href="http://www.rstudio.com">RStudio</a> with R version 4.0.2 (2020-06-22) running on x86_64-apple-darwin17.0.</p>
+<p>Analysis completed in 328.682 seconds ( 5.48 minutes) using <a href="https://cran.r-project.org/package=knitr">knitr</a> in <a href="http://www.rstudio.com">RStudio</a> with R version 4.0.2 (2020-06-22) running on x86_64-apple-darwin17.0.</p>
<p>R packages used:</p>
<ul>
<li>base R - for the basics <span class="citation">(R Core Team 2016)</span></li>
@@ -11122,12 +11847,16 @@ elapsed <- t[[3]]</code></pre>
<li>dplyr - for rename <span class="citation">(Wickham and Francois 2016)</span></li>
<li>fGarch - to create skewed normal consumption distributions <span class="citation">(Wuertz et al. 2016)</span></li>
<li>lubridate - date manipulation <span class="citation">(Grolemund and Wickham 2011)</span></li>
+<li>skimr - for skim <span class="citation">(Arino de la Rubia et al. 2017)</span></li>
<li>knitr - to create this document <span class="citation">(Xie 2016)</span></li>
</ul>
</div>
<div id="references" class="section level1 unnumbered">
<h1>References</h1>
<div id="refs" class="references">
+<div id="ref-skimr">
+<p>Arino de la Rubia, Eduardo, Hao Zhu, Shannon Ellis, Elin Waring, and Michael Quinn. 2017. <em>Skimr: Skimr</em>. <a href="https://github.com/ropenscilabs/skimr">https://github.com/ropenscilabs/skimr</a>.</p>
+</div>
<div id="ref-data.table">
<p>Dowle, M, A Srinivasan, T Short, S Lianoglou with contributions from R Saporta, and E Antonyan. 2015. <em>Data.table: Extension of Data.frame</em>. <a href="https://CRAN.R-project.org/package=data.table">https://CRAN.R-project.org/package=data.table</a>.</p>
</div>
diff --git a/impetusModel/impetusModel.md b/impetusModel/impetusModel.md
index 6668ab70c8204073057919250705d8cc2c9acea1..2965707089461b40a743437eee15623ad77c45af 100644
--- a/impetusModel/impetusModel.md
+++ b/impetusModel/impetusModel.md
@@ -2,7 +2,7 @@
title: "A household level daily consumption estimation microsimulation model"
author: Ben Anderson (b.anderson@soton.ac.uk, `@dataknut`), Despoina Manouseli (d.manouseli@soton.ac.uk)
& Magesh Nagarajan (m.nagarajan@soton.ac.uk)
-date: 'Last run at: 2021-03-15 15:16:59'
+date: 'Last run at: 2021-03-15 15:54:47'
output:
html_document:
keep_md: yes
@@ -646,10 +646,10 @@ kable(caption = "Check % metered distribution",
Table: Check % metered distribution
-| | 1| 2| 3| 4| 5| 6|
-|:-----------|----:|----:|----:|----:|----:|----:|
-|Metered | 40.7| 40.2| 37.4| 42.3| 41.5| 37.3|
-|Not metered | 59.3| 59.8| 62.6| 57.7| 58.5| 62.7|
+| | 1| 2| 3| 4| 5| 6|
+|:-----------|----:|----:|--:|----:|----:|----:|
+|Metered | 38.2| 39.7| 43| 41.7| 42.6| 36.1|
+|Not metered | 61.8| 60.3| 57| 58.3| 57.4| 63.9|
## Baseline consumption estimation
@@ -887,12 +887,12 @@ Table: Test Basin & Bath l/day as modelled using rsnorm()
| | Basin.rsnorm | Bath.rsnorm |Dishwasher.rsnorm |External.rsnorm |KitchenSink.rsnorm |Shower.rsnorm | WC.rsnorm |WashingMachine.rsnorm |
|:--|:-------------|:--------------|:-----------------|:---------------|:------------------|:-------------|:--------------|:---------------------|
-| |Min. :12.30 |Min. : 35.52 |Min. :19.94 |Min. : 0.00 |Min. :27.34 |Min. :21.98 |Min. : 47.47 |Min. : 56.03 |
-| |1st Qu.:17.54 |1st Qu.: 56.57 |1st Qu.:22.61 |1st Qu.:10.87 |1st Qu.:32.47 |1st Qu.:31.80 |1st Qu.: 80.41 |1st Qu.: 72.78 |
-| |Median :24.13 |Median : 74.25 |Median :23.80 |Median :15.78 |Median :43.08 |Median :36.70 |Median : 99.95 |Median : 81.89 |
-| |Mean :22.98 |Mean : 71.85 |Mean :24.17 |Mean :15.66 |Mean :40.40 |Mean :36.55 |Mean : 98.60 |Mean : 84.27 |
-| |3rd Qu.:27.15 |3rd Qu.: 83.95 |3rd Qu.:25.50 |3rd Qu.:22.28 |3rd Qu.:46.25 |3rd Qu.:40.87 |3rd Qu.:114.21 |3rd Qu.: 93.32 |
-| |Max. :42.95 |Max. :125.57 |Max. :33.55 |Max. :52.37 |Max. :63.99 |Max. :59.18 |Max. :170.06 |Max. :145.30 |
+| |Min. :12.01 |Min. : 37.54 |Min. :19.81 |Min. : 0.00 |Min. :27.28 |Min. :21.11 |Min. : 42.40 |Min. : 55.62 |
+| |1st Qu.:17.45 |1st Qu.: 56.79 |1st Qu.:22.63 |1st Qu.:10.80 |1st Qu.:32.31 |1st Qu.:31.86 |1st Qu.: 80.16 |1st Qu.: 73.16 |
+| |Median :24.13 |Median : 74.20 |Median :23.95 |Median :15.64 |Median :43.06 |Median :36.17 |Median :100.04 |Median : 82.05 |
+| |Mean :23.05 |Mean : 71.97 |Mean :24.14 |Mean :15.48 |Mean :40.30 |Mean :36.22 |Mean : 98.92 |Mean : 84.51 |
+| |3rd Qu.:27.24 |3rd Qu.: 83.91 |3rd Qu.:25.40 |3rd Qu.:21.90 |3rd Qu.:46.03 |3rd Qu.:40.48 |3rd Qu.:114.38 |3rd Qu.: 93.75 |
+| |Max. :41.40 |Max. :123.04 |Max. :32.94 |Max. :55.25 |Max. :59.57 |Max. :61.54 |Max. :168.86 |Max. :158.55 |
The table above shows the effect on the mean consumption values for Basin and Bath by occupancy group and metered/un-metered. Note that there is still no correction for occupancy levels.
@@ -921,17 +921,17 @@ kable(caption = "Metered vs un-metered estimates (mean)",
Table: Metered vs un-metered estimates (mean)
-|metered | Basin| Bath| Dishwasher| External| KitchenSink| Shower| WC| WashingMachine|
-|:-----------|--------:|--------:|----------:|---------:|-----------:|--------:|---------:|--------------:|
-|Metered | 16.91258| 55.13962| 22.93975| 9.969381| 31.96897| 31.09094| 77.28764| 77.97218|
-|Not metered | 27.02584| 82.98633| 24.98664| 19.456815| 46.02308| 40.18888| 112.80513| 88.46967|
+|metered | Basin| Bath| Dishwasher| External| KitchenSink| Shower| WC| WashingMachine|
+|:-----------|--------:|--------:|----------:|--------:|-----------:|--------:|---------:|--------------:|
+|Metered | 16.98809| 54.93408| 22.87862| 10.05473| 31.86393| 30.86775| 77.88797| 78.33949|
+|Not metered | 27.08962| 83.32810| 24.98581| 19.10479| 45.91949| 39.78876| 112.94105| 88.62439|
```r
wmMetered <- t[metered == "Metered", WC]
wmNonMetered <- t[metered == "Not metered", WC]
```
-% difference between means for washing machine: 31.49.
+% difference between means for washing machine: 31.04.
### Occupancy based adjustment
@@ -1013,18 +1013,18 @@ Table: Test monthly fixed and occupancy adjusted l/day
|metered | occupancy| meanBasin.baseline| sdBasin.baseline| meanBath.baseline| sdBath.baseline|
|:-----------|---------:|------------------:|----------------:|-----------------:|---------------:|
-|Metered | 1| 17.07| 2.74| 54.78| 10.27|
-|Metered | 2| 18.37| 2.98| 57.75| 10.02|
-|Metered | 3| 19.13| 2.83| 54.83| 9.74|
-|Metered | 4| 19.02| 2.25| 57.78| 11.06|
-|Metered | 5| 19.85| 2.85| 53.21| 9.08|
-|Metered | 6| 17.79| 3.00| 58.93| 9.08|
-|Not metered | 1| 27.27| 3.32| 82.58| 9.67|
-|Not metered | 2| 28.27| 2.80| 84.10| 9.77|
-|Not metered | 3| 29.57| 3.01| 86.01| 9.45|
-|Not metered | 4| 29.50| 2.90| 85.16| 10.26|
-|Not metered | 5| 29.65| 2.92| 87.24| 11.11|
-|Not metered | 6| 30.25| 3.54| 85.79| 8.50|
+|Metered | 1| 16.88| 3.07| 55.58| 9.87|
+|Metered | 2| 18.65| 3.12| 56.38| 9.73|
+|Metered | 3| 19.21| 3.23| 56.38| 9.52|
+|Metered | 4| 19.32| 2.38| 55.16| 9.12|
+|Metered | 5| 19.52| 3.45| 54.44| 9.20|
+|Metered | 6| 17.70| 2.62| 59.13| 11.07|
+|Not metered | 1| 27.08| 3.09| 84.02| 10.62|
+|Not metered | 2| 28.39| 2.99| 83.95| 9.94|
+|Not metered | 3| 29.43| 3.16| 85.63| 10.06|
+|Not metered | 4| 30.21| 3.17| 85.19| 10.32|
+|Not metered | 5| 30.21| 3.82| 85.81| 8.91|
+|Not metered | 6| 30.41| 2.85| 87.72| 8.82|
The table above shows the effect on the median consumption values for Basin and Bath by occupancy group and metered/un-metered.
@@ -3073,17 +3073,17 @@ st <- str(hhDataFinalDaily_v1_3fDT)
```
## Classes 'data.table' and 'data.frame': 1800 obs. of 12 variables:
-## $ hhid : int 8 15 22 28 30 41 43 52 64 66 ...
+## $ hhid : int 15 17 21 22 28 40 41 52 59 63 ...
## $ occupancy : int 1 1 1 1 1 1 1 1 1 1 ...
## $ metered : chr "Metered" "Metered" "Metered" "Metered" ...
-## $ Basin.baseline : num 16.8 21.7 14.4 21.8 13.8 ...
-## $ Bath.baseline : num 54.1 60.7 59.7 76.3 48.7 ...
-## $ Dishwasher.baseline : num 24.5 24.5 24.6 26.5 22.3 ...
-## $ KitchenSink.baseline : num 33.5 33.7 29.9 31.4 31.9 ...
-## $ Shower.baseline : num 40.5 25.3 38.5 28.2 32.3 ...
-## $ WC.baseline : num 85.1 62.8 70.3 68.7 88.4 ...
-## $ WashingMachine.baseline: num 100.2 83.5 75.3 65.8 61.4 ...
-## $ External.baseline : num 16.2 0 11.4 0 0 ...
+## $ Basin.baseline : num 16.9 15.2 22.1 15.7 14.6 ...
+## $ Bath.baseline : num 55.2 45.2 47.3 54.9 47.5 ...
+## $ Dishwasher.baseline : num 21.8 24.1 27 23.5 21.1 ...
+## $ KitchenSink.baseline : num 29.3 32.7 29.3 28.3 32.2 ...
+## $ Shower.baseline : num 25.6 39.8 31 29.4 37.3 ...
+## $ WC.baseline : num 78.1 81.8 75.5 85.6 61.3 ...
+## $ WashingMachine.baseline: num 81.7 127 69.8 89.5 66.2 ...
+## $ External.baseline : num 16.8 0 0 13.4 0 ...
## $ model : chr "v1_3" "v1_3" "v1_3" "v1_3" ...
## - attr(*, ".internal.selfref")=<externalptr>
## - attr(*, "sorted")= chr [1:2] "metered" "occupancy"
@@ -3432,12 +3432,12 @@ Table: Summary of final household data (litres/day) - model v1_3
| | currYear | currMon | metered | occupancy |sumDaily.baseline.madj |Basin.baseline.madj |Bath.baseline.madj |Dishwasher.baseline.madj |External.baseline.madj |KitchenSink.baseline.madj |Shower.baseline.madj |WC.baseline.madj |WashingMachine.baseline.madj |
|:--|:------------|:--------------|:----------------|:-------------|:----------------------|:-------------------|:------------------|:------------------------|:----------------------|:-------------------------|:--------------------|:----------------|:----------------------------|
-| |Min. :1994 |Min. : 1.000 |Length:433800 |Min. :1.000 |Min. :261.3 |Min. :12.61 |Min. : 33.87 |Min. :13.51 |Min. :-2.511 |Min. :27.51 |Min. :22.05 |Min. : 52.98 |Min. : 56.05 |
-| |1st Qu.:1999 |1st Qu.: 4.000 |Class :character |1st Qu.:1.000 |1st Qu.:346.2 |1st Qu.:19.05 |1st Qu.: 57.57 |1st Qu.:20.97 |1st Qu.:11.343 |1st Qu.:34.70 |1st Qu.:33.18 |1st Qu.: 86.77 |1st Qu.: 74.80 |
-| |Median :2004 |Median : 7.000 |Mode :character |Median :2.000 |Median :429.0 |Median :25.60 |Median : 73.96 |Median :22.28 |Median :16.323 |Median :44.75 |Median :37.43 |Median :110.17 |Median : 83.54 |
-| |Mean :2004 |Mean : 6.523 |NA |Mean :2.407 |Mean :408.9 |Mean :24.51 |Mean : 71.85 |Mean :22.59 |Mean :16.087 |Mean :42.25 |Mean :37.53 |Mean :108.00 |Mean : 86.09 |
-| |3rd Qu.:2009 |3rd Qu.:10.000 |NA |3rd Qu.:3.000 |3rd Qu.:460.7 |3rd Qu.:28.77 |3rd Qu.: 83.48 |3rd Qu.:24.06 |3rd Qu.:22.982 |3rd Qu.:47.93 |3rd Qu.:41.63 |3rd Qu.:126.73 |3rd Qu.: 95.34 |
-| |Max. :2014 |Max. :12.000 |NA |Max. :6.000 |Max. :561.7 |Max. :46.99 |Max. :128.95 |Max. :32.75 |Max. :54.270 |Max. :66.99 |Max. :61.82 |Max. :185.19 |Max. :149.06 |
+| |Min. :1994 |Min. : 1.000 |Length:433800 |Min. :1.000 |Min. :254.7 |Min. :12.35 |Min. : 38.24 |Min. :13.80 |Min. :-2.511 |Min. :27.49 |Min. :22.15 |Min. : 50.87 |Min. : 55.36 |
+| |1st Qu.:1999 |1st Qu.: 4.000 |Class :character |1st Qu.:1.000 |1st Qu.:346.4 |1st Qu.:19.10 |1st Qu.: 57.60 |1st Qu.:20.93 |1st Qu.:11.085 |1st Qu.:34.73 |1st Qu.:33.04 |1st Qu.: 86.78 |1st Qu.: 74.97 |
+| |Median :2004 |Median : 7.000 |Mode :character |Median :2.000 |Median :426.0 |Median :25.63 |Median : 73.68 |Median :22.34 |Median :16.267 |Median :44.71 |Median :37.01 |Median :109.68 |Median : 83.64 |
+| |Mean :2004 |Mean : 6.523 |NA |Mean :2.407 |Mean :408.9 |Mean :24.58 |Mean : 71.96 |Mean :22.56 |Mean :15.908 |Mean :42.15 |Mean :37.22 |Mean :108.24 |Mean : 86.33 |
+| |3rd Qu.:2009 |3rd Qu.:10.000 |NA |3rd Qu.:3.000 |3rd Qu.:460.6 |3rd Qu.:28.82 |3rd Qu.: 83.51 |3rd Qu.:23.98 |3rd Qu.:22.532 |3rd Qu.:47.67 |3rd Qu.:41.31 |3rd Qu.:126.21 |3rd Qu.: 95.23 |
+| |Max. :2014 |Max. :12.000 |NA |Max. :6.000 |Max. :569.7 |Max. :44.17 |Max. :123.92 |Max. :35.26 |Max. :57.154 |Max. :62.15 |Max. :62.88 |Max. :189.30 |Max. :158.51 |
```r
kable(caption = "Summary of final household data (litres/day) - model v2_0",
@@ -3726,8 +3726,8 @@ Table: Summary statistics
|model |metered | Daily mean litres/day| Daily mean litres/day per capita|
|:-----|:-----------|---------------------:|--------------------------------:|
-|v1_3 |Not metered | 455.4451| 251.3669|
-|v1_3 |Metered | 339.1046| 188.6442|
+|v1_3 |Not metered | 454.8590| 254.4799|
+|v1_3 |Metered | 340.0453| 186.0782|
|v2_0 |Not metered | 362.7737| 133.9713|
|v2_0 |Metered | 336.4506| 139.7480|
@@ -3862,15 +3862,14 @@ m2Plot
# Introduction
-Now we add the basline water efficiency uptake to each of the two models
+Now we add the baseline water efficiency uptake to each of the two models. This has to be done after the expansion to months as it is a monthly uptake model.
-## Add baseline WE uptake
+> Summary: add baseline WE uptake rates of dual flush WC & low flow shower head uptake and adjust l/day/hh for WCs and showers accordingly
-This has to be done after the expansion to months as it is a monthly uptake model. how this works:
+# Model WE uptake
- * Add baseline WE uptake rates of dual flush WC & low flow shower head uptake and adjust l/day/hh for WCs and showers accordingly
+## Backwards estimation of water efficiency uptake
-### Backwards estimation of water efficiency uptake
The first step is to allocate households to dual-flush/no dual-flush status and low-flow/no low-flow shower heads for all years. The logic applied is as follows:
* dual-flush/no dual-flush WC:
@@ -4074,9 +4073,28 @@ ggplot(dt, aes(x=obsDate, colour = factor(loFlowShower))) +
<!-- -->
+## Update litres/day
+
Next we use the water use reduction values given at the start of the section to update the l/day/hh for those who have the dual flush WCs or low flow showers.
+```r
+# before
+hhFinalDataComboExpandedDT[, .(mean_sumDaily = mean(sumDaily.baseline.madj, na.rm = TRUE),
+ mean_WC = mean(WC.baseline.madj, na.rm = TRUE),
+ mean_shower = mean(Shower.baseline.madj, na.rm = TRUE)
+ ), keyby = .(model, metered)
+ ]
+```
+
+```
+## model metered mean_sumDaily mean_WC mean_shower
+## 1: v1_3 Not metered 454.8590 124.26245 40.41450
+## 2: v1_3 Metered 340.0453 84.19414 32.42067
+## 3: v2_0 Not metered 362.7737 92.13191 109.05040
+## 4: v2_0 Metered 336.4506 83.91561 102.24988
+```
+
```r
# wc ----
hhFinalDataComboExpandedDT <- hhFinalDataComboExpandedDT[, WC.baseline.madj.we := ifelse(dualFlushWC == "Dual flush", WC.baseline.madj * dfWCReduction, WC.baseline.madj)
@@ -4096,10 +4114,24 @@ hhFinalDataComboExpandedDT <- hhFinalDataComboExpandedDT[, sumDaily.baseline.mad
WC.baseline.madj.we +
WashingMachine.baseline.madj
]
+# after
+hhFinalDataComboExpandedDT[, .(mean_sumDaily = mean(sumDaily.baseline.madj.we, na.rm = TRUE),
+ mean_WC = mean(WC.baseline.madj.we, na.rm = TRUE),
+ mean_shower = mean(Shower.baseline.madj.we, na.rm = TRUE)
+ ), keyby = .(model, metered)
+ ]
+```
+
+```
+## model metered mean_sumDaily mean_WC mean_shower
+## 1: v1_3 Not metered 438.7207 110.48887 38.04978
+## 2: v1_3 Metered 328.7714 74.81573 30.52523
+## 3: v2_0 Not metered 346.1385 81.90826 102.68525
+## 4: v2_0 Metered 321.1576 74.54604 96.28288
```
-### Compare effects
+## Compare effects by model
Check the effects on each model
@@ -4140,6 +4172,7 @@ ggplot(plotDT, aes(x = obsDate,)) +
Well that seems to have an effect!
+# Baseline WE Results
## Model 1 (synthetic) results
Now re-draw final baseline charts for papers
@@ -4689,14 +4722,14 @@ stargazer(hhFinalDataComboExpandedDT, type = "html")
<tr><td style="text-align:left">currMon</td><td>827,353</td><td>6.523</td><td>3.463</td><td>1</td><td>4</td><td>10</td><td>12</td></tr>
<tr><td style="text-align:left">hhid</td><td>827,353</td><td>398,103,841.000</td><td>417,963,933.000</td><td>1</td><td>859</td><td>836,920,446</td><td>836,965,495</td></tr>
<tr><td style="text-align:left">occupancy</td><td>827,353</td><td>2.503</td><td>1.359</td><td>1</td><td>1</td><td>3</td><td>10</td></tr>
-<tr><td style="text-align:left">Basin.baseline</td><td>815,303</td><td>39.698</td><td>39.828</td><td>10.400</td><td>21.241</td><td>39.720</td><td>463.200</td></tr>
-<tr><td style="text-align:left">Bath.baseline</td><td>827,353</td><td>54.959</td><td>26.311</td><td>0.000</td><td>26.400</td><td>77.175</td><td>128.861</td></tr>
-<tr><td style="text-align:left">Dishwasher.baseline</td><td>827,353</td><td>13.347</td><td>10.795</td><td>0.000</td><td>0.000</td><td>23.076</td><td>32.913</td></tr>
-<tr><td style="text-align:left">KitchenSink.baseline</td><td>827,353</td><td>31.464</td><td>14.210</td><td>7.570</td><td>15.140</td><td>45.127</td><td>75.700</td></tr>
-<tr><td style="text-align:left">Shower.baseline</td><td>815,785</td><td>69.098</td><td>62.523</td><td>0.000</td><td>34.427</td><td>93.600</td><td>513.825</td></tr>
-<tr><td style="text-align:left">WC.baseline</td><td>814,580</td><td>99.928</td><td>38.972</td><td>25.000</td><td>75.000</td><td>125.489</td><td>262.500</td></tr>
-<tr><td style="text-align:left">WashingMachine.baseline</td><td>818,918</td><td>56.907</td><td>35.323</td><td>0.000</td><td>16.667</td><td>85.311</td><td>149.099</td></tr>
-<tr><td style="text-align:left">External.baseline</td><td>787,106</td><td>18.086</td><td>15.017</td><td>-1.229</td><td>2.576</td><td>25.883</td><td>97.504</td></tr>
+<tr><td style="text-align:left">Basin.baseline</td><td>815,303</td><td>39.732</td><td>39.819</td><td>10.400</td><td>21.391</td><td>39.720</td><td>463.200</td></tr>
+<tr><td style="text-align:left">Bath.baseline</td><td>827,353</td><td>55.014</td><td>26.412</td><td>0.000</td><td>26.400</td><td>77.063</td><td>123.826</td></tr>
+<tr><td style="text-align:left">Dishwasher.baseline</td><td>827,353</td><td>13.332</td><td>10.776</td><td>0.000</td><td>0.000</td><td>23.158</td><td>35.262</td></tr>
+<tr><td style="text-align:left">KitchenSink.baseline</td><td>827,353</td><td>31.413</td><td>14.164</td><td>7.570</td><td>15.140</td><td>45.106</td><td>75.700</td></tr>
+<tr><td style="text-align:left">Shower.baseline</td><td>815,785</td><td>68.933</td><td>62.602</td><td>0.000</td><td>34.123</td><td>93.600</td><td>513.825</td></tr>
+<tr><td style="text-align:left">WC.baseline</td><td>814,580</td><td>100.052</td><td>39.172</td><td>25.000</td><td>75.000</td><td>125.092</td><td>262.500</td></tr>
+<tr><td style="text-align:left">WashingMachine.baseline</td><td>818,918</td><td>57.033</td><td>35.406</td><td>0.000</td><td>16.667</td><td>85.192</td><td>158.547</td></tr>
+<tr><td style="text-align:left">External.baseline</td><td>787,106</td><td>17.987</td><td>15.066</td><td>-1.229</td><td>1.288</td><td>25.695</td><td>97.504</td></tr>
<tr><td style="text-align:left">Basin</td><td>827,353</td><td>0.130</td><td>0.114</td><td>-0.091</td><td>0.057</td><td>0.174</td><td>0.451</td></tr>
<tr><td style="text-align:left">Bath</td><td>827,353</td><td>-1.189</td><td>1.015</td><td>-3.955</td><td>-1.953</td><td>-0.295</td><td>0.091</td></tr>
<tr><td style="text-align:left">Dishwasher</td><td>827,353</td><td>-0.658</td><td>0.590</td><td>-2.179</td><td>-1.059</td><td>-0.134</td><td>0.000</td></tr>
@@ -4705,21 +4738,21 @@ stargazer(hhFinalDataComboExpandedDT, type = "html")
<tr><td style="text-align:left">Shower</td><td>827,353</td><td>0.426</td><td>0.480</td><td>-0.244</td><td>0.045</td><td>0.649</td><td>1.477</td></tr>
<tr><td style="text-align:left">WC</td><td>827,353</td><td>-1.140</td><td>1.097</td><td>-4.362</td><td>-2.118</td><td>-0.231</td><td>0.311</td></tr>
<tr><td style="text-align:left">WashingMachine</td><td>827,353</td><td>-0.270</td><td>1.698</td><td>-3.245</td><td>-1.734</td><td>1.178</td><td>3.439</td></tr>
-<tr><td style="text-align:left">Basin.baseline.madj</td><td>815,303</td><td>39.828</td><td>39.825</td><td>10.328</td><td>21.406</td><td>39.819</td><td>463.651</td></tr>
-<tr><td style="text-align:left">Bath.baseline.madj</td><td>827,353</td><td>53.770</td><td>26.058</td><td>-3.955</td><td>26.202</td><td>75.394</td><td>128.952</td></tr>
-<tr><td style="text-align:left">Dishwasher.baseline.madj</td><td>827,353</td><td>12.689</td><td>10.774</td><td>-2.179</td><td>-0.045</td><td>22.431</td><td>32.752</td></tr>
-<tr><td style="text-align:left">External.baseline.madj</td><td>787,106</td><td>18.208</td><td>15.060</td><td>-2.511</td><td>2.416</td><td>26.016</td><td>98.172</td></tr>
-<tr><td style="text-align:left">KitchenSink.baseline.madj</td><td>827,353</td><td>31.621</td><td>14.208</td><td>7.469</td><td>15.468</td><td>45.301</td><td>76.121</td></tr>
-<tr><td style="text-align:left">Shower.baseline.madj</td><td>815,785</td><td>69.525</td><td>62.529</td><td>-0.244</td><td>34.858</td><td>93.587</td><td>515.302</td></tr>
-<tr><td style="text-align:left">WC.baseline.madj</td><td>814,580</td><td>98.785</td><td>38.677</td><td>20.638</td><td>73.268</td><td>124.337</td><td>262.811</td></tr>
-<tr><td style="text-align:left">WashingMachine.baseline.madj</td><td>818,918</td><td>56.633</td><td>35.140</td><td>-3.245</td><td>18.342</td><td>84.638</td><td>149.063</td></tr>
-<tr><td style="text-align:left">sumDaily.baseline.madj</td><td>787,106</td><td>382.704</td><td>134.180</td><td>53.528</td><td>309.701</td><td>462.286</td><td>1,153.147</td></tr>
+<tr><td style="text-align:left">Basin.baseline.madj</td><td>815,303</td><td>39.862</td><td>39.817</td><td>10.328</td><td>21.594</td><td>39.826</td><td>463.651</td></tr>
+<tr><td style="text-align:left">Bath.baseline.madj</td><td>827,353</td><td>53.825</td><td>26.157</td><td>-3.955</td><td>26.202</td><td>75.225</td><td>123.917</td></tr>
+<tr><td style="text-align:left">Dishwasher.baseline.madj</td><td>827,353</td><td>12.674</td><td>10.755</td><td>-2.179</td><td>-0.045</td><td>22.473</td><td>35.262</td></tr>
+<tr><td style="text-align:left">External.baseline.madj</td><td>787,106</td><td>18.109</td><td>15.107</td><td>-2.511</td><td>1.854</td><td>25.846</td><td>98.172</td></tr>
+<tr><td style="text-align:left">KitchenSink.baseline.madj</td><td>827,353</td><td>31.569</td><td>14.162</td><td>7.469</td><td>15.468</td><td>45.231</td><td>76.121</td></tr>
+<tr><td style="text-align:left">Shower.baseline.madj</td><td>815,785</td><td>69.360</td><td>62.608</td><td>-0.244</td><td>34.554</td><td>93.587</td><td>515.302</td></tr>
+<tr><td style="text-align:left">WC.baseline.madj</td><td>814,580</td><td>98.909</td><td>38.883</td><td>20.638</td><td>73.191</td><td>124.030</td><td>262.811</td></tr>
+<tr><td style="text-align:left">WashingMachine.baseline.madj</td><td>818,918</td><td>56.759</td><td>35.227</td><td>-3.245</td><td>18.342</td><td>84.823</td><td>158.511</td></tr>
+<tr><td style="text-align:left">sumDaily.baseline.madj</td><td>787,106</td><td>382.717</td><td>134.188</td><td>53.528</td><td>309.341</td><td>462.663</td><td>1,153.147</td></tr>
<tr><td style="text-align:left">occRed</td><td>827,353</td><td>2.500</td><td>1.347</td><td>1</td><td>1</td><td>3</td><td>6</td></tr>
<tr><td style="text-align:left">loWC</td><td>827,353</td><td>0.000</td><td>0.000</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
<tr><td style="text-align:left">loSh</td><td>827,353</td><td>0.000</td><td>0.000</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
-<tr><td style="text-align:left">WC.baseline.madj.we</td><td>814,580</td><td>87.808</td><td>41.292</td><td>9.814</td><td>55.413</td><td>117.150</td><td>262.811</td></tr>
-<tr><td style="text-align:left">Shower.baseline.madj.we</td><td>815,785</td><td>65.457</td><td>60.286</td><td>-0.244</td><td>32.086</td><td>85.461</td><td>515.302</td></tr>
-<tr><td style="text-align:left">sumDaily.baseline.madj.we</td><td>787,106</td><td>367.700</td><td>131.472</td><td>35.986</td><td>291.249</td><td>450.079</td><td>1,152.909</td></tr>
+<tr><td style="text-align:left">WC.baseline.madj.we</td><td>814,580</td><td>87.918</td><td>41.466</td><td>9.814</td><td>55.127</td><td>117.016</td><td>262.811</td></tr>
+<tr><td style="text-align:left">Shower.baseline.madj.we</td><td>815,785</td><td>65.309</td><td>60.378</td><td>-0.244</td><td>32.045</td><td>85.413</td><td>515.301</td></tr>
+<tr><td style="text-align:left">sumDaily.baseline.madj.we</td><td>787,106</td><td>367.708</td><td>131.499</td><td>35.986</td><td>292.246</td><td>449.356</td><td>1,152.909</td></tr>
<tr><td colspan="8" style="border-bottom: 1px solid black"></td></tr></table>
Import the CEH drought histories.
@@ -5398,7 +5431,7 @@ table(hhFinalDataComboExpandedCEHDT$dualFlushWC, hhFinalDataComboExpandedCEHDT$d
##
## Dual flush Single flush
## Dual flush 139980 0
-## Single flush 109392 492156
+## Single flush 109634 491914
```
```r
@@ -5530,231 +5563,231 @@ for(y in minYear:maxYear){
## [1] "Updating low flow shower uptake for year: 1995 & month 5 (2. Developing)"
## [1] "N cases selected: 3238"
## [1] "Updating low flow shower uptake for year: 1995 & month 6 (2. Developing)"
-## [1] "N cases selected: 3231"
+## [1] "N cases selected: 3232"
## [1] "Updating low flow shower uptake for year: 1995 & month 7 (2. Developing)"
-## [1] "N cases selected: 3222"
+## [1] "N cases selected: 3225"
## [1] "Updating low flow shower uptake for year: 1995 & month 8 (2. Developing)"
-## [1] "N cases selected: 3216"
+## [1] "N cases selected: 3215"
## [1] "Updating low flow shower uptake for year: 1995 & month 9 (3. Drought)"
-## [1] "N cases selected: 3211"
+## [1] "N cases selected: 3208"
## [1] "Updating low flow shower uptake for year: 1995 & month 10 (3. Drought)"
-## [1] "N cases selected: 3199"
+## [1] "N cases selected: 3200"
## [1] "Updating low flow shower uptake for year: 1995 & month 11 (3. Drought)"
-## [1] "N cases selected: 3191"
+## [1] "N cases selected: 3186"
## [1] "Updating low flow shower uptake for year: 1995 & month 12 (2. Developing)"
-## [1] "N cases selected: 3180"
+## [1] "N cases selected: 3177"
## [1] "Year: 1996"
## [1] "Updating low flow shower uptake for year: 1996 & month 1 (2. Developing)"
-## [1] "N cases selected: 3171"
+## [1] "N cases selected: 3170"
## [1] "Updating low flow shower uptake for year: 1996 & month 2 (2. Developing)"
-## [1] "N cases selected: 3166"
+## [1] "N cases selected: 3162"
## [1] "Updating low flow shower uptake for year: 1996 & month 3 (3. Drought)"
-## [1] "N cases selected: 3156"
+## [1] "N cases selected: 3155"
## [1] "Updating low flow shower uptake for year: 1996 & month 4 (3. Drought)"
-## [1] "N cases selected: 3145"
+## [1] "N cases selected: 3148"
## [1] "Updating low flow shower uptake for year: 1996 & month 5 (3. Drought)"
-## [1] "N cases selected: 3138"
+## [1] "N cases selected: 3133"
## [1] "Updating low flow shower uptake for year: 1996 & month 6 (3. Drought)"
## [1] "N cases selected: 3128"
## [1] "Updating low flow shower uptake for year: 1996 & month 7 (3. Drought)"
-## [1] "N cases selected: 3119"
+## [1] "N cases selected: 3116"
## [1] "Updating low flow shower uptake for year: 1996 & month 8 (3. Drought)"
-## [1] "N cases selected: 3110"
+## [1] "N cases selected: 3106"
## [1] "Updating low flow shower uptake for year: 1996 & month 9 (3. Drought)"
-## [1] "N cases selected: 3103"
+## [1] "N cases selected: 3102"
## [1] "Updating low flow shower uptake for year: 1996 & month 10 (3. Drought)"
-## [1] "N cases selected: 3095"
+## [1] "N cases selected: 3100"
## [1] "Updating low flow shower uptake for year: 1996 & month 11 (3. Drought)"
-## [1] "N cases selected: 3088"
+## [1] "N cases selected: 3086"
## [1] "Updating low flow shower uptake for year: 1996 & month 12 (4. Severe Drought)"
-## [1] "N cases selected: 3077"
+## [1] "N cases selected: 3076"
## [1] "Year: 1997"
## [1] "Updating low flow shower uptake for year: 1997 & month 1 (4. Severe Drought)"
-## [1] "N cases selected: 3065"
+## [1] "N cases selected: 3061"
## [1] "Updating low flow shower uptake for year: 1997 & month 2 (4. Severe Drought)"
-## [1] "N cases selected: 3046"
+## [1] "N cases selected: 3048"
## [1] "Updating low flow shower uptake for year: 1997 & month 3 (4. Severe Drought)"
-## [1] "N cases selected: 3032"
+## [1] "N cases selected: 3043"
## [1] "Updating low flow shower uptake for year: 1997 & month 4 (4. Severe Drought)"
## [1] "N cases selected: 3022"
## [1] "Updating low flow shower uptake for year: 1997 & month 5 (4. Severe Drought)"
-## [1] "N cases selected: 3011"
+## [1] "N cases selected: 3006"
## [1] "Updating low flow shower uptake for year: 1997 & month 6 (5. Recovering)"
-## [1] "N cases selected: 3005"
+## [1] "N cases selected: 3003"
## [1] "Updating low flow shower uptake for year: 1997 & month 7 (5. Recovering)"
-## [1] "N cases selected: 2989"
+## [1] "N cases selected: 2987"
## [1] "Updating low flow shower uptake for year: 1997 & month 8 (5. Recovering)"
-## [1] "N cases selected: 2989"
+## [1] "N cases selected: 2985"
## [1] "Updating low flow shower uptake for year: 1997 & month 9 (4. Severe Drought)"
-## [1] "N cases selected: 2983"
+## [1] "N cases selected: 2980"
## [1] "Updating low flow shower uptake for year: 1997 & month 10 (4. Severe Drought)"
-## [1] "N cases selected: 2967"
+## [1] "N cases selected: 2970"
## [1] "Updating low flow shower uptake for year: 1997 & month 11 (4. Severe Drought)"
-## [1] "N cases selected: 2963"
+## [1] "N cases selected: 2961"
## [1] "Updating low flow shower uptake for year: 1997 & month 12 (5. Recovering)"
-## [1] "N cases selected: 2945"
+## [1] "N cases selected: 2944"
## [1] "Year: 1998"
## [1] "Updating low flow shower uptake for year: 1998 & month 1 (5. Recovering)"
-## [1] "N cases selected: 2943"
+## [1] "N cases selected: 2944"
## [1] "Updating low flow shower uptake for year: 1998 & month 2 (5. Recovering)"
-## [1] "N cases selected: 2934"
+## [1] "N cases selected: 2928"
## [1] "Updating low flow shower uptake for year: 1998 & month 3 (5. Recovering)"
-## [1] "N cases selected: 2932"
+## [1] "N cases selected: 2931"
## [1] "Updating low flow shower uptake for year: 1998 & month 4 (5. Recovering)"
-## [1] "N cases selected: 2922"
+## [1] "N cases selected: 2923"
## [1] "Updating low flow shower uptake for year: 1998 & month 5 (5. Recovering)"
-## [1] "N cases selected: 2914"
-## [1] "Updating low flow shower uptake for year: 1998 & month 6 (5. Recovering)"
## [1] "N cases selected: 2912"
+## [1] "Updating low flow shower uptake for year: 1998 & month 6 (5. Recovering)"
+## [1] "N cases selected: 2902"
## [1] "Updating low flow shower uptake for year: 1998 & month 7 (5. Recovering)"
-## [1] "N cases selected: 2907"
+## [1] "N cases selected: 2890"
## [1] "Updating low flow shower uptake for year: 1998 & month 8 (5. Recovering)"
-## [1] "N cases selected: 2899"
+## [1] "N cases selected: 2902"
## [1] "Updating low flow shower uptake for year: 1998 & month 9 (5. Recovering)"
-## [1] "N cases selected: 2888"
+## [1] "N cases selected: 2893"
## [1] "Updating low flow shower uptake for year: 1998 & month 10 (5. Recovering)"
-## [1] "N cases selected: 2888"
+## [1] "N cases selected: 2885"
## [1] "Updating low flow shower uptake for year: 1998 & month 11 (5. Recovering)"
-## [1] "N cases selected: 2875"
+## [1] "N cases selected: 2883"
## [1] "Year: 1999"
## [1] "Year: 2000"
## [1] "Year: 2001"
## [1] "Year: 2002"
## [1] "Year: 2003"
## [1] "Updating low flow shower uptake for year: 2003 & month 3 (2. Developing)"
-## [1] "N cases selected: 2740"
+## [1] "N cases selected: 2727"
## [1] "Updating low flow shower uptake for year: 2003 & month 4 (2. Developing)"
-## [1] "N cases selected: 2737"
+## [1] "N cases selected: 2724"
## [1] "Updating low flow shower uptake for year: 2003 & month 5 (2. Developing)"
## [1] "N cases selected: 2723"
## [1] "Updating low flow shower uptake for year: 2003 & month 6 (2. Developing)"
-## [1] "N cases selected: 2706"
+## [1] "N cases selected: 2724"
## [1] "Updating low flow shower uptake for year: 2003 & month 7 (2. Developing)"
-## [1] "N cases selected: 2723"
+## [1] "N cases selected: 2714"
## [1] "Updating low flow shower uptake for year: 2003 & month 8 (2. Developing)"
-## [1] "N cases selected: 2712"
+## [1] "N cases selected: 2714"
## [1] "Updating low flow shower uptake for year: 2003 & month 9 (3. Drought)"
-## [1] "N cases selected: 2709"
+## [1] "N cases selected: 2703"
## [1] "Updating low flow shower uptake for year: 2003 & month 10 (3. Drought)"
-## [1] "N cases selected: 2699"
+## [1] "N cases selected: 2689"
## [1] "Updating low flow shower uptake for year: 2003 & month 11 (3. Drought)"
-## [1] "N cases selected: 2683"
+## [1] "N cases selected: 2691"
## [1] "Updating low flow shower uptake for year: 2003 & month 12 (5. Recovering)"
-## [1] "N cases selected: 2674"
+## [1] "N cases selected: 2678"
## [1] "Year: 2004"
## [1] "Updating low flow shower uptake for year: 2004 & month 1 (5. Recovering)"
-## [1] "N cases selected: 2680"
+## [1] "N cases selected: 2671"
## [1] "Updating low flow shower uptake for year: 2004 & month 2 (5. Recovering)"
-## [1] "N cases selected: 2675"
+## [1] "N cases selected: 2662"
## [1] "Updating low flow shower uptake for year: 2004 & month 12 (2. Developing)"
-## [1] "N cases selected: 2630"
+## [1] "N cases selected: 2648"
## [1] "Year: 2005"
## [1] "Updating low flow shower uptake for year: 2005 & month 1 (2. Developing)"
-## [1] "N cases selected: 2633"
+## [1] "N cases selected: 2631"
## [1] "Updating low flow shower uptake for year: 2005 & month 2 (2. Developing)"
-## [1] "N cases selected: 2629"
+## [1] "N cases selected: 2621"
## [1] "Updating low flow shower uptake for year: 2005 & month 3 (2. Developing)"
-## [1] "N cases selected: 2613"
+## [1] "N cases selected: 2621"
## [1] "Updating low flow shower uptake for year: 2005 & month 4 (2. Developing)"
-## [1] "N cases selected: 2618"
+## [1] "N cases selected: 2614"
## [1] "Updating low flow shower uptake for year: 2005 & month 5 (2. Developing)"
-## [1] "N cases selected: 2609"
+## [1] "N cases selected: 2598"
## [1] "Updating low flow shower uptake for year: 2005 & month 6 (5. Recovering)"
-## [1] "N cases selected: 2602"
+## [1] "N cases selected: 2611"
## [1] "Updating low flow shower uptake for year: 2005 & month 7 (5. Recovering)"
-## [1] "N cases selected: 2590"
+## [1] "N cases selected: 2589"
## [1] "Updating low flow shower uptake for year: 2005 & month 8 (5. Recovering)"
-## [1] "N cases selected: 2576"
+## [1] "N cases selected: 2595"
## [1] "Updating low flow shower uptake for year: 2005 & month 9 (2. Developing)"
-## [1] "N cases selected: 2568"
+## [1] "N cases selected: 2578"
## [1] "Updating low flow shower uptake for year: 2005 & month 10 (2. Developing)"
-## [1] "N cases selected: 2579"
+## [1] "N cases selected: 2565"
## [1] "Updating low flow shower uptake for year: 2005 & month 11 (2. Developing)"
-## [1] "N cases selected: 2576"
+## [1] "N cases selected: 2559"
## [1] "Updating low flow shower uptake for year: 2005 & month 12 (3. Drought)"
-## [1] "N cases selected: 2564"
+## [1] "N cases selected: 2566"
## [1] "Year: 2006"
## [1] "Updating low flow shower uptake for year: 2006 & month 1 (3. Drought)"
-## [1] "N cases selected: 2554"
+## [1] "N cases selected: 2546"
## [1] "Updating low flow shower uptake for year: 2006 & month 2 (3. Drought)"
-## [1] "N cases selected: 2557"
+## [1] "N cases selected: 2548"
## [1] "Updating low flow shower uptake for year: 2006 & month 3 (3. Drought)"
-## [1] "N cases selected: 2539"
+## [1] "N cases selected: 2543"
## [1] "Updating low flow shower uptake for year: 2006 & month 4 (3. Drought)"
-## [1] "N cases selected: 2530"
+## [1] "N cases selected: 2537"
## [1] "Updating low flow shower uptake for year: 2006 & month 5 (3. Drought)"
-## [1] "N cases selected: 2530"
-## [1] "Updating low flow shower uptake for year: 2006 & month 6 (5. Recovering)"
## [1] "N cases selected: 2527"
+## [1] "Updating low flow shower uptake for year: 2006 & month 6 (5. Recovering)"
+## [1] "N cases selected: 2515"
## [1] "Updating low flow shower uptake for year: 2006 & month 7 (5. Recovering)"
-## [1] "N cases selected: 2516"
+## [1] "N cases selected: 2519"
## [1] "Updating low flow shower uptake for year: 2006 & month 8 (5. Recovering)"
-## [1] "N cases selected: 2500"
+## [1] "N cases selected: 2510"
## [1] "Updating low flow shower uptake for year: 2006 & month 9 (5. Recovering)"
-## [1] "N cases selected: 2507"
+## [1] "N cases selected: 2501"
## [1] "Updating low flow shower uptake for year: 2006 & month 10 (5. Recovering)"
-## [1] "N cases selected: 2503"
+## [1] "N cases selected: 2490"
## [1] "Updating low flow shower uptake for year: 2006 & month 11 (5. Recovering)"
-## [1] "N cases selected: 2487"
+## [1] "N cases selected: 2479"
## [1] "Updating low flow shower uptake for year: 2006 & month 12 (5. Recovering)"
-## [1] "N cases selected: 2498"
+## [1] "N cases selected: 2487"
## [1] "Year: 2007"
## [1] "Updating low flow shower uptake for year: 2007 & month 1 (5. Recovering)"
-## [1] "N cases selected: 2486"
+## [1] "N cases selected: 2478"
## [1] "Updating low flow shower uptake for year: 2007 & month 2 (5. Recovering)"
-## [1] "N cases selected: 2472"
+## [1] "N cases selected: 2474"
## [1] "Year: 2008"
## [1] "Year: 2009"
## [1] "Updating low flow shower uptake for year: 2009 & month 3 (2. Developing)"
-## [1] "N cases selected: 2405"
+## [1] "N cases selected: 2414"
## [1] "Updating low flow shower uptake for year: 2009 & month 4 (2. Developing)"
-## [1] "N cases selected: 2409"
+## [1] "N cases selected: 2399"
## [1] "Updating low flow shower uptake for year: 2009 & month 5 (2. Developing)"
-## [1] "N cases selected: 2406"
+## [1] "N cases selected: 2410"
## [1] "Updating low flow shower uptake for year: 2009 & month 6 (2. Developing)"
-## [1] "N cases selected: 2407"
-## [1] "Updating low flow shower uptake for year: 2009 & month 7 (2. Developing)"
## [1] "N cases selected: 2388"
+## [1] "Updating low flow shower uptake for year: 2009 & month 7 (2. Developing)"
+## [1] "N cases selected: 2401"
## [1] "Updating low flow shower uptake for year: 2009 & month 8 (2. Developing)"
-## [1] "N cases selected: 2367"
+## [1] "N cases selected: 2381"
## [1] "Updating low flow shower uptake for year: 2009 & month 9 (3. Drought)"
-## [1] "N cases selected: 2369"
+## [1] "N cases selected: 2367"
## [1] "Updating low flow shower uptake for year: 2009 & month 10 (3. Drought)"
-## [1] "N cases selected: 2371"
+## [1] "N cases selected: 2354"
## [1] "Updating low flow shower uptake for year: 2009 & month 11 (3. Drought)"
-## [1] "N cases selected: 2362"
+## [1] "N cases selected: 2371"
## [1] "Updating low flow shower uptake for year: 2009 & month 12 (5. Recovering)"
-## [1] "N cases selected: 2353"
+## [1] "N cases selected: 2363"
## [1] "Year: 2010"
## [1] "Updating low flow shower uptake for year: 2010 & month 1 (5. Recovering)"
-## [1] "N cases selected: 2355"
+## [1] "N cases selected: 2339"
## [1] "Updating low flow shower uptake for year: 2010 & month 2 (5. Recovering)"
## [1] "N cases selected: 2350"
## [1] "Updating low flow shower uptake for year: 2010 & month 9 (2. Developing)"
-## [1] "N cases selected: 2328"
-## [1] "Updating low flow shower uptake for year: 2010 & month 10 (2. Developing)"
## [1] "N cases selected: 2327"
+## [1] "Updating low flow shower uptake for year: 2010 & month 10 (2. Developing)"
+## [1] "N cases selected: 2310"
## [1] "Updating low flow shower uptake for year: 2010 & month 11 (2. Developing)"
-## [1] "N cases selected: 2325"
+## [1] "N cases selected: 2312"
## [1] "Updating low flow shower uptake for year: 2010 & month 12 (2. Developing)"
-## [1] "N cases selected: 2300"
+## [1] "N cases selected: 2319"
## [1] "Year: 2011"
## [1] "Updating low flow shower uptake for year: 2011 & month 1 (2. Developing)"
-## [1] "N cases selected: 2301"
+## [1] "N cases selected: 2307"
## [1] "Updating low flow shower uptake for year: 2011 & month 2 (2. Developing)"
-## [1] "N cases selected: 2310"
+## [1] "N cases selected: 2294"
## [1] "Updating low flow shower uptake for year: 2011 & month 3 (3. Drought)"
-## [1] "N cases selected: 2310"
+## [1] "N cases selected: 2324"
## [1] "Updating low flow shower uptake for year: 2011 & month 4 (3. Drought)"
-## [1] "N cases selected: 2282"
+## [1] "N cases selected: 2303"
## [1] "Updating low flow shower uptake for year: 2011 & month 5 (3. Drought)"
-## [1] "N cases selected: 2291"
+## [1] "N cases selected: 2293"
## [1] "Updating low flow shower uptake for year: 2011 & month 6 (5. Recovering)"
-## [1] "N cases selected: 2275"
+## [1] "N cases selected: 2280"
## [1] "Updating low flow shower uptake for year: 2011 & month 7 (5. Recovering)"
-## [1] "N cases selected: 2263"
+## [1] "N cases selected: 2276"
## [1] "Updating low flow shower uptake for year: 2011 & month 8 (5. Recovering)"
-## [1] "N cases selected: 2269"
+## [1] "N cases selected: 2275"
## [1] "Year: 2012"
```
@@ -5774,7 +5807,7 @@ table(hhFinalDataComboExpandedCEHDT$loFlowShower, hhFinalDataComboExpandedCEHDT$
##
## Low flow Normal flow
## Low flow 103304 0
-## Normal flow 60609 577615
+## Normal flow 60500 577724
```
```r
@@ -5875,8 +5908,8 @@ for(y in minYear:maxYear){
## [1] "Year: 1994"
## [1] "Year: 1995"
## [1] "Applying TUB for year: 1995, month 9 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.7789407941206"
-## [1] "Top 28% cut: 21.7098024058121"
+## [1] "Top 14% cut: 26.1056634495389"
+## [1] "Top 28% cut: 21.2423134841836"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1995, month 9 & model v2_0 (3. Drought)"
@@ -5885,8 +5918,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1995, month 10 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.782703901865"
-## [1] "Top 28% cut: 21.8131787169248"
+## [1] "Top 14% cut: 26.2820053934784"
+## [1] "Top 28% cut: 21.3807199968011"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1995, month 10 & model v2_0 (3. Drought)"
@@ -5895,8 +5928,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1995, month 11 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.6659672351983"
-## [1] "Top 28% cut: 21.7100395402379"
+## [1] "Top 14% cut: 26.1652687268117"
+## [1] "Top 28% cut: 21.287864999319"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1995, month 11 & model v2_0 (3. Drought)"
@@ -5906,8 +5939,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected for TUB: 90"
## [1] "Year: 1996"
## [1] "Applying TUB for year: 1996, month 3 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.0940476883038"
-## [1] "Top 28% cut: 22.1270694605266"
+## [1] "Top 14% cut: 26.5728704902076"
+## [1] "Top 28% cut: 21.6906279447291"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1996, month 3 & model v2_0 (3. Drought)"
@@ -5916,8 +5949,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1996, month 4 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.2561876883038"
-## [1] "Top 28% cut: 22.2926379967517"
+## [1] "Top 14% cut: 26.7447915748942"
+## [1] "Top 28% cut: 21.8705783302517"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1996, month 4 & model v2_0 (3. Drought)"
@@ -5926,8 +5959,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1996, month 5 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.4819374607873"
-## [1] "Top 28% cut: 22.4430440212947"
+## [1] "Top 14% cut: 26.8743837187252"
+## [1] "Top 28% cut: 21.9759103275388"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1996, month 5 & model v2_0 (3. Drought)"
@@ -5936,8 +5969,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1996, month 6 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 28.0896174607873"
-## [1] "Top 28% cut: 23.0507240212947"
+## [1] "Top 14% cut: 27.4908795187252"
+## [1] "Top 28% cut: 22.5871181176804"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1996, month 6 & model v2_0 (3. Drought)"
@@ -5946,8 +5979,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1996, month 7 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.9501941274539"
-## [1] "Top 28% cut: 22.9113006879614"
+## [1] "Top 14% cut: 27.2790357278516"
+## [1] "Top 28% cut: 22.4184405844019"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1996, month 7 & model v2_0 (3. Drought)"
@@ -5956,8 +5989,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1996, month 8 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.3510998949124"
-## [1] "Top 28% cut: 22.2809991672844"
+## [1] "Top 14% cut: 26.6781918860185"
+## [1] "Top 28% cut: 21.870190526396"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1996, month 8 & model v2_0 (3. Drought)"
@@ -5966,8 +5999,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1996, month 9 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.1992343549705"
-## [1] "Top 28% cut: 22.2096337271932"
+## [1] "Top 14% cut: 26.6694160838929"
+## [1] "Top 28% cut: 21.7958146113958"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1996, month 9 & model v2_0 (3. Drought)"
@@ -5976,8 +6009,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1996, month 10 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.6040541955786"
-## [1] "Top 28% cut: 21.6144159632859"
+## [1] "Top 14% cut: 26.112522060145"
+## [1] "Top 28% cut: 21.1993087977289"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1996, month 10 & model v2_0 (3. Drought)"
@@ -5986,8 +6019,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1996, month 11 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.4167043549705"
-## [1] "Top 28% cut: 21.4413093271932"
+## [1] "Top 14% cut: 25.895218429553"
+## [1] "Top 28% cut: 21.0132846113958"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 1996, month 11 & model v2_0 (3. Drought)"
@@ -5996,8 +6029,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 1996, month 12 & model v1_3 (4. Severe Drought)"
-## [1] "Top 14% cut: 26.8217583979764"
-## [1] "Top 28% cut: 21.8416013300851"
+## [1] "Top 14% cut: 26.341907880803"
+## [1] "Top 28% cut: 21.4292354643956"
## [1] "N cases selected: 504"
## [1] "N cases selected for TUB: 221"
## [1] "Applying TUB for year: 1996, month 12 & model v2_0 (4. Severe Drought)"
@@ -6007,8 +6040,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected for TUB: 180"
## [1] "Year: 1997"
## [1] "Applying TUB for year: 1997, month 1 & model v1_3 (4. Severe Drought)"
-## [1] "Top 14% cut: 26.925223901865"
-## [1] "Top 28% cut: 21.9556987169248"
+## [1] "Top 14% cut: 26.4245253934784"
+## [1] "Top 28% cut: 21.5124495968011"
## [1] "N cases selected: 504"
## [1] "N cases selected for TUB: 221"
## [1] "Applying TUB for year: 1997, month 1 & model v2_0 (4. Severe Drought)"
@@ -6017,8 +6050,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 411"
## [1] "N cases selected for TUB: 180"
## [1] "Applying TUB for year: 1997, month 2 & model v1_3 (4. Severe Drought)"
-## [1] "Top 14% cut: 27.0454243549705"
-## [1] "Top 28% cut: 22.0818746634184"
+## [1] "Top 14% cut: 26.5391584879907"
+## [1] "Top 28% cut: 21.663395874687"
## [1] "N cases selected: 504"
## [1] "N cases selected for TUB: 221"
## [1] "Applying TUB for year: 1997, month 2 & model v2_0 (4. Severe Drought)"
@@ -6027,8 +6060,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 411"
## [1] "N cases selected for TUB: 180"
## [1] "Applying TUB for year: 1997, month 3 & model v1_3 (4. Severe Drought)"
-## [1] "Top 14% cut: 27.3708251472368"
-## [1] "Top 28% cut: 22.3558549579495"
+## [1] "Top 14% cut: 26.7832043505596"
+## [1] "Top 28% cut: 21.9240035916594"
## [1] "N cases selected: 504"
## [1] "N cases selected for TUB: 221"
## [1] "Applying TUB for year: 1997, month 3 & model v2_0 (4. Severe Drought)"
@@ -6037,8 +6070,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 411"
## [1] "N cases selected for TUB: 180"
## [1] "Applying TUB for year: 1997, month 4 & model v1_3 (4. Severe Drought)"
-## [1] "Top 14% cut: 27.2761743549705"
-## [1] "Top 28% cut: 22.3108209271932"
+## [1] "Top 14% cut: 26.7549971568743"
+## [1] "Top 28% cut: 21.8727546113958"
## [1] "N cases selected: 504"
## [1] "N cases selected for TUB: 221"
## [1] "Applying TUB for year: 1997, month 4 & model v2_0 (4. Severe Drought)"
@@ -6047,8 +6080,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 411"
## [1] "N cases selected for TUB: 180"
## [1] "Applying TUB for year: 1997, month 5 & model v1_3 (4. Severe Drought)"
-## [1] "Top 14% cut: 27.6131574607873"
-## [1] "Top 28% cut: 22.4938796391352"
+## [1] "Top 14% cut: 26.9216488292586"
+## [1] "Top 28% cut: 22.0719324783234"
## [1] "N cases selected: 504"
## [1] "N cases selected for TUB: 221"
## [1] "Applying TUB for year: 1997, month 5 & model v2_0 (4. Severe Drought)"
@@ -6057,8 +6090,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 411"
## [1] "N cases selected for TUB: 180"
## [1] "Applying TUB for year: 1997, month 9 & model v1_3 (4. Severe Drought)"
-## [1] "Top 14% cut: 27.3354210216372"
-## [1] "Top 28% cut: 22.3185349579495"
+## [1] "Top 14% cut: 26.7720025505596"
+## [1] "Top 28% cut: 21.9170535916594"
## [1] "N cases selected: 504"
## [1] "N cases selected for TUB: 221"
## [1] "Applying TUB for year: 1997, month 9 & model v2_0 (4. Severe Drought)"
@@ -6067,8 +6100,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 411"
## [1] "N cases selected for TUB: 180"
## [1] "Applying TUB for year: 1997, month 10 & model v1_3 (4. Severe Drought)"
-## [1] "Top 14% cut: 26.5627576883038"
-## [1] "Top 28% cut: 21.5992079967517"
+## [1] "Top 14% cut: 26.0723667183396"
+## [1] "Top 28% cut: 21.1817363950688"
## [1] "N cases selected: 504"
## [1] "N cases selected for TUB: 221"
## [1] "Applying TUB for year: 1997, month 10 & model v2_0 (4. Severe Drought)"
@@ -6077,8 +6110,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 411"
## [1] "N cases selected for TUB: 180"
## [1] "Applying TUB for year: 1997, month 11 & model v1_3 (4. Severe Drought)"
-## [1] "Top 14% cut: 26.546723901865"
-## [1] "Top 28% cut: 21.5678029721609"
+## [1] "Top 14% cut: 26.0460253934784"
+## [1] "Top 28% cut: 21.1328121310623"
## [1] "N cases selected: 504"
## [1] "N cases selected for TUB: 221"
## [1] "Applying TUB for year: 1997, month 11 & model v2_0 (4. Severe Drought)"
@@ -6093,8 +6126,8 @@ for(y in minYear:maxYear){
## [1] "Year: 2002"
## [1] "Year: 2003"
## [1] "Applying TUB for year: 2003, month 9 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.3805074607873"
-## [1] "Top 28% cut: 22.3720080069854"
+## [1] "Top 14% cut: 26.7827631433838"
+## [1] "Top 28% cut: 21.9158864251545"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2003, month 9 & model v2_0 (3. Drought)"
@@ -6103,8 +6136,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 2003, month 10 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.6409454764492"
-## [1] "Top 28% cut: 21.6511068603488"
+## [1] "Top 14% cut: 26.146592060145"
+## [1] "Top 28% cut: 21.2333787977289"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2003, month 10 & model v2_0 (3. Drought)"
@@ -6113,8 +6146,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 2003, month 11 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.4280910216372"
-## [1] "Top 28% cut: 21.4645413300851"
+## [1] "Top 14% cut: 25.9257317183396"
+## [1] "Top 28% cut: 21.0460625413537"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2003, month 11 & model v2_0 (3. Drought)"
@@ -6125,8 +6158,8 @@ for(y in minYear:maxYear){
## [1] "Year: 2004"
## [1] "Year: 2005"
## [1] "Applying TUB for year: 2005, month 12 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.8903364764492"
-## [1] "Top 28% cut: 21.9011730299525"
+## [1] "Top 14% cut: 26.397642060145"
+## [1] "Top 28% cut: 21.4844287977289"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2005, month 12 & model v2_0 (3. Drought)"
@@ -6136,8 +6169,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected for TUB: 90"
## [1] "Year: 2006"
## [1] "Applying TUB for year: 2006, month 1 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.9300372351983"
-## [1] "Top 28% cut: 21.9605120502581"
+## [1] "Top 14% cut: 26.4293387268117"
+## [1] "Top 28% cut: 21.5221133301344"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2006, month 1 & model v2_0 (3. Drought)"
@@ -6146,8 +6179,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 2006, month 2 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.0947096646431"
-## [1] "Top 28% cut: 22.1173246634184"
+## [1] "Top 14% cut: 26.6153947183396"
+## [1] "Top 28% cut: 21.7049587977289"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2006, month 2 & model v2_0 (3. Drought)"
@@ -6156,8 +6189,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 2006, month 3 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.1376774607873"
-## [1] "Top 28% cut: 22.136219073652"
+## [1] "Top 14% cut: 26.5399331433838"
+## [1] "Top 28% cut: 21.6851885900171"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2006, month 3 & model v2_0 (3. Drought)"
@@ -6166,8 +6199,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 2006, month 4 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.1374976883038"
-## [1] "Top 28% cut: 22.1499034605266"
+## [1] "Top 14% cut: 26.6100759505596"
+## [1] "Top 28% cut: 21.7340779447291"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2006, month 4 & model v2_0 (3. Drought)"
@@ -6176,8 +6209,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 2006, month 5 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.2061041274539"
-## [1] "Top 28% cut: 22.0907239058019"
+## [1] "Top 14% cut: 26.5238014017263"
+## [1] "Top 28% cut: 21.6648791449901"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2006, month 5 & model v2_0 (3. Drought)"
@@ -6189,8 +6222,8 @@ for(y in minYear:maxYear){
## [1] "Year: 2008"
## [1] "Year: 2009"
## [1] "Applying TUB for year: 2009, month 9 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.2965143549705"
-## [1] "Top 28% cut: 22.3177881271932"
+## [1] "Top 14% cut: 26.7743806962196"
+## [1] "Top 28% cut: 21.8930946113958"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2009, month 9 & model v2_0 (3. Drought)"
@@ -6199,8 +6232,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 2009, month 10 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.482213901865"
-## [1] "Top 28% cut: 21.5178850103286"
+## [1] "Top 14% cut: 25.9815153934784"
+## [1] "Top 28% cut: 21.0854373682863"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2009, month 10 & model v2_0 (3. Drought)"
@@ -6209,8 +6242,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 2009, month 11 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 26.3748776883038"
-## [1] "Top 28% cut: 21.4113279967517"
+## [1] "Top 14% cut: 25.8537004902076"
+## [1] "Top 28% cut: 20.9714579447291"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2009, month 11 & model v2_0 (3. Drought)"
@@ -6221,8 +6254,8 @@ for(y in minYear:maxYear){
## [1] "Year: 2010"
## [1] "Year: 2011"
## [1] "Applying TUB for year: 2011, month 3 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.3260143549705"
-## [1] "Top 28% cut: 22.3624646634184"
+## [1] "Top 14% cut: 26.8048371568743"
+## [1] "Top 28% cut: 21.9284609992966"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2011, month 3 & model v2_0 (3. Drought)"
@@ -6231,8 +6264,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 2011, month 4 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.4912310216372"
-## [1] "Top 28% cut: 22.5276813300851"
+## [1] "Top 14% cut: 26.9700538235409"
+## [1] "Top 28% cut: 22.0878112780625"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2011, month 4 & model v2_0 (3. Drought)"
@@ -6241,8 +6274,8 @@ for(y in minYear:maxYear){
## [1] "N cases selected: 206"
## [1] "N cases selected for TUB: 90"
## [1] "Applying TUB for year: 2011, month 5 & model v1_3 (3. Drought)"
-## [1] "Top 14% cut: 27.7271207941206"
-## [1] "Top 28% cut: 22.688227354628"
+## [1] "Top 14% cut: 27.1140930520585"
+## [1] "Top 28% cut: 22.2210936608721"
## [1] "N cases selected: 252"
## [1] "N cases selected for TUB: 110"
## [1] "Applying TUB for year: 2011, month 5 & model v2_0 (3. Drought)"
@@ -6503,30 +6536,30 @@ hhFinalDataComboExpandedCEHDT[, .(mean = mean(sumDaily.baseline.madj.we.dr, na.r
```
## model currMonS mean
-## 1: v1_3 01 387.2585
-## 2: v1_3 02 387.4656
-## 3: v1_3 03 387.3794
-## 4: v1_3 04 387.9222
-## 5: v1_3 05 386.1899
-## 6: v1_3 06 387.1292
-## 7: v1_3 07 386.1118
-## 8: v1_3 08 384.5214
-## 9: v1_3 09 384.9712
-## 10: v1_3 10 384.3970
-## 11: v1_3 11 384.4273
-## 12: v1_3 12 387.8681
-## 13: v2_0 01 325.6255
-## 14: v2_0 02 326.1925
-## 15: v2_0 03 325.9451
-## 16: v2_0 04 326.4447
-## 17: v2_0 05 324.9236
-## 18: v2_0 06 325.9839
-## 19: v2_0 07 325.1323
-## 20: v2_0 08 323.6261
-## 21: v2_0 09 323.5310
-## 22: v2_0 10 323.2584
-## 23: v2_0 11 322.9130
-## 24: v2_0 12 326.4166
+## 1: v1_3 01 387.1253
+## 2: v1_3 02 387.4301
+## 3: v1_3 03 387.3790
+## 4: v1_3 04 387.9507
+## 5: v1_3 05 386.3003
+## 6: v1_3 06 387.0475
+## 7: v1_3 07 386.0797
+## 8: v1_3 08 384.6640
+## 9: v1_3 09 385.0259
+## 10: v1_3 10 384.4516
+## 11: v1_3 11 384.2612
+## 12: v1_3 12 387.9064
+## 13: v2_0 01 325.7575
+## 14: v2_0 02 326.1426
+## 15: v2_0 03 325.8387
+## 16: v2_0 04 326.6616
+## 17: v2_0 05 324.9912
+## 18: v2_0 06 326.0791
+## 19: v2_0 07 325.3053
+## 20: v2_0 08 323.7215
+## 21: v2_0 09 323.6663
+## 22: v2_0 10 323.0139
+## 23: v2_0 11 322.8619
+## 24: v2_0 12 326.7568
## model currMonS mean
```
@@ -6673,10 +6706,10 @@ Table: Model affects (% total reduced)
|model |metered | Min reduction| Mean reduction| Max reduction|
|:-----|:-----------|-------------:|--------------:|-------------:|
-|v1_3 |Not metered | 0| 2.47| 3.80|
-|v1_3 |Metered | 0| 2.50| 3.59|
-|v2_0 |Not metered | 0| 3.31| 5.34|
-|v2_0 |Metered | 0| 3.24| 5.40|
+|v1_3 |Not metered | 0| 2.62| 4.05|
+|v1_3 |Metered | 0| 2.23| 3.27|
+|v2_0 |Not metered | 0| 3.10| 4.95|
+|v2_0 |Metered | 0| 3.46| 5.59|
```r
baseline1Start <- plotTotalDT[model == "v1_3" & obsDate == min(obsDate), meanBaselineWeSum]
@@ -6690,9 +6723,9 @@ model2Red <- plotTotalDT[model == "v2_0" & obsDate == min(obsDate), meanBaseline
Overall from 1994-12-15 to 2012-11-15:
- * the baseline model showed a reduction of 6.28, 5.48%
- * model v1_3 showed a reduction of 9.02, 8.74%
- * model v2_0 showed a reduction of 8.01, 12.14%
+ * the baseline model showed a reduction of 6.27, 5.69%
+ * model v1_3 showed a reduction of 9.11, 8.43%
+ * model v2_0 showed a reduction of 8.15, 12.13%
This is clearly shown in the chart below where:
@@ -6807,145 +6840,112 @@ ggplot(droughtPhaseDT, aes(x = phase, y = V1, fill = phase)) +
ggsave(paste0("plots_v1/Fig4_5_DroughtPlotKey.pdf"), dpi = 400)
```
-## Extract drought & WE-adjusted hot water volumes (for BECC 2017 paper)
-
-Use: hhFinalDataComboExpandedCEHDT
-
-
-```r
-summary(hhFinalDataComboExpandedCEHDT)
-```
-
-```
-## hhid model obsDate currYear
-## Min. : 1 Length:741528 Min. :1994-12-15 Min. :1994
-## 1st Qu.: 859 Class :character 1st Qu.:1999-06-07 1st Qu.:1999
-## Median : 1717 Mode :character Median :2003-11-30 Median :2003
-## Mean :398103841 Mean :2003-11-30 Mean :2003
-## 3rd Qu.:836920446 3rd Qu.:2008-05-22 3rd Qu.:2008
-## Max. :836965495 Max. :2012-11-15 Max. :2012
-##
-## currMon metered occupancy Basin.baseline
-## Min. : 1.00 Not metered:419904 Min. : 1.000 Min. : 10.40
-## 1st Qu.: 3.75 Metered :321624 1st Qu.: 1.000 1st Qu.: 21.24
-## Median : 6.50 Median : 2.000 Median : 26.79
-## Mean : 6.50 Mean : 2.503 Mean : 39.70
-## 3rd Qu.: 9.25 3rd Qu.: 3.000 3rd Qu.: 39.72
-## Max. :12.00 Max. :10.000 Max. :463.20
-## NA's :10800
-## Bath.baseline Dishwasher.baseline KitchenSink.baseline Shower.baseline
-## Min. : 0.00 Min. : 0.00 Min. : 7.57 Min. : 0.00
-## 1st Qu.: 26.40 1st Qu.: 0.00 1st Qu.:15.14 1st Qu.: 34.43
-## Median : 56.91 Median :19.90 Median :32.23 Median : 41.29
-## Mean : 54.96 Mean :13.35 Mean :31.46 Mean : 69.10
-## 3rd Qu.: 77.17 3rd Qu.:23.08 3rd Qu.:45.13 3rd Qu.: 93.60
-## Max. :128.86 Max. :32.91 Max. :75.70 Max. :513.83
-## NA's :10368
-## WC.baseline WashingMachine.baseline External.baseline Basin
-## Min. : 25.00 Min. : 0.00 Min. :-1.23 Min. :-0.0908
-## 1st Qu.: 75.00 1st Qu.: 16.67 1st Qu.: 2.58 1st Qu.: 0.0569
-## Median :100.00 Median : 66.34 Median :16.76 Median : 0.1282
-## Mean : 99.93 Mean : 56.91 Mean :18.09 Mean : 0.1280
-## 3rd Qu.:125.49 3rd Qu.: 85.31 3rd Qu.:25.88 3rd Qu.: 0.1720
-## Max. :262.50 Max. :149.10 Max. :97.50 Max. : 0.4506
-## NA's :11448 NA's :7560 NA's :36072
-## Bath Dishwasher External KitchenSink
-## Min. :-3.9549 Min. :-2.1795 Min. :-1.2822 Min. :-0.1007
-## 1st Qu.:-1.9531 1st Qu.:-1.0282 1st Qu.:-0.2348 1st Qu.: 0.0538
-## Median :-0.8934 Median :-0.5674 Median : 0.0353 Median : 0.1401
-## Mean :-1.1987 Mean :-0.6474 Mean : 0.1192 Mean : 0.1544
-## 3rd Qu.:-0.2953 3rd Qu.:-0.1228 3rd Qu.: 0.4962 3rd Qu.: 0.2572
-## Max. : 0.0909 Max. : 0.0000 Max. : 1.4791 Max. : 0.4951
-##
-## Shower WC WashingMachine Basin.baseline.madj
-## Min. :-0.24362 Min. :-4.3623 Min. :-3.2449 Min. : 10.33
-## 1st Qu.: 0.03801 1st Qu.:-2.1414 1st Qu.:-1.6484 1st Qu.: 21.40
-## Median : 0.29058 Median :-0.9099 Median :-0.8081 Median : 26.91
-## Mean : 0.41485 Mean :-1.1507 Mean :-0.2277 Mean : 39.83
-## 3rd Qu.: 0.63342 3rd Qu.:-0.2718 3rd Qu.: 1.1919 3rd Qu.: 39.82
-## Max. : 1.46176 Max. : 0.2867 Max. : 3.4392 Max. :463.65
-## NA's :10800
-## Bath.baseline.madj Dishwasher.baseline.madj External.baseline.madj
-## Min. : -3.955 Min. :-2.17945 Min. :-2.51
-## 1st Qu.: 26.196 1st Qu.:-0.04467 1st Qu.: 2.42
-## Median : 55.468 Median :19.03439 Median :16.92
-## Mean : 53.760 Mean :12.69926 Mean :18.21
-## 3rd Qu.: 75.373 3rd Qu.:22.44115 3rd Qu.:26.02
-## Max. :128.952 Max. :32.75192 Max. :98.17
-## NA's :36072
-## KitchenSink.baseline.madj Shower.baseline.madj WC.baseline.madj
-## Min. : 7.469 Min. : -0.244 Min. : 20.64
-## 1st Qu.:15.466 1st Qu.: 34.849 1st Qu.: 73.26
-## Median :32.420 Median : 41.842 Median : 99.08
-## Mean :31.619 Mean : 69.514 Mean : 98.77
-## 3rd Qu.:45.299 3rd Qu.: 93.573 3rd Qu.:124.33
-## Max. :76.121 Max. :515.287 Max. :262.79
-## NA's :10368 NA's :11448
-## WashingMachine.baseline.madj sumDaily.baseline.madj currMonS
-## Min. : -3.245 Min. : 53.53 Length:741528
-## 1st Qu.: 18.377 1st Qu.: 309.71 Class :character
-## Median : 67.546 Median : 389.36 Mode :character
-## Mean : 56.675 Mean : 382.72
-## 3rd Qu.: 84.686 3rd Qu.: 462.32
-## Max. :149.063 Max. :1153.15
-## NA's :7560 NA's :36072
-## occRed loWC loSh dualFlushWC loFlowShower
-## Min. :1.0 Min. :0 Min. :0 Length:741528 Length:741528
-## 1st Qu.:1.0 1st Qu.:0 1st Qu.:0 Class :character Class :character
-## Median :2.0 Median :0 Median :0 Mode :character Mode :character
-## Mean :2.5 Mean :0 Mean :0
-## 3rd Qu.:3.0 3rd Qu.:0 3rd Qu.:0
-## Max. :6.0 Max. :0 Max. :0
-##
-## WC.baseline.madj.we Shower.baseline.madj.we sumDaily.baseline.madj.we
-## Min. : 9.814 Min. : -0.244 Min. : 36.94
-## 1st Qu.: 57.982 1st Qu.: 32.409 1st Qu.: 292.79
-## Median : 81.724 Median : 40.664 Median : 370.09
-## Mean : 88.888 Mean : 65.732 Mean : 369.09
-## 3rd Qu.:118.154 3rd Qu.: 85.720 3rd Qu.: 451.33
-## Max. :262.787 Max. :515.287 Max. :1152.91
-## NA's :11448 NA's :10368 NA's :36072
-## yearOrig currSeason yrStr seasonStr
-## Min. :1994 Spring:185382 Length:741528 Length:741528
-## 1st Qu.:1999 Summer:185382 Class :character Class :character
-## Median :2003 Autumn:185382 Mode :character Mode :character
-## Mean :2003 Winter:185382
-## 3rd Qu.:2008
-## Max. :2012
-##
-## Colne Gt_Stour Mole dualFlushWCdr
-## Length:741528 Length:741528 Length:741528 Length:741528
-## Class :character Class :character Class :character Class :character
-## Mode :character Mode :character Mode :character Mode :character
-##
-##
-##
-##
-## dualFlushWCupdated loFlowShowerDr loFlowShowerUpdated applyTUB
-## Min. :0.0000 Length:741528 Min. :0.00000 Min. :0.00000
-## 1st Qu.:0.0000 Class :character 1st Qu.:0.00000 1st Qu.:0.00000
-## Median :0.0000 Mode :character Median :0.00000 Median :0.00000
-## Mean :0.1908 Mean :0.09715 Mean :0.01215
-## 3rd Qu.:0.0000 3rd Qu.:0.00000 3rd Qu.:0.00000
-## Max. :1.0000 Max. :1.00000 Max. :1.00000
-##
-## WC.baseline.madj.we.dr Shower.baseline.madj.we.dr External.baseline.madj.we.dr
-## Min. : 9.70 Min. : -0.244 Min. :-2.51
-## 1st Qu.: 47.74 1st Qu.: 29.997 1st Qu.: 2.42
-## Median : 73.88 Median : 39.972 Median :16.57
-## Mean : 81.26 Mean : 63.460 Mean :17.77
-## 3rd Qu.:112.29 3rd Qu.: 80.536 3rd Qu.:25.46
-## Max. :262.79 Max. :515.287 Max. :98.17
-## NA's :11448 NA's :10368 NA's :36072
-## sumDaily.baseline.madj.we.dr
-## Min. : 35.06
-## 1st Qu.: 282.44
-## Median : 362.51
-## Mean : 358.79
-## 3rd Qu.: 441.63
-## Max. :1152.50
-## NA's :36072
-```
+# Enhanced WE model?
+
+# Summary of final data
+
+
+```r
+skimr::skim(hhFinalDataComboExpandedCEHDT)
+```
+
+
+Table: Data summary
+
+| | |
+|:------------------------|:----------------------------|
+|Name |hhFinalDataComboExpandedC... |
+|Number of rows |741528 |
+|Number of columns |57 |
+|_______________________ | |
+|Column type frequency: | |
+|character |11 |
+|Date |1 |
+|factor |2 |
+|numeric |43 |
+|________________________ | |
+|Group variables |None |
+
+
+**Variable type: character**
+
+|skim_variable | n_missing| complete_rate| min| max| empty| n_unique| whitespace|
+|:--------------|---------:|-------------:|---:|---:|-----:|--------:|----------:|
+|model | 0| 1| 4| 4| 0| 2| 0|
+|currMonS | 0| 1| 2| 2| 0| 12| 0|
+|dualFlushWC | 0| 1| 10| 12| 0| 2| 0|
+|loFlowShower | 0| 1| 8| 11| 0| 2| 0|
+|yrStr | 0| 1| 4| 7| 0| 36| 0|
+|seasonStr | 0| 1| 6| 6| 0| 4| 0|
+|Colne | 0| 1| 9| 17| 0| 5| 0|
+|Gt_Stour | 0| 1| 9| 17| 0| 5| 0|
+|Mole | 0| 1| 9| 17| 0| 5| 0|
+|dualFlushWCdr | 0| 1| 10| 12| 0| 2| 0|
+|loFlowShowerDr | 0| 1| 8| 11| 0| 2| 0|
+
+
+**Variable type: Date**
+
+|skim_variable | n_missing| complete_rate|min |max |median | n_unique|
+|:-------------|---------:|-------------:|:----------|:----------|:----------|--------:|
+|obsDate | 0| 1|1994-12-15 |2012-11-15 |2003-11-30 | 216|
+
+
+**Variable type: factor**
+
+|skim_variable | n_missing| complete_rate|ordered | n_unique|top_counts |
+|:-------------|---------:|-------------:|:-------|--------:|:--------------------------------------------------|
+|metered | 0| 1|FALSE | 2|Not: 419904, Met: 321624 |
+|currSeason | 0| 1|FALSE | 4|Spr: 185382, Sum: 185382, Aut: 185382, Win: 185382 |
+
+
+**Variable type: numeric**
+
+|skim_variable | n_missing| complete_rate| mean| sd| p0| p25| p50| p75| p100|hist |
+|:----------------------------|---------:|-------------:|------------:|-----------:|-------:|-------:|-------:|------------:|------------:|:-----|
+|hhid | 0| 1.00| 398103840.53| 4.17964e+08| 1.00| 859.00| 1717.00| 836920446.00| 836965495.00|▇▁▁▁▇ |
+|currYear | 0| 1.00| 2003.42| 5.20000e+00| 1994.00| 1999.00| 2003.00| 2008.00| 2012.00|▆▇▆▇▇ |
+|currMon | 0| 1.00| 6.50| 3.45000e+00| 1.00| 3.75| 6.50| 9.25| 12.00|▇▅▅▅▇ |
+|occupancy | 0| 1.00| 2.50| 1.36000e+00| 1.00| 1.00| 2.00| 3.00| 10.00|▇▃▁▁▁ |
+|Basin.baseline | 10800| 0.99| 39.73| 3.98200e+01| 10.40| 21.39| 26.72| 39.72| 463.20|▇▁▁▁▁ |
+|Bath.baseline | 0| 1.00| 55.01| 2.64100e+01| 0.00| 26.40| 56.91| 77.06| 123.83|▃▇▇▇▁ |
+|Dishwasher.baseline | 0| 1.00| 13.33| 1.07800e+01| 0.00| 0.00| 19.85| 23.16| 35.26|▇▁▂▇▁ |
+|KitchenSink.baseline | 0| 1.00| 31.41| 1.41600e+01| 7.57| 15.14| 32.06| 45.11| 75.70|▆▇▇▂▁ |
+|Shower.baseline | 10368| 0.99| 68.93| 6.26000e+01| 0.00| 34.12| 40.90| 93.60| 513.82|▇▂▁▁▁ |
+|WC.baseline | 11448| 0.98| 100.05| 3.91700e+01| 25.00| 75.00| 100.00| 125.09| 262.50|▃▇▅▁▁ |
+|WashingMachine.baseline | 7560| 0.99| 57.03| 3.54100e+01| 0.00| 16.67| 67.32| 85.19| 158.55|▇▂▇▃▁ |
+|External.baseline | 36072| 0.95| 17.99| 1.50700e+01| -1.23| 1.29| 16.87| 25.70| 97.50|▇▅▁▁▁ |
+|Basin | 0| 1.00| 0.13| 1.10000e-01| -0.09| 0.06| 0.13| 0.17| 0.45|▅▇▇▂▂ |
+|Bath | 0| 1.00| -1.20| 1.02000e+00| -3.95| -1.95| -0.89| -0.30| 0.09|▁▂▂▃▇ |
+|Dishwasher | 0| 1.00| -0.65| 5.90000e-01| -2.18| -1.03| -0.57| -0.12| 0.00|▁▂▃▃▇ |
+|External | 0| 1.00| 0.12| 5.30000e-01| -1.28| -0.23| 0.04| 0.50| 1.48|▁▅▇▅▂ |
+|KitchenSink | 0| 1.00| 0.15| 1.30000e-01| -0.10| 0.05| 0.14| 0.26| 0.50|▅▇▆▆▁ |
+|Shower | 0| 1.00| 0.41| 4.80000e-01| -0.24| 0.04| 0.29| 0.63| 1.46|▇▇▂▂▃ |
+|WC | 0| 1.00| -1.15| 1.09000e+00| -4.36| -2.14| -0.91| -0.27| 0.29|▁▂▃▃▇ |
+|WashingMachine | 0| 1.00| -0.23| 1.69000e+00| -3.24| -1.65| -0.81| 1.19| 3.44|▃▇▃▅▃ |
+|Basin.baseline.madj | 10800| 0.99| 39.86| 3.98200e+01| 10.33| 21.59| 26.88| 39.82| 463.65|▇▁▁▁▁ |
+|Bath.baseline.madj | 0| 1.00| 53.82| 2.61500e+01| -3.95| 26.20| 55.54| 75.21| 123.92|▃▇▇▆▁ |
+|Dishwasher.baseline.madj | 0| 1.00| 12.69| 1.07500e+01| -2.18| -0.04| 19.04| 22.48| 35.26|▇▂▂▇▁ |
+|External.baseline.madj | 36072| 0.95| 18.11| 1.51100e+01| -2.51| 1.85| 17.00| 25.85| 98.17|▇▆▁▁▁ |
+|KitchenSink.baseline.madj | 0| 1.00| 31.57| 1.41600e+01| 7.47| 15.47| 32.22| 45.23| 76.12|▆▇▇▂▁ |
+|Shower.baseline.madj | 10368| 0.99| 69.35| 6.26100e+01| -0.24| 34.54| 41.49| 93.57| 515.29|▇▂▁▁▁ |
+|WC.baseline.madj | 11448| 0.98| 98.90| 3.88900e+01| 20.64| 73.17| 99.44| 124.03| 262.79|▃▇▅▁▁ |
+|WashingMachine.baseline.madj | 7560| 0.99| 56.80| 3.52300e+01| -3.24| 18.38| 68.50| 84.87| 158.51|▇▂▇▃▁ |
+|sumDaily.baseline.madj | 36072| 0.95| 382.73| 1.34190e+02| 53.53| 309.36| 390.00| 462.70| 1153.15|▂▇▂▁▁ |
+|occRed | 0| 1.00| 2.50| 1.35000e+00| 1.00| 1.00| 2.00| 3.00| 6.00|▇▂▂▁▁ |
+|loWC | 0| 1.00| 0.00| 0.00000e+00| 0.00| 0.00| 0.00| 0.00| 0.00|▁▁▇▁▁ |
+|loSh | 0| 1.00| 0.00| 0.00000e+00| 0.00| 0.00| 0.00| 0.00| 0.00|▁▁▇▁▁ |
+|WC.baseline.madj.we | 11448| 0.98| 89.01| 4.13600e+01| 9.81| 57.78| 82.02| 117.92| 262.79|▅▇▆▁▁ |
+|Shower.baseline.madj.we | 10368| 0.99| 65.58| 6.05500e+01| -0.24| 32.30| 40.36| 85.66| 515.29|▇▂▁▁▁ |
+|sumDaily.baseline.madj.we | 36072| 0.95| 369.11| 1.31780e+02| 36.75| 293.70| 370.66| 450.65| 1152.91|▂▇▂▁▁ |
+|yearOrig | 0| 1.00| 2003.42| 5.20000e+00| 1994.00| 1999.00| 2003.00| 2008.00| 2012.00|▆▇▆▇▇ |
+|dualFlushWCupdated | 0| 1.00| 0.19| 3.90000e-01| 0.00| 0.00| 0.00| 0.00| 1.00|▇▁▁▁▂ |
+|loFlowShowerUpdated | 0| 1.00| 0.10| 3.00000e-01| 0.00| 0.00| 0.00| 0.00| 1.00|▇▁▁▁▁ |
+|applyTUB | 0| 1.00| 0.01| 1.10000e-01| 0.00| 0.00| 0.00| 0.00| 1.00|▇▁▁▁▁ |
+|WC.baseline.madj.we.dr | 11448| 0.98| 81.43| 4.19800e+01| 9.81| 48.05| 73.92| 112.12| 262.79|▇▇▅▁▁ |
+|Shower.baseline.madj.we.dr | 10368| 0.99| 63.38| 5.91000e+01| -0.24| 29.81| 39.53| 80.61| 515.15|▇▂▁▁▁ |
+|External.baseline.madj.we.dr | 36072| 0.95| 17.67| 1.48900e+01| -2.51| 1.85| 16.59| 25.40| 98.17|▇▆▁▁▁ |
+|sumDaily.baseline.madj.we.dr | 36072| 0.95| 358.82| 1.29210e+02| 36.75| 283.92| 360.27| 440.73| 1152.91|▂▇▁▁▁ |
@@ -7001,7 +7001,7 @@ t <- proc.time() - startTime
elapsed <- t[[3]]
```
-Analysis completed in 316.864 seconds ( 5.28 minutes) using [knitr](https://cran.r-project.org/package=knitr) in [RStudio](http://www.rstudio.com) with R version 4.0.2 (2020-06-22) running on x86_64-apple-darwin17.0.
+Analysis completed in 328.682 seconds ( 5.48 minutes) using [knitr](https://cran.r-project.org/package=knitr) in [RStudio](http://www.rstudio.com) with R version 4.0.2 (2020-06-22) running on x86_64-apple-darwin17.0.
R packages used:
@@ -7011,6 +7011,7 @@ R packages used:
* dplyr - for rename [@dplyr]
* fGarch - to create skewed normal consumption distributions [@fgarch]
* lubridate - date manipulation [@lubridate]
+ * skimr - for skim [@skimr]
* knitr - to create this document [@knitr]
diff --git a/impetusModel/impetusModel_files/figure-html/Basin monthly-1.png b/impetusModel/impetusModel_files/figure-html/Basin monthly-1.png
index fa6d7ed4aaa38a7d4fa280a0a7dfee07a77d4a9b..26913d15fa89c6e6337781c56ddaa9bbc939d24e 100644
Binary files a/impetusModel/impetusModel_files/figure-html/Basin monthly-1.png and b/impetusModel/impetusModel_files/figure-html/Basin monthly-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/Bath monthly-1.png b/impetusModel/impetusModel_files/figure-html/Bath monthly-1.png
index 45727aedda6e08225dfaee16939043999bacf800..451d440a4d9504a8680a027cc0a21bd2dfd0aea1 100644
Binary files a/impetusModel/impetusModel_files/figure-html/Bath monthly-1.png and b/impetusModel/impetusModel_files/figure-html/Bath monthly-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/Compare External-1.png b/impetusModel/impetusModel_files/figure-html/Compare External-1.png
index 51e7ba7895c66870177487f761aa2ba6a1388f38..1960dd69212bc44659356d080f304b13fb38dd8f 100644
Binary files a/impetusModel/impetusModel_files/figure-html/Compare External-1.png and b/impetusModel/impetusModel_files/figure-html/Compare External-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/Compare External-2.png b/impetusModel/impetusModel_files/figure-html/Compare External-2.png
index b056cb9e391b500c8173d17dbeb23a5d23982e7a..22f41fc07a5483dc29b3631186f36f0220e1f6d1 100644
Binary files a/impetusModel/impetusModel_files/figure-html/Compare External-2.png and b/impetusModel/impetusModel_files/figure-html/Compare External-2.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/Compare WC-1.png b/impetusModel/impetusModel_files/figure-html/Compare WC-1.png
index aa910c96b01abdaf039289906ee8de1f7adf2fdd..795afb135fb9e79bc3d4f750acac3af81d49b1d6 100644
Binary files a/impetusModel/impetusModel_files/figure-html/Compare WC-1.png and b/impetusModel/impetusModel_files/figure-html/Compare WC-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/Compare WC-2.png b/impetusModel/impetusModel_files/figure-html/Compare WC-2.png
index 7d24a84f04ad1575c9126f63e87422cfb1c8ba8c..c3d6f22c1cd9ebcadfab93e935f5326ecb10eafd 100644
Binary files a/impetusModel/impetusModel_files/figure-html/Compare WC-2.png and b/impetusModel/impetusModel_files/figure-html/Compare WC-2.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/Compare shower-1.png b/impetusModel/impetusModel_files/figure-html/Compare shower-1.png
index 0a385e44d47e50b3907722b235959430508bfffb..9ed584e4e416eb3159b6d3f540408f361c57e35e 100644
Binary files a/impetusModel/impetusModel_files/figure-html/Compare shower-1.png and b/impetusModel/impetusModel_files/figure-html/Compare shower-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/Compare shower-2.png b/impetusModel/impetusModel_files/figure-html/Compare shower-2.png
index a0073ff620779490d30eae065d86e31af0fd1097..9101502f1392f5dbcbac3dcf03e80df9e576afd5 100644
Binary files a/impetusModel/impetusModel_files/figure-html/Compare shower-2.png and b/impetusModel/impetusModel_files/figure-html/Compare shower-2.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/Dishwasher monthly-1.png b/impetusModel/impetusModel_files/figure-html/Dishwasher monthly-1.png
index 33add3a7c8dfe99865196af3d3346e3526caff2e..b2eda5a88573693a3a505e9b817fe965977d14d0 100644
Binary files a/impetusModel/impetusModel_files/figure-html/Dishwasher monthly-1.png and b/impetusModel/impetusModel_files/figure-html/Dishwasher monthly-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/Drought model - TUB-1.png b/impetusModel/impetusModel_files/figure-html/Drought model - TUB-1.png
index 5944cd20eb0115d05f1495b93f071dfdf8dd94ad..29242e9edea081179bbfd1a1c6f451347e22d5e6 100644
Binary files a/impetusModel/impetusModel_files/figure-html/Drought model - TUB-1.png and b/impetusModel/impetusModel_files/figure-html/Drought model - TUB-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/Drought model - TUB-2.png b/impetusModel/impetusModel_files/figure-html/Drought model - TUB-2.png
index f0b5ac0cf957c1c588dd82f76c75327b7f602f51..dd11491c72e7a0d65b916a09a0cc7814505331c7 100644
Binary files a/impetusModel/impetusModel_files/figure-html/Drought model - TUB-2.png and b/impetusModel/impetusModel_files/figure-html/Drought model - TUB-2.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/Drought model - WC-1.png b/impetusModel/impetusModel_files/figure-html/Drought model - WC-1.png
index be2e636fccb600aff1dc3a18a4b11fc838af994b..ff5149746989fdddd45c82eabf19f21776210459 100644
Binary files a/impetusModel/impetusModel_files/figure-html/Drought model - WC-1.png and b/impetusModel/impetusModel_files/figure-html/Drought model - WC-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/Drought model - shower-1.png b/impetusModel/impetusModel_files/figure-html/Drought model - shower-1.png
index cedd6742d350e522d14cbc4a67003611fd6960d9..5c403f1d2990f92f1e669cabfc4c219d80c95097 100644
Binary files a/impetusModel/impetusModel_files/figure-html/Drought model - shower-1.png and b/impetusModel/impetusModel_files/figure-html/Drought model - shower-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/External monthly-1.png b/impetusModel/impetusModel_files/figure-html/External monthly-1.png
index 8404133b9b06f2ee4cc4cdd372e8476e1ad0b8de..65941c266db232c728f2c56f080a4d4fba32d194 100644
Binary files a/impetusModel/impetusModel_files/figure-html/External monthly-1.png and b/impetusModel/impetusModel_files/figure-html/External monthly-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/Kitchen sink monthly-1.png b/impetusModel/impetusModel_files/figure-html/Kitchen sink monthly-1.png
index cd9cdfa3bb5d74a137cae8b7ae105ec2f5501b52..e454286bc93498d141be9607d3466d24b4874b82 100644
Binary files a/impetusModel/impetusModel_files/figure-html/Kitchen sink monthly-1.png and b/impetusModel/impetusModel_files/figure-html/Kitchen sink monthly-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/Shower monthly-1.png b/impetusModel/impetusModel_files/figure-html/Shower monthly-1.png
index fb6d1ed48c53773dbb017defb3287582ed52b3e3..7ba36027000afc85a12ce2b2b919d573d366272f 100644
Binary files a/impetusModel/impetusModel_files/figure-html/Shower monthly-1.png and b/impetusModel/impetusModel_files/figure-html/Shower monthly-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/WC monthly-1.png b/impetusModel/impetusModel_files/figure-html/WC monthly-1.png
index 516e38f866db337d600ba6dff59ecf78eead88e9..adf9312f0ac55219651b9e60cfc21773fae42018 100644
Binary files a/impetusModel/impetusModel_files/figure-html/WC monthly-1.png and b/impetusModel/impetusModel_files/figure-html/WC monthly-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/Washing machine monthly-1.png b/impetusModel/impetusModel_files/figure-html/Washing machine monthly-1.png
index 3e15dda91f9031765639a894fd8ec103401b1f9b..c0eb81a53aba3ec48f849bedee111588d3b03522 100644
Binary files a/impetusModel/impetusModel_files/figure-html/Washing machine monthly-1.png and b/impetusModel/impetusModel_files/figure-html/Washing machine monthly-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/allUses1995-1.png b/impetusModel/impetusModel_files/figure-html/allUses1995-1.png
index 8b92f41483bc3142065d008895b3634f3e415673..67c156d24bddff0c536ff51dc5c7980db246559d 100644
Binary files a/impetusModel/impetusModel_files/figure-html/allUses1995-1.png and b/impetusModel/impetusModel_files/figure-html/allUses1995-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/allUsesLastYear-1.png b/impetusModel/impetusModel_files/figure-html/allUsesLastYear-1.png
index 3102acd1dddfd5e19cd1e3b1c5e9b66efecb9a7a..5bce2d5d7f64d96b552f73686133021d3f255309 100644
Binary files a/impetusModel/impetusModel_files/figure-html/allUsesLastYear-1.png and b/impetusModel/impetusModel_files/figure-html/allUsesLastYear-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/compareESTmcm v1-1.png b/impetusModel/impetusModel_files/figure-html/compareESTmcm v1-1.png
index 2bea01e8b3c133b2f3b36a657355d4e38a034c07..e0a239107c42c8e2ef1c5207b9b6cc63a6bc2e97 100644
Binary files a/impetusModel/impetusModel_files/figure-html/compareESTmcm v1-1.png and b/impetusModel/impetusModel_files/figure-html/compareESTmcm v1-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/compareESTmcm v1-2.png b/impetusModel/impetusModel_files/figure-html/compareESTmcm v1-2.png
index 8cdf9fcc710f70b7cd5d3ab67b65c413a04b33da..2647b2434d8e647dd8fd86972954f4b0a085893b 100644
Binary files a/impetusModel/impetusModel_files/figure-html/compareESTmcm v1-2.png and b/impetusModel/impetusModel_files/figure-html/compareESTmcm v1-2.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/compare_v_1.3-1.png b/impetusModel/impetusModel_files/figure-html/compare_v_1.3-1.png
index 55f5b91351f96995050df1dfee5a6503c3fee488..954ec4a495c374520123952dcf0314b79541c582 100644
Binary files a/impetusModel/impetusModel_files/figure-html/compare_v_1.3-1.png and b/impetusModel/impetusModel_files/figure-html/compare_v_1.3-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/compare_v_2_0-1.png b/impetusModel/impetusModel_files/figure-html/compare_v_2_0-1.png
index 17b4efedcbde2a4569b7758015c1728e23e785f6..0b0bbadf996d65990e85674fd6093da3c6cf3f71 100644
Binary files a/impetusModel/impetusModel_files/figure-html/compare_v_2_0-1.png and b/impetusModel/impetusModel_files/figure-html/compare_v_2_0-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/final model v1_3 2012 by month-1.png b/impetusModel/impetusModel_files/figure-html/final model v1_3 2012 by month-1.png
index 4d30763abf02261207f59d382a1cbfcb73f4ef23..55c04e876bb1b9171590ab1043a27c63f7d3b1c1 100644
Binary files a/impetusModel/impetusModel_files/figure-html/final model v1_3 2012 by month-1.png and b/impetusModel/impetusModel_files/figure-html/final model v1_3 2012 by month-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/final model v1_3 2012 by month-2.png b/impetusModel/impetusModel_files/figure-html/final model v1_3 2012 by month-2.png
index e4c3cd8a68d4f358e8ace1d7abcb10f3679b8e36..d015d49b091e8a4070702288c9f7162d896b1a13 100644
Binary files a/impetusModel/impetusModel_files/figure-html/final model v1_3 2012 by month-2.png and b/impetusModel/impetusModel_files/figure-html/final model v1_3 2012 by month-2.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/final model v1_3 all dates-1.png b/impetusModel/impetusModel_files/figure-html/final model v1_3 all dates-1.png
index 5b418bc7565b8a01e454d34ab2d4d0eef5fcc899..8e0c5b1f0f363090eb909c4ffa5a21aa0e4831d0 100644
Binary files a/impetusModel/impetusModel_files/figure-html/final model v1_3 all dates-1.png and b/impetusModel/impetusModel_files/figure-html/final model v1_3 all dates-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/final model v2_0 2012 by month-1.png b/impetusModel/impetusModel_files/figure-html/final model v2_0 2012 by month-1.png
index a6237308a16ee13a6b25564db9adfc9d02339026..26d1323af0b0689aa73d3808d01acf8327f49b17 100644
Binary files a/impetusModel/impetusModel_files/figure-html/final model v2_0 2012 by month-1.png and b/impetusModel/impetusModel_files/figure-html/final model v2_0 2012 by month-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/final model v2_0 2012 by month-2.png b/impetusModel/impetusModel_files/figure-html/final model v2_0 2012 by month-2.png
index 16ce7c5f2914b6d7953efe0d27e40ddbb46817fa..31fab1b5a76dcf313b7bf2008ba7d911a09f5762 100644
Binary files a/impetusModel/impetusModel_files/figure-html/final model v2_0 2012 by month-2.png and b/impetusModel/impetusModel_files/figure-html/final model v2_0 2012 by month-2.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/final model v2_0 all dates-1.png b/impetusModel/impetusModel_files/figure-html/final model v2_0 all dates-1.png
index 7dd96eeaa625384cd5279546b90d2e279627f9f9..3babfe7d4061cfb7ec6239c00045e72b4e09be62 100644
Binary files a/impetusModel/impetusModel_files/figure-html/final model v2_0 all dates-1.png and b/impetusModel/impetusModel_files/figure-html/final model v2_0 all dates-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-1.png b/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-1.png
index 3d9bd34e0f7c506465d75d4b5ca325298485d825..48f27133327eef32fbfdf84656e8e7e947d444ad 100644
Binary files a/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-1.png and b/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-2.png b/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-2.png
index 6a4cf8523e04f7a342532fd4d53390c76a75ac62..063818e24081c86cdfc589bcc64746c53f6c00d4 100644
Binary files a/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-2.png and b/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-2.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-3.png b/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-3.png
index c8e151864b883486af0ef7b390ae54e09dd6900c..5cc6ff77ec6205e76d805948f7ca76ad7ff86673 100644
Binary files a/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-3.png and b/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-3.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-4.png b/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-4.png
index e644718dcca8dfc5c1d1c5ba15085e943d352191..6c64ad82786b5d215c467a6c814941b10d759e62 100644
Binary files a/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-4.png and b/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-4.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-5.png b/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-5.png
index 3e5666a76ffc151f95e8a571ace569a19bccd9fe..b27245f159c726817eaa3ccba3fbcc654c62639c 100644
Binary files a/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-5.png and b/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-5.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-6.png b/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-6.png
index 565f0d5116b1798e51a0a3aa2f03bc259ca5a083..5a926273ccf9f9c6480114a6dec9cca504da8c6d 100644
Binary files a/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-6.png and b/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-6.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-7.png b/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-7.png
index cc861a587659ac9b7def16a91cefb0195fc40c1d..dd7af0fb79675ff4e7dc3d735f0602d519edf07f 100644
Binary files a/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-7.png and b/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-7.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-8.png b/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-8.png
index 289fc595c7210d2414c4fec03b05821a2f7b89c7..de4509a7587baa4291502c033cce12d539eb9081 100644
Binary files a/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-8.png and b/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-8.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-9.png b/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-9.png
index f6c19ab4e9095945c109b3a2e018389876dc3d8c..9f78d34c4fe0bb3a1855e01579afda85f33bd1f0 100644
Binary files a/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-9.png and b/impetusModel/impetusModel_files/figure-html/finalBaseHHDataTests-9.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-1.png b/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-1.png
index 6441ebc93157adf12639c9c505d6b214ed9b4a63..9bb91533509af36db846e078311513699157ae99 100644
Binary files a/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-1.png and b/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-2.png b/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-2.png
index 5df21cf4a2536d762ec5b2f2b7124d9721d03caf..36e1c566c775d251d740498852ef0075568b8906 100644
Binary files a/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-2.png and b/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-2.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-3.png b/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-3.png
index 25480768e90745409654fb717326c4d13253e41e..4b021efd345ed87459664342c857eae951da45bf 100644
Binary files a/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-3.png and b/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-3.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-4.png b/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-4.png
index 9619f48526c52642f6138b5996c0ea7389f4ea4e..25fca2fb4d493cc8ea090923545169c11a3ca97e 100644
Binary files a/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-4.png and b/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-4.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-5.png b/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-5.png
index 22912d19ef60fe0845c8aebabc3510313c4afe7a..dd05e2c8a2fa8a5e07ece60ff91de862bb5b300a 100644
Binary files a/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-5.png and b/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-5.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-6.png b/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-6.png
index 3d0a46cf6bc1224dcf6526f0731ab91dbdcaa0bb..fe9855160b7da7824fbb953e03cdfcec6842db59 100644
Binary files a/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-6.png and b/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-6.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-7.png b/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-7.png
index 3663e0114aeaa62f5daaf8331c84585dd2c11664..47a9f2a8f979ecee731c7792d0b7485bf8f33373 100644
Binary files a/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-7.png and b/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-7.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-8.png b/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-8.png
index 368a008ea975008ddfae690cd62a5337becb6da1..1db1aa86c01378ab6770a39efc386582861cdb52 100644
Binary files a/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-8.png and b/impetusModel/impetusModel_files/figure-html/fixBaselineDistributions-8.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/iwaBath_paperFig-1.png b/impetusModel/impetusModel_files/figure-html/iwaBath_paperFig-1.png
index 8d5749adf4b9c4083e13f16b4f5b0d8cac4ec9f1..525f9d6d3c660b7f73a5fd41895eddfa305e8f5d 100644
Binary files a/impetusModel/impetusModel_files/figure-html/iwaBath_paperFig-1.png and b/impetusModel/impetusModel_files/figure-html/iwaBath_paperFig-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/model v1_3 savings-1.png b/impetusModel/impetusModel_files/figure-html/model v1_3 savings-1.png
index 9522d35fdb611d952669712ecbb1a388d9337057..922177e1ca34f885ad7bc67e952a306aa5ac83c0 100644
Binary files a/impetusModel/impetusModel_files/figure-html/model v1_3 savings-1.png and b/impetusModel/impetusModel_files/figure-html/model v1_3 savings-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/model v1_3 savings-2.png b/impetusModel/impetusModel_files/figure-html/model v1_3 savings-2.png
index 6eceb4fd504f870aae6730c8a5f75a018575dde4..d4715428a0be6f0f4e23597154e95db4992bc194 100644
Binary files a/impetusModel/impetusModel_files/figure-html/model v1_3 savings-2.png and b/impetusModel/impetusModel_files/figure-html/model v1_3 savings-2.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/model v1_3 with ci-1.png b/impetusModel/impetusModel_files/figure-html/model v1_3 with ci-1.png
index c4fbf78af1ad9003e7c217aeefaacb13c736846d..13ba20d560ac879908770a53e1870fbda0768953 100644
Binary files a/impetusModel/impetusModel_files/figure-html/model v1_3 with ci-1.png and b/impetusModel/impetusModel_files/figure-html/model v1_3 with ci-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/model v2_0 savings-1.png b/impetusModel/impetusModel_files/figure-html/model v2_0 savings-1.png
index 0305de184b6a0f1b2e9560238e2d25bfc7530fee..88a3444dd5b4fb59ee05bca3c9f49ed7b61b86bb 100644
Binary files a/impetusModel/impetusModel_files/figure-html/model v2_0 savings-1.png and b/impetusModel/impetusModel_files/figure-html/model v2_0 savings-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/plot we adjusted shower and WC use-1.png b/impetusModel/impetusModel_files/figure-html/plot we adjusted shower and WC use-1.png
index 72b5db5663df1b0e339b466f35657e98d6f904b6..82594ee9a5b77c5ae40bb1b9d32703744b7bcd57 100644
Binary files a/impetusModel/impetusModel_files/figure-html/plot we adjusted shower and WC use-1.png and b/impetusModel/impetusModel_files/figure-html/plot we adjusted shower and WC use-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/plot we adjusted shower and WC use-2.png b/impetusModel/impetusModel_files/figure-html/plot we adjusted shower and WC use-2.png
index c6958591913e1e9bf977a683ceba649315d243f2..54211073e0b61568c7bf8d8a34fe83a33637bc77 100644
Binary files a/impetusModel/impetusModel_files/figure-html/plot we adjusted shower and WC use-2.png and b/impetusModel/impetusModel_files/figure-html/plot we adjusted shower and WC use-2.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/reportESTocc-1.png b/impetusModel/impetusModel_files/figure-html/reportESTocc-1.png
index 5bbc75c5fde05a5460f2e867e0f825d346ccf4b4..22533052dd46f4c10e3f824e95593a21b38d0c9b 100644
Binary files a/impetusModel/impetusModel_files/figure-html/reportESTocc-1.png and b/impetusModel/impetusModel_files/figure-html/reportESTocc-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/test Colne drought history and climate data-1.png b/impetusModel/impetusModel_files/figure-html/test Colne drought history and climate data-1.png
index 703fe41033dec90f03272d2b48d26b4eff29d22c..8a6a14ef4c61800bb10c62e33a7e94cc9c68be97 100644
Binary files a/impetusModel/impetusModel_files/figure-html/test Colne drought history and climate data-1.png and b/impetusModel/impetusModel_files/figure-html/test Colne drought history and climate data-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-1.png b/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-1.png
index 90e7fcd1c003a61501f36ef51a31f550e0f909f3..30ba64b655225212b070e2244a93ccf3315b83d5 100644
Binary files a/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-1.png and b/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-2.png b/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-2.png
index 3ae553d5fe4bb423b0f35ea9d244e5fc7ea91299..2ff5fb05ee2581b0a245acc7c23e3f831a654772 100644
Binary files a/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-2.png and b/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-2.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-3.png b/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-3.png
index 9184e868d852bfe811b296195a95e259090bdf16..37dee01be8c63ccd70184397b2796e64e35c4e74 100644
Binary files a/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-3.png and b/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-3.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-4.png b/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-4.png
index b33f8306742b6dd31b22b18a2bb7ccff5db9387d..549564cc33d63b9c654689a8011246cdce12f07c 100644
Binary files a/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-4.png and b/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-4.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-5.png b/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-5.png
index ea0f457cf951a433c96ec249613656f215594349..d4204e39deaaf5ec2c7971df015c0e2e96e8d27f 100644
Binary files a/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-5.png and b/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-5.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-6.png b/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-6.png
index 0b1131bfe75e9f7b1c1e7d30b662c904afa0d354..0dcf143db802d7fc2dc37abd25f1c7b6ffdfbbc8 100644
Binary files a/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-6.png and b/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-6.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-7.png b/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-7.png
index 5e1073f8f0d74c5c3088130113de8b00a8b5dd82..983581d5596b5f618770c9b357954b43a6d32d61 100644
Binary files a/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-7.png and b/impetusModel/impetusModel_files/figure-html/test model v1_3 by component-7.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/test model v1_3 total-1.png b/impetusModel/impetusModel_files/figure-html/test model v1_3 total-1.png
index c8ae053a52d1466822e687319bb433fb6297d09d..de3f8f276d5d714e4783e609ec21f93e4fda8c8c 100644
Binary files a/impetusModel/impetusModel_files/figure-html/test model v1_3 total-1.png and b/impetusModel/impetusModel_files/figure-html/test model v1_3 total-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/test model v2 by component-2.png b/impetusModel/impetusModel_files/figure-html/test model v2 by component-2.png
index 14965fa96bb4e2360224e848901841949d5571cb..d3afe0f41a8fb421aa1e3d343a12b12a5b0711c5 100644
Binary files a/impetusModel/impetusModel_files/figure-html/test model v2 by component-2.png and b/impetusModel/impetusModel_files/figure-html/test model v2 by component-2.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/test model v2 by component-3.png b/impetusModel/impetusModel_files/figure-html/test model v2 by component-3.png
index a2d9841ebe816426ea55e67fac3a9d7afbb0a842..9d72592432194617c93dd6b52f9bea8899e2e669 100644
Binary files a/impetusModel/impetusModel_files/figure-html/test model v2 by component-3.png and b/impetusModel/impetusModel_files/figure-html/test model v2 by component-3.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/test model v2 total-1.png b/impetusModel/impetusModel_files/figure-html/test model v2 total-1.png
index a3ec86657cbe78345c7aa93e89bf46d8be3fa076..71ca6bbe7976ef418941cc1b7ee4016c97937bde 100644
Binary files a/impetusModel/impetusModel_files/figure-html/test model v2 total-1.png and b/impetusModel/impetusModel_files/figure-html/test model v2 total-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/test model v2 total-2.png b/impetusModel/impetusModel_files/figure-html/test model v2 total-2.png
index aceece37fa5d3cfb04f385d14a1fa276b09ddbd8..1f8941d34168a33c20a36c9944f1ac1821bbc546 100644
Binary files a/impetusModel/impetusModel_files/figure-html/test model v2 total-2.png and b/impetusModel/impetusModel_files/figure-html/test model v2 total-2.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-1.png b/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-1.png
index e3bafdf3dc1a49e7997ad1e8a5034457c1e0ed54..7a276210ad32b79cf204b38cf32bce3d0d1826be 100644
Binary files a/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-1.png and b/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-1.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-10.png b/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-10.png
index f0d9a02bd0136420f14067f180fe5f3b7c57e5d6..665f5167ead841dbdbe1a04806366ae818890f02 100644
Binary files a/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-10.png and b/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-10.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-2.png b/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-2.png
index 9dc2fd093fc7bc25d7f7cdfcde7df8f55d38a4ee..34edf2a16952e010a7c6c9ab4e5d3a5330daf3ee 100644
Binary files a/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-2.png and b/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-2.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-3.png b/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-3.png
index 759273d195cba5b5809cbf020bd71aca24b8edfe..e3c93f35e785bc50e3b7b183bb18e35bc75e3116 100644
Binary files a/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-3.png and b/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-3.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-4.png b/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-4.png
index 7f56ec8d9c8a8aa7fdaad4d4aacac98650ab0f5e..ea6d62ec4a2b94b7b899746e1b42283cce75e8aa 100644
Binary files a/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-4.png and b/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-4.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-5.png b/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-5.png
index bc60a3ac1a6afa9b404f6470f86656790239c6b7..54de49a82c786e58605a186a2b528415824f6e71 100644
Binary files a/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-5.png and b/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-5.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-6.png b/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-6.png
index ce8f1c2e25ca81aefbb1d5db60e58a260971d8bc..73ad8e1d42e8efecd91734d0dc8b774442663ae8 100644
Binary files a/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-6.png and b/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-6.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-7.png b/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-7.png
index 874ee9753c69ada7f77740525a1a3a3c4d624ae2..8c67c87d4cb7a2e78f8e9a855e210dd26c68597b 100644
Binary files a/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-7.png and b/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-7.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-8.png b/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-8.png
index 2a1c8ab1d4333f6ba69158c5e0c2a481bc54146c..fedf22e7024d4e99bba7187a3079cee9ae328e81 100644
Binary files a/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-8.png and b/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-8.png differ
diff --git a/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-9.png b/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-9.png
index c302bb76a5a84d7b6e64dd20063ccf58767f37cf..f63f64196653c46ed2dd51c81e0620e355fb1b7a 100644
Binary files a/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-9.png and b/impetusModel/impetusModel_files/figure-html/testYearlyLitresPerDay-9.png differ
diff --git a/impetusModel/plots_v1/Fig2_CompareModelv1_3withEST2013.pdf b/impetusModel/plots_v1/Fig2_CompareModelv1_3withEST2013.pdf
index 2682ebbbc755dcfcb27f3e3bbc6fa2c252de2e91..2d931aadb9c52379e7ca62a9622228f447c1c8e7 100644
Binary files a/impetusModel/plots_v1/Fig2_CompareModelv1_3withEST2013.pdf and b/impetusModel/plots_v1/Fig2_CompareModelv1_3withEST2013.pdf differ
diff --git a/impetusModel/plots_v1/Fig3_Final_model_v1_3_2012_by_month.pdf b/impetusModel/plots_v1/Fig3_Final_model_v1_3_2012_by_month.pdf
index bf9dfd1fda52017a082ee09c56125805676e24ed..14bbc958c5c410d11223af07e09a8e9423987238 100644
Binary files a/impetusModel/plots_v1/Fig3_Final_model_v1_3_2012_by_month.pdf and b/impetusModel/plots_v1/Fig3_Final_model_v1_3_2012_by_month.pdf differ
diff --git a/impetusModel/plots_v1/Fig4_5_DroughtPlotKey.pdf b/impetusModel/plots_v1/Fig4_5_DroughtPlotKey.pdf
index ea2d5a38be36f3744439994c7793846ac0ddb99d..32fb35843a8c52c2e39b6af685d7a3f619005248 100644
Binary files a/impetusModel/plots_v1/Fig4_5_DroughtPlotKey.pdf and b/impetusModel/plots_v1/Fig4_5_DroughtPlotKey.pdf differ
diff --git a/impetusModel/plots_v1/Fig4_Compare_sum_model_v1_3.pdf b/impetusModel/plots_v1/Fig4_Compare_sum_model_v1_3.pdf
index 3fff0435b29f0c4f2a22f43d98a1bdf0537f99fd..514749202e66b58f8d02fbe40ae5064c4266c945 100644
Binary files a/impetusModel/plots_v1/Fig4_Compare_sum_model_v1_3.pdf and b/impetusModel/plots_v1/Fig4_Compare_sum_model_v1_3.pdf differ
diff --git a/impetusModel/plots_v1/Fig5_Chart_savings_v1_3_by_month.pdf b/impetusModel/plots_v1/Fig5_Chart_savings_v1_3_by_month.pdf
index ef38c048f1a6e12ab837dbbe2c597f81f19a5222..630d872675b0c2499ef9cc1c5a60a0ede8cc7db0 100644
Binary files a/impetusModel/plots_v1/Fig5_Chart_savings_v1_3_by_month.pdf and b/impetusModel/plots_v1/Fig5_Chart_savings_v1_3_by_month.pdf differ
diff --git a/impetusModel/plots_v1/baselineMadjWeMonthlyByYearMetering.pdf b/impetusModel/plots_v1/baselineMadjWeMonthlyByYearMetering.pdf
index 9e66c1294ddf46a1a9e051e6bb848a202d910191..6d42b375f9e6c580b005595f91b78dea47b01549 100644
Binary files a/impetusModel/plots_v1/baselineMadjWeMonthlyByYearMetering.pdf and b/impetusModel/plots_v1/baselineMadjWeMonthlyByYearMetering.pdf differ
diff --git a/impetusModel/plots_v1/compareBaselineWEDroughtWE_v1.3.pdf b/impetusModel/plots_v1/compareBaselineWEDroughtWE_v1.3.pdf
index 745f83c5f80416db495dfd9a50cf79333235dd39..3ca4a21b680271da6123ccce81ecdb1fff4df00b 100644
Binary files a/impetusModel/plots_v1/compareBaselineWEDroughtWE_v1.3.pdf and b/impetusModel/plots_v1/compareBaselineWEDroughtWE_v1.3.pdf differ
diff --git a/impetusModel/plots_v2/Final_model_v2_0_2012_by_month.pdf b/impetusModel/plots_v2/Final_model_v2_0_2012_by_month.pdf
index 0676855d86c4f50a35b230bef953a51ed7e57e53..fd6868fa5e000b7602e6e966c29deb4b8413d889 100644
Binary files a/impetusModel/plots_v2/Final_model_v2_0_2012_by_month.pdf and b/impetusModel/plots_v2/Final_model_v2_0_2012_by_month.pdf differ
diff --git a/impetusModel/plots_v2/baselineMadjWeMonthlyByYearMetering.pdf b/impetusModel/plots_v2/baselineMadjWeMonthlyByYearMetering.pdf
index 092e834c7cfb2aabacf4f0ccf4400d47ea6e0d6e..af6f2ed93c87ee8469147973e9a17f0d9c0bf938 100644
Binary files a/impetusModel/plots_v2/baselineMadjWeMonthlyByYearMetering.pdf and b/impetusModel/plots_v2/baselineMadjWeMonthlyByYearMetering.pdf differ
diff --git a/impetusModel/plots_v2/baselineMadjWeMonthlyComponentByMetering.pdf b/impetusModel/plots_v2/baselineMadjWeMonthlyComponentByMetering.pdf
index 500c4d3d21a1ced89497254fddb421e3486ca130..3495ca11acebca4075f680fb17b3f4482264ef0d 100644
Binary files a/impetusModel/plots_v2/baselineMadjWeMonthlyComponentByMetering.pdf and b/impetusModel/plots_v2/baselineMadjWeMonthlyComponentByMetering.pdf differ
diff --git a/impetusModel/plots_v2/baselineMadjWeMonthlyTotalByMetering.pdf b/impetusModel/plots_v2/baselineMadjWeMonthlyTotalByMetering.pdf
index 005dca14a4387a37ee8bc447467bd18bc9eb7dae..ea9ab2943fadecc5992200deccc2ee734d672e4a 100644
Binary files a/impetusModel/plots_v2/baselineMadjWeMonthlyTotalByMetering.pdf and b/impetusModel/plots_v2/baselineMadjWeMonthlyTotalByMetering.pdf differ
diff --git a/impetusModel/plots_v2/baselineWeDroughtModelPcSavings.pdf b/impetusModel/plots_v2/baselineWeDroughtModelPcSavings.pdf
index 6d3f11bb19aa4f4a300a399b8dadd3dc88045d3c..9a88bbe08c829783da0f7dfb6d12319d1ab8f6cb 100644
Binary files a/impetusModel/plots_v2/baselineWeDroughtModelPcSavings.pdf and b/impetusModel/plots_v2/baselineWeDroughtModelPcSavings.pdf differ
diff --git a/impetusModel/plots_v2/compareBaselineWEDroughtWE_v2_0.pdf b/impetusModel/plots_v2/compareBaselineWEDroughtWE_v2_0.pdf
index d18e2c35637f2a2a3372bdfa7b3b4e936d413383..41f0a8f4d7f17ebaa8bd36f17191242b5c4211b7 100644
Binary files a/impetusModel/plots_v2/compareBaselineWEDroughtWE_v2_0.pdf and b/impetusModel/plots_v2/compareBaselineWEDroughtWE_v2_0.pdf differ
diff --git a/impetusModel/plots_v2/compareWithESTlitres.pdf b/impetusModel/plots_v2/compareWithESTlitres.pdf
index aad06bb9071fbbd5155e1bf5ef6b4d0294977698..c32dd66e62ad0623728b8c802eb8cc164c3d32b1 100644
Binary files a/impetusModel/plots_v2/compareWithESTlitres.pdf and b/impetusModel/plots_v2/compareWithESTlitres.pdf differ
diff --git a/impetusModel/plots_v2/compareWithESTpercent.pdf b/impetusModel/plots_v2/compareWithESTpercent.pdf
index bf68f82eb09e613ca369425ea2ab3ea7f879101d..e26fa5dc792907867f5d5cae50a869fa19249400 100644
Binary files a/impetusModel/plots_v2/compareWithESTpercent.pdf and b/impetusModel/plots_v2/compareWithESTpercent.pdf differ