Merge branch 'master' into ex-2-87

Author: martin-henz

javascript/latexContent.js

@@ -887,7 +887,7 @@ export const ending = `
 %\\shipoutAnswer
 
 \\newpage
-\\markboth{References}{References}
+\\renewcommand{\\chaptermark}[1]{\\markboth{References}{References}}
 \\input{./others/97references97.tex}
 
 \\newpage

package.json

@@ -25,9 +25,9 @@
   },
   "homepage": "https://sourceacademy.org/sicpjs",
   "devDependencies": {
-    "@babel/node": "^7.24.6",
-    "@babel/core": "^7.24.6",
-    "@babel/preset-env": "^7.24.6",
+    "@babel/node": "^7.24.7",
+    "@babel/core": "^7.24.7",
+    "@babel/preset-env": "^7.24.7",
     "fs-extra": "^11.2.0",
     "http-server": "^14.1.1",
     "husky": "^8.0.3",

static/img_javascript/ex-3-13-sol.png

@@ -231,7 +231,9 @@ abs(-5);
         <META>alternative-expression</META> and returns its value as the value of the
 	conditional.<FOOTNOTE>
 	<INDEX>conditional expression<SUBINDEX>non-boolean value as predicate</SUBINDEX></INDEX>
-	Conditionals in full JavaScript accept any value, not just a boolean, as the result of evaluating
+	Conditionals
+	<LABEL NAME="foot:any-value-as-predicate"/>
+	in full JavaScript accept any value, not just a boolean, as the result of evaluating
 	the <META>predicate</META> expression (see footnote<SPACE/><REF NAME="foot:truthy"/>
 	in section<SPACE/><REF NAME="sec:eval-data-structures"/> for details). The programs in this book
 	use only boolean values as predicates of conditionals.
@@ -591,8 +593,10 @@ $\vdots$
             <INDEX>evaluation<SUBINDEX>of <JAVASCRIPTINLINE>&amp;&amp;</JAVASCRIPTINLINE><ORDER>of ;1</ORDER></SUBINDEX><FRAGILE/></INDEX>
 	    <EM>logical conjunction</EM>, meaning roughly 
 	    the same as the English word <QUOTE>and.</QUOTE>
-	    This syntactic form is syntactic sugar<FOOTNOTE>
-            Syntactic forms that are simply convenient
+	    We assume<FOOTNOTE>This assumption is justified by the restriction mentioned
+	    in footnote<SPACE/><REF NAME="foot:any-value-as-predicate"/>. Full JavaScript
+	    needs to consider the case where the result of evaluating <META>expression</META><LATEXINLINE>$_1$</LATEXINLINE> is neither true nor false.</FOOTNOTE> this syntactic form to be syntactic
+	    sugar<FOOTNOTE>Syntactic forms that are simply convenient
             alternative surface structures for things that can be written in more
             uniform ways are sometimes called <EM>syntactic sugar</EM>, to use a
             phrase coined by 
@@ -617,7 +621,7 @@ $\vdots$
             <INDEX>evaluation<SUBINDEX>of {\tt "|"|}<ORDER>of ;2</ORDER></SUBINDEX><FRAGILE/></INDEX>
 	    <EM>logical disjunction</EM>, meaning roughly
 	    the same as the English word <QUOTE>or.</QUOTE>
-	    This syntactic form is syntactic sugar for<BR/>
+	    We assume this syntactic form to be syntactic sugar for<BR/>
 	    <META>expression</META><LATEXINLINE>$_1$</LATEXINLINE> <JAVASCRIPTINLINE>?</JAVASCRIPTINLINE>
 	    <JAVASCRIPTINLINE>true</JAVASCRIPTINLINE> <JAVASCRIPTINLINE>:</JAVASCRIPTINLINE>
 	    <META>expression</META><LATEXINLINE>$_2$</LATEXINLINE>.

static/img_javascript/ex-3-14-sol-1.png

@@ -708,23 +708,21 @@ function sqrt_iter(guess, x) {
         <REQUIRES>sqrt</REQUIRES>
         <REQUIRES>improve</REQUIRES>
         <REQUIRES>sqrt_iter</REQUIRES>	
+        <REQUIRES>square_definition</REQUIRES>	
 	<EXAMPLE>example_1.8</EXAMPLE>
 	<JAVASCRIPT>
-const error_threshold = 0.01;
+const relative_tolerance = 0.0001;
 function is_good_enough(guess, x) {
-    return relative_error(guess, improve(guess, x))
-           &lt; error_threshold;
-}
-function relative_error(estimate, reference) {
-    return abs(estimate - reference) / reference;
+    return abs(square(guess) - x) &lt; guess * relative_tolerance;
 }
 	</JAVASCRIPT>
       </SNIPPET>
     </SOLUTION>
     <SNIPPET HIDE="yes">
       <NAME>example_1.8</NAME>
       <JAVASCRIPT>
-sqrt(3);
+display(sqrt(0.0001));
+display(sqrt(4000000000000));
       </JAVASCRIPT>
       <SCHEME>
       </SCHEME>

static/img_javascript/ex-3-14-sol-2.png

@@ -657,12 +657,13 @@ function timed_prime_test(n) {
 function start_prime_test(n, start_time) {
     return is_prime(n)
            ? report_prime(get_time() - start_time)
-           : true;
+           : false;
 }
 <SHORT_SPACE_AND_ALLOW_BREAK/>
 function report_prime(elapsed_time) {
     display(" *** ");
     display(elapsed_time);
+    return true;
 }
       </JAVASCRIPT>
     </SNIPPET>
@@ -726,8 +727,8 @@ function search_for_primes(start, times) {
            ? true
            : start &gt; 2 &amp;&amp; start % 2 === 0
            ? search_for_primes(start + 1, times)
-           // if we get undefined -&gt; its a prime
-           : is_undefined(timed_prime_test(start)) 
+           // if we get true, it's a prime
+           : timed_prime_test(start)
            ? search_for_primes(start + 2, times - 1)
            : search_for_primes(start + 2, times);
 }
@@ -740,8 +741,8 @@ function search_for_primes(start, times) {
       <REQUIRES>search_for_primes_definition</REQUIRES>
       <JAVASCRIPT>
 search_for_primes(10000, 3);
-// search_for_primes(100000, 3);
-// search_for_primes(1000000, 3);
+// search_for_primes(10000000, 3);
+// search_for_primes(10000000000, 3);
       </JAVASCRIPT>
       <SCHEME>
       </SCHEME>