Cleanup

Assignment8/code/disk.c

@@ -57,10 +57,6 @@ void delete(DiskQueue *queue, DiskRequest request) {
 	exit(EXIT_FAILURE);
 }
 
-DiskRequest peek(DiskQueue *queue) {
-	return *queue->head;
-}
-
 DiskRequest *dequeue(DiskQueue *queue) {
 	DiskRequest *head = queue->head;
 	queue->head = head->next;
@@ -81,7 +77,7 @@ void destroyDiskQueue(DiskQueue *queue) {
 
 int calcDistance(int position, int destination) {
 	if (position > destination) {
-		return destination + (10000 - position);
+		return destination + (9999 + 1 - position);
 	} else {
 		return destination - position;
 	}

Assignment8/code/disk.h

@@ -21,8 +21,6 @@ void enqueue(DiskQueue *queue, int time, int position);
 
 void delete(DiskQueue *queue, DiskRequest request);
 
-DiskRequest peek(DiskQueue *queue);
-
 DiskRequest *dequeue(DiskQueue *queue);
 
 DiskRequest *findClosest(DiskQueue *queue, int position, double time);

Assignment8/code/main.c

@@ -68,7 +68,6 @@ void cscan(int start) {
 		if (request != NULL) {
 			delete(queue, *request);
 		}
-		//printf("Movement: %i Time:%.1lf\n", movement, seekTime);
 	}
 }