diff --git a/ASD_Task_4.depend b/ASD_Task_4.depend index a544662..bcca234 100644 --- a/ASD_Task_4.depend +++ b/ASD_Task_4.depend @@ -19,3 +19,18 @@ "player.h" +1583570365 source:d:\strukdat\asd_task_4\list.cpp + "list.h" + +1583570365 d:\strukdat\asd_task_4\list.h + + + + +1583570365 source:d:\strukdat\asd_task_4\player.cpp + "player.h" + + +1583570365 d:\strukdat\asd_task_4\player.h + "list.h" + diff --git a/bin/Debug/ASD_Task_4.exe b/bin/Debug/ASD_Task_4.exe new file mode 100644 index 0000000..aa53606 Binary files /dev/null and b/bin/Debug/ASD_Task_4.exe differ diff --git a/list.cpp b/list.cpp index 847a957..f9a502e 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,16 @@ void insertLast(List &L, address P) { * FS : elemen yang ditunjuk P menjadi elemen terakhir pada List L */ //------------- YOUR CODE HERE ------------- - + if (first(L) == NULL){ + first(L) = P; + next(first(L)) = P; + prev(first(L)) = P; + }else { + next(P) = first(L); + prev(P) = prev(first(L)); + next(prev(first(L))) = P; + prev(first(L)) = P; + } //---------------------------------------- } @@ -58,11 +80,16 @@ address findElmByID(List L, infotype x) { mengembalikan Nil jika tidak ditemukan */ - address P = NULL; + address P = first(L); //------------- YOUR CODE HERE ------------- - + do{ + if(info(P).ID == x.ID){ + return P; + } + P = next(P); + }while(P != first(L) && first(L) != NULL); //---------------------------------------- - return P; + return NULL; } address findElmByName(List L, infotype x) { @@ -72,11 +99,16 @@ address findElmByName(List L, infotype x) { mengembalikan Nil jika tidak ditemukan */ - address P = NULL; + address P = first(L); //------------- YOUR CODE HERE ------------- - + do { + if(info(P).name == x.name){ + return P; + } + P = next(P); + }while(P != first(L)); //---------------------------------------- - return P; + return NULL; } void deleteFirst(List &L, address &P) { @@ -85,7 +117,19 @@ void deleteFirst(List &L, address &P) { * FS : elemen pertama di dalam List L dilepas dan disimpan/ditunjuk oleh P */ //------------- YOUR CODE HERE ------------- - + if(next(first(L)) == first(L)){ + P = first(L); + first(L) = NULL; + next(P) = NULL; + prev(P) = NULL; + }else { + P = first(L); + first(L) = next(first(L)); + next(prev(P)) = first(L); + prev(first(L)) = prev(P); + next(P) = NULL; + prev(P) = NULL; + } //---------------------------------------- } @@ -95,7 +139,16 @@ void deleteLast(List &L, address &P) { * FS : elemen tarakhir di dalam List L dilepas dan disimpan/ditunjuk oleh P */ //------------- YOUR CODE HERE ------------- - + if(next(P) == first(L)){ + P = first(L); + first(L) = NULL; + }else{ + P = prev(first(L)); + next(prev(P)) = first(L); + prev(first(L)) = prev(P); + next(P) = NULL; + prev(P) = NULL; + } //---------------------------------------- } @@ -106,7 +159,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 +173,35 @@ 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; + } //---------------------------------------- } +void insertAndShort(List &L, infotype x){ + address P,Q ; + P = first(L) ; + if ((P == NULL) || (info(P).ID > x.ID)) + { + insertFirst(L,allocate(x)) ; + } + else if (findElmByID(L,x) == NULL) + { + while ((P != NULL) && (info(P).ID < x.ID)) + { + Q = P ; + P = next(P) ; + } + insertAfter(L,Q,allocate(x)); + } +} diff --git a/list.h b/list.h index 4468d0f..6d2d636 100644 --- a/list.h +++ b/list.h @@ -29,15 +29,15 @@ typedef struct elmlist *address; struct elmlist { //------------- YOUR CODE HERE ----------- - - + infotype info; + address next; + address prev; //---------------------------------------- }; struct List { //------------- YOUR CODE HERE ----------- - - + address first; //---------------------------------------- }; @@ -61,5 +61,5 @@ void deleteAfter(List &, address &, address &); address findElmByID(List, infotype ); address findElmByName(List, infotype ); - +void insertAndShort(List &L, infotype x); #endif // LIST_H_INCLUDED diff --git a/main.cpp b/main.cpp index a66a5c1..dcb19a9 100644 --- a/main.cpp +++ b/main.cpp @@ -122,10 +122,9 @@ void runMenu(int menu) { case 2: // insert last music //------------- YOUR CODE HERE ------------- - cout<<"UNDER MAIN TENIS"<>x.name; P = findElmByName(L, x); if(P != NULL){ - cout<<"music found"<>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..c56d998 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..f8fe86b 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..b832198 Binary files /dev/null and b/obj/Debug/player.o differ diff --git a/player.cpp b/player.cpp index 31ef288..e04e5ca 100644 --- a/player.cpp +++ b/player.cpp @@ -43,9 +43,25 @@ void shuffleList(List &L) { * FS : isi (elemen) dari list teracak */ //------------- YOUR CODE HERE ------------- - - cout<<"UNDER MAIN TENIS"<