Commit d4a0aa34 authored by Trisha Gee's avatar Trisha Gee
Browse files

[Ch10b] Creating the answers for the Sharpen Your Pencil exposed a HUGE...

[Ch10b] Creating the answers for the Sharpen Your Pencil exposed a HUGE problem. The BPM isn't an int; AND the "BPM" was ordered like title descending. Changed BPM to an int, and created real values for the BPMs. Also, added the Sharpen exercise.
parent 2a7404a1
Loading
Loading
Loading
Loading
+3 −3
Changes for src/main/java/ch10b/CollectionsFactoryMethods.java: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ public class CollectionsFactoryMethods {
  }

  public static void createAListOfSongs() {
    List<SongV2> songs = List.of(new SongV2("somersault", "zero 7", "50"),
                                 new SongV2("cassidy", "grateful dead", "65"),
                                 new SongV2("$10", "hitchhiker", "80"));
    List<SongV2> songs = List.of(new SongV2("somersault", "zero 7", 147),
                                 new SongV2("cassidy", "grateful dead", 158),
                                 new SongV2("$10", "hitchhiker", 140));
  }

  public static void createASet() {
+14 −14
Changes for src/main/java/ch10b/MockMoreSongs.java: 14 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -7,25 +7,25 @@ class MockMoreSongs {

  public static List<SongV3> getSongsV3() {
    List<SongV3> mySongs = new ArrayList<>();
    mySongs.add(new SongV3("somersault", "zero 7", "50"));
    mySongs.add(new SongV3("cassidy", "grateful dead", "65"));
    mySongs.add(new SongV3("$10", "hitchhiker", "80"));
    mySongs.add(new SongV3("havana", "cabello", "60"));
    mySongs.add(new SongV3("$10", "hitchhiker", "80"));
    mySongs.add(new SongV3("cassidy", "grateful dead", "65"));
    mySongs.add(new SongV3("50 ways", "simon", "70"));
    mySongs.add(new SongV3("somersault", "zero 7", 147));
    mySongs.add(new SongV3("cassidy", "grateful dead", 158));
    mySongs.add(new SongV3("$10", "hitchhiker", 140));
    mySongs.add(new SongV3("havana", "cabello", 105));
    mySongs.add(new SongV3("$10", "hitchhiker", 140));
    mySongs.add(new SongV3("cassidy", "grateful dead", 158));
    mySongs.add(new SongV3("50 ways", "simon", 102));
    return mySongs;
  }

  public static List<SongV4> getSongsV4() {
    List<SongV4> mySongs = new ArrayList<>();
    mySongs.add(new SongV4("somersault", "zero 7", "50"));
    mySongs.add(new SongV4("cassidy", "grateful dead", "65"));
    mySongs.add(new SongV4("$10", "hitchhiker", "80"));
    mySongs.add(new SongV4("havana", "cabello", "60"));
    mySongs.add(new SongV4("$10", "hitchhiker", "80"));
    mySongs.add(new SongV4("cassidy", "grateful dead", "65"));
    mySongs.add(new SongV4("50 ways", "simon", "70"));
    mySongs.add(new SongV4("somersault", "zero 7", 147));
    mySongs.add(new SongV4("cassidy", "grateful dead", 158));
    mySongs.add(new SongV4("$10", "hitchhiker", 140));
    mySongs.add(new SongV4("havana", "cabello", 105));
    mySongs.add(new SongV4("$10", "hitchhiker", 140));
    mySongs.add(new SongV4("cassidy", "grateful dead", 158));
    mySongs.add(new SongV4("50 ways", "simon", 102));
    return mySongs;
  }
}
+12 −12
Changes for src/main/java/ch10b/MockSongs.java: 12 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -17,25 +17,25 @@ class MockSongs {

  public static List<SongV2> getSongsV2() {
    List<SongV2> mySongs = new ArrayList<>();
    mySongs.add(new SongV2("somersault", "zero 7", "50"));
    mySongs.add(new SongV2("cassidy", "grateful dead", "65"));
    mySongs.add(new SongV2("$10", "hitchhiker", "80"));
    mySongs.add(new SongV2("somersault", "zero 7", 147));
    mySongs.add(new SongV2("cassidy", "grateful dead", 158));
    mySongs.add(new SongV2("$10", "hitchhiker", 140));

    mySongs.add(new SongV2("havana", "cabello", "60"));
    mySongs.add(new SongV2("Cassidy", "grateful dead", "65"));
    mySongs.add(new SongV2("50 ways", "simon", "70"));
    mySongs.add(new SongV2("havana", "cabello", 105));
    mySongs.add(new SongV2("Cassidy", "grateful dead", 158));
    mySongs.add(new SongV2("50 ways", "simon", 102));
    return mySongs;
  }

  public static List<SongV3> getSongsV3() {
    List<SongV3> mySongs = new ArrayList<>();
    mySongs.add(new SongV3("somersault", "zero 7", "50"));
    mySongs.add(new SongV3("cassidy", "grateful dead", "65"));
    mySongs.add(new SongV3("$10", "hitchhiker", "80"));
    mySongs.add(new SongV3("somersault", "zero 7", 147));
    mySongs.add(new SongV3("cassidy", "grateful dead", 158));
    mySongs.add(new SongV3("$10", "hitchhiker", 140));

    mySongs.add(new SongV3("havana", "cabello", "60"));
    mySongs.add(new SongV3("Cassidy", "grateful dead", "65"));
    mySongs.add(new SongV3("50 ways", "simon", "70"));
    mySongs.add(new SongV3("havana", "cabello", 105));
    mySongs.add(new SongV3("Cassidy", "grateful dead", 158));
    mySongs.add(new SongV3("50 ways", "simon", 102));
    return mySongs;
  }
}
+20 −0
Changes for src/main/java/ch10b/SharpenLambdas.java: 20 added lines, 0 removed lines.
Original line number Diff line number Diff line
package ch10b;

import java.util.List;

public class SharpenLambdas {
  public static void main(String[] args) {
    new SharpenLambdas().go();
  }

  public void go() {
    List<SongV3> songList = MockSongs.getSongsV3();
    System.out.println(songList);

    songList.sort((one, two) -> one.getBpm() - two.getBpm());
    System.out.println(songList);

    songList.sort((one, two) -> two.getTitle().compareTo(one.getTitle()));
    System.out.println(songList);
  }
}
+3 −3
Changes for src/main/java/ch10b/SongV2.java: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ package ch10b;
class SongV2 {
  private String title;
  private String artist;
  private String bpm;
  private int bpm;

  SongV2(String title, String artist, String bpm) {
  SongV2(String title, String artist, int bpm) {
    this.title = title;
    this.artist = artist;
    this.bpm = bpm;
@@ -19,7 +19,7 @@ class SongV2 {
    return artist;
  }

  public String getBpm() {
  public int getBpm() {
    return bpm;
  }

Loading