Skip to content

Commit c436676

Browse files
ashleydavisashleydavis
committed
Small tweaks and improvements.
1 parent 912baf3 commit c436676

17 files changed

+329
-44
lines changed

‎listing-1.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
'use strict';
1+
"use strict";
22

33
console.log("Hello world");

‎listing-10.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
'use strict';
1+
"use strict";
22

33
const dataForge = require('data-forge');
44
const formulajs = require('formulajs');
55

6-
dataForge.readFile('./data/monthly_crashes-cut-down.csv')
6+
dataForge.readFile("./data/monthly_crashes-cut-down.csv")
77
.parseCSV()
88
.then(dataFrame => {
99
dataFrame = dataFrame.parseFloats([
1010
"Month#", "Year", "Crashes", "Fatalities",
1111
"Hospitalized"
1212
]);
1313
const monthNoSeries = dataFrame.getSeries("Month#");
14-
const xValues = monthNoSeries.take(6).toArray();
14+
const xValues = monthNoSeries.head(6).toArray();
1515
const fatalitiesSeries = dataFrame.getSeries("Fatalities");
16-
const yValues = fatalitiesSeries.take(6).toArray();
16+
const yValues = fatalitiesSeries.head(6).toArray();
1717
const nextMonthNo = monthNoSeries.skip(6).first();
1818
const nextMonthFatalitiesForecast = formulajs.FORECAST(nextMonthNo, yValues, xValues);
1919
console.log('Forecasted fatalities: ' + nextMonthFatalitiesForecast);

‎listing-11.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
'use strict';
1+
"use strict";
22

33
const dataForge = require('data-forge');
44
const formulajs = require('formulajs');
55

6-
dataForge.readFile('./data/monthly_crashes-cut-down.csv')
6+
dataForge.readFile("./data/monthly_crashes-cut-down.csv")
77
.parseCSV()
88
.then(dataFrame => {
99
dataFrame = dataFrame
@@ -14,9 +14,7 @@ dataForge.readFile('./data/monthly_crashes-cut-down.csv')
1414
.setIndex("Month#");
1515
const fatalitiesSeries = dataFrame.getSeries("Fatalities");
1616
const fatalitiesSeriesWithForecast = fatalitiesSeries.rollingWindow(6)
17-
.asPairs()
18-
.select(pair => {
19-
const window = pair[1];
17+
.select(window => {
2018
const fatalitiesValues = window.toArray();
2119
const monthNoValues = window.getIndex().toArray();
2220
const nextMonthNo = monthNoValues[monthNoValues.length-1] + 1;
@@ -25,7 +23,8 @@ dataForge.readFile('./data/monthly_crashes-cut-down.csv')
2523
formulajs.FORECAST(nextMonthNo, fatalitiesValues, monthNoValues)
2624
];
2725
})
28-
.asValues();
26+
.withIndex(pair => pair[0])
27+
.select(pair => pair[1]);
2928
const dataFrameWithForecast = dataFrame.withSeries({ Trend: fatalitiesSeriesWithForecast });
3029
console.log(dataFrameWithForecast.toString());
3130
})

‎listing-12.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
1-
'use strict';
1+
"use strict";
22

33
const dataForge = require('data-forge');
44
const formulajs = require('formulajs');
55

6-
dataForge.readFile('./data/monthly_crashes-cut-down.csv')
6+
dataForge.readFile("./data/monthly_crashes-cut-down.csv")
77
.parseCSV()
88
.then(dataFrame => {
99
dataFrame = dataFrame
1010
.parseFloats(["Month#", "Year", "Crashes", "Fatalities", "Hospitalized"])
1111
.setIndex("Month#");
1212
const fatalitiesSeries = dataFrame.getSeries("Fatalities");
1313
const fatalitiesSeriesWithForecast = fatalitiesSeries.rollingWindow(6) // Returns a series of windows.
14-
.asPairs() // Deal with index/value pairs.
15-
.select(pair => { // Transform each window into a forecast indexed by month#.
16-
const window = pair[1];
14+
.select(window => { // Transform each window into a forecast indexed by month#.
1715
const fatalitiesValues = window.toArray();
1816
const monthNoValues = window.getIndex().toArray();
1917
const nextMonthNo = monthNoValues[monthNoValues.length-1] + 1;
@@ -22,7 +20,8 @@ dataForge.readFile('./data/monthly_crashes-cut-down.csv')
2220
formulajs.FORECAST(nextMonthNo, fatalitiesValues, monthNoValues)
2321
];
2422
})
25-
.asValues(); // Convert back to series of values.
23+
.withIndex(pair => pair[0])
24+
.select(pair => pair[1]);
2625
const dataFrameWithForecast = dataFrame.withSeries({
2726
Trend: fatalitiesSeriesWithForecast
2827
});

‎listing-13.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//
99
// Your JavaScript code goes here.
1010
//
11-
document.write('Hello world!');
11+
document.write("Hello world!");
1212
</script>
1313
</body>
1414
</html>

‎listing-14.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<script src="/bower_components/jquery/dist/jquery.min.js"></script>
88

99
<script>
10-
$.get('/output/trend_output.csv')
10+
$.get("/output/trend_output.csv")
1111
.then(response => {
1212
console.log(response);
1313
})

‎listing-15.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<script src="/bower_components/data-forge/data-forge.dist.js"></script>
3535

3636
<script>
37-
$.get('./output/trend_output.csv')
37+
$.get("./output/trend_output.csv")
3838
.then(response => {
3939
var dataFrame = new dataForge
4040
.fromCSV(response)

‎listing-2.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
'use strict;';
1+
"use strict";
22

33
const importCsvFile = require('./toolkit/importCsvFile.js');
44

5-
importCsvFile('./data/monthly_crashes-cut-down.csv')
5+
importCsvFile("./data/monthly_crashes-cut-down.csv")
66
.then(data => {
77
console.log(data);
88
})

‎listing-3.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
'use strict;'
1+
"use strict";
22

33
const importCsvFile = require('./toolkit/importCsvFile.js');
44

5-
importCsvFile('./data/monthly_crashes-cut-down.csv')
5+
importCsvFile("./data/monthly_crashes-cut-down.csv")
66
.then(data => {
77
const sample = data.slice(0, 3);
88
console.log(sample);

‎listing-4.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
'use strict';
1+
"use strict";
22

33
const importCsvFile = require('./toolkit/importCsvFile.js');
44

5-
importCsvFile('./data/monthly_crashes-cut-down.csv')
5+
importCsvFile("./data/monthly_crashes-cut-down.csv")
66
.then(data => {
77
const sample = data[0];
8-
console.log('Year: ' + typeof(sample.Year));
9-
console.log('Month: ' + typeof(sample.Month));
10-
console.log('Crashes: ' + typeof(sample.Crashes));
11-
console.log('Fatalities: ' + typeof(sample.Fatalities));
8+
console.log("Year: " + typeof(sample.Year));
9+
console.log("Month: " + typeof(sample.Month));
10+
console.log("Crashes: " + typeof(sample.Crashes));
11+
console.log("Fatalities: " + typeof(sample.Fatalities));
1212
})
1313
.catch(err => {
1414
console.error(err && err.stack || err);

‎listing-5.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
'use strict;'
1+
"use strict";
22

33
const assert = require('assert');
44
const importCsvFile = require('./toolkit/importCsvFile.js');
55

6-
importCsvFile('./data/monthly_crashes-cut-down.csv')
6+
importCsvFile("./data/monthly_crashes-cut-down.csv")
77
.then(data => {
88
data.forEach(row => {
9-
assert(typeof(row.Year) === 'number');
10-
assert(typeof(row.Month) === 'string');
11-
assert(typeof(row.Crashes) === 'number');
12-
assert(typeof(row.Fatalities) === 'number');
9+
assert(typeof(row.Year) === "number");
10+
assert(typeof(row.Month) === "string");
11+
assert(typeof(row.Crashes) === "number");
12+
assert(typeof(row.Fatalities) === "number");
1313
});
1414
})
1515
.catch(err => {

‎listing-6.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
'use strict;'
1+
"use strict";
22

33
const dataForge = require('data-forge');
44

5-
dataForge.readFile('./data/monthly_crashes-cut-down.csv')
5+
dataForge.readFile("./data/monthly_crashes-cut-down.csv")
66
.parseCSV()
77
.then(dataFrame => {
88
console.log(dataFrame.getColumnNames());

‎listing-7.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
'use strict';
1+
"use strict";
22

33
const dataForge = require('data-forge');
44

5-
dataForge.readFile('./data/monthly_crashes-cut-down.csv')
5+
dataForge.readFile("./data/monthly_crashes-cut-down.csv")
66
.parseCSV()
77
.then(dataFrame => {
88
console.log("=== Head ===");

‎listing-8.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
'use strict';
1+
"use strict";
22

33
const dataForge = require('data-forge');
44

5-
dataForge.readFile('./data/monthly_crashes-cut-down.csv')
5+
dataForge.readFile("./data/monthly_crashes-cut-down.csv")
66
.parseCSV()
77
.then(dataFrame => {
88
dataFrame = dataFrame.parseFloats([

‎listing-9.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
'use strict';
1+
"use strict";
22

33
const dataForge = require('data-forge');
44

5-
dataForge.readFile('./data/monthly_crashes-cut-down.csv')
5+
dataForge.readFile("./data/monthly_crashes-cut-down.csv")
66
.parseCSV()
77
.then(dataFrame => {
88
dataFrame = dataFrame.parseFloats([

0 commit comments

Comments
 (0)