Skip to content

Commit ba6f45b

Browse files
committed
Merge correction to 6.1 into quarto build and give attribution
1 parent 8721d27 commit ba6f45b

4 files changed

Lines changed: 7 additions & 5 deletions

File tree

‎ch00.tex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ \section*{Acknowledgments}
238238

239239
Many students have given exceptional feedback, including Ian Staton, Tanner Wernecke, Jacob Green, Rasha Abuhantash, Nick Duncan, Kylie Davidson, Shirley Jiang, Elena Trafton, Jennifer Gregorio, and Azeem Mufti.
240240

241-
Other contributors who found one or more typos: Stijn Debrouwere, Guy Driesen, Andai Velican, Chris Kuszmaul, Daniel Kurikesu, Josh Donath, Rens Findhammer, Elisa Abedrapo, Yousef BaAfif, Bruce Hill, Matt Underwood, Isaac Sultan, Dan Rice, Robert Beard, Daniel Pierce, Michael Giftthaler, Chris Fox, Min Zeng, Markus Geuss, Mauricio Gonzalez, Enrico Sartirana, Kasem Satitwiwat, Jason Miller, Kevin Molloy, Cory Culbertson, Will Crawford, Shawn Brenneman, Tom Nguyen, and Ala-Uddin Mohammad.
241+
Other contributors who found one or more typos: Stijn Debrouwere, Guy Driesen, Andai Velican, Chris Kuszmaul, Daniel Kurikesu, Josh Donath, Rens Findhammer, Elisa Abedrapo, Yousef BaAfif, Bruce Hill, Matt Underwood, Isaac Sultan, Dan Rice, Robert Beard, Daniel Pierce, Michael Giftthaler, Chris Fox, Min Zeng, Markus Geuss, Mauricio Gonzalez, Enrico Sartirana, Kasem Satitwiwat, Jason Miller, Kevin Molloy, Cory Culbertson, Will Crawford, Shawn Brenneman, Tom Nguyen, Ala-Uddin Mohammad, and Pascal Croizier.
242242

243243
%\medskip
244244

‎ch06.tex‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ \section{The while Statement}
102102
Each time through the loop, the program displays the value of \java{n} and then checks whether it is even or odd.
103103
If it is even, the value of \java{n} is divided by 2.
104104
If it is odd, the value is replaced by $3n+1$.
105-
For example, if the starting value is 3, the resulting sequence is 3, 10, 5, 16, 8, 4, 2, (the above code will not print 1, because the while loop terminates when n == 1)
105+
For example, if the starting value is 3, the resulting sequence is 3, 10, 5, 16, 8, 4, 2.
106+
(The above code will not print 1, because the while loop terminates when n == 1.)
106107

107108
Since \java{n} sometimes increases and sometimes decreases, there is no obvious proof that \java{n} will ever reach 1 and that the program will ever terminate.
108109
For some values of \java{n}, such as the powers of two, we can prove that it terminates.

‎quarto/ch06.qmd‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ Each time through the loop, the program displays the value of `n`{.java}
101101
and then checks whether it is even or odd. If it is even, the value of
102102
`n`{.java} is divided by 2. If it is odd, the value is replaced by
103103
$3n+1$. For example, if the starting value is 3, the resulting sequence
104-
is 3, 10, 5, 16, 8, 4, 2, 1.
104+
is 3, 10, 5, 16, 8, 4, 2. (The above code will not print 1, because the
105+
while loop terminates when n == 1.)
105106

106107
Since `n`{.java} sometimes increases and sometimes decreases, there is
107108
no obvious proof that `n`{.java} will ever reach 1 and that the program

‎quarto/index.qmd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,8 @@ Rens Findhammer, Elisa Abedrapo, Yousef BaAfif, Bruce Hill, Matt
285285
Underwood, Isaac Sultan, Dan Rice, Robert Beard, Daniel Pierce, Michael
286286
Giftthaler, Chris Fox, Min Zeng, Markus Geuss, Mauricio Gonzalez, Enrico
287287
Sartirana, Kasem Satitwiwat, Jason Miller, Kevin Molloy, Cory
288-
Culbertson, Will Crawford, Shawn Brenneman, Tom Nguyen, and Ala-Uddin
289-
Mohammad.
288+
Culbertson, Will Crawford, Shawn Brenneman, Tom Nguyen, Ala-Uddin
289+
Mohammad, and Pascal Croizier.
290290

291291
If you have additional comments or ideas about the text, please send
292292
them to:

0 commit comments

Comments
 (0)