diff --git a/ASD_Task_4.depend b/ASD_Task_4.depend index a544662..be5de8b 100644 --- a/ASD_Task_4.depend +++ b/ASD_Task_4.depend @@ -19,3 +19,23 @@ "player.h" +1583302872 source:c:\users\user\documents\github\asd_task_4\main.cpp + "player.h" + "list.h" + + +1582808123 c:\users\user\documents\github\asd_task_4\player.h + "list.h" + +1583301631 c:\users\user\documents\github\asd_task_4\list.h + + + + +1583304616 source:c:\users\user\documents\github\asd_task_4\player.cpp + "player.h" + + +1583303832 source:c:\users\user\documents\github\asd_task_4\list.cpp + "list.h" + diff --git a/ASD_Task_4.layout b/ASD_Task_4.layout index 5ec49e7..3cd35c1 100644 --- a/ASD_Task_4.layout +++ b/ASD_Task_4.layout @@ -2,29 +2,29 @@ - + - + - + - + - + - + - + - + - + diff --git a/bin/Debug/ASD_Task_4.exe b/bin/Debug/ASD_Task_4.exe new file mode 100644 index 0000000..ea09125 Binary files /dev/null and b/bin/Debug/ASD_Task_4.exe differ diff --git a/list.cpp b/list.cpp index 847a957..68df165 100644 --- a/list.cpp +++ b/list.cpp @@ -5,7 +5,7 @@ void createList(List &L) { * FS : first(L) diset Nil */ //------------- YOUR CODE HERE ------------- - + first(L) == NULL; //---------------------------------------- } @@ -17,7 +17,10 @@ address allocate(infotype x) { address P = NULL; //------------- YOUR CODE HERE ------------- - + P = new elmlist; + info(P) = x; + next(P) = NULL; + prev(P) = NULL; //---------------------------------------- return P; } @@ -27,7 +30,7 @@ void deallocate(address &P) { * FS : menghapus elemen yang ditunjuk oleh P (delete) */ //------------- YOUR CODE HERE ------------- - + delete P; //---------------------------------------- } @@ -37,7 +40,20 @@ void insertFirst(List &L, address P) { * FS : elemen yang ditunjuk P menjadi elemen pertama pada List L */ //------------- YOUR CODE HERE ------------- - + if ( first(L) == NULL ) + { + first(L) = P; + next(P) = P; + prev(P) = P; + } + else + { + next(P) = first(L) ; + prev(P) = prev(first(L)); + next(prev(first(L))) = P; + prev(first(L)) = P; + first(L) = P; + } //---------------------------------------- } @@ -47,7 +63,19 @@ void insertLast(List &L, address P) { * FS : elemen yang ditunjuk P menjadi elemen terakhir pada List L */ //------------- YOUR CODE HERE ------------- - + address Prec; + Prec = first(L); + if (first(L) == NULL) + { + insertFirst(L,P); + } + else + { + next(P) = first(L); + prev(P) = prev(first(L)); + next(prev(first(L))) = P; + prev(first(L)) = P; + } //---------------------------------------- } @@ -60,7 +88,16 @@ address findElmByID(List L, infotype x) { address P = NULL; //------------- YOUR CODE HERE ------------- - + P = first(L); + do + { + P = next(P); + } + while((P != first(L)) && (x.ID != info(P).ID)) ; + if ((P == first(L)) && (x.ID != info(P).ID)) + { + return NULL; + } //---------------------------------------- return P; } @@ -74,7 +111,16 @@ address findElmByName(List L, infotype x) { address P = NULL; //------------- YOUR CODE HERE ------------- - + P = first(L); + do + { + P = next(P); + } + while((P != first(L)) && (x.name != info(P).name)); + if (P == first(L) && (x.name != info(P).name)) + { + return NULL; + } //---------------------------------------- return P; } @@ -85,7 +131,21 @@ void deleteFirst(List &L, address &P) { * FS : elemen pertama di dalam List L dilepas dan disimpan/ditunjuk oleh P */ //------------- YOUR CODE HERE ------------- - + P = first(L); + if (next(P) == first(L)) + { + first(L) = NULL; + next(P) = NULL; + prev(P) = NULL; + } + else + { + first(L) = next(first(L)); + next(prev(P)) = first(L); + prev(first(L)) = prev(P); + next(P) = NULL; + prev(P) = NULL; + } //---------------------------------------- } @@ -95,7 +155,19 @@ void deleteLast(List &L, address &P) { * FS : elemen tarakhir di dalam List L dilepas dan disimpan/ditunjuk oleh P */ //------------- YOUR CODE HERE ------------- - + P = first(L); + if (next(P) == first(L)) + { + next(P) = NULL; + prev(P) = NULL; + first(L) = NULL; + } + else + { + P = prev(first(L)); + next(prev(first(L))) = next(P); + prev(first(L)) = prev(P); + } //---------------------------------------- } @@ -106,7 +178,10 @@ void insertAfter(List &L, address &Prec, address P) { * ditunjuk pointer Prec */ //------------- YOUR CODE HERE ------------- - + prev(next(Prec)) = P; + next(P) = next(Prec); + next(Prec) = P; + prev(P) = Prec; //---------------------------------------- } @@ -117,7 +192,21 @@ void deleteAfter(List &L, address &Prec, address &P) { * dan disimpan/ditunjuk oleh P */ //------------- YOUR CODE HERE ------------- - + P = next(Prec); + if (next(next(Prec)) == Prec) + { + next(P) = NULL; + prev(P) = NULL; + next(Prec) = Prec; + prev(Prec) = Prec; + } + else + { + next(Prec) = next(P); + prev(next(P)) = Prec; + next(P) = NULL; + prev(P) = NULL; + } //---------------------------------------- } diff --git a/list.h b/list.h index 4468d0f..5b8988e 100644 --- a/list.h +++ b/list.h @@ -29,15 +29,15 @@ typedef struct elmlist *address; struct elmlist { //------------- YOUR CODE HERE ----------- - - + infotype info; + address prev; + address next; //---------------------------------------- }; struct List { //------------- YOUR CODE HERE ----------- - - + address first; //---------------------------------------- }; @@ -60,6 +60,4 @@ void deleteAfter(List &, address &, address &); address findElmByID(List, infotype ); address findElmByName(List, infotype ); - - #endif // LIST_H_INCLUDED diff --git a/main.cpp b/main.cpp index a66a5c1..ac2bd88 100644 --- a/main.cpp +++ b/main.cpp @@ -125,6 +125,8 @@ void runMenu(int menu) { cout<<"UNDER MAIN TENIS"<>x.ID; + P = findElmByID(L, x); + if(P != NULL){ + cout<<"music found"< 0) + { + P = first(L); + int j = randomInt(i); + while( j != 0) + { + P = next(P); + j--; + } + address Q = P; + deleteAfter(L, prev(P), Q); + insertFirst(L, Q); + i--; + } - cout<<"UNDER MAIN TENIS"<