Update Giancoli v6 to use Circ.asy v0.2.

[course.git] / latex / problems / Giancoli_6 / problem17.40.tex

diff --git a/latex/problems/Giancoli_6/problem17.40.tex b/latex/problems/Giancoli_6/problem17.40.tex
index 3a579a6963616990c6e32a63f6e7ac560919ed62..20975e5552b86c985f301dfd5201779c588bcc93 100644 (file)
--- a/latex/problems/Giancoli_6/problem17.40.tex
+++ b/latex/problems/Giancoli_6/problem17.40.tex
@@ -20,19 +20,19 @@ real u = 1cm;
 real dx = u;
 real dy = 1.5u;
 
-TwoTerminal bat = battery("$V$");
-TwoTerminal c1 = capacitor("$C_1$", draw=false);
-centerto(bat, c1, dy); c1.draw();
-wire(bat.end, c1.end, rlsq, dx/2);
-wire(bat.beg, c1.beg, rlsq, -dx/2);
-label("(a)", bat.mid + (0, -dy/2));
+MultiTerminal bat = battery("$V$");
+MultiTerminal c1 = capacitor("$C_1$", draw=false);
+two_terminal_centerto(bat, c1, dy); c1.draw();
+wire(bat.terminal[1], c1.terminal[1], rlsq, dx/2);
+wire(bat.terminal[0], c1.terminal[0], rlsq, -dx/2);
+label("(a)", bat.center + (0, -dy/2));
 
 c1.shift(3*dx); c1.draw();
-TwoTerminal c2 = capacitor("$C_2$", draw=false);
-centerto(c1, c2, -dy); c2.draw();
-wire(c2.end, c1.end, rlsq, dx/2);
-wire(c2.beg, c1.beg, rlsq, -dx/2);
-label("(b)", c2.mid + (0, -dy/2));
+MultiTerminal c2 = capacitor("$C_2$", draw=false);
+two_terminal_centerto(c1, c2, -dy); c2.draw();
+wire(c2.terminal[1], c1.terminal[1], rlsq, dx/2);
+wire(c2.terminal[0], c1.terminal[0], rlsq, -dx/2);
+label("(b)", c2.center + (0, -dy/2));
 \end{asy}
 \end{center}
 \end{problem*}
@@ -46,25 +46,25 @@ real u = 1cm;
 real dx = u;
 real dy = 1.5u;
 
-TwoTerminal bat = battery("$V$");
-TwoTerminal c1 = capacitor("$C_1$", draw=false);
-centerto(bat, c1, dy); c1.draw();
-wire(bat.end, c1.end, rlsq, dx/2);
-wire(bat.beg, c1.beg, rlsq, -dx/2);
-label("(a)", bat.mid + (0, -dy/2));
-label("$Q_{1a}$", c1.end, NE);
-label("$-Q_{1a}$", c1.beg, NW);
+MultiTerminal bat = battery("$V$");
+MultiTerminal c1 = capacitor("$C_1$", draw=false);
+two_terminal_centerto(bat, c1, dy); c1.draw();
+wire(bat.terminal[1], c1.terminal[1], rlsq, dx/2);
+wire(bat.terminal[0], c1.terminal[0], rlsq, -dx/2);
+label("(a)", bat.center + (0, -dy/2));
+label("$Q_{1a}$", c1.terminal[1], NE);
+label("$-Q_{1a}$", c1.terminal[0], NW);
 
 c1.shift(3*dx); c1.draw();
-TwoTerminal c2 = capacitor("$C_2$", draw=false);
-centerto(c1, c2, -dy); c2.draw();
-wire(c2.end, c1.end, rlsq, dx/2);
-wire(c2.beg, c1.beg, rlsq, -dx/2);
-label("(b)", c2.mid + (0, -dy/2));
-label("$Q_{1b}$", c1.end, NE);
-label("$-Q_{1b}$", c1.beg, NW);
-label("$Q_{2b}$", c2.end, SE);
-label("$-Q_{2b}$", c2.beg, SW);
+MultiTerminal c2 = capacitor("$C_2$", draw=false);
+two_terminal_centerto(c1, c2, -dy); c2.draw();
+wire(c2.terminal[1], c1.terminal[1], rlsq, dx/2);
+wire(c2.terminal[0], c1.terminal[0], rlsq, -dx/2);
+label("(b)", c2.center + (0, -dy/2));
+label("$Q_{1b}$", c1.terminal[1], NE);
+label("$-Q_{1b}$", c1.terminal[0], NW);
+label("$Q_{2b}$", c2.terminal[1], SE);
+label("$-Q_{2b}$", c2.terminal[0], SW);
 \end{asy}
 \end{center}