diff --git a/code/plot_chirp_size.py b/code/plot_chirp_size.py index e23c0f8..bfaf170 100644 --- a/code/plot_chirp_size.py +++ b/code/plot_chirp_size.py @@ -252,9 +252,9 @@ def main(datapath: str): size_loser_pearsonr = pearsonr(size_diffs_loser, size_chirps_loser) fig, (ax1, ax2, ax3) = plt.subplots(1, 3, figsize=( - 21*ps.cm, 8*ps.cm), width_ratios=[1, 0.8, 0.8], sharey=True) + 21*ps.cm, 7*ps.cm), width_ratios=[1, 0.8, 0.8], sharey=True) plt.subplots_adjust(left=0.11, right=0.948, top=0.86, - wspace=0.343, bottom=0.18) + wspace=0.343, bottom=0.198) scatterwinner = 1.15 scatterloser = 1.85 chirps_winner = np.asarray(chirps_winner)[~np.isnan(chirps_winner)] @@ -262,8 +262,8 @@ def main(datapath: str): stat = wilcoxon(chirps_winner, chirps_loser) print(stat) - winner_color = ps.lavender - loser_color = ps.purple + winner_color = ps.gblue3 + loser_color = ps.gblue1 bplot1 = ax1.boxplot(chirps_winner, positions=[ 0.9], showfliers=False, patch_artist=True) @@ -308,7 +308,8 @@ def main(datapath: str): ax3.set_xlabel('EODf [Hz]') handles, labels = ax2.get_legend_handles_labels() - fig.legend(handles, labels, loc='upper center', ncol=2) + fig.legend(handles, labels, loc='upper center', + ncol=2, bbox_to_anchor=(0.5, 1.04)) # pearson r plt.savefig('../poster/figs/chirps_winner_loser.pdf') plt.show() diff --git a/code/plot_event_timeline.py b/code/plot_event_timeline.py index 952ed2e..987de6f 100644 --- a/code/plot_event_timeline.py +++ b/code/plot_event_timeline.py @@ -47,17 +47,17 @@ def main(datapath: str): # Associate chirps to inidividual fish fish1 = (bh.chirps[bh.chirps_ids == fish1_id] / 60) / 60 fish2 = (bh.chirps[bh.chirps_ids == fish2_id] / 60) / 60 - fish1_color = ps.purple - fish2_color = ps.lavender + fish1_color = ps.gblue1 + fish2_color = ps.gblue3 fig, ax = plt.subplots(5, 1, figsize=( 21*ps.cm, 10*ps.cm), height_ratios=[0.5, 0.5, 0.5, 0.2, 6], sharex=True) # marker size s = 80 ax[0].scatter(physical_contact, np.ones( - len(physical_contact)), color=ps.maroon, marker='|', s=s) + len(physical_contact)), color=ps.red, marker='|', s=s) ax[1].scatter(chasing_onset, np.ones(len(chasing_onset)), - color=ps.orange, marker='|', s=s) + color=ps.purple, marker='|', s=s) ax[2].scatter(fish1, np.ones(len(fish1))-0.25, color=fish1_color, marker='|', s=s) ax[2].scatter(fish2, np.zeros(len(fish2))+0.25, diff --git a/poster/figs/chirps_winner_loser.pdf b/poster/figs/chirps_winner_loser.pdf index 8495a1f..4c40103 100644 Binary files a/poster/figs/chirps_winner_loser.pdf and b/poster/figs/chirps_winner_loser.pdf differ diff --git a/poster/figs/timeline.pdf b/poster/figs/timeline.pdf index d496403..56af4e3 100644 Binary files a/poster/figs/timeline.pdf and b/poster/figs/timeline.pdf differ diff --git a/poster/main.pdf b/poster/main.pdf index 4633011..6101aa8 100644 Binary files a/poster/main.pdf and b/poster/main.pdf differ diff --git a/poster/main.tex b/poster/main.tex index f4a4920..3fbd223 100644 --- a/poster/main.tex +++ b/poster/main.tex @@ -49,34 +49,35 @@ blockverticalspace=2mm, colspace=20mm, subcolspace=0mm]{tikzposter} %Default val \noindent \begin{itemize} \setlength\itemsep{0.5em} - \item Two fish compete for one hidding place in one tank, + \item Two fish compete for one hidding place in one tank. \item Experiment had a 3 hour long darkphase and a 3 hour long light phase. \end{itemize} \noindent - \begin{tikzfigure}[] \label{fig:example_b} \includegraphics[width=\linewidth]{figs/chirps_winner_loser.pdf} \end{tikzfigure} - - + \noindent \begin{itemize} - \setlength\itemsep{0.5em} \item Fish who lost the competition chirped more often than the fish who lost. \item Size has an effect on the Competition outcome, and the chirp count. + \item Frequency of the fish has no effect on the competition outcome. \end{itemize} - } -\myblock[TranspBlock]{Interactions at modulations}{ +\myblock[TranspBlock]{Are Chirps coding for onset or offset of physical interaction?}{ \vspace{-1.2cm} - \begin{tikzfigure}[] - \label{fig:example_c} - \includegraphics[width=0.5\linewidth]{example-image-c} - \end{tikzfigure} - - + \begin{minipage}{0.6666\linewidth} + \begin{tikzfigure}[] + \includegraphics[width=0.3\linewidth]{figs/chirps_in_chasing.pdf} + \end{tikzfigure} + \end{minipage} + \begin{minipage}{0.3333\linewidth} + \begin{tikzfigure}[] + \includegraphics[width=\linewidth]{figs/chirps_in_chasing.pdf} + \end{tikzfigure} + \end{minipage} } \myblock[GrayBlock]{Conclusion}{