Skip to content

Commit 9a3b562

Browse files
feat(2018 day-03): track claims that have been made
1 parent 495cde6 commit 9a3b562

File tree

3 files changed

+18
-1
lines changed

3 files changed

+18
-1
lines changed

2018/day-03/claims.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ const makeClaim = (claim) => {
7474
}
7575
}
7676

77+
// Log claim
78+
_claims.push(claim.id)
79+
7780
return _cloth
7881
}
7982

@@ -101,14 +104,16 @@ const parseClaim = (str) => {
101104
return claim
102105
}
103106

107+
const getClaimedList = () => { return _claims }
108+
104109
resetState()
105110

106111
module.exports = {
107112
_conflicts,
108-
_claims,
109113
_cloth,
110114
countConflicts,
111115
findNonOverlappingClaim,
116+
getClaimedList,
112117
isClaimed,
113118
makeClaim,
114119
parseClaim,

2018/day-03/claims.test.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ var {
44
_cloth,
55
countConflicts,
66
findNonOverlappingClaim,
7+
getClaimedList,
78
isClaimed,
89
makeClaim,
910
resetState,
@@ -64,6 +65,14 @@ describe('--- Day 3: No Matter How You Slice It ---', () => {
6465
expect(result[3][3]).to.deep.equal([1, 2])
6566
expect(result[5][5]).to.deep.equal([3])
6667
})
68+
69+
it('logs the claim ID', () => {
70+
claims.forEach((claim) => {
71+
makeClaim(parseClaim(claim))
72+
})
73+
const actual = getClaimedList()
74+
expect(actual).to.deep.equal([123, 1, 2, 3])
75+
})
6776
})
6877

6978
describe('isClaimed(x,y)', () => {

2018/day-03/solution.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ fs.readFile(filePath, { encoding: 'utf8' }, (err, data) => {
1010
const claimsList = inputParser.linesToArray(data)
1111
claimsList.forEach((claim) => claims.makeClaim(claims.parseClaim(claim)))
1212
const answer = claims.countConflicts()
13+
const answer2 = claims.findNonOverlappingClaim()
1314
console.log(`-- Part 1 --`)
1415
console.log(`Answer: ${answer}`)
16+
console.log(`-- Part 2 --`)
17+
console.log(`Answer: ${answer2}`)
1518
})

0 commit comments

Comments
 (0)