Skip to content

Commit 5ad6be7

Browse files
amejiarosarioamejiarosario
committed
refactor sets
1 parent 0a5a237 commit 5ad6be7

File tree

6 files changed

+250
-57
lines changed

6 files changed

+250
-57
lines changed

‎src/data-structures/graphs/graph-scale.spec.js‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
const Graph = require('./graph');
2+
3+
xdescribe('Graph (social network)', () => {
4+
let graph;
5+
6+
beforeEach(() => {
7+
graph = new Graph(Graph.UNDIRECTED);
8+
9+
graph.addEdge('You', 'James');
10+
graph.addEdge('James', 'Michael');
11+
graph.addEdge('James', 'William');
12+
graph.addEdge('You', 'John');
13+
graph.addEdge('John', 'Linda');
14+
graph.addEdge('Linda', 'Elizabeth');
15+
graph.addEdge('You', 'Robert');
16+
graph.addEdge('You', 'Mary');
17+
graph.addEdge('You', 'Patricia');
18+
graph.addEdge('You', 'Jennifer');
19+
graph.addEdge('You', 'Larry');
20+
graph.addEdge('You', 'Eric');
21+
graph.addEdge('David', 'Barbara');
22+
graph.addEdge('Richard', 'Susan');
23+
graph.addEdge('Joseph', 'Jessica');
24+
graph.addEdge('Susan', 'Joseph');
25+
graph.addEdge('Mark', 'Jan');
26+
graph.addEdge('Mark', 'David');
27+
graph.addEdge('Mark', 'Dustin');
28+
graph.addEdge('Mark', 'Owen');
29+
graph.addEdge('Mark', 'Pricilla');
30+
graph.addEdge('Mark', 'Andrew');
31+
graph.addEdge('Mark', 'Adam');
32+
graph.addEdge('Pricilla', 'Richard');
33+
graph.addEdge('Jessica', 'Elizabeth');
34+
graph.addEdge('Mary', 'Barbara');
35+
graph.addEdge('William', 'Jan');
36+
graph.addEdge('Joseph', 'Robert');
37+
graph.addEdge('Dustin', 'Michael');
38+
graph.addEdge('Andrew', 'William');
39+
graph.addEdge('Jessica', 'John');
40+
graph.addEdge('Adam', 'Susan');
41+
graph.addEdge('William', 'Barbara');
42+
graph.addEdge('Joseph', 'Patricia');
43+
graph.addEdge('Joseph', 'Michael');
44+
graph.addEdge('Elizabeth', 'Adam');
45+
graph.addEdge('Jan', 'Elizabeth');
46+
graph.addEdge('Richard', 'Joseph');
47+
});
48+
49+
it('should return all paths connecting you and mark', () => {
50+
expect(graph.findPath('You', 'Mark')).toEqual([]);
51+
});
52+
});

‎src/data-structures/sets/array-set.js‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
/**
2+
* Set implemented with our HashMap to have sublinear times on all operations
3+
*/
4+
class HashMapSet {
5+
/**
6+
* Initialize Set using a HashMap
7+
*
8+
* @param {Array} iterable If passed, all iterable elements will be added to the new Set
9+
*/
10+
constructor(iterable = []) {
11+
this.array = [];
12+
Array.from(iterable).forEach(element => this.add(element));
13+
}
14+
15+
/**
16+
* Add a new value
17+
*
18+
* Runtime: O(1)
19+
*
20+
* @param {any} value
21+
*/
22+
add(value) {
23+
if (!this.has(value)) {
24+
this.array.push(value);
25+
}
26+
}
27+
28+
/**
29+
* check if value is already on the set
30+
*
31+
* Runtime: O(n)
32+
*
33+
* @param {any} value
34+
*/
35+
has(value) {
36+
return this.array.indexOf(value) > -1;
37+
}
38+
39+
/**
40+
* Delete a value from the set
41+
*
42+
* Runtime: O(n)
43+
*
44+
* @param {any} value
45+
*/
46+
delete(value) {
47+
const index = this.array.indexOf(value);
48+
this.array.splice(index, 1);
49+
return index > -1;
50+
}
51+
52+
/**
53+
* Get size of the set
54+
*/
55+
get size() {
56+
return this.array.length;
57+
}
58+
59+
/**
60+
* Return all values on the set as an array
61+
*/
62+
entries() {
63+
return this.array;
64+
}
65+
}
66+
67+
module.exports = HashMapSet;
68+

