Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions source/ch6_definingclasses.ptx
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ Fraction@6ff3c5b5
<program xml:id="java-tostring" language="java">
<code>
public String toString() {
return numerator.toString() + "/" + denominator.toString();
return numerator.toString() + "/" + denominator.toString(); // convert to a string
}
</code>
</program>
Expand Down Expand Up @@ -598,10 +598,10 @@ object1.equals(object2)

<program xml:id="java-fraction-equals" language="java">
<code>
public boolean equals(Fraction other) {
Integer num1 = this.numerator * other.getDenominator();
Integer num2 = this.denominator * other.getNumerator();
if (num1 == num2)

public boolean equals(Fraction other) { // a method to compare two fractions
Integer num1 = this.numerator * other.getDenominator(); Integer num2 = this.denominator * other.getNumerator();
if (num1 == num2) // if the numerators are equal in value, the fractions are equal
return true;
else
return false;
Expand Down Expand Up @@ -688,16 +688,16 @@ public class Fraction extends Number {

<program xml:id="java-object-type-conversions" language="java">
<code>
public double doubleValue() {
public double doubleValue() { // convert to a double
return numerator.doubleValue() / denominator.doubleValue();
}
public float floatValue() {
public float floatValue() { // convert to a float
return numerator.floatValue() / denominator.floatValue();
}
public int intValue() {
public int intValue() { // convert to an int
return numerator.intValue() / denominator.intValue();
}
public long longValue() {
public long longValue() { // convert to a long
return numerator.longValue() / denominator.longValue();
}
</code>
Expand All @@ -724,7 +724,7 @@ public long longValue() {
<program xml:id="java-ugly-add-method" language="java">
<code>
public void test(Number a, Number b) {
a.add(b);
a.add(b); // this is a bad idea
}
</code>
</program>
Expand Down