Merge branch 'master' of https://github.com/parkjs814/AlgorithmVisualizer

64json · 64json · commit e3c30f1b5006 · 2016-05-22T15:31:43.000-05:00
diff --git a/algorithm/graph_search/bellman_ford/desc.json b/algorithm/graph_search/bellman_ford/desc.json
@@ -1,5 +1,5 @@
 {
-  "BELLMAN_FORD": "The Bellman–Ford algorithm is an algorithm that computes shortest paths from a single source vertex to all of the other vertices in a weighted digraph. It is different from Dijksstra's Shortest Path Algorithm becuase it allows NEGATIVE weights unlike Dijkstra's.",
+  "Bellman-Ford": "The Bellman–Ford algorithm is an algorithm that computes shortest paths from a single source vertex to all of the other vertices in a weighted digraph. It is different from Dijkstra's Shortest Path Algorithm because it allows NEGATIVE weights unlike Dijkstra's.",
   "Applications": [
     "Packet Routing - A variation of BF is used in the Distance vector Routing Protocol"
   ],
@@ -13,4 +13,4 @@
   "files": {
     "shortest_path": "Finding the shortest path"
   }
-}
+}
diff --git a/algorithm/sorting/merge/desc.json b/algorithm/sorting/merge/desc.json
@@ -1,5 +1,5 @@
 {
-  "Quicksort": "In computer science, merge sort (also commonly spelled mergesort) is an efficient, general-purpose, comparison-based sorting algorithm. Most implementations produce a stable sort, which means that the implementation preserves the input order of equal elements in the sorted output. Mergesort is a divide and conquer algorithm that was invented by John von Neumann in 1945. A detailed description and analysis of bottom-up mergesort appeared in a report by Goldstine and Neumann as early as 1948.",
+  "Mergesort": "In computer science, merge sort (also commonly spelled mergesort) is an efficient, general-purpose, comparison-based sorting algorithm. Most implementations produce a stable sort, which means that the implementation preserves the input order of equal elements in the sorted output. Mergesort is a divide and conquer algorithm that was invented by John von Neumann in 1945. A detailed description and analysis of bottom-up mergesort appeared in a report by Goldstine and Neumann as early as 1948.",
   "Complexity": {
     "time": "average O(n log n)",
     "space": "worst O(n)"

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "BELLMAN_FORD": "The Bellman–Ford algorithm is an algorithm that computes shortest paths from a single source vertex to all of the other vertices in a weighted digraph. It is different from Dijksstra's Shortest Path Algorithm becuase it allows NEGATIVE weights unlike Dijkstra's.",`
	`2`	`+ "Bellman-Ford": "The Bellman–Ford algorithm is an algorithm that computes shortest paths from a single source vertex to all of the other vertices in a weighted digraph. It is different from Dijkstra's Shortest Path Algorithm because it allows NEGATIVE weights unlike Dijkstra's.",`
`3`	`3`	`"Applications": [`
`4`	`4`	`"Packet Routing - A variation of BF is used in the Distance vector Routing Protocol"`
`5`	`5`	`],`
`@@ -13,4 +13,4 @@`
`13`	`13`	`"files": {`
`14`	`14`	`"shortest_path": "Finding the shortest path"`
`15`	`15`	`}`
`16`		`-}`
	`16`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		- "Quicksort": "In computer science, merge sort (also commonly spelled mergesort) is an efficient, general-purpose, comparison-based sorting algorithm. Most implementations produce a stable sort, which means that the implementation preserves the input order of equal elements in the sorted output. Mergesort is a divide and conquer algorithm that was invented by John von Neumann in 1945. A detailed description and analysis of bottom-up mergesort appeared in a report by Goldstine and Neumann as early as 1948.",
	`2`	+ "Mergesort": "In computer science, merge sort (also commonly spelled mergesort) is an efficient, general-purpose, comparison-based sorting algorithm. Most implementations produce a stable sort, which means that the implementation preserves the input order of equal elements in the sorted output. Mergesort is a divide and conquer algorithm that was invented by John von Neumann in 1945. A detailed description and analysis of bottom-up mergesort appeared in a report by Goldstine and Neumann as early as 1948.",
`3`	`3`	`"Complexity": {`
`4`	`4`	`"time": "average O(n log n)",`
`5`	`5`	`"space": "worst O(n)"`