diff --git a/ASD_Task_3.depend b/ASD_Task_3.depend index 831bfcc..984caa1 100644 --- a/ASD_Task_3.depend +++ b/ASD_Task_3.depend @@ -52,3 +52,32 @@ "operation.h" "my_data.h" +1582346225 source:d:\strukdat\asd_task_3\my_data.cpp + "my_data.h" + +1582346224 d:\strukdat\asd_task_3\my_data.h + + +1582381220 source:d:\strukdat\asd_task_3\main.cpp + + + "list.h" + "operation.h" + "my_data.h" + +1582353470 d:\strukdat\asd_task_3\list.h + + "my_data.h" + +1582265226 d:\strukdat\asd_task_3\operation.h + "list.h" + +1582383177 source:d:\strukdat\asd_task_3\operation.cpp + "list.h" + "operation.h" + "my_data.h" + +1582380088 source:d:\strukdat\asd_task_3\list.cpp + "list.h" + "my_data.h" + diff --git a/ASD_Task_3.layout b/ASD_Task_3.layout index 17b1801..17c2c5f 100644 --- a/ASD_Task_3.layout +++ b/ASD_Task_3.layout @@ -2,39 +2,39 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/bin/Debug/ASD_Task_3.exe b/bin/Debug/ASD_Task_3.exe new file mode 100644 index 0000000..c8ff378 Binary files /dev/null and b/bin/Debug/ASD_Task_3.exe differ diff --git a/list.cpp b/list.cpp index fe0655c..31aaed0 100644 --- a/list.cpp +++ b/list.cpp @@ -6,9 +6,8 @@ void createList(List &L) { * FS : set first(L) and last(L) with Null */ //-------------your code here------------- - your code here - - + first(L) = NULL; + last(L) = NULL; //---------------------------------------- } @@ -19,9 +18,13 @@ address allocate(infotype x) { address P; //-------------your code here------------- - your code here - - + P = new elmlist; + info(P).ID = x.ID; + info(P).name = x.name; + info(P).rank = x.rank; + info(P).score = x.score; + next(P) = NULL; + prev(P) = NULL; //---------------------------------------- return P; } @@ -31,9 +34,7 @@ void deallocate(address &P) { * FS : delete element pointed by P */ //-------------your code here------------- - your code here - - + delete P; //---------------------------------------- } @@ -43,7 +44,14 @@ void insertFirst(List &L, address P) { * FS : element pointed by P became the first element in List L */ //-------------your code here------------- - your code here + if(first(L)!=NULL){ + next(P) = first(L); + prev(first(L)) = P; + first(L) = P; + } else { + first(L) = P; + last(L) = P; + } //---------------------------------------- @@ -55,9 +63,9 @@ void insertLast(List &L, address P) { * FS : element pointed by P became the last element in List L */ //-------------your code here------------- - your code here - - + next(last(L)) = P; + prev(P) = last(L); + last(L) = P; //---------------------------------------- } @@ -70,9 +78,10 @@ address findElm(List L, infotype x) { address P; //-------------your code here------------- - your code here - - + P = first(L); + while((P != NULL)&&(info(P).ID != x.ID)){ + P = next(P); + } //---------------------------------------- return P; } @@ -83,10 +92,16 @@ void deleteFirst(List &L, address &P) { * FS : first element in List L is removed and is pointed by P */ //-------------your code here------------- - your code here - - - + if(first(L) == last(L)){ + P = first(L); + first(L) = NULL; + last(L) = NULL; + } else if(first(L) != NULL){ + P = first(L); + first(L) = next(P); + next(P) = NULL; + prev(first(L)) = NULL; + } //---------------------------------------- } @@ -96,10 +111,16 @@ void deleteLast(List &L, address &P) { * FS : last element in List L is removed and is pointed by P */ //-------------your code here------------- - your code here - - - + if (last(L) != NULL){ + P = last(L); + last(L) = prev(P); + prev(P) = NULL; + next(last(L)) = NULL; + } else if(last(L)==first(L)){ + P = first(L); + last(L) = NULL; + first(L) = NULL; + } //---------------------------------------- } @@ -109,9 +130,12 @@ void printInfo(List L) { * call the view_data function from my_data.h to print the info */ //-------------your code here------------- - your code here - - + address P = first(L); + while(P != NULL){ + view_data(info(P)); + P = next(P); + } + cout << endl; //---------------------------------------- } @@ -123,8 +147,16 @@ void insertAfter(List &L, address Prec, address P) { * pointed by pointer Prec */ //-------------your code here------------- - your code here - + if(first(L)==NULL){ + insertFirst(L,P); + } else if(first(L) != last(L) && Prec != NULL){ + next(P) = next(Prec); + prev(P) = Prec; + prev(next(Prec)) = P; + next(Prec) = P; + } else if(Prec != NULL){ + insertLast(L,P); + } //---------------------------------------- } @@ -135,9 +167,17 @@ void deleteAfter(List &L, address Prec, address &P) { * is removed and pointed by pointer P */ //-------------your code here------------- - your code here - - + if(first(L) == last(L) && Prec != NULL){ + deleteFirst(L,P); + } else if(next(Prec) != last(L) && Prec != NULL){ + P = next(Prec); + next(Prec) = next(P); + prev(next(Prec)) = Prec; + next(P) = NULL; + prev(P) = NULL; + } else if(Prec != NULL){ + deleteLast(L,P); + } //---------------------------------------- } diff --git a/list.h b/list.h index c21344f..c070520 100644 --- a/list.h +++ b/list.h @@ -23,9 +23,9 @@ using namespace std; * prev : address * > * -* Type List : < -* first : address -* last : address +* Type List : < +* first : address +* last : address * > * **/ @@ -37,14 +37,16 @@ typedef struct elmlist *address; struct elmlist{ //------------- your code here ----------- - + infotype info; + address next; + address prev; //---------------------------------------- }; struct List{ //------------- your code here ----------- - - + address first; + address last; //---------------------------------------- }; diff --git a/main.cpp b/main.cpp index 9e0b483..5185213 100644 --- a/main.cpp +++ b/main.cpp @@ -1,4 +1,5 @@ #include +#include #include "list.h" #include "operation.h" #include "my_data.h" @@ -50,9 +51,49 @@ void mainMenu() { switch(choice) { case 1: X = create_data(); - P = allocate(X); - insertFirst(L,P) + insertAndSort(L,X); break; + case 2: + printInfo(L); + break; + case 3: + cout << "Masukkan ID: "; + cin >> X.ID; + P = findElm(L,X); + if(P != NULL){ + view_data(info(P)); + } else { + cout << "Not found\n"; + } + break; + case 4: + cout << "Masukkan ID: "; + cin >> X.ID; + P = findElm(L,X); + if(P != NULL){ + edit_data(info(P)); + } else { + cout << "Not found\n"; + } + break; + case 5: + cout << "Masukkan ID: "; + cin>> X.ID; + if(findElm(L,X) != NULL){ + deletebyID(L, X.ID); + } else { + cout << "Not found" << endl; + } + break; + case 6: + savePassedMember(L, L_passed); + break; + case 7: + printInfo(L_passed); + break; + + default: + exit(0); } } while(true); diff --git a/my_data.cpp b/my_data.cpp index 68b9d77..c9b8f96 100644 --- a/my_data.cpp +++ b/my_data.cpp @@ -1,10 +1,10 @@ - + #include "my_data.h" /** - CLASS : - NAME : - STUDENT ID : + CLASS : IF-43-05 + NAME : MUHAMMAD IKRAM KAER SINAPOY + STUDENT ID : 1301193341 **/ mytype create_data() { @@ -15,11 +15,14 @@ mytype create_data() { mytype d; // =========================== // YOUR CODE HERE - your code here - - - - + cout<< "Masukkan ID: "; + cin>> d.ID; + cout<< "Masukkan Nama: "; + cin>> d.name; + cout<< "Masukkan Ranking: "; + cin>> d.rank; + cout<< "Masukkan Score: "; + cin>> d.score; // =========================== return d; } @@ -32,11 +35,7 @@ void view_data(mytype d) { // =========================== // YOUR CODE HERE - your code here - - - - + cout << d.ID << " - " << d.name << " - " << d.rank << " - " << d.score << endl; // =========================== } @@ -50,11 +49,12 @@ void edit_data(mytype &d) { // =========================== // YOUR CODE HERE - your code here - - - - + cout << "Masukkan pergantian nama: "; + cin >> d.name; + cout << "Masukkan pergantian rank: "; + cin >> d.rank; + cout << "Masukkan pergantian score: "; + cin >> d.score; // =========================== } diff --git a/my_data.h b/my_data.h index 2937b48..c96489a 100644 --- a/my_data.h +++ b/my_data.h @@ -5,9 +5,9 @@ using namespace std; /** - CLASS : - NAME : - STUDENT ID : + CLASS : IF-43-05 + NAME : MUHAMMAD IKRAM KAER SINAPOY + STUDENT ID : 1301193341 **/ struct mytype { @@ -20,8 +20,10 @@ struct mytype { */ //================================================= // YOUR CODE STARTS HERE - your code here - + int ID; + string name; + int rank; + float score; // YOUR CODE ENDS HERE //================================================= }; @@ -29,6 +31,6 @@ struct mytype { mytype create_data(); void view_data(mytype d); -void edit_data(mytype &d); +void edit_data(mytype &d); #endif // MY_DATA_H_INCLUDED diff --git a/obj/Debug/list.o b/obj/Debug/list.o new file mode 100644 index 0000000..e87a675 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..92d03eb Binary files /dev/null and b/obj/Debug/main.o differ diff --git a/obj/Debug/my_data.o b/obj/Debug/my_data.o new file mode 100644 index 0000000..4b15936 Binary files /dev/null and b/obj/Debug/my_data.o differ diff --git a/obj/Debug/operation.o b/obj/Debug/operation.o new file mode 100644 index 0000000..8a86441 Binary files /dev/null and b/obj/Debug/operation.o differ diff --git a/operation.cpp b/operation.cpp index c2dc0b0..8393895 100644 --- a/operation.cpp +++ b/operation.cpp @@ -1,7 +1,7 @@ #include "list.h" #include "operation.h" #include "my_data.h" - + void insertAndSort(List &L, infotype x) { /** @@ -14,7 +14,19 @@ void insertAndSort(List &L, infotype x) { */ //-------------your code here------------- - your code here + address P,Q; + P = first(L); + if(P == NULL || info(first(L)).ID >= x.ID){ + insertFirst(L, allocate(x)); + }else if(info(last(L)).ID <= x.ID ){ + insertLast(L, allocate(x)); + }else{ + while(P != NULL && info(P).ID < x.ID){ + Q = P; + P = next(P); + } + insertAfter(L,Q,allocate(x)); + } //---------------------------------------- @@ -29,9 +41,17 @@ void deletebyID(List &L, int id_x) { address Prec, P; //-------------your code here------------- - your code here - - + P = first(L); + if(P==first(L) && id_x==info(P).ID){ + deleteFirst(L,P); + } else { + while(P != NULL) { + if(id_x == info(P).ID && first(L) != last(L)){ + deleteAfter(L,prev(P),P); + } + P = next(P); + } + } //---------------------------------------- } @@ -43,8 +63,13 @@ void savePassedMember(List &L, List &L2){ */ address P; //-------------your code here------------- - your code here - - + P = first(L); + address Q = P; + while(P != NULL){ + if(info(P).score > 80){ + insertLast(L2, allocate(info(P))); + } + P = next(P); + } //---------------------------------------- }