Skip to content

Commit 85babc6

Browse files
0.3.1
1 parent 7bab077 commit 85babc6

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tgillespie/graph",
3-
"version": "0.3.0",
3+
"version": "0.3.1",
44
"description": "",
55
"main": "lib/index.js",
66
"files": [

src/models/Graph/Graph.ts

+24-24
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { VertexNotFoundError } from '../../Errors';
66
import { AdjacencyList } from '../AdjacencyList/AdjacencyList';
77
import { TarjanStronglyConnectedComponentsAlgorithm } from './algorithms';
88
import { MutableHashMap } from '@tgillespie/hash-data-structures';
9-
import {MutableHashSet} from "@tgillespie/hash-data-structures/lib/lib/mutable-hash-set/mutable-hash-set";
9+
import { MutableHashSet } from '@tgillespie/hash-data-structures/lib/lib/mutable-hash-set/mutable-hash-set';
1010

1111
export class Graph<V extends Vertex, E extends Edge<V>> {
1212
// Redundant information storage for performance
@@ -30,14 +30,14 @@ export class Graph<V extends Vertex, E extends Edge<V>> {
3030

3131
addVertex(...vertex: V[]): Graph<V, E> {
3232
const uniqueVertices = new MutableHashSet<V>();
33-
const setOfGraphVertices = new MutableHashSet<V>();
33+
const setOfGraphVertices = new MutableHashSet<V>();
3434

35-
vertex.forEach(x => uniqueVertices.add(x));
36-
this._listOfVertices.forEach(x => setOfGraphVertices.add(x));
35+
vertex.forEach((x) => uniqueVertices.add(x));
36+
this._listOfVertices.forEach((x) => setOfGraphVertices.add(x));
3737

38-
const filteredVertices = uniqueVertices.difference(setOfGraphVertices).toArray();
38+
const filteredVertices = uniqueVertices.difference(setOfGraphVertices).toArray();
3939

40-
filteredVertices.forEach((singleVertex) => {
40+
filteredVertices.forEach((singleVertex) => {
4141
this._listOfVertices.push(singleVertex);
4242
this._adjacencyList.initVertex(singleVertex);
4343
});
@@ -46,13 +46,13 @@ export class Graph<V extends Vertex, E extends Edge<V>> {
4646
}
4747

4848
deleteVertex(...vertex: V[]): Graph<V, E> {
49-
const uniqueVertices = new MutableHashSet<V>();
50-
const setOfGraphVertices = new MutableHashSet<V>();
49+
const uniqueVertices = new MutableHashSet<V>();
50+
const setOfGraphVertices = new MutableHashSet<V>();
5151

52-
vertex.forEach(x => uniqueVertices.add(x));
53-
this._listOfVertices.forEach(x => setOfGraphVertices.add(x));
52+
vertex.forEach((x) => uniqueVertices.add(x));
53+
this._listOfVertices.forEach((x) => setOfGraphVertices.add(x));
5454

55-
const filteredVertices = uniqueVertices.intersection(setOfGraphVertices).toArray();
55+
const filteredVertices = uniqueVertices.intersection(setOfGraphVertices).toArray();
5656
filteredVertices.forEach((singleVertex) => {
5757
this._listOfVertices = this._listOfVertices.filter((x) => !x.equals(singleVertex));
5858
this._listOfEdges = this._listOfEdges.filter(
@@ -68,13 +68,13 @@ export class Graph<V extends Vertex, E extends Edge<V>> {
6868
}
6969

7070
addEdge(...edge: E[]): Graph<V, E> {
71-
const uniqueEdges = new MutableHashSet<E>();
72-
const setOfGraphEdges = new MutableHashSet<E>();
71+
const uniqueEdges = new MutableHashSet<E>();
72+
const setOfGraphEdges = new MutableHashSet<E>();
7373

74-
edge.forEach(x => uniqueEdges.add(x));
75-
this._listOfEdges.forEach(x => setOfGraphEdges.add(x));
74+
edge.forEach((x) => uniqueEdges.add(x));
75+
this._listOfEdges.forEach((x) => setOfGraphEdges.add(x));
7676

77-
const filteredEdges = uniqueEdges.difference(setOfGraphEdges).toArray();
77+
const filteredEdges = uniqueEdges.difference(setOfGraphEdges).toArray();
7878

7979
if (!this.addUnknownVerticesInEdges)
8080
filteredEdges.forEach((singleEdge) => this.validateEdgeVerticesAreContainedInGraph(singleEdge));
@@ -95,13 +95,13 @@ export class Graph<V extends Vertex, E extends Edge<V>> {
9595
}
9696

9797
deleteEdge(...edge: E[]): Graph<V, E> {
98-
const uniqueEdges = new MutableHashSet<E>();
99-
const setOfGraphEdges = new MutableHashSet<E>();
98+
const uniqueEdges = new MutableHashSet<E>();
99+
const setOfGraphEdges = new MutableHashSet<E>();
100100

101-
edge.forEach(x => uniqueEdges.add(x));
102-
this._listOfEdges.forEach(x => setOfGraphEdges.add(x));
101+
edge.forEach((x) => uniqueEdges.add(x));
102+
this._listOfEdges.forEach((x) => setOfGraphEdges.add(x));
103103

104-
const filteredEdges = uniqueEdges.intersection(setOfGraphEdges).toArray();
104+
const filteredEdges = uniqueEdges.intersection(setOfGraphEdges).toArray();
105105
filteredEdges.forEach((singleEdge) => {
106106
this._listOfEdges = this._listOfEdges.filter((x) => !x.equals(singleEdge));
107107

@@ -139,8 +139,8 @@ export class Graph<V extends Vertex, E extends Edge<V>> {
139139
});
140140
}
141141

142-
const resultSet = new MutableHashSet<V>();
143-
result.forEach(x => resultSet.add(x));
142+
const resultSet = new MutableHashSet<V>();
143+
result.forEach((x) => resultSet.add(x));
144144

145145
return resultSet.toArray();
146146
}
@@ -204,7 +204,7 @@ export class Graph<V extends Vertex, E extends Edge<V>> {
204204
let takenEdge = null;
205205
let previousVertex = null;
206206

207-
while (![...visited.values()].every(x => x)) {
207+
while (![...visited.values()].every((x) => x)) {
208208
currentVertex = stack.pop();
209209
if (currentVertex === undefined) {
210210
takenEdge = null;

0 commit comments

Comments
 (0)