Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 5af8617

Browse filesBrowse files
ChrisMayfieldChrisMayfield
committed
ch04 revisions
1 parent f48f47e commit 5af8617
Copy full SHA for 5af8617

File tree

Expand file treeCollapse file tree

5 files changed

+59
-70
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

5 files changed

+59
-70
lines changed
Open diff view settings
Collapse file

‎ch04/Circle.java‎

Copy file name to clipboard
+3-66Lines changed: 3 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,13 @@
11
public class Circle {
22

33
public static double calculateArea(double radius) {
4-
double result = Math.PI * radius * radius;
5-
return result;
6-
}
7-
8-
public static double calculateArea2(double radius) {
94
return Math.PI * radius * radius;
105
}
116

12-
public static double distance
13-
(double x1, double y1, double x2, double y2) {
14-
double dx = x2 - x1;
15-
double dy = y2 - y1;
16-
System.out.println("dx is " + dx);
17-
System.out.println("dy is " + dy);
18-
return 0.0;
19-
}
20-
21-
public static double distance2
22-
(double x1, double y1, double x2, double y2) {
23-
double dx = x2 - x1;
24-
double dy = y2 - y1;
25-
double dsquared = dx * dx + dy * dy;
26-
System.out.println("dsquared is " + dsquared);
27-
return 0.0;
28-
}
29-
30-
public static double distance3
31-
(double x1, double y1, double x2, double y2) {
32-
double dx = x2 - x1;
33-
double dy = y2 - y1;
34-
double dsquared = dx * dx + dy * dy;
35-
double result = Math.sqrt(dsquared);
36-
return result;
37-
}
38-
39-
public static double circleArea
40-
(double xc, double yc, double xp, double yp) {
41-
double radius = distance(xc, yc, xp, yp);
42-
double area = calculateArea(radius);
43-
return area;
44-
}
45-
46-
public static double calculateArea
47-
(double xc, double yc, double xp, double yp) {
48-
return calculateArea(distance(xc, yc, xp, yp));
49-
}
50-
517
public static void main(String[] args) {
52-
53-
System.out.println("calculateArea");
54-
System.out.println(calculateArea(3.0));
55-
56-
System.out.println("calculateArea2");
57-
System.out.println(calculateArea2(3.0));
58-
59-
System.out.println("distance");
60-
System.out.println(distance(1.0, 2.0, 4.0, 6.0));
61-
62-
System.out.println("distance2");
63-
System.out.println(distance2(1.0, 2.0, 4.0, 6.0));
64-
65-
System.out.println("distance3");
66-
System.out.println(distance3(1.0, 2.0, 4.0, 6.0));
67-
68-
System.out.println("circleArea");
69-
System.out.println(circleArea(1.0, 2.0, 4.0, 6.0));
70-
71-
System.out.println("calculateArea with 4 doubles");
72-
System.out.println(calculateArea(1.0, 2.0, 4.0, 6.0));
73-
8+
double diameter = 10.0;
9+
double area = calculateArea(diameter / 2);
10+
System.out.println(area);
7411
}
7512

7613
}
Collapse file

‎ch04/Distance.java‎

Copy file name to clipboard
+45Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
public class Distance {
2+
3+
public static double distance1(double x1, double y1, double x2, double y2) {
4+
return 0.0; // stub
5+
}
6+
7+
public static double distance2(double x1, double y1, double x2, double y2) {
8+
double dx = x2 - x1;
9+
double dy = y2 - y1;
10+
System.out.println("dx is " + dx);
11+
System.out.println("dy is " + dy);
12+
return 0.0; // stub
13+
}
14+
15+
public static double distance3(double x1, double y1, double x2, double y2) {
16+
double dx = x2 - x1;
17+
double dy = y2 - y1;
18+
double dsquared = dx * dx + dy * dy;
19+
System.out.println("dsquared is " + dsquared);
20+
return 0.0; // stub
21+
}
22+
23+
public static double distance4(double x1, double y1, double x2, double y2) {
24+
double dx = x2 - x1;
25+
double dy = y2 - y1;
26+
double dsquared = dx * dx + dy * dy;
27+
double result = Math.sqrt(dsquared);
28+
return result;
29+
}
30+
31+
public static void main(String[] args) {
32+
System.out.println("\ndistance version 1");
33+
System.out.println(distance1(1.0, 2.0, 4.0, 6.0));
34+
35+
System.out.println("\ndistance version 2");
36+
System.out.println(distance2(1.0, 2.0, 4.0, 6.0));
37+
38+
System.out.println("\ndistance version 3");
39+
System.out.println(distance3(1.0, 2.0, 4.0, 6.0));
40+
41+
System.out.println("\ndistance version 4");
42+
System.out.println(distance4(1.0, 2.0, 4.0, 6.0));
43+
}
44+
45+
}
Collapse file

‎ch04/Methods.java‎ ‎ch04/MathMethods.java‎ch04/Methods.java renamed to ch04/MathMethods.java

Copy file name to clipboardExpand all lines: ch04/MathMethods.java
+5-4Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
/**
2-
* Examples from Chapter 4.
3-
*/
4-
public class Methods {
1+
public class MathMethods {
52

63
public static void main(String[] args) {
74
double root = Math.sqrt(17.0);
@@ -10,10 +7,14 @@ public static void main(String[] args) {
107

118
double degrees = 90;
129
double angle2 = degrees / 180.0 * Math.PI;
10+
1311
double radians = Math.toRadians(180.0);
1412
double degrees2 = Math.toDegrees(Math.PI);
13+
1514
long x = Math.round(Math.PI * 20.0);
1615

16+
// examples of composition
17+
1718
double x2 = Math.cos(angle + Math.PI / 2.0);
1819
double x3 = Math.exp(Math.log(10.0));
1920
double x4 = Math.pow(2.0, 10.0);
Collapse file

‎ch04/PrintTime.java‎

Copy file name to clipboardExpand all lines: ch04/PrintTime.java
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ public static void main(String[] args) {
1010
int hour = 11;
1111
int minute = 59;
1212
printTime(hour, minute);
13+
14+
// additional example for stack diagram
15+
printTime(hour + 1, 0);
1316
}
1417

1518
}
Collapse file

‎ch04/PrintTwice.java‎

Copy file name to clipboardExpand all lines: ch04/PrintTwice.java
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ public static void printTwice(String s) {
77

88
public static void main(String[] args) {
99
printTwice("Don't make me say this twice!");
10+
11+
String message = "Never say never.";
12+
printTwice(message);
1013
}
1114

1215
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.