Merge branch 'JoshJ-Problems' of https://github.com/code4tomorrow/java into JoshJ-Problems

Author: JJ27

src/com/codefortomorrow/advanced/chapter14/practice/Lexico.java

@@ -13,9 +13,9 @@
 Hint: Java’s String.compareTo method may be of use to you.
 */
 
-public class Lexico{
+public class Lexico {
 
-    public static void main(String[] args){
+    public static void main(String[] args) {
         // Add code here
     }
 }

src/com/codefortomorrow/advanced/chapter14/solutions/Lexico.java

@@ -13,15 +13,16 @@
 Hint: Java’s String.compareTo method may be of use to you.
 */
 
-public class Lexico{
+public class Lexico {
 
-  public static void main(String[] args){
-    BufferedReader br = null;
-    BufferedReader br2 = null;
-    try{
-      br = new BufferedReader(new FileReader("f1.txt"));
-      br2 = new BufferedReader(new FileReader("f2.txt"));
+    public static void main(String[] args) {
+        BufferedReader br = null;
+        BufferedReader br2 = null;
+        try {
+            br = new BufferedReader(new FileReader("f1.txt"));
+            br2 = new BufferedReader(new FileReader("f2.txt"));
 
+<<<<<<< HEAD
       String line1 = br.readLine();
       String line2 = br2.readLine();
       int c = line1.compareTo(line2);
@@ -41,4 +42,21 @@ public static void main(String[] args){
     br2.close();
   }
   }
+=======
+            String line1 = br.readLine();
+            String line2 = br2.readLine();
+            int c = line1.compareTo(line2);
+            while (c == 0) {
+                line1 = br.readLine();
+                line2 = br2.readLine();
+                c = line1.compareTo(line2);
+            }
+            if (c > 0) System.out.println("File 2"); else System.out.println(
+                "File 1"
+            );
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+>>>>>>> 7e8c2fe0ebe2b7a31da0266f78e9388b466656c3
 }

src/com/codefortomorrow/advanced/chapter15/practice/MeasurableProblem.java

@@ -1,4 +1,5 @@
 package com.codefortomorrow.advanced.chapter15.practice;
+
 /*
 Create a Measurable interface
 that is used to “measure” anything. Add necessary methods.
@@ -11,14 +12,17 @@
 
 Problem adapted from Java SE 9 Textbook
 */
-public class MeasurableProblem{
-  public static void main(String[] args){
-    //Add testing code
-  }
+public class MeasurableProblem {
+
+    public static void main(String[] args) {
+        //Add testing code
+    }
 }
-interface Measurable{
-  //add interface code here
+
+interface Measurable {
+    //add interface code here
 }
-class Student implements Measurable{
-  //Add student code here
+
+class Student implements Measurable {
+    //Add student code here
 }

src/com/codefortomorrow/advanced/chapter15/solutions/MeasurableProblem.java

@@ -1,5 +1,7 @@
 package com.codefortomorrow.advanced.chapter15.solutions;
+
 import java.util.Arrays;
+
 /*
 Create a Measurable interface
 that is used to “measure” anything. Add necessary methods.
@@ -12,66 +14,75 @@
 
 Problem adapted from Java SE 9 Textbook
 */
-public class MeasurableProblem{
-  public static void main(String[] args){
-    Object[] students = {
-      new Student("John", 2.7),
-      new Student("Josh", 1.2),
-      new Student("Jacob", 3.4),
-      new Student("Rebecca", 3.5),
-      new Student("Arnav", 4.0)
-    };
-    Student test = new Student();
-    System.out.println("Average: " + test.average(students));
-    System.out.println("Largest: " + test.largest(students));
-    System.out.println("Smallest: " + test.smallest(students));
-  }
+public class MeasurableProblem {
+
+    public static void main(String[] args) {
+        Object[] students = {
+            new Student("John", 2.7),
+            new Student("Josh", 1.2),
+            new Student("Jacob", 3.4),
+            new Student("Rebecca", 3.5),
+            new Student("Arnav", 4.0),
+        };
+        Student test = new Student();
+        System.out.println("Average: " + test.average(students));
+        System.out.println("Largest: " + test.largest(students));
+        System.out.println("Smallest: " + test.smallest(students));
+    }
 }
-interface Measurable{
-  abstract double average(Object[] students);
-  abstract String largest(Object[] students);
-  abstract String smallest(Object[] students);
+
+interface Measurable {
+    abstract double average(Object[] students);
+
+    abstract String largest(Object[] students);
+
+    abstract String smallest(Object[] students);
 }
-class Student implements Measurable{
-  private double GPA;
-  private String name;
-  public Student(String name, double GPA){
-    this.name = name;
-    this.GPA = GPA;
-  }
-  public Student(){
-    name = "";
-    GPA = 0.0;
-  }
-  public double average(Object[] orig){
-    Student[] students = Arrays.copyOf(orig, orig.length, Student[].class); //Casting
-    double sum = 0;
-    for(Student s: students)
-      sum += s.getGPA();
-    return sum / students.length;
-  }
-  public String largest(Object[] orig){
-    Student[] students = Arrays.copyOf(orig, orig.length, Student[].class); //Casting
-    Student curr = students[0];
-    for(Student s: students){
-      if(s.getGPA() > curr.getGPA())
-        curr = s;
+
+class Student implements Measurable {
+    private double GPA;
+    private String name;
+
+    public Student(String name, double GPA) {
+        this.name = name;
+        this.GPA = GPA;
+    }
+
+    public Student() {
+        name = "";
+        GPA = 0.0;
+    }
+
+    public double average(Object[] orig) {
+        Student[] students = Arrays.copyOf(orig, orig.length, Student[].class); //Casting
+        double sum = 0;
+        for (Student s : students) sum += s.getGPA();
+        return sum / students.length;
+    }
+
+    public String largest(Object[] orig) {
+        Student[] students = Arrays.copyOf(orig, orig.length, Student[].class); //Casting
+        Student curr = students[0];
+        for (Student s : students) {
+            if (s.getGPA() > curr.getGPA()) curr = s;
+        }
+        return curr.getName();
     }
-    return curr.getName();
-  }
-  public String smallest(Object[] orig){
-    Student[] students = Arrays.copyOf(orig, orig.length, Student[].class); //Casting
-    Student curr = students[0];
-    for(Student s: students){
-      if(s.getGPA() < curr.getGPA())
-        curr = s;
+
+    public String smallest(Object[] orig) {
+        Student[] students = Arrays.copyOf(orig, orig.length, Student[].class); //Casting
+        Student curr = students[0];
+        for (Student s : students) {
+            if (s.getGPA() < curr.getGPA()) curr = s;
+        }
+        return curr.getName();
+    }
+
+    public double getGPA() {
+        return GPA;
+    }
+
+    public String getName() {
+        return name;
     }
-    return curr.getName();
-  }
-  public double getGPA(){
-    return GPA;
-  }
-  public String getName(){
-    return name;
-  }
 }