Skip to content

Commit 255c1c9

Browse files
authored
Changed method names to make more idiomatic (#2317) (#2501)
1 parent c94babb commit 255c1c9

File tree

4 files changed

+43
-42
lines changed

4 files changed

+43
-42
lines changed

exercises/practice/complex-numbers/.meta/config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"muzimuzhi",
1414
"SleeplessByte",
1515
"Smarticles101",
16-
"sshine"
16+
"sshine",
17+
"Wasy18"
1718
],
1819
"files": {
1920
"solution": [

exercises/practice/complex-numbers/.meta/src/reference/java/ComplexNumber.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,56 +2,56 @@ final class ComplexNumber {
22

33
private final double real;
44

5-
private final double imag;
5+
private final double imaginary;
66

7-
ComplexNumber(double real, double imag) {
7+
ComplexNumber(double real, double imaginary) {
88
this.real = real;
9-
this.imag = imag;
9+
this.imaginary = imaginary;
1010
}
1111

1212
double getReal() {
1313
return real;
1414
}
1515

16-
double getImag() {
17-
return imag;
16+
double getImaginary() {
17+
return imaginary;
1818
}
1919

20-
ComplexNumber times(ComplexNumber other) {
20+
ComplexNumber multiply(ComplexNumber other) {
2121
return new ComplexNumber(
22-
real * other.real - imag * other.imag,
23-
real * other.imag + imag * other.real);
22+
real * other.real - imaginary * other.imaginary,
23+
real * other.imaginary + imaginary * other.real);
2424
}
2525

2626
ComplexNumber add(ComplexNumber other) {
27-
return new ComplexNumber(real + other.real, imag + other.imag);
27+
return new ComplexNumber(real + other.real, imaginary + other.imaginary);
2828
}
2929

30-
ComplexNumber minus(ComplexNumber other) {
31-
return new ComplexNumber(real - other.real, imag - other.imag);
30+
ComplexNumber subtract(ComplexNumber other) {
31+
return new ComplexNumber(real - other.real, imaginary - other.imaginary);
3232
}
3333

34-
ComplexNumber div(ComplexNumber other) {
35-
return this.times(other.conjugate()).div(Math.pow(other.abs(), 2));
34+
ComplexNumber divide(ComplexNumber other) {
35+
return this.multiply(other.conjugate()).divide(Math.pow(other.abs(), 2));
3636
}
3737

3838
double abs() {
39-
return Math.hypot(real, imag);
39+
return Math.hypot(real, imaginary);
4040
}
4141

4242
ComplexNumber conjugate() {
43-
return new ComplexNumber(real, -imag);
43+
return new ComplexNumber(real, -imaginary);
4444
}
4545

4646
ComplexNumber exponentialOf() {
47-
return new ComplexNumber(Math.cos(imag), Math.sin(imag)).times(Math.exp(real));
47+
return new ComplexNumber(Math.cos(imaginary), Math.sin(imaginary)).multiply(Math.exp(real));
4848
}
4949

50-
private ComplexNumber div(double factor) {
51-
return new ComplexNumber(real / factor, imag / factor);
50+
private ComplexNumber divide(double factor) {
51+
return new ComplexNumber(real / factor, imaginary / factor);
5252
}
5353

54-
private ComplexNumber times(double factor) {
55-
return new ComplexNumber(factor * real, factor * imag);
54+
private ComplexNumber multiply(double factor) {
55+
return new ComplexNumber(factor * real, factor * imaginary);
5656
}
5757
}

exercises/practice/complex-numbers/src/main/java/ComplexNumber.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
class ComplexNumber {
22

3-
ComplexNumber(double real, double imag) {
3+
ComplexNumber(double real, double imaginary) {
44
throw new UnsupportedOperationException("Delete this statement and write your own implementation.");
55
}
66

77
double getReal() {
88
throw new UnsupportedOperationException("Delete this statement and write your own implementation.");
99
}
1010

11-
double getImag() {
11+
double getImaginary() {
1212
throw new UnsupportedOperationException("Delete this statement and write your own implementation.");
1313
}
1414

@@ -20,23 +20,23 @@ ComplexNumber add(ComplexNumber other) {
2020
throw new UnsupportedOperationException("Delete this statement and write your own implementation.");
2121
}
2222

23-
ComplexNumber minus(ComplexNumber other) {
23+
ComplexNumber subtract(ComplexNumber other) {
2424
throw new UnsupportedOperationException("Delete this statement and write your own implementation.");
2525
}
2626

27-
ComplexNumber times(ComplexNumber other) {
27+
ComplexNumber multiply(ComplexNumber other) {
2828
throw new UnsupportedOperationException("Delete this statement and write your own implementation.");
2929
}
3030

31-
ComplexNumber times(double factor) {
31+
ComplexNumber multiply(double factor) {
3232
throw new UnsupportedOperationException("Delete this statement and write your own implementation.");
3333
}
3434

35-
ComplexNumber div(ComplexNumber other) {
35+
ComplexNumber divide(ComplexNumber other) {
3636
throw new UnsupportedOperationException("Delete this statement and write your own implementation.");
3737
}
3838

39-
ComplexNumber div(double divisor) {
39+
ComplexNumber divide(double divisor) {
4040
throw new UnsupportedOperationException("Delete this statement and write your own implementation.");
4141
}
4242

exercises/practice/complex-numbers/src/test/java/ComplexNumberTest.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ private void assertDoublesEqual(double d1, double d2, String numberPart) {
1717

1818
private void assertComplexNumbersEqual(ComplexNumber c1, ComplexNumber c2) {
1919
assertDoublesEqual(c1.getReal(), c2.getReal(), "real");
20-
assertDoublesEqual(c1.getImag(), c2.getImag(), "imaginary");
20+
assertDoublesEqual(c1.getImaginary(), c2.getImaginary(), "imaginary");
2121
}
2222

2323
// Tests
@@ -49,31 +49,31 @@ public void testRealPartOfNumberWithRealAndImaginaryParts() {
4949
@Test
5050
public void testImaginaryPartOfPurelyRealNumber() {
5151
double expected = 0.0;
52-
double actual = new ComplexNumber(1.0, 0).getImag();
52+
double actual = new ComplexNumber(1.0, 0).getImaginary();
5353
assertDoublesEqual(expected, actual, "imaginary");
5454
}
5555

5656
@Ignore("Remove to run test")
5757
@Test
5858
public void testImaginaryPartOfPurelyImaginaryNumber() {
5959
double expected = 1.0;
60-
double actual = new ComplexNumber(0, 1.0).getImag();
60+
double actual = new ComplexNumber(0, 1.0).getImaginary();
6161
assertDoublesEqual(expected, actual, "imaginary");
6262
}
6363

6464
@Ignore("Remove to run test")
6565
@Test
6666
public void testImaginaryPartOfNumberWithRealAndImaginaryParts() {
6767
double expected = 2.0;
68-
double actual = new ComplexNumber(1.0, 2.0).getImag();
68+
double actual = new ComplexNumber(1.0, 2.0).getImaginary();
6969
assertDoublesEqual(expected, actual, "imaginary");
7070
}
7171

7272
@Ignore("Remove to run test")
7373
@Test
7474
public void testImaginaryUnitExhibitsDefiningProperty() {
7575
ComplexNumber expected = new ComplexNumber(-1.0, 0);
76-
ComplexNumber actual = new ComplexNumber(0, 1.0).times(new ComplexNumber(0, 1.0));
76+
ComplexNumber actual = new ComplexNumber(0, 1.0).multiply(new ComplexNumber(0, 1.0));
7777
assertComplexNumbersEqual(expected, actual);
7878
}
7979

@@ -105,71 +105,71 @@ public void testAdditionWithRealAndImaginaryParts() {
105105
@Test
106106
public void testSubtractionWithPurelyRealNumbers() {
107107
ComplexNumber expected = new ComplexNumber(-1.0, 0.0);
108-
ComplexNumber actual = new ComplexNumber(1.0, 0.0).minus(new ComplexNumber(2.0, 0.0));
108+
ComplexNumber actual = new ComplexNumber(1.0, 0.0).subtract(new ComplexNumber(2.0, 0.0));
109109
assertComplexNumbersEqual(expected, actual);
110110
}
111111

112112
@Ignore("Remove to run test")
113113
@Test
114114
public void testSubtractionWithPurelyImaginaryNumbers() {
115115
ComplexNumber expected = new ComplexNumber(0, -1.0);
116-
ComplexNumber actual = new ComplexNumber(0, 1.0).minus(new ComplexNumber(0, 2.0));
116+
ComplexNumber actual = new ComplexNumber(0, 1.0).subtract(new ComplexNumber(0, 2.0));
117117
assertComplexNumbersEqual(expected, actual);
118118
}
119119

120120
@Ignore("Remove to run test")
121121
@Test
122122
public void testSubtractionWithRealAndImaginaryParts() {
123123
ComplexNumber expected = new ComplexNumber(-2.0, -2.0);
124-
ComplexNumber actual = new ComplexNumber(1.0, 2.0).minus(new ComplexNumber(3.0, 4.0));
124+
ComplexNumber actual = new ComplexNumber(1.0, 2.0).subtract(new ComplexNumber(3.0, 4.0));
125125
assertComplexNumbersEqual(expected, actual);
126126
}
127127

128128
@Ignore("Remove to run test")
129129
@Test
130130
public void testMultiplicationWithPurelyRealNumbers() {
131131
ComplexNumber expected = new ComplexNumber(2.0, 0);
132-
ComplexNumber actual = new ComplexNumber(1.0, 0).times(new ComplexNumber(2.0, 0));
132+
ComplexNumber actual = new ComplexNumber(1.0, 0).multiply(new ComplexNumber(2.0, 0));
133133
assertComplexNumbersEqual(expected, actual);
134134
}
135135

136136
@Ignore("Remove to run test")
137137
@Test
138138
public void testMultiplicationWithPurelyImaginaryNumbers() {
139139
ComplexNumber expected = new ComplexNumber(-2.0, 0);
140-
ComplexNumber actual = new ComplexNumber(0, 1.0).times(new ComplexNumber(0, 2.0));
140+
ComplexNumber actual = new ComplexNumber(0, 1.0).multiply(new ComplexNumber(0, 2.0));
141141
assertComplexNumbersEqual(expected, actual);
142142
}
143143

144144
@Ignore("Remove to run test")
145145
@Test
146146
public void testMultiplicationWithRealAndImaginaryParts() {
147147
ComplexNumber expected = new ComplexNumber(-5.0, 10.0);
148-
ComplexNumber actual = new ComplexNumber(1.0, 2.0).times(new ComplexNumber(3.0, 4.0));
148+
ComplexNumber actual = new ComplexNumber(1.0, 2.0).multiply(new ComplexNumber(3.0, 4.0));
149149
assertComplexNumbersEqual(expected, actual);
150150
}
151151

152152
@Ignore("Remove to run test")
153153
@Test
154154
public void testDivisionWithPurelyRealNumbers() {
155155
ComplexNumber expected = new ComplexNumber(0.5, 0);
156-
ComplexNumber actual = new ComplexNumber(1.0, 0).div(new ComplexNumber(2.0, 0));
156+
ComplexNumber actual = new ComplexNumber(1.0, 0).divide(new ComplexNumber(2.0, 0));
157157
assertComplexNumbersEqual(expected, actual);
158158
}
159159

160160
@Ignore("Remove to run test")
161161
@Test
162162
public void testDivisionWithPurelyImaginaryNumbers() {
163163
ComplexNumber expected = new ComplexNumber(0.5, 0);
164-
ComplexNumber actual = new ComplexNumber(0, 1.0).div(new ComplexNumber(0, 2.0));
164+
ComplexNumber actual = new ComplexNumber(0, 1.0).divide(new ComplexNumber(0, 2.0));
165165
assertComplexNumbersEqual(expected, actual);
166166
}
167167

168168
@Ignore("Remove to run test")
169169
@Test
170170
public void testDivisionWithRealAndImaginaryParts() {
171171
ComplexNumber expected = new ComplexNumber(0.44, 0.08);
172-
ComplexNumber actual = new ComplexNumber(1.0, 2.0).div(new ComplexNumber(3.0, 4.0));
172+
ComplexNumber actual = new ComplexNumber(1.0, 2.0).divide(new ComplexNumber(3.0, 4.0));
173173
assertComplexNumbersEqual(expected, actual);
174174
}
175175

0 commit comments

Comments
 (0)