summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormokha <mokha@cisco.com>2019-05-15 21:40:39 -0600
committermokha <mokha@cisco.com>2019-05-15 21:40:39 -0600
commit4e343415d3939ac7292e0b3bb19182785a819860 (patch)
treebc21eec3eb1bbfb79659bb46edc05e11286eaaa4 /src
parent5e19c9d4a736b75d482bfe46616ed110d1465745 (diff)
tidy up output
Diffstat (limited to 'src')
-rw-r--r--src/Q10/TaxReturn.java5
-rw-r--r--src/Q6/Triangle.java8
-rw-r--r--src/Q7/HailstoneSequence.java1
-rw-r--r--src/Q8/Candidate.java2
4 files changed, 10 insertions, 6 deletions
diff --git a/src/Q10/TaxReturn.java b/src/Q10/TaxReturn.java
index d30dc7d..7fbd48b 100644
--- a/src/Q10/TaxReturn.java
+++ b/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());
}
}
diff --git a/src/Q6/Triangle.java b/src/Q6/Triangle.java
index 5c3b725..3e641ce 100644
--- a/src/Q6/Triangle.java
+++ b/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());
}
}
diff --git a/src/Q7/HailstoneSequence.java b/src/Q7/HailstoneSequence.java
index 926665d..a217a49 100644
--- a/src/Q7/HailstoneSequence.java
+++ b/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();
}
}
diff --git a/src/Q8/Candidate.java b/src/Q8/Candidate.java
index 7c8809b..2024267 100644
--- a/src/Q8/Candidate.java
+++ b/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);
}
}