Skip to content

PR FROM MayangSari_1301194227_IF-43-05 #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mayangsr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

PR FROM MayangSari_1301194227_IF-43-05 #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions ASD_Task_2.depend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,21 @@
"list.h"
"operation.h"

1581182896 source:c:\users\asus\documents\github\asd_task_2\main.cpp
<iostream>
"list.h"
"operation.h"

1581049061 c:\users\asus\documents\github\asd_task_2\list.h
<iostream>

1580936410 c:\users\asus\documents\github\asd_task_2\operation.h
"list.h"

1581237784 source:c:\users\asus\documents\github\asd_task_2\list.cpp
"list.h"

1581258007 source:c:\users\asus\documents\github\asd_task_2\operation.cpp
"list.h"
"operation.h"

20 changes: 10 additions & 10 deletions ASD_Task_2.layout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@
<CodeBlocks_layout_file>
<FileVersion major="1" minor="0" />
<ActiveTarget name="Debug" />
<File name="operation.cpp" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="list.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="656" topLine="0" />
<Cursor1 position="423" topLine="27" />
</Cursor>
</File>
<File name="Main.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="operation.cpp" open="1" top="1" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="837" topLine="23" />
<Cursor1 position="660" topLine="14" />
</Cursor>
</File>
<File name="list.h" open="1" top="1" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="Main.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="151" topLine="0" />
<Cursor1 position="2316" topLine="0" />
</Cursor>
</File>
<File name="list.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="operation.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="214" topLine="117" />
<Cursor1 position="152" topLine="0" />
</Cursor>
</File>
<File name="operation.h" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="list.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="-1" zoom_2="0">
<Cursor>
<Cursor1 position="152" topLine="0" />
<Cursor1 position="2912" topLine="0" />
</Cursor>
</File>
</CodeBlocks_layout_file>
4 changes: 2 additions & 2 deletions Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using namespace std;

void mainMenu();
List L;
address P;
address P, Prec;
infotype X;

