Commit 4e34341
Changed files (5)
src
src/Q10/TaxReturn.java
@@ -111,7 +111,10 @@ public class TaxReturn {
System.out.println("Bad input.");
return;
}
- TaxReturn aTaxReturn = new TaxReturn(income, status);
+ System.out.print("Enter # of children: ");
+ int children = in.nextInt();
+
+ TaxReturn aTaxReturn = new TaxReturn(income, status, children);
System.out.println("The tax is " + aTaxReturn.getTax());
}
}
src/Q6/Triangle.java
@@ -57,10 +57,10 @@ public class Triangle {
}
public static void main(String[] args) {
- System.out.print(new Triangle(48, Triangle.NULL, 80).toString());
- System.out.print(new Triangle(84, Triangle.NULL, 91).toString());
+ System.out.println(new Triangle(48, Triangle.NULL, 80).toString());
+ System.out.println(new Triangle(84, Triangle.NULL, 91).toString());
- System.out.print(new Triangle(45, 55, 75).isRightTriangle());
- System.out.print(new Triangle(28, 45, 53).isRightTriangle());
+ System.out.println(new Triangle(45, 55, 75).isRightTriangle());
+ System.out.println(new Triangle(28, 45, 53).isRightTriangle());
}
}
src/Q7/HailstoneSequence.java
@@ -45,5 +45,6 @@ public class HailstoneSequence {
for (Integer i : sequence) System.out.println(i);
for (Integer i : sequence) System.out.print("-");
+ System.out.println();
}
}
src/Q8/Candidate.java
@@ -142,6 +142,6 @@ public class Candidate extends AddressBook {
};
for (Candidate candidate : Candidate.getEligibleCandidates(candidates))
- System.out.print(candidate);
+ System.out.println(candidate);
}
}
Rakefile
@@ -20,6 +20,7 @@ task package: [:test, :doc] do
sh 'cp -r src/ tmp/assignment1'
sh 'cp tmp/assignment1/Q1/AddressBook.java tmp/assignment1/Q4/'
sh 'cp tmp/assignment1/Q1/AddressBook.java tmp/assignment1/Q5/'
+ sh 'cp tmp/assignment1/Q1/AddressBook.java tmp/assignment1/Q8/'
sh 'cp -r doc/ tmp/assignment1/doc'
sh 'cp -r target/site/apidocs/ tmp/assignment1/doc'
sh "sed -i '' '/package Q.*;/d' tmp/assignment1/Q*/*.java"