From c81c43035b971fe582550c0e418951b03628f1f2 Mon Sep 17 00:00:00 2001 From: noah Date: Wed, 16 Feb 2022 02:48:17 -0600 Subject: [PATCH] Pass edges by reference to state merge --- src/ag_gen/ag_gen.cpp | 4 ++-- src/mpi/tasks.cpp | 2 +- src/mpi/tasks.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ag_gen/ag_gen.cpp b/src/ag_gen/ag_gen.cpp index a289413..e23dac5 100755 --- a/src/ag_gen/ag_gen.cpp +++ b/src/ag_gen/ag_gen.cpp @@ -1444,7 +1444,7 @@ int initQSize, double mem_threshold, mpi::communicator &world, int state_limit) if(world.iprobe(w, 11)){ world.recv(w, 11, node_edges[w]); } - if(!node_factbases[w].empty() || !node_edges.empty()){ + if(!node_factbases[w].empty() || !node_edges[w].empty()){ state_merge(node_factbases[w], node_edges[w], hash_map, instance, mem_threshold, world); } } @@ -1496,7 +1496,7 @@ int initQSize, double mem_threshold, mpi::communicator &world, int state_limit) if(world.iprobe(w, 11)){ world.recv(w, 11, node_edges[w]); } - if(!node_factbases[w].empty() || !node_edges.empty()){ + if(!node_factbases[w].empty() || !node_edges[w].empty()){ state_merge(node_factbases[w], node_edges[w], hash_map, instance, mem_threshold, world); } } diff --git a/src/mpi/tasks.cpp b/src/mpi/tasks.cpp index 1e3e0ad..a2102cb 100644 --- a/src/mpi/tasks.cpp +++ b/src/mpi/tasks.cpp @@ -505,7 +505,7 @@ int send_check(boost::mpi::communicator &world, int curr_node){ return send_to; } -void state_merge(std::vector node_factbases, std::vector node_edges,\ +void state_merge(std::vector &node_factbases, std::vector &node_edges,\ std::unordered_map &hash_map, AGGenInstance &instance, double mem_threshold,\ mpi::communicator &world){ diff --git a/src/mpi/tasks.h b/src/mpi/tasks.h index 8e12e40..21cb452 100644 --- a/src/mpi/tasks.h +++ b/src/mpi/tasks.h @@ -23,7 +23,7 @@ void task_four(NetworkState &new_state); int send_check(boost::mpi::communicator &world, int curr_node); -void state_merge(std::vector node_factbases, std::vector node_edges,\ +void state_merge(std::vector &node_factbases, std::vector &node_edges,\ std::unordered_map &hash_map, AGGenInstance &instance, double mem_threshold,\ mpi::communicator &world);