int main() {
Expand Down Expand Up @@ -34,7 +34,7 @@ int main() {
//==================================================
// TEST INSERT AFTER
P = findElm(L, 6);
insertLast(L, allocate(5));
insertAfter(L, P, allocate(5));
printInfo(L);
cout<<"output should be: 8, 3, 6, 5, 4, 2,"<<endl;

Expand Down
Binary file added bin/Debug/ASD_Task_2.exe
View file
Open in desktop
Binary file not shown.
122 changes: 83 additions & 39 deletions list.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,81 @@
#include "list.h"

void createList(List &L) {
void createList(List &L)
{
/**
* FS : set first(L) with Null
*/
//-------------your code here-------------
cout<<"your code here"<<endl;


first(L) = NULL;
//----------------------------------------
}

address allocate(infotype x) {
address allocate(infotype x)
{
/**
* FS : return new list element with info = x and next element is Null
*/

address P = NULL;
//-------------your code here-------------
cout<<"your code here"<<endl;

P = new elmlist;
info(P) = x;
next(P) = NULL;

//----------------------------------------
return P;
}

void deallocate(address &P) {
void deallocate(address &P)
{
/**
* FS : delete element pointed by P
*/
//-------------your code here-------------
cout<<"your code here"<<endl;

delete (P);

//----------------------------------------
}

void insertFirst(List &L, address P) {
void insertFirst(List &L, address P)
{
/**
* IS : List L may be empty
* FS : element pointed by P became the first element in List L
*/
//-------------your code here-------------
cout<<"your code here"<<endl;

//cout<<"your code here"<<endl;
next(P) = first(L);
first(L) = P;


//----------------------------------------
}

void insertLast(List &L, address P) {
void insertLast(List &L, address P)
{
/**
* IS : List L may be empty
* FS : element pointed by P became the last element in List L
*/
//-------------your code here-------------
cout<<"your code here"<<endl;


//----------------------------------------
address Q;
Q = first(L);
if (Q==NULL){
insertFirst(L, P);
}else {
while(next(Q) != NULL)
{
Q = next(Q);
}
next(Q) = P;
}
}
//----------------------------------------

address findElm(List L, infotype x) {

address findElm(List L, infotype x)
{
/**
* IS : List L may be empty
* FS : returns element with info.ID = x.ID,
Expand All @@ -70,75 +84,105 @@ address findElm(List L, infotype x) {

address P;
//-------------your code here-------------
cout<<"your code here"<<endl;

P = first(L);
while(P != NULL && info(P)!= x)
{
P = next(P);
}

//----------------------------------------
return P;
}

void deleteFirst(List &L, address &P) {
void deleteFirst(List &L, address &P)
{
/**
* IS : List L may be empty
* FS : first element in List L is removed and is pointed by P
*/
//-------------your code here-------------
cout<<"your code here"<<endl;

if (first(L)!=NULL)
{
P=first(L);
first(L)=next(P);
next(P)=NULL;
}


//----------------------------------------
}

void deleteLast(List &L, address &P) {
void deleteLast(List &L, address &P)
{
/**
* IS : List L may be empty
* FS : last element in List L is removed and is pointed by P
*/
//-------------your code here-------------
cout<<"your code here"<<endl;



address Q;
Q=first(L);
if (next(Q)==NULL)
{
first(L)=NULL;
}
else
{
while(next(next(Q))!= NULL)
{
Q=next(Q);
}
P=next(Q);
next(Q)=NULL;
}
//----------------------------------------
}

void printInfo(List L) {
void printInfo(List L)
{
/**
* FS : view info of all element inside List L,
* call the view_data function from my_data.h to print the info
*/
//-------------your code here-------------
cout<<"your code here"<<endl;

address P;
P = first(L);
while(P!=NULL)
{
cout<<info(P)<<" ";
P=next(P);
}

//----------------------------------------
cout<<endl;
}


void insertAfter(List &L, address Prec, address P) {
void insertAfter(List &L, address Prec, address P)
{
/**
* IS : Prec and P is not NULL
* FS : element pointed by P is placed behind the element
* pointed by pointer Prec
*/
//-------------your code here-------------
cout<<"your code here"<<endl;

if (next(Prec)!=NULL){
next(P)=next(Prec);
next(Prec)=P;
}
//----------------------------------------

}
void deleteAfter(List &L, address Prec, address &P) {
void deleteAfter(List &L, address Prec, address &P)
{
/**
* IS : Prec is not NULL
* FS : element which was before behind an element pointed by Prec
* is removed and pointed by pointer P
*/
//-------------your code here-------------
cout<<"your code here"<<endl;


P=next(Prec);
next(Prec)=next(P);
next(P)=NULL;
//----------------------------------------
}

5 changes: 3 additions & 2 deletions list.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,15 @@ typedef struct elmlist *address;

struct elmlist{
//------------- your code here -----------

infotype info;
address next;

//----------------------------------------
};

struct List{
//------------- your code here -----------

address first;
//----------------------------------------
};

Expand Down
Binary file added obj/Debug/Main.o
View file
Open in desktop
Binary file not shown.
Binary file modified obj/Debug/list.o
View file
Open in desktop
Binary file not shown.
Binary file modified obj/Debug/operation.o
View file
Open in desktop
Binary file not shown.
22 changes: 19 additions & 3 deletions operation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
#include "operation.h"


void insert_sorted(List &L, infotype x) {
void insert_sorted(List &L, infotype x)
{
/**
* IS : List may be empty
* PR : insert an infotype x into an already sorted List L
Expand All @@ -13,8 +14,23 @@ void insert_sorted(List &L, infotype x) {
*/

//-------------your code here-------------
cout<<"your code here"<<endl;

address P, Q;
if ((first(L)==NULL) || (x<info(first(L)))){
P=allocate(x);
insertFirst(L, P);
}else if(findElm(L, x)==NULL){
Q=first(L);
while((next(Q)!=NULL) && (x>info(next(Q)))){
Q=next(Q);
if(next(Q)==NULL){
P=allocate(x);
insertLast(L, P);
}else if (info(P)!=info(Q)){
P=allocate(x);
insertAfter(L, Q, P);
}
}
}

//----------------------------------------
}