From aa843fc851be51c368926dfb854d082c42b444e9 Mon Sep 17 00:00:00 2001 From: "Robin P. Clark" Date: Fri, 15 Mar 2013 08:41:13 +0000 Subject: [PATCH] Sorted out the CH6 CH7 directories --- .../CH6_Software_Examples/Makefile | 21 ++++++++++++++++++ .../software.tex | 0 .../Makefile | 0 .../components_81_euler.dia | Bin .../copy.tex | 4 ++-- .../Makefile | 0 .../copy.tex | 2 +- .../master_uml_further_work.dia | Bin submission_thesis/Makefile | 5 +++-- submission_thesis/style.tex | 3 ++- submission_thesis/thesis.tex | 6 ++--- 11 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 submission_thesis/CH6_Software_Examples/Makefile rename submission_thesis/{CH5_Examples => CH6_Software_Examples}/software.tex (100%) rename submission_thesis/{CH6_Evaluation => CH7_Evaluation}/Makefile (100%) rename submission_thesis/{CH6_Evaluation => CH7_Evaluation}/components_81_euler.dia (100%) rename submission_thesis/{CH6_Evaluation => CH7_Evaluation}/copy.tex (99%) rename submission_thesis/{CH7_Conclusion => CH8_Conclusion}/Makefile (100%) rename submission_thesis/{CH7_Conclusion => CH8_Conclusion}/copy.tex (99%) rename submission_thesis/{CH7_Conclusion => CH8_Conclusion}/master_uml_further_work.dia (100%) diff --git a/submission_thesis/CH6_Software_Examples/Makefile b/submission_thesis/CH6_Software_Examples/Makefile new file mode 100644 index 0000000..0e310cf --- /dev/null +++ b/submission_thesis/CH6_Software_Examples/Makefile @@ -0,0 +1,21 @@ +# + +PNG_DIA = + + + +%.png:%.dia + dia -t png $< + echo " Chapter 5 DIA images generated" + + +# this is the target used +# to make all images, dia gnuplot etc +# +copy: $(PNG_DIA) + echo "Chapter 6 sub make called" + + + +clean: + rm ${PNG_DIA} diff --git a/submission_thesis/CH5_Examples/software.tex b/submission_thesis/CH6_Software_Examples/software.tex similarity index 100% rename from submission_thesis/CH5_Examples/software.tex rename to submission_thesis/CH6_Software_Examples/software.tex diff --git a/submission_thesis/CH6_Evaluation/Makefile b/submission_thesis/CH7_Evaluation/Makefile similarity index 100% rename from submission_thesis/CH6_Evaluation/Makefile rename to submission_thesis/CH7_Evaluation/Makefile diff --git a/submission_thesis/CH6_Evaluation/components_81_euler.dia b/submission_thesis/CH7_Evaluation/components_81_euler.dia similarity index 100% rename from submission_thesis/CH6_Evaluation/components_81_euler.dia rename to submission_thesis/CH7_Evaluation/components_81_euler.dia diff --git a/submission_thesis/CH6_Evaluation/copy.tex b/submission_thesis/CH7_Evaluation/copy.tex similarity index 99% rename from submission_thesis/CH6_Evaluation/copy.tex rename to submission_thesis/CH7_Evaluation/copy.tex index f0bde23..bce68cb 100644 --- a/submission_thesis/CH6_Evaluation/copy.tex +++ b/submission_thesis/CH7_Evaluation/copy.tex @@ -321,7 +321,7 @@ exhaustive checking (within {\fgs}) entirely feasible. \begin{figure}[h] \centering - \includegraphics[width=400pt]{./CH6_Evaluation/components_81_euler.png} + \includegraphics[width=400pt]{./CH7_Evaluation/components_81_euler.png} % components_81_euler.png: 3056x2532 pixel, 72dpi, 107.81x89.32 cm, bb=0 0 3056 2532 \caption{Euler diagram of a hypothetical FMMD Hierarchy with 81 base components with the number of components in each $FG$ fixed to three ($|FG|=3$)} \label{fig:three_tree} @@ -1342,4 +1342,4 @@ the component causing the side effect into the wrong {\fg}, or only one germane \section{Evaluation} -TO DO \ No newline at end of file +TO DO diff --git a/submission_thesis/CH7_Conclusion/Makefile b/submission_thesis/CH8_Conclusion/Makefile similarity index 100% rename from submission_thesis/CH7_Conclusion/Makefile rename to submission_thesis/CH8_Conclusion/Makefile diff --git a/submission_thesis/CH7_Conclusion/copy.tex b/submission_thesis/CH8_Conclusion/copy.tex similarity index 99% rename from submission_thesis/CH7_Conclusion/copy.tex rename to submission_thesis/CH8_Conclusion/copy.tex index 0776475..744a6d0 100644 --- a/submission_thesis/CH7_Conclusion/copy.tex +++ b/submission_thesis/CH8_Conclusion/copy.tex @@ -85,7 +85,7 @@ are added to UML diagram in figure \ref{fig:cfg} are represented in figure \ref \begin{figure}[h] \centering - \includegraphics[width=400pt,keepaspectratio=true]{./CH7_Conclusion/master_uml_further_work.png} + \includegraphics[width=400pt,keepaspectratio=true]{./CH8_Conclusion/master_uml_further_work.png} % cfg2.png: 702x464 pixel, 72dpi, 24.76x16.37 cm, bb=0 0 702 464 \caption{FMMD UML diagram, incorporating Environmental, Operational State and Inhibit gates} \label{fig:cfg2} diff --git a/submission_thesis/CH7_Conclusion/master_uml_further_work.dia b/submission_thesis/CH8_Conclusion/master_uml_further_work.dia similarity index 100% rename from submission_thesis/CH7_Conclusion/master_uml_further_work.dia rename to submission_thesis/CH8_Conclusion/master_uml_further_work.dia diff --git a/submission_thesis/Makefile b/submission_thesis/Makefile index 877dd5e..d04b366 100644 --- a/submission_thesis/Makefile +++ b/submission_thesis/Makefile @@ -23,7 +23,8 @@ copy: cd CH3_FMEA_criticism; make copy cd CH4_FMMD; make copy cd CH5_Examples; make copy - cd CH6_Evaluation; make copy - cd CH7_Conclusion; make copy + cd CH6_Software_Examples; make copy + cd CH7_Evaluation; make copy + cd CH8_Conclusion; make copy #cd CH8_finsh_appendixes; make copy diff --git a/submission_thesis/style.tex b/submission_thesis/style.tex index 520bf9c..4febcb2 100644 --- a/submission_thesis/style.tex +++ b/submission_thesis/style.tex @@ -36,7 +36,8 @@ \newcommand{\sd}{\ensuremath{\Sigma \Delta ADC}} %\newcommand{\sd}{\ensuremath{Sigma\;Delta\;ADC}} \newcommand{\derivec}{{D}} -\newcommand{\hh}{\ensuremath{{\stackrel{o}{H}}}} +%\newcommand{\hh}{\ensuremath{{\stackrel{o}{H}}}} +\newcommand{\hh}{\ensuremath{{\hbar}}} \newcommand{\abslev}{\ensuremath{\alpha}} \newcommand{\oc}{\ensuremath{^{o}{C}}} \newcommand{\adctw}{{${\mathcal{ADC}}_{12}$}} diff --git a/submission_thesis/thesis.tex b/submission_thesis/thesis.tex index 6c48ee6..bdb732f 100644 --- a/submission_thesis/thesis.tex +++ b/submission_thesis/thesis.tex @@ -87,13 +87,13 @@ \input{CH5_Examples/copy} \chapter{Applying FMMD to Software and Hybrid Systems} -\input{CH5_Examples/software} +\input{CH6_Software_Examples/software} \chapter {FMMD Metrics Critiques Exceptions and Evaluation} -\input{CH6_Evaluation/copy} +\input{CH7_Evaluation/copy} \chapter{Conclusion} -\input{CH7_Conclusion/copy} +\input{CH8_Conclusion/copy} \appendix \input{appendixes/detailed_analysis}