From d0cfa0651b85d86e6c5e5a9e62e0e3d718ceac50 Mon Sep 17 00:00:00 2001 From: Robin Clark Date: Sun, 23 Sep 2012 18:41:07 +0100 Subject: [PATCH] Need to check the Bubba OSC. Chris said the 90_degree symptom of the PHS45 was actually 0_degrees. So that ripples through. And then do the SUMJ, mix it with the opamp --- submission_thesis/CH4_FMMD/Makefile | 2 +- submission_thesis/CH4_FMMD/cfg.dia | Bin 2351 -> 2379 bytes submission_thesis/CH4_FMMD/copy.tex | 7 +- submission_thesis/CH5_Examples/Makefile | 2 +- .../CH5_Examples/bubba_euler_1.dia | Bin 0 -> 2759 bytes .../CH5_Examples/bubba_euler_2.dia | Bin 0 -> 2433 bytes submission_thesis/CH5_Examples/copy.tex | 370 +++++++----------- 7 files changed, 152 insertions(+), 229 deletions(-) create mode 100644 submission_thesis/CH5_Examples/bubba_euler_1.dia create mode 100644 submission_thesis/CH5_Examples/bubba_euler_2.dia diff --git a/submission_thesis/CH4_FMMD/Makefile b/submission_thesis/CH4_FMMD/Makefile index b92da04..2ade291 100644 --- a/submission_thesis/CH4_FMMD/Makefile +++ b/submission_thesis/CH4_FMMD/Makefile @@ -1,6 +1,6 @@ -PNG_DIA = cfg2.png cfg.png compco2.png compco3.png compco.png component.png componentpl.png fmmd_uml2.png fmmd_uml.png partitioncfm.png master_uml.png top_down_de_comp.png dc1.png dc2.png eulerfmmd.png +PNG_DIA = cfg2.png cfg.png compco2.png compco3.png compco.png component.png componentpl.png fmmd_uml2.png fmmd_uml.png partitioncfm.png master_uml.png top_down_de_comp.png dc1.png dc2.png eulerfmmd.png %.png:%.dia diff --git a/submission_thesis/CH4_FMMD/cfg.dia b/submission_thesis/CH4_FMMD/cfg.dia index 7681c8c6b92deafc46a220693f4353fb28b698e5..2a4e48dd23e6dfd78805e17f688b8c1143f06068 100644 GIT binary patch delta 1117 zcmV-j1fu(|63Y^>{se!txQ0-e(RvTBZA1*Ab%511(%Ya$F=7~|eO@QD4F=@@SWNE` z5fMYEumw5tE=R{43~DsI`Wm7A6C}6nqmkbPiDL)CYqz&!9!A=8ajoCTURYY&^I^w6 zOKZfQ#WU3LK4fW)^tPw5dtP~6NpE1ZTS&Jx6D2L?Fc#7?b7z0D=t~4A%`8nB;;ipD z+fK?5YKNHk^Zp9OL`??jRiIcM_atQg50ETm{y~wtNEifZh=SDLd?-L9-oSj=z%=H= zd(dIzOhJ;oyM0<|7&K{s^$2+ehlCzau;&#Uiy|zHu;vI`i5OEvIrUnQ=smQTR3s$Q zyZcsgfkm$x%kzI`A1T!%ZxK7Oq&+Ljg(;sK8b+kSA=a%$B%%HbAP4)X_zdT&|NH_g zV70V0f3Fh^2cxDMBDlk&gP2?V&6Me#Sw!LK;WwOYv@tS7_5oUoNPqLAU5<=}XX7IQ z%3SGnxt|xyiVHz|vFA?N$% zGo!s7X%m0D&59PfE`liOGe5IlkT|9QMHCZk3Y6l6QoEZP(b{`@);ZF)$%|5ONN$rt ztk}?Vv{xCv@%!Xxw6~uL5+!c6z-tAh2C)VsF@@g=8{2jM@a%HP&pH?wvaVT6!^)MUCZE*-Hh!E73PaUk2-%y7zAmEg4ElAHW4;9Vb2?-?NAt- z*1y`CtO{0-AV%#33}Q4yF%oAGqu5G=Z!L=LQ*cg-EF1|+6qKlgeL;wZC`9rM(=;-k zP^5fM(}-QiV{~e_o3emn5ZhWOd6I26=_Y8>8%))Xi5Ns_h@zyDBF12wn=+f}~`Sct+7{)MzcROWL&lY{>kc$x^wMoA* z%yH@6rr&#nAJC~U_V)l)!Kr_GaPRFToJb_NGe%3lUcw!aLX_3}fGR<2NA?ixgg-S? zkEk^E|MrGR?>*9Y5Hke(0b2H1Z*SoQW(I#8DJvC9STe`F z#uX$uGeWTK;$eujL;UZW=WwppHZJX1m1-OUGeYI;tIjZH=hs1%f+}_LFsRZHRq0g> zyDAFzq>tYX1?&=pjHfjir@^5Sgs7EzL4<}VLTA}H5vbsKUsq;T$nH?qz=iF}f(~`C jFX+&_>QMbUOSY!G`c%Jw?`4^+u0H(_etpt*mXiPgN_iuv delta 1089 zcmV-H1it&r60Z`l{sezA+ERqVjMjU2Z6jg`tplvCk=_P1iV?#w?ejXJZ7?AJ$6|Vq zh=>?Mg)PXDcR4!dU{Iss)z=8^pCGwqAC3GbNE|y5Uc0>=^Dxq$i);Nx_QKNIo)0_r zSz06ZES{l`_aRGbq_;hd-Sf)pN_qpM-9oypnJ8&7hp~{JnLB@zMPDK~X=Z845NCbI z*>+NfP&>rLpZ8ZNCTcQJuL8yDxF;d=e}H5m^AC#DMZzFRLlmU`=0gD@@doC@2Bt9| z-h&P!X9|+!-R;v#!=On6tVhT*I3)CVf<3R;SQKGlgf&OlO2n8V%Bk0aMDL-!q#_}a z-rcu~3oLroSe}13`$(xCd5hSICGA;JE=>8{&@dtm4zX@6A_?_h06Ex4#b-EI{pS~0 z0js60`FovUI2bk65WyWD9mL$?Z>CJ|%pwX;55M7Lqm7XvvJcQwMEaW_?Q&!+JR2Vg zP!22S-X%;ZHswfjEhS)Us!x3=?!|_pwn4T%RUfOkc0GS#3DcmVd5Iv;JN;3;_c9ad z{@ZeBKAv#kmGZkUM-8JGB&Px~y8*+5AsvS&^+HVTVqu7>A33J}R%F{{k++0Z+S}qN zkoC`kK5(y3zXJ>fl-NE_AR&B>1)?YK%CUy?as6y8Z68^iGxw$KD71sT;N&y)zDwsF znHlZvNSlAyZC13{}G6Vs4!m)denbG!XQXP6r|n`w282>347isZHL0x zwEorBWL2j7{yi^d}~o`pMrBzWZ_6qqM$?_>T5lC3GPKGiSads!x{t55#}E8V>o H4vzo;SXmG5 diff --git a/submission_thesis/CH4_FMMD/copy.tex b/submission_thesis/CH4_FMMD/copy.tex index cf58070..ffaa685 100644 --- a/submission_thesis/CH4_FMMD/copy.tex +++ b/submission_thesis/CH4_FMMD/copy.tex @@ -830,6 +830,7 @@ as {\fcs} in table~\ref{tbl:ampfmea1}. % % % +\label{sec:invamp} % \begin{figure}[h+] \centering @@ -1476,11 +1477,11 @@ that it inherits a set of failure modes. %We thus have a `new' component, %or system building block, but %with a known and traceable %fault behaviour. -A {\fg} must comprise of two or more components, and the UML diagram shows this -with the two to many relationship. +A {\fg} must comprise of at least one component, and the UML diagram shows this +with the one to many relationship. Under exceptional circumstances a component may need to be a member of more than one {\fg} (this is looked at in section~\ref{sec:sideeffects}). The relationship between -the {\fg} and component is therefore $ \star \leftrightarrow 2..\star$. +the {\fg} and component is therefore $ \star \leftrightarrow 1..\star$. % A {\fg} will only be associated with one {\dc} and is given a one to one relationship in the UML diagram. % diff --git a/submission_thesis/CH5_Examples/Makefile b/submission_thesis/CH5_Examples/Makefile index 5b89d49..db91feb 100644 --- a/submission_thesis/CH5_Examples/Makefile +++ b/submission_thesis/CH5_Examples/Makefile @@ -5,7 +5,7 @@ PNG_DIA = blockdiagramcircuit2.png bubba_oscillator_block_diagram.png circuit1 poss1finalbubba.png poss2finalbubba.png pt100.png pt100_doublef.png pt100_singlef.png \ pt100_tc.png pt100_tc_sp.png shared_component.png stat_single.png three_tree.png \ tree_abstraction_levels.png vrange.png sigma_delta_block.png ftcontext.png ct1.png hd.png \ - sigdel1.png sdadc.png + sigdel1.png sdadc.png bubba_euler_1.png bubba_euler_2.png diff --git a/submission_thesis/CH5_Examples/bubba_euler_1.dia b/submission_thesis/CH5_Examples/bubba_euler_1.dia new file mode 100644 index 0000000000000000000000000000000000000000..92ca9aeb7f8342f5cc36cbb00fcf83b1045bd789 GIT binary patch literal 2759 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 N_kW?DM3A4o002(mfvNxi literal 0 HcmV?d00001 diff --git a/submission_thesis/CH5_Examples/bubba_euler_2.dia b/submission_thesis/CH5_Examples/bubba_euler_2.dia new file mode 100644 index 0000000000000000000000000000000000000000..35d354715425efc3fb84092197fb5f7d9a120fd9 GIT binary patch literal 2433 zcmV-{34Zn;iwFP!000021MOW~bJ|7}e$TI9$SYaz{ZeXolD3)jp-rY~`5*F#-t-v=YTxW}F$3Wk2om?fK3*yE=UT!-gf|Xf}&3bfb&@)r($lvx7;LMdrQy-6+e_WOS3oy+t&SFZ-it{LeI9-Yh14*D7x} zUe13rU_FsOsul_~e%|)S~J$MayZv1&G6x%nf2BY|# zWZCkG`~Mux)^!Hp-u}AU4qds^G@0yQxP=xKz1$^}?E2G}mZr<~e&15>x5+vg&Em4V zPZpWC?(h9{zy0l4>;3rghHP-XRm#Ie#w=!s%fs|0nZ)ZSXjW`f(bIL_?Bc0e-)>iT zV%%F>Vr?O2(S4le-M@L1>0bT?=N6|IjkDzT;c8<}O!HM?29~40<8hV`|6>*{CQ&-+ zz3RPLe(67YCE6!RCYSy9@TsZM-D%sn-lf@U`ITst4G;!`b8$SO4bEs(wiw5H4AWVh zLs6g{8scKeC=dfA0d52x&*J%~@iJW$Jc)LOX|b&3*=KhY;8bnAByWg#9VgT4Y#$^8 zl);S`YG9n!*UP(4B|c{(Np){Kb~hkA@SSPy@rDpjwmFCQ~_+zIS>kU z!h1iXt;c=RJ@*kHu<#P+&iy~)FWCn9QBHpBiTn~;`VquCA-{Cw7ub+r0x1nRUeQ8&nNf*tWw|gh)BfV-0oU>yeZP1x)U!3P5}iwRCfg=dsKHu z9;hm4C+hBLv~|^87Svs+4%8j9XR7Da2i+M2j2OOQ)dAacGzPfhmh4bjHK+8f)cp5& zoveeHpG3?n2^+NhJhi;Sx-l zq~}kZo)8-MEPUHaiVM}~DobisCR z*)HTzn?T77F2hZLLmK{@@@*@~8XVi_l!I43%$inHfx6Lf4aNC`h|`>*vV9HrF~pE` z?_Rc%mormHyE()vDCvOWIhZg3+7M|zC@05pCHJK*HeSGc#-<+kPUeR!-Dl)4r)pJHno_j%Ga#D-!03*QLS9c9%k%kCcP^|ghKGl5; zux@CsilI3Rp?L%6mHKgBv1J3jm zntUMAPIeb(e>EO)c+x(}gMhI31mJES_=#wQdVop*o0L-xQs z0+73F6&~pcnqU9WdlhYi^gpM=K}h(!(Uy8fJW9s4OH zr)>)%c5|C|R85Y^9M9I1(=uzWG3%jx#01mx_Qt>}j`VR%&mHiq# zJO-#t>T3!8p+Hq4zhC03#kySH4_OsE(q1j>J}gp&hV!Nd2`PZNRXm1Tv`GdASs2QP zw&I8R^%&KrkT)M$9Wj>xkvz?a8C7)ikvZ>T&Hy251B?bSKYr+JMqHC83-^T&LHvr;oV1lzx%e}gP3~~^Kv={F+W2w$BonPPWeci zb_rQ2*U^PECF=;;Eb!1m+P&F`>S#F;0J4fD>s`x_m5iX>W`U5#3q%0Bfel+dW|E^Q zll&Q)^XVL0Ov>