Sitrone
diff --git a/‎Algorithms 4/Part Ⅰ/week 2/hw2/ArrayRandQueue.java
Lines changed: 5 additions & 22 deletions b/‎Algorithms 4/Part Ⅰ/week 2/hw2/ArrayRandQueue.java
Lines changed: 5 additions & 22 deletions
diff --git a/‎Algorithms 4/Part Ⅰ/week 2/hw2/DLinkedListRandQueue.java
Lines changed: 1 addition & 17 deletions b/‎Algorithms 4/Part Ⅰ/week 2/hw2/DLinkedListRandQueue.java
Lines changed: 1 addition & 17 deletions
diff --git a/‎Algorithms 4/Part Ⅰ/week 2/hw2/LinkedListRandQueue.java
Lines changed: 1 addition & 17 deletions b/‎Algorithms 4/Part Ⅰ/week 2/hw2/LinkedListRandQueue.java
Lines changed: 1 addition & 17 deletions
diff --git a/‎Algorithms 4/Part Ⅰ/week 2/hw2/sub/queues94.zip
7.43 KB b/‎Algorithms 4/Part Ⅰ/week 2/hw2/sub/queues94.zip
7.43 KB
@@ -83,7 +83,7 @@ public ListIterator(Object[] elements)
 			{
 				arr[i] = (Item) elements[i];
 			}
-			shuffle(arr);
+			StdRandom.shuffle(arr);
 		}
 
 		@Override
@@ -101,30 +101,13 @@ public Item next()
 			}
 			return arr[index++];
 		}
-		
-	    private void shuffle(Item[] arr)
-	    {
-	        for (int i = arr.length - 1; i > 0; i--)
-	        {
-	            int temp = StdRandom.uniform(i);
-	            swap(arr, temp, i);
-	        }
-	    }
-
-	    private void swap(Item[] arr, int i, int j)
-	    {
-	    	Item temp = arr[i];
-	        arr[i] = arr[j];
-	        arr[j] = temp;
-	    }
-		
 	}
-	
+
 	private void resize(int len)
 	{
 		@SuppressWarnings("unchecked")
 		Item[] temp = (Item[]) new Object[len];
-		for(int i = 0; i < size; i++)
+		for (int i = 0; i < size; i++)
 		{
 			temp[i] = elements[i];
 		}
@@ -141,7 +124,7 @@ private void checkNull(Item item)
 
 	private void checkEmpty()
 	{
-		if(isEmpty())
+		if (isEmpty())
 		{
 			throw new NoSuchElementException();
 		}
@@ -156,7 +139,7 @@ private boolean isFull()
 	public String toString()
 	{
 		String res = "";
-		for(int i = 0; i < size; i++)
+		for (int i = 0; i < size; i++)
 		{
 			res += elements[i] + " ";
 		}
 
@@ -93,7 +93,7 @@ public RandQueueIterator()
 				arr[i] = cur.item;
 				cur = cur.next;
 			}
-			shuffle(arr);
+			StdRandom.shuffle(arr);
 		}
 
 
@@ -118,22 +118,6 @@ public void remove()
 			throw new UnsupportedOperationException();
 		}
 
-	    private void shuffle(Item[] arr)
-	    {
-	        for (int i = arr.length - 1; i > 0; i--)
-	        {
-	            int temp = StdRandom.uniform(i);
-	            swap(arr, temp, i);
-	        }
-	    }
-
-	    private void swap(Item[] arr, int i, int j)
-	    {
-	    	Item temp = arr[i];
-	        arr[i] = arr[j];
-	        arr[j] = temp;
-	    }
-		
 	}
 
 	private void checkNull(Item item)
 
@@ -106,7 +106,7 @@ public RandQueueIterator()
 				arr[i] = cur.item;
 				cur = cur.next;
 			}
-			shuffle(arr);
+			StdRandom.shuffle(arr);
 		}
 
 		@Override
@@ -129,22 +129,6 @@ public void remove()
 		{
 			throw new UnsupportedOperationException();
 		}
