diff --git a/Attribute.h b/Attribute.h index fde2fcc..4b60d4d 100755 --- a/Attribute.h +++ b/Attribute.h @@ -41,12 +41,6 @@ public: cout< a){ - - name = n; - values = a; - } void erase(int position) { diff --git a/Relation.h b/Relation.h index 7a90300..3082e02 100755 --- a/Relation.h +++ b/Relation.h @@ -22,7 +22,7 @@ public: for(int i = 0; i < att.size(); i++) { //Loop through the elements in the i'th column - for(int j = 0; j < att[i].values.size(); j++){ + for(int j = 0; j < att[i].getValues().size(); j++){ //In this column, at this element's spot, assign an element from the tuple vector to this spot att[i].addRow(tuple[i]); @@ -46,8 +46,6 @@ public: } } } - - int getSize() { return size; } string getTableName() { return name; @@ -68,7 +66,7 @@ public: cout << "Column Title: " << input << endl; for(int j = 0; j < att[i].getSize(); j++) { - cout << att[i].values[j] << endl; + cout << att[i].getValues()[j] << endl; } break; @@ -81,10 +79,10 @@ public: void display() { cout<<"\n\nDisplay of relation--------------------------------"<