fixed some bugs.

Signed-off-by: unknown <saq10002@iteb-219.ad.engr.uconn.edu>
saq10002 · Sep 23, 2014 · 119728e · 119728e
1 parent f75b407
commit 119728e
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 32 deletions.
diff --git a/YASI_12/YASI_12.vcxproj b/YASI_12/YASI_12.vcxproj
@@ -73,6 +73,7 @@
     <ClCompile Include="utils.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="alg.graph.h" />
     <ClInclude Include="common.h" />
     <ClInclude Include="ds.arraybinarytree.h" />
     <ClInclude Include="ds.aux.hastree.h" />

diff --git a/YASI_12/YASI_12.vcxproj.filters b/YASI_12/YASI_12.vcxproj.filters
@@ -16,23 +16,29 @@
     <Filter Include="Header Files\nonproject">
       <UniqueIdentifier>{e771e66c-6407-4d3a-bd6f-97ad63c60a2d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\List">
-      <UniqueIdentifier>{dd3f1d18-aa29-4dd2-b39f-3fee286fb955}</UniqueIdentifier>
+    <Filter Include="Header Files\Common">
+      <UniqueIdentifier>{d2827f3c-736f-4f2a-891c-9fa2883e5685}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Data Structures">
+      <UniqueIdentifier>{38bc138b-d5b5-4dea-9c6e-6197d9c01502}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\Tree">
+    <Filter Include="Header Files\Data Structures\Tree">
       <UniqueIdentifier>{c53f92c4-0949-4c57-bebb-d65e28421697}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\Heap">
+    <Filter Include="Header Files\Data Structures\List">
+      <UniqueIdentifier>{dd3f1d18-aa29-4dd2-b39f-3fee286fb955}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Data Structures\Heap">
       <UniqueIdentifier>{7c28c024-2e52-4642-b5b0-dd1332b5e474}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\Dictionary">
-      <UniqueIdentifier>{3513b12f-c68b-43a7-8531-76ebdb5b60f7}</UniqueIdentifier>
+    <Filter Include="Header Files\Data Structures\Graph">
+      <UniqueIdentifier>{9d029d58-d806-4503-8f54-cc27d0b9332d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\Common">
-      <UniqueIdentifier>{d2827f3c-736f-4f2a-891c-9fa2883e5685}</UniqueIdentifier>
+    <Filter Include="Header Files\Data Structures\Dictionary">
+      <UniqueIdentifier>{3513b12f-c68b-43a7-8531-76ebdb5b60f7}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\Graph">
-      <UniqueIdentifier>{9d029d58-d806-4503-8f54-cc27d0b9332d}</UniqueIdentifier>
+    <Filter Include="Header Files\Algorithms">
+      <UniqueIdentifier>{0f4869ec-8aa0-40e8-bf1a-dc5133ff0b1c}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -51,40 +57,40 @@
       <Filter>Header Files\nonproject</Filter>
     </ClInclude>
     <ClInclude Include="ds.doublylinkedlist.h">
-      <Filter>Header Files\List</Filter>
+      <Filter>Header Files\Data Structures\List</Filter>
     </ClInclude>
     <ClInclude Include="ds.singlylinkedlist.h">
-      <Filter>Header Files\List</Filter>
+      <Filter>Header Files\Data Structures\List</Filter>
     </ClInclude>
     <ClInclude Include="ds.arraybinarytree.h">
-      <Filter>Header Files\Tree</Filter>
+      <Filter>Header Files\Data Structures\Tree</Filter>
     </ClInclude>
     <ClInclude Include="ds.binarysearchtree.h">
-      <Filter>Header Files\Tree</Filter>
+      <Filter>Header Files\Data Structures\Tree</Filter>
     </ClInclude>
     <ClInclude Include="ds.binarytree.h">
-      <Filter>Header Files\Tree</Filter>
+      <Filter>Header Files\Data Structures\Tree</Filter>
     </ClInclude>
     <ClInclude Include="ds.binarytreebase.h">
-      <Filter>Header Files\Tree</Filter>
+      <Filter>Header Files\Data Structures\Tree</Filter>
     </ClInclude>
     <ClInclude Include="ds.tree.h">
-      <Filter>Header Files\Tree</Filter>
+      <Filter>Header Files\Data Structures\Tree</Filter>
     </ClInclude>
     <ClInclude Include="ds.binaryheap.h">
-      <Filter>Header Files\Heap</Filter>
+      <Filter>Header Files\Data Structures\Heap</Filter>
     </ClInclude>
     <ClInclude Include="ds.priorityqueue.h">
-      <Filter>Header Files\Heap</Filter>
+      <Filter>Header Files\Data Structures\Heap</Filter>
     </ClInclude>
     <ClInclude Include="ds.list.h">
-      <Filter>Header Files\List</Filter>
+      <Filter>Header Files\Data Structures\List</Filter>
     </ClInclude>
     <ClInclude Include="ds.dictionary.h">
-      <Filter>Header Files\Dictionary</Filter>
+      <Filter>Header Files\Data Structures\Dictionary</Filter>
     </ClInclude>
     <ClInclude Include="ds.BSTDictionary.h">
-      <Filter>Header Files\Dictionary</Filter>
+      <Filter>Header Files\Data Structures\Dictionary</Filter>
     </ClInclude>
     <ClInclude Include="common.h">
       <Filter>Header Files\Common</Filter>
@@ -117,22 +123,25 @@
       <Filter>Header Files\nonproject</Filter>
     </ClInclude>
     <ClInclude Include="ds.hashtablebase.h">
-      <Filter>Header Files\Dictionary</Filter>
+      <Filter>Header Files\Data Structures\Dictionary</Filter>
     </ClInclude>
     <ClInclude Include="ds.LinearProbingHashTable.h">
-      <Filter>Header Files\Dictionary</Filter>
+      <Filter>Header Files\Data Structures\Dictionary</Filter>
     </ClInclude>
     <ClInclude Include="ds.SeparateChainingHashTable.h">
-      <Filter>Header Files\Dictionary</Filter>
+      <Filter>Header Files\Data Structures\Dictionary</Filter>
     </ClInclude>
     <ClInclude Include="ds.IntLinearProbingHashTable.h">
-      <Filter>Header Files\Dictionary</Filter>
+      <Filter>Header Files\Data Structures\Dictionary</Filter>
     </ClInclude>
     <ClInclude Include="ds.HopScotchHashTable.h">
-      <Filter>Header Files\Dictionary</Filter>
+      <Filter>Header Files\Data Structures\Dictionary</Filter>
     </ClInclude>
     <ClInclude Include="ds.graph.h">
-      <Filter>Header Files\Graph</Filter>
+      <Filter>Header Files\Data Structures\Graph</Filter>
+    </ClInclude>
+    <ClInclude Include="alg.graph.h">
+      <Filter>Header Files\Algorithms</Filter>
     </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/YASI_12/ds.graph.h b/YASI_12/ds.graph.h
@@ -62,8 +62,8 @@ class Graph : public IGraph{
 	typedef Edge<VertexType, EdgeElement> EdgeType;
 	typedef DoublyLinkedList<VertexType*> VertexList;
 	typedef DoublyLinkedList<EdgeType*> EdgeList;
-	typedef VertexList::iterator VertexIterator;
-	typedef EdgeList::iterator EdgeIterator;
+	typedef typename VertexList::iterator VertexIterator;
+	typedef typename EdgeList::iterator EdgeIterator;
 protected:
 	VertexList	vertexList;
 	EdgeList	edgeList;
@@ -163,7 +163,7 @@ class Graph : public IGraph{
 			ppv1 = ht.get(vid1);
 			if (!ppv1){
 				pv1 = addVertex(vid1);
-				ht.put(vertexId, pv1);
+				ht.put(vid1, pv1);
 			}
 			else{
 				pv1 = *ppv1;
@@ -195,7 +195,7 @@ class Graph : public IGraph{
 			for (EdgeList::iterator j = v->pOutEdges->begin(); j != v->pOutEdges->end(); j++){
 				// for each outgoing edge
 				EdgeType* e = *j;
-				str << e->start->id << " " << e->end->id;
+				str << e->start->label << " " << e->end->label;
 				if (_weighted){
 					str << " " << e->weight;
 				}

diff --git a/YASI_12/main.cpp b/YASI_12/main.cpp
@@ -13,6 +13,7 @@
 #include "ds.linearprobinghashtable.h"
 #include "ds.hopscotchhashtable.h"
 #include "ds.graph.h"
+#include "alg.graph.h"
 
 //#include "Sorter.h"