Skip to content
This repository was archived by the owner on May 27, 2019. It is now read-only.

Commit c7bbfc9

Browse files
committed
Add begin and end vertex args to Dijkstra's algorithm
1 parent 2fa5d95 commit c7bbfc9

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

DirectedGraph.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ string DirectedGraph::runAlgorithm(char index, char arg1, int arg2, int arg3) {
7979

8080
if (index == 1) {
8181
if (arg1 == 0) {
82-
output = dijkstrasAlgorithmOnMatrix();
82+
output = dijkstrasAlgorithmOnMatrix(arg2, arg3);
8383
} else if (arg1 == 1) {
84-
output = dijkstrasAlgorithmOnList();
84+
output = dijkstrasAlgorithmOnList(arg2, arg3);
8585
} else {
8686
throw "Nieznany blad!"; // should never be thrown
8787
}
@@ -147,10 +147,10 @@ void DirectedGraph::loadRawDataToList(std::vector<int> rawData) {
147147

148148
// private
149149

150-
string DirectedGraph::dijkstrasAlgorithmOnMatrix() {
150+
std::string DirectedGraph::dijkstrasAlgorithmOnMatrix(int beginVertex, int endVertex) {
151151
throw "Algorytm jeszcze nie zaimplementowany!";
152152
}
153153

154-
string DirectedGraph::dijkstrasAlgorithmOnList() {
154+
std::string DirectedGraph::dijkstrasAlgorithmOnList(int beginVertex, int endVertex) {
155155
throw "Algorytm jeszcze nie zaimplementowany!";
156156
}

DirectedGraph.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class DirectedGraph : public Graph {
2525
void loadRawDataToList(std::vector<int> rawData) override ;
2626

2727
private:
28-
std::string dijkstrasAlgorithmOnMatrix();
29-
std::string dijkstrasAlgorithmOnList();
28+
std::string dijkstrasAlgorithmOnMatrix(int beginVertex, int endVertex);
29+
std::string dijkstrasAlgorithmOnList(int beginVertex, int endVertex);
3030

3131
};
3232

0 commit comments

Comments
 (0)