-		
-	    private void shuffle(Item[] arr)
-	    {
-	        for (int i = arr.length - 1; i > 0; i--)
-	        {
-	            int temp = StdRandom.uniform(i);
-	            swap(arr, temp, i);
-	        }
-	    }
-
-	    private void swap(Item[] arr, int i, int j)
-	    {
-	    	Item temp = arr[i];
-	        arr[i] = arr[j];
-	        arr[j] = temp;
-	    }
 	}
 
 	private void checkNull(Item item)
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public ListIterator(Object[] elements)`
`83`	`83`	`{`
`84`	`84`	`arr[i] = (Item) elements[i];`
`85`	`85`	`}`
`86`		`- shuffle(arr);`
	`86`	`+ StdRandom.shuffle(arr);`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`@Override`
`@@ -101,30 +101,13 @@ public Item next()`
`101`	`101`	`}`
`102`	`102`	`return arr[index++];`
`103`	`103`	`}`
`104`		`-`
`105`		`- private void shuffle(Item[] arr)`
`106`		`- {`
`107`		`- for (int i = arr.length - 1; i > 0; i--)`
`108`		`- {`
`109`		`- int temp = StdRandom.uniform(i);`
`110`		`- swap(arr, temp, i);`
`111`		`- }`
`112`		`- }`
`113`		`-`
`114`		`- private void swap(Item[] arr, int i, int j)`
`115`		`- {`
`116`		`- Item temp = arr[i];`
`117`		`- arr[i] = arr[j];`
`118`		`- arr[j] = temp;`
`119`		`- }`
`120`		`-`
`121`	`104`	`}`
`122`		`-`
	`105`	`+`
`123`	`106`	`private void resize(int len)`
`124`	`107`	`{`
`125`	`108`	`@SuppressWarnings("unchecked")`
`126`	`109`	`Item[] temp = (Item[]) new Object[len];`
`127`		`- for(int i = 0; i < size; i++)`
	`110`	`+ for (int i = 0; i < size; i++)`
`128`	`111`	`{`
`129`	`112`	`temp[i] = elements[i];`
`130`	`113`	`}`
`@@ -141,7 +124,7 @@ private void checkNull(Item item)`
`141`	`124`
`142`	`125`	`private void checkEmpty()`
`143`	`126`	`{`
`144`		`- if(isEmpty())`
	`127`	`+ if (isEmpty())`
`145`	`128`	`{`
`146`	`129`	`throw new NoSuchElementException();`
`147`	`130`	`}`
`@@ -156,7 +139,7 @@ private boolean isFull()`
`156`	`139`	`public String toString()`
`157`	`140`	`{`
`158`	`141`	`String res = "";`
`159`		`- for(int i = 0; i < size; i++)`
	`142`	`+ for (int i = 0; i < size; i++)`
`160`	`143`	`{`
`161`	`144`	`res += elements[i] + " ";`
`162`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public RandQueueIterator()`
`106`	`106`	`arr[i] = cur.item;`
`107`	`107`	`cur = cur.next;`
`108`	`108`	`}`
`109`		`- shuffle(arr);`
	`109`	`+ StdRandom.shuffle(arr);`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`@Override`
`@@ -129,22 +129,6 @@ public void remove()`
`129`	`129`	`{`
`130`	`130`	`throw new UnsupportedOperationException();`
`131`	`131`	`}`
`132`		`-`
`133`		`- private void shuffle(Item[] arr)`
`134`		`- {`
`135`		`- for (int i = arr.length - 1; i > 0; i--)`
`136`		`- {`
`137`		`- int temp = StdRandom.uniform(i);`
`138`		`- swap(arr, temp, i);`
`139`		`- }`
`140`		`- }`
`141`		`-`
`142`		`- private void swap(Item[] arr, int i, int j)`
`143`		`- {`
`144`		`- Item temp = arr[i];`
`145`		`- arr[i] = arr[j];`
`146`		`- arr[j] = temp;`
`147`		`- }`
`148`	`132`	`}`
`149`	`133`
`150`	`134`	`private void checkNull(Item item)`