Commit 7de10fa

committed

VisualSortArray, LaunchFrame: Renamed method, added state check.

1 parent 0449c96 commit 7de10faCopy full SHA for 7de10fa

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ private void doSort() {`
`264`	`264`	`String msg = String.format("%s: %d elements, %d comparisons, %d swaps",`
`265`	`265`	`algorithm.getName(), array.length(), array.getComparisonCount(), array.getSwapCount());`
`266`	`266`	`try {`
`267`		`- array.assertSorted();`
	`267`	`+ array.finishSorting();`
`268`	`268`	`} catch (AssertionError e) {`
`269`	`269`	`msg = algorithm.getName() + ": Sorting failed";`
`270`	`270`	`}`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,9 @@ public long getSwapCount() {`
`152`	`152`
`153`	`153`
`154`	`154`	`// Checks if the array is sorted. Returns silently if so, throws AssertionError if not.`
`155`		`- public void assertSorted() {`
	`155`	`+ public void finishSorting() {`
	`156`	`+ if (isDone)`
	`157`	`+ throw new IllegalStateException();`
`156`	`158`	`for (int i = 1; i < values.length; i++) {`
`157`	`159`	`if (values[i - 1] > values[i])`
`158`	`160`	`throw new AssertionError();`

Comments

(0)