Make FER dashed, BER solid; Change colors

letter.tex

@@ -32,8 +32,8 @@
 \ifoverleaf
 	\input{common.tex}
 \else
-	\usetikzlibrary{external}
+%	\usetikzlibrary{external}
-	\tikzexternalize[prefix=build/]
+%	\tikzexternalize[prefix=build/]
 	\input{lib/latex-common/common.tex}
 \fi
 
@@ -41,11 +41,22 @@
 \pgfplotsset{colorscheme/cel}
 
 % TODO
-\pgfplotsset{fancy marks/.style={}}
-
 \newcommand{\figwidth}{\columnwidth}
 \newcommand{\figheight}{0.75\columnwidth}
 
+\pgfplotsset{
+	FERPlot/.style={
+		line width=1pt,
+		densely dashed,
+	},
+	BERPlot/.style={
+		line width=1pt,
+	},
+	DFRPlot/.style={
+		only marks,
+	},
+}
+
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -343,24 +354,6 @@ decoded bits.%
 \begin{figure}[ht]
     \centering
 
-	\pgfplotsset{
-	FERPlot/.style={
-		line width=1pt,
-		densely dashed,
-		mark=triangle,
-		fancy marks
-	},
-	BERPlot/.style={
-		line width=1pt,
-		mark=*,
-		fancy marks,
-	},
-	DFRPlot/.style={
-		only marks,
-		mark=square*,
-		fancy marks,
-	}}
-
     \begin{tikzpicture}
         \begin{axis}[
             grid=both,
@@ -373,24 +366,24 @@ decoded bits.%
             height=\figheight,
             legend pos = south west,
         ]
-            \addplot+[FERPlot, scol0]
+            \addplot+[FERPlot, mark=o, mark options={solid}, scol1]
                 table [x=SNR, y=FER, col sep=comma,
                        discard if not={gamma}{0.05},
                        discard if gt={SNR}{9}]
                     {res/proximal_ber_fer_dfr_20433484.csv};
             \addlegendentry{FER}
-            \addplot+[DFRPlot, scol2]
+            \addplot+[BERPlot, mark=*, scol1]
-                table [x=SNR, y=DFR, col sep=comma,
-                       discard if not={gamma}{0.05},
-                       discard if gt={SNR}{9}]
-                    {res/proximal_ber_fer_dfr_20433484.csv};
-            \addlegendentry{DFR}
-            \addplot+[BERPlot, scol1]
                 table [x=SNR, y=BER, col sep=comma,
                        discard if not={gamma}{0.05},
                        discard if gt={SNR}{7.5}]
                     {res/proximal_ber_fer_dfr_20433484.csv};
             \addlegendentry{BER}
+            \addplot+[DFRPlot, mark=square*, scol0]
+                table [x=SNR, y=DFR, col sep=comma,
+                       discard if not={gamma}{0.05},
+                       discard if gt={SNR}{9}]
+                    {res/proximal_ber_fer_dfr_20433484.csv};
+            \addlegendentry{DFR}
         \end{axis}
     \end{tikzpicture}
 
@@ -602,7 +595,7 @@ the probability that a given component was decoded incorrectly.%
 			width=\figwidth,
 			height=\figheight,
         ]
-            \addplot+ [scol1, mark=none, line width=1]
+            \addplot+ [scol0, mark=none, line width=1]
                 table [col sep=comma, y=p_error]{res/p_error.csv};
         \end{axis}
     \end{tikzpicture}
@@ -680,20 +673,6 @@ Again, these parameters were chosen,%
     \centering
 
     \begin{tikzpicture}
-		\pgfplotsset{
-			ProxPlot/.style={
-				line width=1pt,
-				mark=*,
-				fancy marks,
-			},
-			ImprPlot/.style={
-				line width=1pt,
-				mark=triangle,
-				densely dashed,
-				fancy marks,
-			},
-		}
-
         \begin{axis}[
             grid=both,
             xlabel={$E_\text{b} / N_0$ (dB)},
@@ -708,28 +687,28 @@ Again, these parameters were chosen,%
                 at={(0.5,-0.44)},anchor=south}
         ]
 
-            \addplot+[ProxPlot, scol1]
+            \addplot+[FERPlot, mark=o, mark options={solid}, scol1]
                 table [x=SNR, y=FER, col sep=comma,
                        discard if not={gamma}{0.05},
                        discard if gt={SNR}{9}]
                     {res/proximal_ber_fer_dfr_20433484.csv};
             \addlegendentry{FER, prox. dec.};
 
-            \addplot+[ProxPlot, scol2]
+            \addplot+[BERPlot, mark=*, scol1]
                 table [x=SNR, y=BER, col sep=comma,
                        discard if not={gamma}{0.05},
                        discard if gt={SNR}{7.5}]
                     {res/proximal_ber_fer_dfr_20433484.csv};
             \addlegendentry{BER, prox. dec.};
 
-            \addplot+[ImprPlot, scol1]
+            \addplot+[FERPlot, mark=triangle, mark options={solid}, scol2]
                 table [x=SNR, y=FER, col sep=comma,
                        discard if not={gamma}{0.05},
                        discard if gt={SNR}{7.5}]
                     {res/improved_ber_fer_dfr_20433484.csv};
             \addlegendentry{FER, improved};
 
-            \addplot+[ImprPlot, scol2]
+            \addplot+[BERPlot, mark=triangle*, scol2]
                 table [x=SNR, y=BER, col sep=comma,
                        discard if not={gamma}{0.05},
                        discard if gt={SNR}{6.5}]