Input/Output Handling.

Author: Elzawawy

Graph.cpp

@@ -9,9 +9,12 @@
 
 #define INF 99999
 
-Graph::Graph(int numberOfVertices) {
+Graph::Graph(int numberOfVertices,AdjacencyMatrix adjacencyMatrix) {
  this->numberOfVertices = numberOfVertices;
+ this->adjacencyMatrix = adjacencyMatrix;
  this->numberOfEdges=0;
+ createNodes(numberOfVertices);
+ createEdges(adjacencyMatrix);
 }
 
 
@@ -98,11 +101,9 @@ vector<GraphEdge> *Graph::dijkstraAlgorithm(GraphNode *node) {
  }
  }
  for (int j = 0; j < numberOfVertices; ++j) {
-
  cout<<"Path to Node "<<j<<" is ";
  printParents(j,node->getNodeIndex(),parentVertices);
  cout<<endl;
-
  }
 
  return edgesShortestPath;
@@ -123,21 +124,17 @@ int Graph::getNumberOfVertices() {
  return numberOfVertices;
 }
 
-vector<GraphNode *> * Graph::createNodes(int numberOfVertices) {
- vector<GraphNode*>* vector1=new vector<GraphNode*>();
+void Graph::createNodes(int numberOfVertices) {
  for (int i = 0; i < numberOfVertices; ++i) {
- vector1->push_back(this->addNode(i));
+ addNode(i);
  }
- return vector1;
-
 }
 
-void Graph::createEdges(vector<GraphNode *> *nodes,vector<vector<int>> matrix ) {
-
+void Graph::createEdges(vector<vector<int>> matrix ) {
  for (int i = 0; i < numberOfVertices; ++i) {
  for (int j = 0; j < numberOfVertices; ++j) {
  if (matrix[i][j]!=0)
- this->addEdge(nodes->at((unsigned long) i), nodes->at((unsigned long) j), matrix[i][j]);
+ this->addEdge(vertices.at((unsigned long) i), vertices.at((unsigned long) j), matrix[i][j]);
  }
 
  }

Graph.h

@@ -12,9 +12,11 @@
 
 using namespace std;
 typedef unordered_map<GraphNode* ,vector<GraphEdge*>> AdjacencyList;
+typedef vector<vector<int>> AdjacencyMatrix;
 class Graph {
 
  AdjacencyList adjacencyList;
+ AdjacencyMatrix adjacencyMatrix;
  int numberOfVertices;
  int numberOfEdges;
  vector<GraphEdge*> edges;
@@ -25,10 +27,11 @@ class Graph {
 
 public:
  int getNumberOfVertices() ;
- vector<GraphNode*>* createNodes(int numberOfVertices);
 
- Graph(int numberOfVertices);
- void createEdges(vector<GraphNode*>* nodes,vector<vector<int>> matrix);
+
+ Graph(int numberOfVertices,AdjacencyMatrix adjacencyMatrix);
+ void createNodes(int numberOfVertices);
+ void createEdges(vector<vector<int>> matrix);
 
  GraphNode* addNode(int index);
  GraphEdge addEdge(GraphNode *node1,GraphNode *node2,int weight);

GraphNode.cpp

@@ -20,3 +20,5 @@ int GraphNode::getNodeIndex() {
 }
 
 
+
+

main.cpp

@@ -3,26 +3,18 @@
 #define randomVertix 0
 using namespace std;
 int main() {
- int numberOfVertices=2;
- cout<<"enter number of vertices"<<endl;
+ int numberOfVertices;
+ cout<<"Enter number of vertices : ";
  cin>>numberOfVertices;
-
- Graph graph(numberOfVertices);
-
  cout<<"enter the adjacency matrix"<<endl;
-
- vector<vector<int>> matrix((unsigned long) numberOfVertices);
+ vector<vector<int>> matrix((unsigned long) numberOfVertices);
  int x;
  for (int i = 0; i < numberOfVertices; ++i)
  for (int j = 0; j < numberOfVertices; ++j){
  cin>>x;
  matrix.at((unsigned long) i).push_back(x);
  }
-
-
- graph.createEdges(graph.createNodes(numberOfVertices),matrix);
-
-
+ Graph graph(numberOfVertices,matrix);
  vector<GraphEdge>*vector1=graph.primAlgorithm(graph.getVertices().at(randomVertix));
 
  int sum=0;