Skip to content

Commit

Permalink
fix merge conflicts with main
Browse files Browse the repository at this point in the history
  • Loading branch information
@RHammond2
RHammond2 committed Dec 9, 2021
2 parents 7827e70 + 5848d98 commit b24b3c6
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 34 deletions.
2 changes: 2 additions & 0 deletions LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Copyright (c) 2020 Alliance for Sustainable Energy, LLC

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down
40 changes: 23 additions & 17 deletions docs/jupyter_execute/examples/metrics_demonstration.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@
" <td>0.78</td>\n",
" <td>0.85</td>\n",
" <td>0.96</td>\n",
" <td>0.97</td>\n",
" <td>0.98</td>\n",
" <td>0.97</td>\n",
" <td>0.92</td>\n",
Expand Down Expand Up @@ -651,7 +652,7 @@
" <th>9</th>\n",
" <td>2003</td>\n",
" <td>10</td>\n",
" <td>0.95</td>\n",
" <td>0.96</td>\n",
" </tr>\n",
" <tr>\n",
" <th>10</th>\n",
Expand Down Expand Up @@ -955,7 +956,6 @@
" <td>0.38</td>\n",
" <td>0.41</td>\n",
" <td>0.46</td>\n",
" <td>0.47</td>\n",
" <td>0.46</td>\n",
" <td>0.44</td>\n",
" <td>0.46</td>\n",
Expand All @@ -964,10 +964,16 @@
" <td>0.41</td>\n",
" <td>0.32</td>\n",
" <td>0.47</td>\n",
" <td>0.46</td>\n",
" <td>0.47</td>\n",
" <td>0.47</td>\n",
" <td>0.47</td>\n",
" <td>0.40</td>\n",
" <td>0.47</td>\n",
" <td>0.42</td>\n",
" <td>0.46</td>\n",
" <td>0.35</td>\n",
" <td>0.46</td>\n",
" <td>0.47</td>\n",
" <td>0.46</td>\n",
" <td>0.42</td>\n",
" <td>0.39</td>\n",
Expand Down Expand Up @@ -1109,7 +1115,7 @@
" </tr>\n",
" <tr>\n",
" <th>2006</th>\n",
" <td>0.44</td>\n",
" <td>0.46</td>\n",
" </tr>\n",
" <tr>\n",
" <th>2007</th>\n",
Expand Down Expand Up @@ -1316,15 +1322,15 @@
" <tr>\n",
" <th rowspan=\"12\" valign=\"top\">2003</th>\n",
" <th>1</th>\n",
" <td>0.62</td>\n",
" <td>0.63</td>\n",
" </tr>\n",
" <tr>\n",
" <th>2</th>\n",
" <td>0.36</td>\n",
" <td>0.37</td>\n",
" </tr>\n",
" <tr>\n",
" <th>3</th>\n",
" <td>0.37</td>\n",
" <td>0.38</td>\n",
" </tr>\n",
" <tr>\n",
" <th>4</th>\n",
Expand Down Expand Up @@ -1360,7 +1366,7 @@
" </tr>\n",
" <tr>\n",
" <th>12</th>\n",
" <td>0.52</td>\n",
" <td>0.54</td>\n",
" </tr>\n",
" <tr>\n",
" <th rowspan=\"12\" valign=\"top\">2004</th>\n",
Expand All @@ -1369,7 +1375,7 @@
" </tr>\n",
" <tr>\n",
" <th>2</th>\n",
" <td>0.47</td>\n",
" <td>0.49</td>\n",
" </tr>\n",
" <tr>\n",
" <th>3</th>\n",
Expand Down Expand Up @@ -1536,7 +1542,7 @@
" <tr>\n",
" <th>0</th>\n",
" <td>2003</td>\n",
" <td>0.98</td>\n",
" <td>0.99</td>\n",
" </tr>\n",
" <tr>\n",
" <th>1</th>\n",
Expand Down Expand Up @@ -1650,7 +1656,7 @@
" <tr>\n",
" <th>1</th>\n",
" <td>2</td>\n",
" <td>1.04</td>\n",
" <td>0.99</td>\n",
" </tr>\n",
" <tr>\n",
" <th>2</th>\n",
Expand All @@ -1675,7 +1681,7 @@
" <tr>\n",
" <th>6</th>\n",
" <td>7</td>\n",
" <td>1.02</td>\n",
" <td>1.00</td>\n",
" </tr>\n",
" <tr>\n",
" <th>7</th>\n",
Expand Down Expand Up @@ -1822,7 +1828,7 @@
" <th>9</th>\n",
" <td>2003</td>\n",
" <td>10</td>\n",
" <td>0.92</td>\n",
" <td>0.93</td>\n",
" </tr>\n",
" <tr>\n",
" <th>10</th>\n",
Expand Down Expand Up @@ -1906,7 +1912,7 @@
" <th>23</th>\n",
" <td>2004</td>\n",
" <td>12</td>\n",
" <td>1.03</td>\n",
" <td>1.10</td>\n",
" </tr>\n",
" </tbody>\n",
"</table>\n",
Expand Down Expand Up @@ -2248,7 +2254,7 @@
" <td>525,000.00</td>\n",
" <td>525,000.00</td>\n",
" <td>525,000.00</td>\n",
" <td>2,660,000.00</td>\n",
" <td>2,670,291.67</td>\n",
" <td>0.00</td>\n",
" </tr>\n",
" <tr>\n",
Expand Down Expand Up @@ -2455,7 +2461,7 @@
" <td>54,250.00</td>\n",
" <td>54,250.00</td>\n",
" <td>0.00</td>\n",
" <td>2,750,000.00</td>\n",
" <td>3,543,750.00</td>\n",
" </tr>\n",
" <tr>\n",
" <th>7</th>\n",
Expand Down Expand Up @@ -2665,7 +2671,7 @@
"3 52,500.00 0.00 0.00 \n",
"4 54,250.00 0.00 3,570,312.50 \n",
"5 52,500.00 266,000.00 0.00 \n",
"6 54,250.00 0.00 2,750,000.00 \n",
"6 54,250.00 0.00 3,543,750.00 \n",
"7 54,250.00 0.00 0.00 \n",
"8 52,500.00 0.00 2,820,312.50 \n",
"9 54,250.00 0.00 0.00 \n",
Expand Down
40 changes: 23 additions & 17 deletions examples/metrics_demonstration.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@
" <td>0.78</td>\n",
" <td>0.85</td>\n",
" <td>0.96</td>\n",
" <td>0.97</td>\n",
" <td>0.98</td>\n",
" <td>0.97</td>\n",
" <td>0.92</td>\n",
Expand Down Expand Up @@ -651,7 +652,7 @@
" <th>9</th>\n",
" <td>2003</td>\n",
" <td>10</td>\n",
" <td>0.95</td>\n",
" <td>0.96</td>\n",
" </tr>\n",
" <tr>\n",
" <th>10</th>\n",
Expand Down Expand Up @@ -955,7 +956,6 @@
" <td>0.38</td>\n",
" <td>0.41</td>\n",
" <td>0.46</td>\n",
" <td>0.47</td>\n",
" <td>0.46</td>\n",
" <td>0.44</td>\n",
" <td>0.46</td>\n",
Expand All @@ -964,10 +964,16 @@
" <td>0.41</td>\n",
" <td>0.32</td>\n",
" <td>0.47</td>\n",
" <td>0.46</td>\n",
" <td>0.47</td>\n",
" <td>0.47</td>\n",
" <td>0.47</td>\n",
" <td>0.40</td>\n",
" <td>0.47</td>\n",
" <td>0.42</td>\n",
" <td>0.46</td>\n",
" <td>0.35</td>\n",
" <td>0.46</td>\n",
" <td>0.47</td>\n",
" <td>0.46</td>\n",
" <td>0.42</td>\n",
" <td>0.39</td>\n",
Expand Down Expand Up @@ -1109,7 +1115,7 @@
" </tr>\n",
" <tr>\n",
" <th>2006</th>\n",
" <td>0.44</td>\n",
" <td>0.46</td>\n",
" </tr>\n",
" <tr>\n",
" <th>2007</th>\n",
Expand Down Expand Up @@ -1316,15 +1322,15 @@
" <tr>\n",
" <th rowspan=\"12\" valign=\"top\">2003</th>\n",
" <th>1</th>\n",
" <td>0.62</td>\n",
" <td>0.63</td>\n",
" </tr>\n",
" <tr>\n",
" <th>2</th>\n",
" <td>0.36</td>\n",
" <td>0.37</td>\n",
" </tr>\n",
" <tr>\n",
" <th>3</th>\n",
" <td>0.37</td>\n",
" <td>0.38</td>\n",
" </tr>\n",
" <tr>\n",
" <th>4</th>\n",
Expand Down Expand Up @@ -1360,7 +1366,7 @@
" </tr>\n",
" <tr>\n",
" <th>12</th>\n",
" <td>0.52</td>\n",
" <td>0.54</td>\n",
" </tr>\n",
" <tr>\n",
" <th rowspan=\"12\" valign=\"top\">2004</th>\n",
Expand All @@ -1369,7 +1375,7 @@
" </tr>\n",
" <tr>\n",
" <th>2</th>\n",
" <td>0.47</td>\n",
" <td>0.49</td>\n",
" </tr>\n",
" <tr>\n",
" <th>3</th>\n",
Expand Down Expand Up @@ -1536,7 +1542,7 @@
" <tr>\n",
" <th>0</th>\n",
" <td>2003</td>\n",
" <td>0.98</td>\n",
" <td>0.99</td>\n",
" </tr>\n",
" <tr>\n",
" <th>1</th>\n",
Expand Down Expand Up @@ -1650,7 +1656,7 @@
" <tr>\n",
" <th>1</th>\n",
" <td>2</td>\n",
" <td>1.04</td>\n",
" <td>0.99</td>\n",
" </tr>\n",
" <tr>\n",
" <th>2</th>\n",
Expand All @@ -1675,7 +1681,7 @@
" <tr>\n",
" <th>6</th>\n",
" <td>7</td>\n",
" <td>1.02</td>\n",
" <td>1.00</td>\n",
" </tr>\n",
" <tr>\n",
" <th>7</th>\n",
Expand Down Expand Up @@ -1822,7 +1828,7 @@
" <th>9</th>\n",
" <td>2003</td>\n",
" <td>10</td>\n",
" <td>0.92</td>\n",
" <td>0.93</td>\n",
" </tr>\n",
" <tr>\n",
" <th>10</th>\n",
Expand Down Expand Up @@ -1906,7 +1912,7 @@
" <th>23</th>\n",
" <td>2004</td>\n",
" <td>12</td>\n",
" <td>1.03</td>\n",
" <td>1.10</td>\n",
" </tr>\n",
" </tbody>\n",
"</table>\n",
Expand Down Expand Up @@ -2248,7 +2254,7 @@
" <td>525,000.00</td>\n",
" <td>525,000.00</td>\n",
" <td>525,000.00</td>\n",
" <td>2,660,000.00</td>\n",
" <td>2,670,291.67</td>\n",
" <td>0.00</td>\n",
" </tr>\n",
" <tr>\n",
Expand Down Expand Up @@ -2455,7 +2461,7 @@
" <td>54,250.00</td>\n",
" <td>54,250.00</td>\n",
" <td>0.00</td>\n",
" <td>2,750,000.00</td>\n",
" <td>3,543,750.00</td>\n",
" </tr>\n",
" <tr>\n",
" <th>7</th>\n",
Expand Down Expand Up @@ -2665,7 +2671,7 @@
"3 52,500.00 0.00 0.00 \n",
"4 54,250.00 0.00 3,570,312.50 \n",
"5 52,500.00 266,000.00 0.00 \n",
"6 54,250.00 0.00 2,750,000.00 \n",
"6 54,250.00 0.00 3,543,750.00 \n",
"7 54,250.00 0.00 0.00 \n",
"8 52,500.00 0.00 2,820,312.50 \n",
"9 54,250.00 0.00 0.00 \n",
Expand Down

0 comments on commit b24b3c6

Please sign in to comment.