Merge branch 'update-make' into 'master'

Update make

See merge request horlingsw/master-assignment-report!10

.gitlab-ci.yml

@@ -29,6 +29,7 @@ final_report:
       - include/references.bib
       - report.tex
       - content/*.tex
+      - graphics/*.tex
 
 rro:
   stage: rro

Makefile

@@ -28,7 +28,7 @@ $(TARGET): $(SOURCE) $(GRPH_TARGET) $(CONTENT_SOURCE)
 	$(LATEXMK) $(LATEXMK_OPTS) $(LATEXMK_TARGET) $<
 
 $(GRPH_DIR)/%.pdf: $(GRPH_DIR)/%.tex
-	$(LATEXMK) -lualatex -outdir=$(GRPH_DIR) $(LATEXMK_OPTS) $<
+	$(LATEXMK) $(LATEXMK_TARGET) -outdir=$(GRPH_DIR) $(LATEXMK_OPTS) $<
 
 .PHONY: clean Clean
 clean: 

graphics/approach.tex

@@ -1,19 +1,27 @@
 %&tex
 \documentclass{standalone}
 \usepackage{tikz}
-\usetikzlibrary {quotes,arrows.meta,graphs,graphdrawing} \usegdlibrary {layered}
+\usepackage{siltex}
+\usetikzlibrary {arrows.meta,positioning} 
 \tikzset{nodes={text height=.7em, text width=2.7cm, align=center,
 draw=black!20, thick, fill=white, font=\footnotesize},
 >={Stealth[round,sep]}, rounded corners, semithick}
 
 \begin{document}
 
-\begin{tikzpicture}
-
-\graph [layered layout, level distance=1.2cm, sibling sep=.5em, sibling distance=1.5cm, sweep crossing minimization] {
-{"Design Method", "System Engineering"} -> "Design Plan";
-{"Evaluation Plan", "Design Plan", "Subject of design"} -> "Case Study";
-};
+\begin{tikzpicture}[on grid,y=1.2cm,x=1.6cm]
+    \node (dm) {Design Method};
+    \node (a1)[right = 1 of dm, draw=none, fill=none] {};
+    \node (se)[right = 2 of dm] {Systems Engineering};
+    \node (dp)[below = 1 of a1] {Design Plan};
+    \node (ep)[left  = 2 of dp] {Evaluation Plan};
+    \node (sd)[right = 2 of dp] {Subject of Design};
+    \node (cs)[below = 1 of dp] {Case Study};
+    \path[->] (dm) edge (dp)
+              (se) edge (dp)
+              (ep) edge (cs)
+              (dp) edge (cs)
+              (sd) edge (cs);
 \end{tikzpicture}
 \end{document}
 

graphics/design_flow.tex

@@ -1,6 +1,7 @@
 \documentclass{standalone}
 \usepackage{tikz}
-\usetikzlibrary {arrows.meta,graphs,graphdrawing,positioning} \usegdlibrary {layered, trees}
+\usepackage{siltex}
+\usetikzlibrary {arrows.meta,positioning}
 \tikzset{nodes={text height=.7em, text width=2.8cm, align=center,
 draw=black!50, thick, font=\footnotesize, fill=white},
 >={Stealth[round,sep]}, rounded corners, semithick}
@@ -9,7 +10,21 @@ draw=black!50, thick, font=\footnotesize, fill=white},
 \begin{tikzpicture}[on grid,y=1.2cm,x=3.2cm]
     \draw[fill=lightgray] (-1.7cm , 0.5cm) rectangle (5cm, -2.8cm);
     \draw[fill=lightgray] (-1.7cm,-3cm) rectangle (5cm, -7.2cm);
-    \input{design_flow.tikz}
+    \node (pd) {Problem Description};
+    \node (sp)[below=1 of pd]  {Specifications};
+    \node (id)[below=1 of sp]  {Initial Design};
+    \node (fs)[below=1 of id]  {Feature Definition};
+    \node (ss)[below=1 of fs]  {Feature Selection};
+    \node (a1)[below=0.8 of ss,draw=none, fill=none] {};
+    \node (rd)[below=0.8 of a1]  {Rapid Development};
+    \node (va)[right=1 of a1]  {Variable Approach};
+    \path[->] (pd) edge (sp)
+              (sp) edge (id)
+              (id) edge (fs)
+              (fs) edge (ss)
+              (ss) edge (rd)
+              (rd.east) edge[bend right] (va)
+              (va) edge[bend right] (ss.east);
     \draw (3.4cm,0cm) node[draw=none, fill=none,text width=2.9cm] (wf) {Systems Engineering:\\Waterfall};
     \node (ridm)[right=1 of fs, fill=none, draw=none] {Rapid Iterative Design Method};
 \end{tikzpicture}

graphics/design_flow.tikz

@@ -1,16 +0,0 @@
-%&tex
-    \node (pd) {Problem Description};
-    \node (sp)[below=1 of pd]  {System\\Requirements};
-    \node (id)[below=1 of sp]  {Initial Design};
-    \node (fs)[below=1 of id]  {Feature Definition};
-    \node (ss)[below=1 of fs]  {Feature Selection};
-    \node (a1)[below=0.8 of ss,draw=none, fill=none] {};
-    \node (rd)[below=0.8 of a1]  {Rapid Development};
-    \node (va)[right=1 of a1]  {Variable Approach};
-    \path[->] (pd) edge (sp)
-              (sp) edge (id)
-              (id) edge (fs)
-              (fs) edge (ss)
-              (ss) edge (rd)
-              (rd.east) edge[bend right] (va)
-              (va) edge[bend right] (ss.east);

graphics/design_flow_analysis.tex

@@ -1,17 +0,0 @@
-\documentclass{standalone}
-\usepackage{tikz}
-\usetikzlibrary {arrows.meta,graphs,graphdrawing,positioning} \usegdlibrary {layered, trees}
-\tikzset{nodes={text height=.7em, text width=2.8cm, align=center,
-draw=black!50, thick, font=\footnotesize, fill=white},
->={Stealth[round,sep]}, rounded corners, semithick}
-
-\begin{document}
-\begin{tikzpicture}[on grid,y=1.2cm,x=3.2cm]
-    \draw[fill=lightgray] (-1.7cm , 1.4cm) rectangle (1.7cm, -4.1cm);
-    \draw[fill=lightgray] (-1.7cm,-4.3cm) rectangle (5cm, -8.0cm);
-    \input{design_flow.tikz}
-    \node (prep)[above=0.7 of pd, draw=none, fill=none] {Preliminary Design};
-    \node (b)[right=0.5 of rd,fill=none, draw=none] {};
-    \node (ridm)[below=0.7 of b, fill=none, draw=none,text width=5cm] {Rapid Iterative Design Method};
-\end{tikzpicture}
-\end{document}

graphics/feature_dependency.tex

@@ -1,16 +1,21 @@
 \documentclass{standalone}
 \usepackage{tikz}
-\usetikzlibrary {arrows.meta,graphs,graphdrawing} \usegdlibrary {layered}
+\usepackage{siltex}
+\usetikzlibrary {arrows.meta,positioning}
 \tikzset{nodes={text height=.7em, text width=1.2cm, align=center,
 draw=black!50, thick, font=\footnotesize, fill=white},
 >={Stealth[round,sep]}, rounded corners, semithick}
 
 \begin{document}
-\begin{tikzpicture}
-    \graph [layered layout, level distance=1.2cm, sibling sep=.5em, sibling distance=1.5cm, sweep crossing minimization] {
-        "Feat. A" -> {"Feat. B", "Feat. C"};
-        "Feat. D" ->[edges=white!99] "Feat. C" -> "Feat. E";
-    };
+\begin{tikzpicture}[on grid, y = 1.5cm, x = 1.8cm]
+    \node (a) {Feature A};
+    \node (d) [right = 1 of a]{Feature D};
+    \node (b) [below = 1 of a]{Feature B};
+    \node (c) [below = 1 of d]{Feature C};
+    \node (e) [below = 1 of c]{Feature E};
+    \path[->] (a) edge (b)
+              (a) edge (c)
+              (c) edge (e);
 \end{tikzpicture}
 \end{document}
 

graphics/test_flow_graph.tex

@@ -1,6 +1,6 @@
 %&tex
 \documentclass{standalone}
-%\usepackage[]{siltex}
+\usepackage{siltex}
 \usepackage{tikz}
 \usetikzlibrary {arrows.meta,graphs,positioning,shapes.geometric}
 \tikzset{nodes={text height=.7em, text width=1.7cm, align=center,

graphics/waterfall.tex

@@ -1,16 +1,23 @@
 \documentclass{standalone}
 \usepackage{tikz}
-\usetikzlibrary {arrows.meta,graphs,graphdrawing} \usegdlibrary {layered}
+\usepackage{siltex}
+\usetikzlibrary {arrows.meta,positioning}
 \tikzset{nodes={text height=.7em, text width=2.8cm, align=center,
 draw=black!50, thick, font=\footnotesize, fill=white},
 >={Stealth[round,sep]}, rounded corners, semithick}
 
 \begin{document}
 
-\begin{tikzpicture}
-    \graph [layered layout, level distance=1.2cm, sibling sep=.5em, sibling distance=1.5cm, sweep crossing minimization] {
-        pd [as=Problem Description] -> "Specifications" -> "Initial Design" -> "Implementation" -> "Testing";
-    };
+\begin{tikzpicture}[on grid,y=1.2cm,x=3.2cm]
+    \node (pd) {Problem Description};
+    \node (sp)[below=1 of pd]  {Specifications};
+    \node (id)[below=1 of sp]  {Initial Design};
+    \node (im)[below=1 of id]  {Implementation};
+    \node (te)[below=1 of im]  {Testing};
+    \path[->] (pd) edge (sp)
+              (sp) edge (id)
+              (id) edge (im)
+              (im) edge (te);
 \end{tikzpicture}
 \end{document}