‎src/data-structures/sets/hash-set-1.js‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
const HashMap = require('../hash-maps/hash-map');
2+
/**
3+
* Set implemented with our HashMap to have sublinear times on all operations
4+
*/
5+
class HashMapSet {
6+
/**
7+
* Initialize (Hash)map for the set
8+
*
9+
* @param {Array} iterable If passed, all iterable elements will be added to the new Set
10+
*/
11+
constructor(iterable = []) {
12+
this.hashMap = new HashMap();
13+
Array.from(iterable).forEach(element => this.add(element));
14+
}
15+
16+
/**
17+
* Add a new value
18+
* @param {any} value
19+
*/
20+
add(value) {
21+
this.hashMap.set(value);
22+
}
23+
24+
/**
25+
* check if value is already on the set
26+
* @param {any} value
27+
*/
28+
has(value) {
29+
return this.hashMap.has(value);
30+
}
31+
32+
/**
33+
* Get size of the set
34+
*/
35+
get size() {
36+
return this.hashMap.size;
37+
}
38+
39+
/**
40+
* Delete a value from the set
41+
* @param {any} value
42+
*/
43+
delete(value) {
44+
return this.hashMap.delete(value);
45+
}
46+
47+
/**
48+
* Return all values on the set as an array
49+
*/
50+
entries() {
51+
return Array.from(this.hashMap.keys());
52+
}
53+
}
54+
55+
module.exports = HashMapSet;
56+

‎src/data-structures/sets/hash-set.js‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
/**
2+
* Set implemented with Map (JS built-in) to have sublinear times on all operations
3+
*/
4+
class HashSet {
5+
/**
6+
* Initialize Set using the built-in Map
7+
*
8+
* @param {Array} iterable If passed, all iterable elements will be added to the new Set
9+
*/
10+
constructor(iterable = []) {
11+
this.hashMap = new Map();
12+
Array.from(iterable).forEach(element => this.add(element));
13+
}
14+
15+
/**
16+
* Add a new value
17+
* @param {any} value
18+
*/
19+
add(value) {
20+
this.hashMap.set(value);
21+
}
22+
23+
/**
24+
* check if value is already on the set
25+
* @param {any} value
26+
*/
27+
has(value) {
28+
return this.hashMap.has(value);
29+
}
30+
31+
/**
32+
* Get size of the set
33+
*/
34+
get size() {
35+
return this.hashMap.size;
36+
}
37+
38+
/**
39+
* Delete a value from the set
40+
* @param {any} value
41+
*/
42+
delete(value) {
43+
return this.hashMap.delete(value);
44+
}
45+
46+
/**
47+
* Return all values on the set as an array
48+
*/
49+
entries() {
50+
return Array.from(this.hashMap.keys());
51+
}
52+
}
53+
54+
module.exports = HashSet;
55+

‎src/data-structures/sets/set.js‎

Lines changed: 2 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,3 @@
1-
/**
2-
* Set implemented with Map (JS built-in) or a HashMap to have sublinear times on all operations
3-
*/
4-
class HSet {
5-
/**
6-
* Initialize (Hash)map for the set
7-
* @param {Map|HashMap} Type data structure for the set
8-
*/
9-
constructor(Type = Map) {
10-
this.hashMap = new Type();
11-
}
12-
13-
/**
14-
* Add a new value
15-
* @param {any} value
16-
*/
17-
add(value) {
18-
this.hashMap.set(value);
19-
}
20-
21-
/**
22-
* check if value is already on the set
23-
* @param {any} value
24-
*/
25-
has(value) {
26-
return this.hashMap.has(value);
27-
}
28-
29-
/**
30-
* Get size of the set
31-
*/
32-
get size() {
33-
return this.hashMap.size;
34-
}
35-
36-
/**
37-
* Delete a value from the set
38-
* @param {any} value
39-
*/
40-
delete(value) {
41-
return this.hashMap.delete(value);
42-
}
43-
44-
/**
45-
* Return all values on the set as an array
46-
*/
47-
entries() {
48-
return Array.from(this.hashMap.keys());
49-
}
50-
}
51-
52-
module.exports = HSet;
1+
const HashSet = require('./hash-set');
532

3+
module.exports = HashSet;

‎src/data-structures/sets/set.spec.js‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
const HSet = require('./set');
2-
const HashMap = require('../hash-maps/hash-map');
1+
const ArraySet = require('./array-set');
2+
const HashSet = require('./hash-set');
3+
const HashMapSet = require('./hash-set-1');
34

4-
[Map, HashMap].forEach((dataType) => {
5-
describe(`Set with ${dataType}`, () => {
5+
[ArraySet, HashSet, HashMapSet].forEach((MySet) => {
6+
describe(`Set (${MySet.name})`, () => {
67
let set;
78

89
beforeEach(() => {
9-
set = new HSet(dataType);
10+
set = new MySet();
1011
});
1112

1213
it('should set size and has', () => {
@@ -58,5 +59,16 @@ const HashMap = require('../hash-maps/hash-map');
5859
expect(set.entries()).toEqual([1, 3]);
5960
expect(set.size).toBe(2);
6061
});
62+
63+
it('should initialize with data provided', () => {
64+
set = new MySet([1, 2, 3, 1]);
65+
expect(set.size).toBe(3);
66+
expect(set.entries()).toEqual([1, 2, 3]);
67+
});
68+
69+
xit('should return an iterable', () => {
70+
set = new MySet([1, 2, 3, 1]);
71+
expect(Array.from(set)).toEqual([1, 2, 3]);
72+
});
6173
});
6274
});

0 commit comments

Comments
 (0)