|
|
@@ -76,7 +76,7 @@ int main(int argc, char* argv[]){
|
|
|
// printf("%d \n",unsorted[i]);
|
|
|
//}
|
|
|
}else{
|
|
|
- printf("./a.out -F _filename_ _numberofelements_ _sortingmethod_");
|
|
|
+ printf("./a.out -F <filename> <numberofelements> <sortingmethod>");
|
|
|
exit(EXIT_FAILURE);
|
|
|
}
|
|
|
}
|
|
|
@@ -225,35 +225,16 @@ int* i_sort(int *array, int n) {
|
|
|
}
|
|
|
|
|
|
// Merge sort
|
|
|
-//bei ungerader anzahl bekommt arr2 das zusaetyliche element zugewiesen
|
|
|
-// um das zu aendern, (size/2)+1 bei arr1 kopier schleife
|
|
|
-// ar1size = size von 1. uebergeben array
|
|
|
-// ar2size= size von 2. uebergeben array
|
|
|
int* m_sort(int *array, int l, int r){
|
|
|
//if(size == 1){
|
|
|
if(l < r){
|
|
|
|
|
|
- //printf("arraysize=1");
|
|
|
- //return array;
|
|
|
-
|
|
|
-
|
|
|
int mid = (l + r)/2;
|
|
|
- // teile array in zwei haelften auf, arr1 1. haelfte arr2 2. haelfte
|
|
|
- //int newarr1s = size/2;
|
|
|
- int *arr1 = malloc(sizeof(int) * 5); //erste haelfte
|
|
|
- //printf("erster");
|
|
|
- //printf("newarr1s %d \n",newarr1s);
|
|
|
- //for(int i = 0; i < l; i++){ // kopiere erste haelfte von array
|
|
|
- //arr1[i] = array[i];
|
|
|
- // printf("%d\n",array[i]);
|
|
|
- //}
|
|
|
+ int *arr1 = malloc(sizeof(int) * 5); //first part
|
|
|
printf("zweiter teil: \n");
|
|
|
- //int newarr2s = size - (size/2);
|
|
|
- //printf("newarr2s %d \n",newarr2s);
|
|
|
- int *arr2 = malloc(sizeof(int) * 5); // zweite healfte
|
|
|
+ int *arr2 = malloc(sizeof(int) * 5); //second part
|
|
|
|
|
|
for(int i = l; i < r; i++){
|
|
|
- //arr2[i] = array[i];
|
|
|
printf("%d\n",array[i]);
|
|
|
}
|
|
|
|
|
|
@@ -261,10 +242,6 @@ int* m_sort(int *array, int l, int r){
|
|
|
|
|
|
|
|
|
arr2 = m_sort(array,mid+1,r);
|
|
|
- //printf("\n\n");
|
|
|
- //for(int i = newarr1s; i < size; i++){
|
|
|
-// printf("%d\n",arr2[i]);
|
|
|
-// }
|
|
|
|
|
|
int e1,e2;
|
|
|
for(int i = l; i < r; i++){
|
|
|
@@ -285,12 +262,8 @@ int* m_sort(int *array, int l, int r){
|
|
|
e2++;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
}
|
|
|
|
|
|
- //return array;
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
|
|
|
}
|