Commit 3e0ac74

committed

Use Infinity instead of zero in Graph adjacency matrix to show that vertices are not connected.

1 parent f966ef5 commit 3e0ac74Copy full SHA for 3e0ac74

File tree

+14

-15

lines changed

+14

-15

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ function isSafe(adjacencyMatrix, verticesIndices, cycle, vertexCandidate) {`
`15`	`15`	`const endVertexAdjacencyIndex = verticesIndices[endVertex.getKey()];`
`16`	`16`
`17`	`17`	`// Check if last vertex in the path and candidate vertex are adjacent.`
`18`		`- if (!adjacencyMatrix[endVertexAdjacencyIndex][candidateVertexAdjacencyIndex]) {`
	`18`	`+ if (adjacencyMatrix[endVertexAdjacencyIndex][candidateVertexAdjacencyIndex]===Infinity) {`
`19`	`19`	`return false;`
`20`	`20`	`}`
`21`	`21`
`@@ -43,7 +43,7 @@ function isCycle(adjacencyMatrix, verticesIndices, cycle) {`
`43`	`43`	`const endVertexAdjacencyIndex = verticesIndices[endVertex.getKey()];`
`44`	`44`
`45`	`45`	`// Check if we can go from end vertex to the start one.`
`46`		`- return !!adjacencyMatrix[endVertexAdjacencyIndex][startVertexAdjacencyIndex];`
	`46`	`+ return adjacencyMatrix[endVertexAdjacencyIndex][startVertexAdjacencyIndex]!==Infinity;`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/**`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -177,18 +177,17 @@ export default class Graph {`
`177`	`177`	`const vertices = this.getAllVertices();`
`178`	`178`	`const verticesIndices = this.getVerticesIndices();`
`179`	`179`
`180`		`- // Init matrix with zeros.`
	`180`	`+ // Init matrix with infinities meaning that there is no ways of`
	`181`	`+ // getting from one vertex to another yet.`
`181`	`182`	`const adjacencyMatrix = Array(vertices.length).fill(null).map(() => {`
`182`		`- return Array(vertices.length).fill(0);`
	`183`	`+ return Array(vertices.length).fill(Infinity);`
`183`	`184`	`});`
`184`	`185`
`185`	`186`	`// Fill the columns.`
`186`	`187`	`vertices.forEach((vertex, vertexIndex) => {`
`187`	`188`	`vertex.getNeighbors().forEach((neighbor) => {`
`188`	`189`	`const neighborIndex = verticesIndices[neighbor.getKey()];`
`189`		`- adjacencyMatrix[vertexIndex][neighborIndex] = this.isDirected ?`
`190`		`- this.findEdge(vertex, neighbor).weight :`
`191`		`- 1;`
	`190`	`+ adjacencyMatrix[vertexIndex][neighborIndex] = this.findEdge(vertex, neighbor).weight;`
`192`	`191`	`});`
`193`	`192`	`});`
`194`	`193`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -348,10 +348,10 @@ describe('Graph', () => {`
`348`	`348`
`349`	`349`	`const adjacencyMatrix = graph.getAdjacencyMatrix();`
`350`	`350`	`expect(adjacencyMatrix).toEqual([`
`351`		`- [0,1,0,0],`
`352`		`- [1,0,1,1],`
`353`		`- [0,1,0,1],`
`354`		`- [0,1,1,0],`
	`351`	`+ [Infinity,0,Infinity,Infinity],`
	`352`	`+ [0,Infinity,0,0],`
	`353`	`+ [Infinity,0,Infinity,0],`
	`354`	`+ [Infinity,0,0,Infinity],`
`355`	`355`	`]);`
`356`	`356`	`});`
`357`	`357`
`@@ -375,10 +375,10 @@ describe('Graph', () => {`
`375`	`375`
`376`	`376`	`const adjacencyMatrix = graph.getAdjacencyMatrix();`
`377`	`377`	`expect(adjacencyMatrix).toEqual([`
`378`		`- [0, 2, 0,0],`
`379`		`- [0,0, 1, 7],`
`380`		`- [0,0,0, 5],`
`381`		`- [0,0,0,0],`
	`378`	`+ [Infinity, 2, Infinity,Infinity],`
	`379`	`+ [Infinity,Infinity, 1, 7],`
	`380`	`+ [Infinity,Infinity,Infinity, 5],`
	`381`	`+ [Infinity,Infinity,Infinity,Infinity],`
`382`	`382`	`]);`
`383`	`383`	`});`
`384`	`384`	`});`

Comments

(0)