Merge branch 'master' of https://github.com/bhoffman0/CSAwesome

RunestoneInteractive · Apr 14, 2024 · 4da3689 · 4da3689
2 parents 404298d + 303d6f0
commit 4da3689
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/_sources/TimedTests/test1.rst b/_sources/TimedTests/test1.rst
@@ -3,7 +3,7 @@
    :start: 1
 
 .. highlight:: java
-   :linenothreshold: 4
+   :linenothreshold: 100
 
 .. |start| image:: Figures/start.png
     :height: 24px

diff --git a/_sources/Unit1-Getting-Started/preface.rst b/_sources/Unit1-Getting-Started/preface.rst
@@ -117,15 +117,15 @@ Many others have been involved in the creation of content for the eBook (includi
 This work is licensed under a |creative commons|.
 
 Barbara Ericson `[email protected] <mailto://[email protected]>`_
-2014-2023
+2014-2024
 All rights reserved.
 
 Beryl Hoffman `[email protected] <mailto://[email protected]>`_
-2019-2023
+2019-2024
 All rights reserved.
 
 Peter Seibel `[email protected] <mailto://[email protected]>`_
-2023
+2023-2024
 All rights reserved.
 
 

diff --git a/_sources/Unit6-Arrays/soundA.rst b/_sources/Unit6-Arrays/soundA.rst
@@ -132,6 +132,7 @@ Click to reveal the Mixed Up Code for the solution of this problem.
     .. parsonsprob:: SoundA
       :numbered: left
       :adaptive:
+      :noindent:
 
       The method ``limitAmplitude`` below contains the correct code for a solution to this problem, but the code blocks are mixed up.  Drag the blocks from the left to the right and put them in order with the correct indentation so that the code would work correctly.
       -----

diff --git a/_sources/Unit7-ArrayList/topic-7-3-arraylist-loops.rst b/_sources/Unit7-ArrayList/topic-7-3-arraylist-loops.rst
@@ -310,7 +310,7 @@ You can step through the code above by clicking on the following `Example <http:
 
    The following has the correct code for the method getScore plus at least one extra unneeded code statement.  This method will calculate and return the score for a word game.  The code should loop through all of the elements in wordList and if the length of the current word is 3 it should add one to the score, if the length of the word is 4 it should add 2 to the score, and if the length is greater than 4 it should add 3 to the score.  The method should return the score.  Drag the needed blocks from the left into the correct order on the right. Check your solution by clicking on the Check button.  You will be told if any of the blocks are in the wrong order or if you need to remove one or more blocks.  There is one extra block that is not needed in a correct solution.
    -----
-   public static int getScore(List<String> wordList)
+   public static int getScore(ArrayList<String> wordList)
    {
    =====
      int score = 0;
@@ -697,6 +697,7 @@ Here is the pseudocode for the constructor method.
             assertTrue(passed);
         }
 
+        /* //remove test because instructions say to add a matched pair.
         @Test
         public void test2()
         {
@@ -710,6 +711,7 @@ Here is the pseudocode for the constructor method.
             getResults(expect, output, "Part 2 - call to numMatches from main()", passed);
             assertTrue(passed);
         }
+        */
 
         @Test
         public void test3()

diff --git a/_sources/Unit8-2DArray/a2dHardMC.rst b/_sources/Unit8-2DArray/a2dHardMC.rst
@@ -26,7 +26,6 @@ These problems are harder than those that you will typically see on the AP CSA e
    .. code-block:: java
 
       int[][] arr = { {3,2,1},{1,2,3}};
-      int value = 0;
       for (int row = 1; row < arr.length; row++) 
       {
          for (int col = 1; col < arr[0].length; col++) 

diff --git a/_sources/Unit9-Inheritance/ooMedMC.rst b/_sources/Unit9-Inheritance/ooMedMC.rst
@@ -188,7 +188,7 @@ These problems are similar to those you will see on the AP CSA exam.
 
       Car car = new Car(5);
       Car fastCar = new RaceCar(5);
-      car.display()
+      car.display();
       car.addFuel();
       car.display();
       fastCar.display();