From 94912e6b141950b0c90791efafb1953fa70d69a6 Mon Sep 17 00:00:00 2001 From: Rebecca Schofield Date: Tue, 15 Sep 2015 20:55:21 -0500 Subject: [PATCH] attribute works as expects --- Attribute.h | 25 ++++++++++++++++++------- Relation.h | 14 ++++++++------ a.out | Bin 0 -> 29594 bytes test.cpp | 38 ++++++++++++-------------------------- 4 files changed, 38 insertions(+), 39 deletions(-) create mode 100755 a.out diff --git a/Attribute.h b/Attribute.h index 9d53d4c..2c51e1b 100755 --- a/Attribute.h +++ b/Attribute.h @@ -9,25 +9,36 @@ using namespace std; class Attribute { //a named column of a relation string name; - - bool isKey; + string type; + bool key; int size; public: vector values; - - void initializeAttribute(string n, vector a){ - + + Attribute(string n, string t, bool k){ name = n; - values = a; + type = t; + key = k; + size = 0; + } + + void addRow(string v) { + values.push_back(v); } string getName(){ return name; } - Attribute(){ } + string getType(){ + return type; + } + + bool isKey(){ + return key; + } void display() { diff --git a/Relation.h b/Relation.h index c41db03..568f020 100755 --- a/Relation.h +++ b/Relation.h @@ -6,21 +6,19 @@ using namespace std; //NOT DONE class Relation { - //a table with rows and columns string name; //The title the user gives it - vector< Attribute > att; //A vector of the columns + vector att; //A vector of the columns public: Relation(); //constructor - Relation(string n, vector< Attribute > a) { + Relation(string n, vector a) { name = n; att = a; - } + } void addTuple(vector< string > tuple) { - //Loop through the attribute columns for(int i = 0; i < att.size(); i++) { @@ -28,11 +26,15 @@ public: for(int j = 0; j < att[i].values.size(); j++){ //In this column, at this element's spot, assign an element from the tuple vector to this spot - (att[i].values[j]).assign(tuple[i]); + att[i].addRow(tuple[i]); } } } + string getTableName() { + return name; + } + void displayTableName() { cout << "The table name is: " << name << endl; } diff --git a/a.out b/a.out new file mode 100755 index 0000000000000000000000000000000000000000..d8082f0af5f9dda34369707a36b35b40de1e84a9 GIT binary patch literal 29594 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 E01-!;=l}o! literal 0 HcmV?d00001 diff --git a/test.cpp b/test.cpp index b6b03b0..03a58ce 100755 --- a/test.cpp +++ b/test.cpp @@ -5,40 +5,26 @@ using namespace std; -int main() { +int main() { + Attribute atributo("shamWow", "VARCHAR(10)", false); - /* - DBEngine engine; - Relation r; - Attribute a; - */ + atributo.addRow("rag"); + atributo.addRow("sponge"); + atributo.addRow("wooow"); + atributo.addRow("cloth"); - vector shamWow; - shamWow.push_back("rag"); - shamWow.push_back("sponge"); - shamWow.push_back("wooow"); - shamWow.push_back("cloth"); - - Attribute atributo; - atributo.initializeAttribute("atributo",shamWow); atributo.display(); - vector doom; - doom.push_back("zombieman"); - doom.push_back("revenant"); - doom.push_back("imp"); - doom.push_back("archvile"); + Attribute atributo2("doom", "VARCHAR(20)", false); + + atributo2.addRow("zombieman"); + atributo2.addRow("revenant"); + atributo2.addRow("imp"); + atributo2.addRow("archvile"); - Attribute atributo2; - atributo2.initializeAttribute("attribute_2", doom); atributo2.display(); - - - string line1 = "Table_1"; - - //Relation r(line1, my_attributes); }