Trianta/search-algorithms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

It works

Browse Source
This commit is contained in:
TriantaTV 2023-09-10 21:50:35 -05:00
parent dc29da26ee
commit c1eb1f1127
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -35,3 +35,4 @@
# Building # Building
build build
*.swp *.swp
.vs

3
src/algorithm.cpp
View File

@ -59,7 +59,7 @@ void PrintSolution(std::vector<Vertex*> solution) {
std::cout << std::endl; std::cout << std::endl;
} }
std::vector<Vertex*> UCBFS(Graph graph, int start) { void UCBFS(Graph graph, int start) {
std::queue<int> setds; std::queue<int> setds;
std::vector<uint> dist(graph.nodeCount + 1, -1); std::vector<uint> dist(graph.nodeCount + 1, -1);
setds.push(start); setds.push(start);
@ -68,7 +68,6 @@ std::vector<Vertex*> UCBFS(Graph graph, int start) {
{ {
int tmp = setds.front(); int tmp = setds.front();
setds.pop(); setds.pop();
std::cout << "tmp: " << tmp << std::endl;
for (Edge i : graph.vertices.at(tmp).edges) for (Edge i : graph.vertices.at(tmp).edges)
{ {
int v = i.destination->nodeNumber; int v = i.destination->nodeNumber;

2
src/algorithm.hpp
View File

@ -30,7 +30,7 @@ struct Graph {
Graph ReadInGraph(std::string fileLocation); Graph ReadInGraph(std::string fileLocation);
void PrintSolution(std::vector<Vertex*> solution); void PrintSolution(std::vector<Vertex*> solution);
std::vector<Vertex*> UCBFS(Graph graph, int start); void UCBFS(Graph graph, int start);
std::vector<Vertex*> BFS(Graph graph, int start, int end); std::vector<Vertex*> BFS(Graph graph, int start, int end);
std::vector<Vertex*> DFS(Graph graph, int start, int end); std::vector<Vertex*> DFS(Graph graph, int start, int end);

8
src/main.cpp
View File

@ -7,12 +7,18 @@ int main(int argc, char* argv[]) {
return 1; return 1;
} }
Graph newGraph = ReadInGraph(argv[1]); Graph newGraph = ReadInGraph(argv[1]);
std::cout << "BFS" << std::endl;
std::cout << "---" << std::endl;
for (int i = 1; i < newGraph.nodeCount + 1; i++) { for (int i = 1; i < newGraph.nodeCount + 1; i++) {
PrintSolution(BFS(newGraph, 1, i)); PrintSolution(BFS(newGraph, 1, i));
} }
std::cout << "DFS" << std::endl;
std::cout << "---" << std::endl;
for (int i = 1; i < newGraph.nodeCount + 1; i++) { for (int i = 1; i < newGraph.nodeCount + 1; i++) {
PrintSolution(DFS(newGraph, 1, i)); PrintSolution(DFS(newGraph, 1, i));
} }
PrintSolution(UCBFS(newGraph, 1)); std::cout << "UCBFS" << std::endl;
std::cout << "---" << std::endl;
UCBFS(newGraph, 1);
return 0; return 0;
} }

2
test/CMakeLists.txt
View File

@ -1,4 +1,3 @@
find_package(Catch2 REQUIRED)
include_directories("${CMAKE_CURRENT_SOURCE_DIR}") include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
add_executable(testing add_executable(testing
./test-main.cpp ./test-main.cpp
@ -6,4 +5,3 @@ add_executable(testing
../src/algorithm.cpp ../src/algorithm.cpp
) )
set_target_properties(testing PROPERTIES LINKER_LANGUAGE CXX) set_target_properties(testing PROPERTIES LINKER_LANGUAGE CXX)
target_link_libraries(testing Catch2::Catch2)