Move loadData method to super class

Author: baatochan

DirectedGraph.cpp

@@ -18,10 +18,6 @@ std::string DirectedGraph::getAvailableAlgorithms() {
 	return output;
 }
 
-void DirectedGraph::loadDataFrom(std::string fileName) {
-	vector<int> rawData = loadRawDataFrom(fileName);
-}
-
 void DirectedGraph::generate(int numberOfVertices, int density) {
 
 }
@@ -33,3 +29,13 @@ void DirectedGraph::runAlgorithm(int index) {
 void DirectedGraph::test() {
 
 }
+
+// private
+
+void DirectedGraph::loadRawDataToMatrix(std::vector<int> rawData) {
+
+}
+
+void DirectedGraph::loadRawDataToList(std::vector<int> rawData) {
+
+}

DirectedGraph.h

@@ -14,14 +14,16 @@ class DirectedGraph : public Graph {
 
 	std::string getAvailableAlgorithms() override;
 
-	void loadDataFrom(std::string fileName) override;
-
 	void generate(int numberOfVertices, int density) override;
 
 	void runAlgorithm(int index) override;
 
 	void test() override;
 
+protected:
+	void loadRawDataToMatrix(std::vector<int> rawData) override ;
+	void loadRawDataToList(std::vector<int> rawData) override ;
+
 };
 
 

Graph.cpp

@@ -112,6 +112,12 @@ string Graph::printAdjacencyList() {
 	return output;
 }
 
+void Graph::loadDataFrom(std::string fileName) {
+	vector<int> rawData = loadRawDataFrom(fileName);
+	loadRawDataToMatrix(rawData);
+	loadRawDataToList(rawData);
+}
+
 // protected
 
 vector<int> Graph::loadRawDataFrom(string path) {

Graph.h

@@ -41,7 +41,7 @@ class Graph {
 
 	std::string printAdjacencyList();
 
-	virtual void loadDataFrom(std::string fileName)= 0;
+	void loadDataFrom(std::string fileName);
 
 	virtual void generate(int numberOfVertices, int density)= 0;
 
@@ -53,6 +53,9 @@ class Graph {
 
 	std::vector<int> loadRawDataFrom(std::string path);
 
+	virtual void loadRawDataToMatrix(std::vector<int> rawData)= 0;
+	virtual void loadRawDataToList(std::vector<int> rawData)= 0;
+
 };
 
 

UndirectedGraph.cpp

@@ -18,10 +18,6 @@ std::string UndirectedGraph::getAvailableAlgorithms() {
 	return output;
 }
 
-void UndirectedGraph::loadDataFrom(std::string fileName) {
-	vector<int> rawData = loadRawDataFrom(fileName);
-}
-
 void UndirectedGraph::generate(int numberOfVertices, int density) {
 
 }
@@ -33,3 +29,13 @@ void UndirectedGraph::runAlgorithm(int index) {
 void UndirectedGraph::test() {
 
 }
+
+// private
+
+void UndirectedGraph::loadRawDataToMatrix(vector<int> rawData) {
+
+}
+
+void UndirectedGraph::loadRawDataToList(std::vector<int> rawData) {
+
+}

UndirectedGraph.h

@@ -14,14 +14,16 @@ class UndirectedGraph : public Graph {
 
 	std::string getAvailableAlgorithms() override;
 
-	void loadDataFrom(std::string fileName) override;
-
 	void generate(int numberOfVertices, int density) override;
 
 	void runAlgorithm(int index) override;
 
 	void test() override;
 
+protected:
+	void loadRawDataToMatrix(std::vector<int> rawData) override ;
+	void loadRawDataToList(std::vector<int> rawData) override ;
+
 };