diff --git a/ASD_Task_4.depend b/ASD_Task_4.depend index a544662..5f7040b 100644 --- a/ASD_Task_4.depend +++ b/ASD_Task_4.depend @@ -19,3 +19,23 @@ "player.h" +1583562406 source:c:\users\user\documents\github\asd_task_4\main.cpp + "player.h" + "list.h" + + +1583335737 c:\users\user\documents\github\asd_task_4\player.h + "list.h" + +1583556155 c:\users\user\documents\github\asd_task_4\list.h + + + + +1583562315 source:c:\users\user\documents\github\asd_task_4\player.cpp + "player.h" + + +1583561542 source:c:\users\user\documents\github\asd_task_4\list.cpp + "list.h" + diff --git a/bin/Debug/ASD_Task_4.exe b/bin/Debug/ASD_Task_4.exe new file mode 100644 index 0000000..afc43a5 Binary files /dev/null and b/bin/Debug/ASD_Task_4.exe differ diff --git a/list.cpp b/list.cpp index 847a957..6e4f2d3 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,17 @@ 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 +60,14 @@ void insertLast(List &L, address P) { * FS : elemen yang ditunjuk P menjadi elemen terakhir pada List L */ //------------- YOUR CODE HERE ------------- - + 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,8 +80,14 @@ address findElmByID(List L, infotype x) { address P = NULL; //------------- YOUR CODE HERE ------------- - + P = first(L); + do{ + P = next(P); + }while(P != first(L) && info(P).ID != x.ID); //---------------------------------------- + if(P == first(L) && info(P).ID != x.ID){ + P = NULL; + } return P; } @@ -74,7 +100,14 @@ address findElmByName(List L, infotype x) { address P = NULL; //------------- YOUR CODE HERE ------------- - + P = first(L); + do{ + P = next(P); + }while(info(P).name != x.name && P != first(L)); + //---------------------------------------- + if(info(P).name != x.name && P == first(L)){ + P = NULL; + } //---------------------------------------- return P; } @@ -85,7 +118,16 @@ 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)){ + next(P) = NULL; + prev(P) = NULL; + first(L) = NULL; + } else { + next(prev(first(L))) = next(P); + first(L) = next(P); + next(prev(first(L))) = first(L); + } //---------------------------------------- } @@ -95,7 +137,13 @@ void deleteLast(List &L, address &P) { * FS : elemen tarakhir di dalam List L dilepas dan disimpan/ditunjuk oleh P */ //------------- YOUR CODE HERE ------------- - + P = prev(first(L)); + if(P == first(L)){ + deleteFirst(L, P); + } else { + prev(first(L)) = prev(P); + next(prev(P)) = first(L); + } //---------------------------------------- } @@ -106,7 +154,10 @@ void insertAfter(List &L, address &Prec, address P) { * ditunjuk pointer Prec */ //------------- YOUR CODE HERE ------------- - + next(P) = next(Prec); + prev(P) = Prec; + prev(next(Prec)) = P; + next(Prec) = P; //---------------------------------------- } @@ -117,7 +168,20 @@ void deleteAfter(List &L, address &Prec, address &P) { * dan disimpan/ditunjuk oleh P */ //------------- YOUR CODE HERE ------------- - + P = next(Prec); + if(next(Prec) == first(L)){ + deleteLast(L, P); + } else if (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..07db4e2 100644 --- a/list.h +++ b/list.h @@ -29,20 +29,19 @@ typedef struct elmlist *address; struct elmlist { //------------- YOUR CODE HERE ----------- - - + infotype info; + address next; + address prev; //---------------------------------------- }; struct List { //------------- YOUR CODE HERE ----------- - - + address first; //---------------------------------------- }; - /** YOU DON'T NEED TO MODIFY THIS */ void createList(List &); diff --git a/main.cpp b/main.cpp index a66a5c1..9d3f5b2 100644 --- a/main.cpp +++ b/main.cpp @@ -122,10 +122,8 @@ void runMenu(int menu) { case 2: // insert last music //------------- YOUR CODE HERE ------------- - cout<<"UNDER MAIN TENIS"<>x.ID; + P = findElmByID(L, x); + if(P != NULL){ + cout<<"music found"<>x.name; + cin>>x.ID; deleteMusicByID(L, x); cout<<"press enter";getche(); break; diff --git a/obj/Debug/list.o b/obj/Debug/list.o new file mode 100644 index 0000000..253053f Binary files /dev/null and b/obj/Debug/list.o differ diff --git a/obj/Debug/main.o b/obj/Debug/main.o new file mode 100644 index 0000000..e6d26df Binary files /dev/null and b/obj/Debug/main.o differ diff --git a/obj/Debug/player.o b/obj/Debug/player.o new file mode 100644 index 0000000..e56642b Binary files /dev/null and b/obj/Debug/player.o differ diff --git a/player.cpp b/player.cpp index 31ef288..88c1f38 100644 --- a/player.cpp +++ b/player.cpp @@ -14,12 +14,16 @@ void printInfo(List L) { */ address Q = first(L); - do { + if(first(L) != NULL){ + do { cout<<"name : "< 0){ + P = first(L); + int random = randomInt(lenList); + while(random != 0){ + P = next(P); + random = random - 1; + } + deleteAfter(L, prev(P), Q); + insertFirst(L, Q); + lenList = lenList - 1; + } //---------------------------------------- } @@ -55,9 +74,16 @@ void playRepeat(List &L, int n) { * dari lagu pertama hingga terakhir sebanyak n kali */ //------------- YOUR CODE HERE ------------- - - cout<<"UNDER MAIN TENIS"<