Skip to content

Commit 100717b

Browse files
Jim FloresJim Flores
authored andcommitted
Updated code to print more detailed output.
1 parent 74c90b4 commit 100717b

File tree

2 files changed

+32
-6
lines changed

2 files changed

+32
-6
lines changed

studio/index.js

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,14 @@ var astronauts = [
1313
];
1414
for (var i = 0; i < astronauts.length; i++) {
1515
var astronaut = astronauts[i];
16-
console.log(astronaut.name, falcon9.addAstronaut(astronaut));
16+
var status_1 = '';
17+
if (falcon9.addAstronaut(astronaut)) {
18+
status_1 = "On board";
19+
}
20+
else {
21+
status_1 = "Not on board";
22+
}
23+
console.log(astronaut.name + ": " + status_1);
1724
}
1825
var cargo = [
1926
new Cargo_1.Cargo(3107.39, "Satellite"),
@@ -24,6 +31,13 @@ var cargo = [
2431
];
2532
for (var i = 0; i < cargo.length; i++) {
2633
var c = cargo[i];
27-
console.log(c.material, falcon9.addCargo(c));
34+
var loaded = '';
35+
if (falcon9.addCargo(c)) {
36+
loaded = "Loaded";
37+
}
38+
else {
39+
loaded = "Not loaded";
40+
}
41+
console.log(c.material + ": " + loaded);
2842
}
2943
console.log("Final cargo and astronaut mass: " + falcon9.currentMassKg() + " kg.");

studio/index.ts

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,15 @@ let astronauts: Astronaut[] = [
1313
new Astronaut(99, 'Charles')
1414
];
1515

16-
for (let i =0; i < astronauts.length; i++) {
16+
for (let i = 0; i < astronauts.length; i++) {
1717
let astronaut = astronauts[i];
18-
console.log(astronaut.name, falcon9.addAstronaut(astronaut));
18+
let status = '';
19+
if (falcon9.addAstronaut(astronaut)) {
20+
status = "On board";
21+
} else {
22+
status = "Not on board";
23+
}
24+
console.log(`${astronaut.name}: ${status}`);
1925
}
2026

2127
let cargo: Cargo[] = [
@@ -26,9 +32,15 @@ let cargo: Cargo[] = [
2632
new Cargo(2107.39, "Tesla Roadster"),
2733
];
2834

29-
for (let i =0; i < cargo.length; i++) {
35+
for (let i = 0; i < cargo.length; i++) {
3036
let c = cargo[i];
31-
console.log(c.material, falcon9.addCargo(c));
37+
let loaded = '';
38+
if (falcon9.addCargo(c)) {
39+
loaded = "Loaded"
40+
} else {
41+
loaded = "Not loaded"
42+
}
43+
console.log(`${c.material}: ${loaded}`);
3244
}
3345

3446
console.log(`Final cargo and astronaut mass: ${falcon9.currentMassKg()} kg.`);

0 commit comments

Comments
 (0)