[+] Push

src/process/twitter_visualization.py

@@ -3,7 +3,9 @@ TODO: Module Docstring
 """
 from datetime import timedelta
 from dataclasses import dataclass, field
+from typing import Optional
 
+import matplotlib.ticker
 import numpy as np
 import scipy.signal
 from matplotlib import pyplot as plt, font_manager
@@ -327,16 +329,17 @@ def graph_histogram(x: list[float], path: str, title: str, clear_outliers: bool
 
 
 def graph_line_plot(x: list[datetime], y: Union[list[float], list[list[float]]], path: str,
-                    title: str, freq: bool, n: int = 0) -> None:
+                    title: str, freq: bool, n: int = 0, labels: Optional[list[str]] = None) -> None:
     """
     Plot a line plot, and reduce noise using an IIR filter
 
     :param x: X axis data
-    :param y: Y axis data
+    :param y: Y axis data (or Y axis data lines)
     :param n: IIR filter parameter (Ignored if n <= 0)
     :param path: Output image path (should end in .png)
     :param freq: Whether you are graphing frequencies data instead of popularity ratios
     :param title: Title
+    :param labels: Labels or none
     :return: None
     """
     # Filter
@@ -359,6 +362,10 @@ def graph_line_plot(x: list[datetime], y: Union[list[float], list[list[float]]],
     ax.xaxis.set_minor_locator(mdates.MonthLocator(interval=1))
     ax.xaxis.set_minor_formatter(mdates.DateFormatter('%m'))
 
+    if freq:
+        # Y axis percent format
+        ax.yaxis.set_major_formatter(matplotlib.ticker.PercentFormatter(1))
+
     # Plot
     ax.set_title(title, color=border_color)
 
@@ -377,15 +384,19 @@ def graph_line_plot(x: list[datetime], y: Union[list[float], list[list[float]]],
     # Plotting multiple data lines
     else:
         fig.set_size_inches(16, 9)
-        for y in y:
+        plt.tight_layout()
-            ax.plot(x, y)
+        for i in range(len(y)):
+            line, = ax.plot(x, y[i])
+            if len(labels) > i:
+                line.set_label(labels[i])
+                ax.legend()
         if not freq:
             ax.axhline(1, color=border_color)
             ax.set_ylim(0, 2)
 
     # Colors
     ax.tick_params(color=border_color, labelcolor=border_color)
-    ax.tick_params(which='minor', color='#9d5800')
+    ax.tick_params(which='minor', colors='#e1ad6b', labelcolor='#e1ad6b')
     for spine in ax.spines.values():
         spine.set_edgecolor(border_color)
 
@@ -483,9 +494,11 @@ def report_all() -> None:
     report_change_different_n(samples[0])
 
     graph_line_plot(samples[0].dates, [s.date_pops for s in samples], 'change/comb/pop.png',
-                    'COVID-posting popularity ratio over time for all samples - IIR(10)', False, 10)
+                    'COVID-posting popularity ratio over time for all samples - IIR(10)', False, 10,
+                    labels=[s.name for s in samples])
     graph_line_plot(samples[0].dates, [s.date_freqs for s in samples], 'change/comb/freq.png',
-                    'COVID-posting frequency over time for all samples - IIR(10)', True, 10)
+                    'COVID-posting frequency over time for all samples - IIR(10)', True, 10,
+                    labels=[s.name for s in samples])
 
 
 if __name__ == '__main__':

src/report/report_document.md

@@ -109,7 +109,7 @@ Then, we encountered the issue of noise. When we plot the graph without a filter
 
 ## Results - Posting Frequency
 
-We graphed the posting frequencies of our three samples in line graphs with the x-axis being the date, which gave us the following graphs:
+We graphed the posting frequencies of our three samples in line graphs with the x-axis being the date with labels representing the month, which gave us the following graphs:
 
 <div class="image-row">
     <div><img src="/change/freq/500-pop.png" alt="graph"></div>
@@ -117,7 +117,11 @@ We graphed the posting frequencies of our three samples in line graphs with the
     <div><img src="/change/freq/eng-news.png" alt="graph"></div>
 </div>
 
-For all three samples, the posting rates were almost zero during the first month when COVID-19 first started, which is expected because no one knew how devastating it will be at that time. Then, all three samples had a peak in posting frequencies from 
+For all three samples, the posting rates were almost zero during the first month when COVID-19 first started, which is expected because no one knew how devastating it will be at that time. Then, all three samples had a peak in posting frequencies from March 2020 to June 2020. After June 2020, 
+
+<div class="image-row">
+    <div><img src="/change/comb/freq.png" alt="graph" class="large"></div>
+</div>
 
 For `500-rand` and `eng-nes`, 
 

src/report/report_page.html

@@ -37,7 +37,7 @@ $('img').addClass('clickable').click(function() {
 
     modal = $('<div id="modal">').css({
         background: 'RGBA(0,0,0,.5) url(' + src + ') no-repeat center',
-        backgroundSize: 'auto',
+        backgroundSize: $(this).hasClass('large') ? 'contain' : 'auto',
         width: '100vw',
         height: '100vh',
         position: 'fixed',

src/report/resources/style.css

@@ -70,6 +70,10 @@ img.clickable {
     cursor: pointer;
 }
 
+img.large {
+    background-size: contain !important;
+}
+
 #modal {
     transition: all 0.25s ease;
 }