Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,21 @@
"list.h"
"operation.h"

1581163978 source:c:\users\rulz\documents\github\asd_task_2\operation.cpp
"list.h"
"operation.h"

1581163470 c:\users\rulz\documents\github\asd_task_2\list.h
<iostream>

1581164015 c:\users\rulz\documents\github\asd_task_2\operation.h
"list.h"

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

1581163916 source:c:\users\rulz\documents\github\asd_task_2\list.cpp
"list.h"

20 changes: 10 additions & 10 deletions ASD_Task_2.layout
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="Main.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="656" topLine="0" />
<Cursor1 position="837" topLine="74" />
</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="list.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="837" topLine="23" />
<Cursor1 position="3817" topLine="0" />
</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="operation.h" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="151" topLine="0" />
<Cursor1 position="157" 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="list.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="214" topLine="117" />
<Cursor1 position="151" 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="operation.cpp" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="152" topLine="0" />
<Cursor1 position="1021" topLine="0" />
</Cursor>
</File>
</CodeBlocks_layout_file>
2 changes: 1 addition & 1 deletion Main.cpp
Original file line number Diff line number Diff line change
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
Binary file not shown.
82 changes: 44 additions & 38 deletions list.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ void createList(List &L) {
* FS : set first(L) with Null
*/
//-------------your code here-------------
cout<<"your code here"<<endl;


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

Expand All @@ -18,9 +16,9 @@ address allocate(infotype x) {

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


P = new elmlist;
info(P) = x;
next(P) = NULL;
//----------------------------------------
return P;
}
Expand All @@ -30,9 +28,7 @@ void deallocate(address &P) {
* FS : delete element pointed by P
*/
//-------------your code here-------------
cout<<"your code here"<<endl;


delete P;
//----------------------------------------
}

Expand All @@ -42,10 +38,8 @@ void insertFirst(List &L, address P) {
* FS : element pointed by P became the first element in List L
*/
//-------------your code here-------------
cout<<"your code here"<<endl;



next(P) = first(L);
first(L) = P;
//----------------------------------------
}

Expand All @@ -55,9 +49,12 @@ void insertLast(List &L, address P) {
* 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);
while(next(Q)!=NULL){
Q=next(Q);
}
next(Q) = P;
//----------------------------------------
}

Expand All @@ -70,10 +67,10 @@ 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;
}

Expand All @@ -83,10 +80,11 @@ void deleteFirst(List &L, address &P) {
* 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;
}
//----------------------------------------
}

Expand All @@ -96,10 +94,17 @@ void deleteLast(List &L, address &P) {
* 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){
deleteFirst(L,P);
} else {
while(next(next(Q)) != NULL){
Q = next(Q);
}
P = next(Q);
next(Q) = NULL;
}
//----------------------------------------
}

Expand All @@ -109,9 +114,12 @@ void printInfo(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;
}
Expand All @@ -124,10 +132,9 @@ void insertAfter(List &L, address Prec, address P) {
* pointed by pointer Prec
*/
//-------------your code here-------------
cout<<"your code here"<<endl;

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

}
void deleteAfter(List &L, address Prec, address &P) {
/**
Expand All @@ -136,9 +143,8 @@ void deleteAfter(List &L, address Prec, address &P) {
* 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;
//----------------------------------------
}

10 changes: 3 additions & 7 deletions list.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,12 @@ typedef int infotype;
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
Binary file not shown.
Binary file modified obj/Debug/list.o
Binary file not shown.
Binary file modified obj/Debug/operation.o
Binary file not shown.
20 changes: 17 additions & 3 deletions operation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,23 @@ void insert_sorted(List &L, infotype x) {
* FS : elements in List L sorted in ascending order, x is inside List L
*/

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

address Q,P;
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,P,Q);
}
}

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