From: W. Trevor King Date: Thu, 13 Jan 2011 13:05:03 +0000 (-0500) Subject: Update TwoTerminal parameter orders in Kirchoff's Law notes. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e8b52d8262e509fac5b79dbf57c5f9f5d2bd9a58;p=course.git Update TwoTerminal parameter orders in Kirchoff's Law notes. This updates the source to follow changes made to Circ.asy in commit 663d2cc1dea88109e4ab15da910936553d36a9a3 --- diff --git a/latex/notes/topics/kirchoff/RCcircuits.tex b/latex/notes/topics/kirchoff/RCcircuits.tex index ef7222b..fe6efcb 100644 --- a/latex/notes/topics/kirchoff/RCcircuits.tex +++ b/latex/notes/topics/kirchoff/RCcircuits.tex @@ -7,9 +7,9 @@ \begin{asy} import Circ; real u = 1cm; - TwoTerminal B = source((0,0), DC, 0, "$\mathcal{E}$", ""); - TwoTerminal R = resistor(B.end+(u,.5u), normal, 90, "", "$R$"); - TwoTerminal C = capacitor(B.beg+(-u,.5u), normal, 90, "$C$", ""); + TwoTerminal B = source((0,0), 0, DC, "$\mathcal{E}$", ""); + TwoTerminal R = resistor(B.end+(u,.5u), 90, normal, "", "$R$"); + TwoTerminal C = capacitor(B.beg+(-u,.5u), 90, normal, "$C$", ""); TwoTerminal I = current((B.end.x, R.end.y+.5u), 180, "", "$I$"); wire(B.beg, C.beg, rlsq); wire(B.end, R.beg, rlsq); diff --git a/latex/notes/topics/kirchoff/kirchoff.tex b/latex/notes/topics/kirchoff/kirchoff.tex index 2e57161..16fbf53 100644 --- a/latex/notes/topics/kirchoff/kirchoff.tex +++ b/latex/notes/topics/kirchoff/kirchoff.tex @@ -11,9 +11,9 @@ TwoTerminal Ra = resistor((-u,h), normal, 0, "$20\U{$\Omega$}$", ""); TwoTerminal Rb = resistor((u,h), normal, 0, "$10\U{$\Omega$}$", ""); TwoTerminal I = current((u,0), 0, "I", ""); - wireU(Ra.beg, B.beg, -12pt, rlsq); + wire(Ra.beg, B.beg, rlsq, dist=-12pt); wire(Ra.end, Rb.beg, nsq); - wireU(Rb.end, B.end, 12pt, rlsq); + wire(Rb.end, B.end, rlsq, dist=12pt); dot("a", B.end, NE); dot("b", Rb.end, NE); dot("c", Rb.beg, NW); @@ -57,8 +57,8 @@ TwoTerminal Il = current((u,h), 0, "$I_2$", ""); // lower resistors TwoTerminal Iu = current((u,2h), 0, "$I_3$", ""); // upper resistors pair a = Il.end+(12pt, 0); - wireU(Rll.beg, B.beg, -12pt, rlsq); - wireU(Rul.beg, B.beg, -12pt, rlsq); + wire(Rll.beg, B.beg, rlsq, dist=-12pt); + wire(Rul.beg, B.beg, rlsq, dist=-12pt); wire(B.end, Ib.beg, nsq); wire(Rll.end, Rlr.beg, nsq); wire(Rlr.end, Il.beg, nsq); diff --git a/latex/notes/topics/kirchoff/overview.tex b/latex/notes/topics/kirchoff/overview.tex index 9f92258..c4eba74 100644 --- a/latex/notes/topics/kirchoff/overview.tex +++ b/latex/notes/topics/kirchoff/overview.tex @@ -26,13 +26,13 @@ \begin{asy} import Circ; real u = 2cm; - TwoTerminal B = source((-u,0), DC, 0, "V", "5\U{V}"); - TwoTerminal R = resistor((-u,u), normal, 0, "R", "$10\U{$\Omega$}$"); - TwoTerminal C = capacitor((u,u), normal, 0, "C", "$15\U{$\mu$F}$"); + TwoTerminal B = source((-u,0), 0, DC, "V", "5\U{V}"); + TwoTerminal R = resistor((-u,u), 0, normal, "R", "$10\U{$\Omega$}$"); + TwoTerminal C = capacitor((u,u), 0, normal, "C", "$15\U{$\mu$F}$"); TwoTerminal I = current((u,0), 0, "I", ""); - wireU(R.beg, B.beg, -12pt, rlsq); + wire(R.beg, B.beg, rlsq, dist=-12pt); wire(R.end, C.beg, nsq); - wireU(C.end, B.end, 12pt, rlsq); + wire(C.end, B.end, rlsq, dist=12pt); \end{asy} \end{center} \end{frame} diff --git a/latex/notes/topics/kirchoff/resistors.tex b/latex/notes/topics/kirchoff/resistors.tex index 00e97d0..041d4f7 100644 --- a/latex/notes/topics/kirchoff/resistors.tex +++ b/latex/notes/topics/kirchoff/resistors.tex @@ -6,9 +6,9 @@ \begin{center} \begin{asy} import Circ; - TwoTerminal Ra = resistor((0,0), normal, 0, "$R_a$, $V_a$", ""); + TwoTerminal Ra = resistor((0,0), 0, normal, "$R_a$, $V_a$", ""); TwoTerminal I = current(Ra.end, 0, "$I$", ""); - TwoTerminal Rb = resistor(I.end, normal, 0, "$R_b$, $V_b$", ""); + TwoTerminal Rb = resistor(I.end, 0, normal, "$R_b$, $V_b$", ""); dot("a", Ra.beg, W); dot("b", Rb.end, E); real u = 5mm; @@ -36,8 +36,8 @@ \begin{asy} import Circ; real u = 20pt; - TwoTerminal Ra = resistor((0,+u), normal, 0, "$R_a$, $V_a$", ""); - TwoTerminal Rb = resistor((0,-u), normal, 0, "", "$R_b$, $V_b$"); + TwoTerminal Ra = resistor((0,+u), 0, normal, "$R_a$, $V_a$", ""); + TwoTerminal Rb = resistor((0,-u), 0, normal, "", "$R_b$, $V_b$"); pair aj = (Ra.beg.x, 0); pair a = aj-(12pt,0); pair bj = (Rb.end.x, 0); diff --git a/latex/notes/topics/kirchoff/seriesParallel.tex b/latex/notes/topics/kirchoff/seriesParallel.tex index dd825f1..a8b6222 100644 --- a/latex/notes/topics/kirchoff/seriesParallel.tex +++ b/latex/notes/topics/kirchoff/seriesParallel.tex @@ -7,18 +7,18 @@ \begin{asy} import Circ; real u = 2cm, h = 1.5cm; - TwoTerminal B = source((-u,0), DC, 0, "V", "9\U{V}"); - TwoTerminal Ra = resistor((-u,1.5h), normal, 0, "R$_\text{a}$", ""); - TwoTerminal Rb = resistor(Ra.end, normal, 0, "R$_\text{b}$", ""); - TwoTerminal Rc = resistor((u,2h), normal, 0, "R$_\text{c}$", ""); - TwoTerminal Rd = resistor((u,h), normal, 0, "R$_\text{d}$", ""); + TwoTerminal B = source((-u,0), 0, DC, "V", "9\U{V}"); + TwoTerminal Ra = resistor((-u,1.5h), 0, normal, "R$_\text{a}$", ""); + TwoTerminal Rb = resistor(Ra.end, 0, normal, "R$_\text{b}$", ""); + TwoTerminal Rc = resistor((u,2h), 0, normal, "R$_\text{c}$", ""); + TwoTerminal Rd = resistor((u,h), 0, normal, "R$_\text{d}$", ""); pair m = (Rc.beg.x - 12pt, 1.5h); // middle junction point pair r = (Rd.end.x + 12pt, 1.5h); // right junction point - wireU(Ra.beg, B.beg, -12pt, rlsq); - wireU(Rc.end, r, 12pt, rlsq); - wireU(Rd.end, r, 12pt, rlsq); - wireU(r, B.end, 12pt, rlsq); + wire(Ra.beg, B.beg, rlsq, dist=-12pt); + wire(Rc.end, r, rlsq, dist=12pt); + wire(Rd.end, r, rlsq, dist=12pt); + wire(r, B.end, rlsq, dist=12pt); wire(Rb.end, m, nsq); wire(Rc.beg, m, rlsq); wire(Rd.beg, m, rlsq); @@ -36,18 +36,18 @@ \begin{asy} import Circ; real u = 2cm, h = 1.5cm; - TwoTerminal B = source((-u,0), DC, 0, "V", "9\U{V}"); - TwoTerminal Ra = resistor((-u,1.5h), normal, 0, "R$_\text{a}$", ""); - TwoTerminal Rb = resistor(Ra.end, normal, 0, "R$_\text{b}$", ""); - TwoTerminal Rc = resistor((u,2h), normal, 0, "R$_\text{c}$", ""); - TwoTerminal Rd = resistor((u,h), normal, 0, "R$_\text{d}$", ""); + TwoTerminal B = source((-u,0), 0, DC, "V", "9\U{V}"); + TwoTerminal Ra = resistor((-u,1.5h), 0, normal, "R$_\text{a}$", ""); + TwoTerminal Rb = resistor(Ra.end, 0, normal, "R$_\text{b}$", ""); + TwoTerminal Rc = resistor((u,2h), 0, normal, "R$_\text{c}$", ""); + TwoTerminal Rd = resistor((u,h), 0, normal, "R$_\text{d}$", ""); pair m = (Rc.beg.x - 12pt, 1.5h); // middle junction point pair r = (Rd.end.x + 12pt, 1.5h); // right junction point - wireU(Ra.beg, B.beg, -12pt, rlsq); - wireU(Rc.end, r, 12pt, rlsq); - wireU(Rd.end, r, 12pt, rlsq); - wireU(r, B.end, 12pt, rlsq); + wire(Ra.beg, B.beg, rlsq, dist=-12pt); + wire(Rc.end, r, rlsq, dist=12pt); + wire(Rd.end, r, rlsq, dist=12pt); + wire(r, B.end, rlsq, dist=12pt); wire(Rb.end, m, nsq); wire(Rc.beg, m, rlsq); wire(Rd.beg, m, rlsq);