From b2e36b30566c0dbcc286acfceb9c7baa16842d06 Mon Sep 17 00:00:00 2001
From: Brandon Jackson <1drummer@att.net>
Date: Tue, 15 Sep 2015 21:38:49 -0500
Subject: [PATCH] Update test.cpp

---
 test.cpp | 52 +++++++++++++++++++++++++---------------------------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/test.cpp b/test.cpp
index 0c956a1..69b71bd 100755
--- a/test.cpp
+++ b/test.cpp
@@ -1,29 +1,8 @@
-/*
-#include <iostream>
-#include "DBEngine.h"
-
-using namespace std;
-
-int main() {
-	
-	
-	//DBEngine engine;
-	vector<string> my_vector = {"Name", "Grade", "Happiness"};
-	string at1 = "Name", at2 = "Grade", at3 = "Happiness";
-	
-	
-	Attribute<string> attribute_1(at1);//, attribute_2(at2), attribute_3(at3);
-	
-	
-	//Relation r(line1, my_attributes);
-	
-	//r.displayTableName();
-*/
-	
 #include <iostream>
 //#include "DBEngine.h"
 #include <vector>
-#include "Attribute.h"
+//#include "Attribute.h"
+#include "Relation.h"
 
 using namespace std;
 
@@ -43,6 +22,7 @@ int main() {
 	
 	Attribute atributo;
 	atributo.initializeAttribute("atributo",shamWow);
+	
 	atributo.display();
 	
 	vector<string> doom;
@@ -52,16 +32,34 @@ int main() {
 	doom.push_back("archvile");
 	
 	Attribute atributo2;
-	atributo2.initializeAttribute("attribute_2", doom);
+	atributo2.initializeAttribute("atributo2",doom);
+	
 	atributo2.display();
 	
+	vector<Attribute> setOfAttributes;
+	setOfAttributes.push_back(atributo);
+	setOfAttributes.push_back(atributo2);
+	
+	vector<string> attNames;
+	attNames.push_back("attName1");
+	attNames.push_back("attName2");
+	
+	Relation myLittleRelation;
+	myLittleRelation.initializeRelation("randomName", attNames, setOfAttributes);
 	
 	
+	//adding tuple business-----------------------
 	
-	string line1 = "Table_1";
+	vector<string> tuple;
+	tuple.push_back("hadoken");
+	tuple.push_back("soryuken");
 	
+	myLittleRelation.addTuple(tuple);
 	
+	myLittleRelation.display();
 	
-	//Relation r(line1, my_attributes);
+	string input_query = "atributo";
+	cout << "\nThe attempted input query is: " << input_query << endl;
+	
+	myLittleRelation.projectQuery(input_query);
 }
-