|
@@ -35,8 +35,8 @@ using namespace paradevs::tests::boost_graph;
|
|
|
namespace paradevs { namespace tests {
|
|
|
namespace multithreading { namespace lifegame {
|
|
|
|
|
|
-const int NCOLUMNS = 10;
|
|
|
-const int NLINES = 10;
|
|
|
+const int NCOLUMNS = 5;
|
|
|
+const int NLINES = 5;
|
|
|
|
|
|
class GraphBuilder
|
|
|
{
|
|
@@ -50,21 +50,22 @@ public:
|
|
|
OutputEdgeList& output_edges,
|
|
|
Connections& parent_connections)
|
|
|
{
|
|
|
+ //std::vector < std::string > parameters = {
|
|
|
+ // "HEM", "rande", "diff", "ratio"
|
|
|
+ //};
|
|
|
std::vector < std::string > parameters = {
|
|
|
- "HEM", "rande", "diff", "ratio"
|
|
|
+ "HEM", "gggp", "diff", "ratio"
|
|
|
};
|
|
|
- // std::vector < std::string > parameters = {
|
|
|
- // "HEM", "gggp", "diff", "ratio"
|
|
|
- // };
|
|
|
|
|
|
bool contraction_coef_flag = false;
|
|
|
- uint contraction_coef = 20;
|
|
|
uint cluster_number = _cluster_number;
|
|
|
OrientedGraph go;
|
|
|
Edges edge_partie;
|
|
|
Connections connections;
|
|
|
|
|
|
generate(go);
|
|
|
+ std::cout << "Nbrs models : " << num_vertices(go) << std::endl;
|
|
|
+ uint contraction_coef = 20;//num_vertices(go);
|
|
|
output_edges = OutputEdgeList(cluster_number);
|
|
|
if (contraction_coef_flag) {
|
|
|
uint coars = num_vertices(go) / contraction_coef;
|
|
@@ -93,7 +94,6 @@ private:
|
|
|
void generate(OrientedGraph& g)
|
|
|
{
|
|
|
std::vector < OrientedGraph::vertex_descriptor > vertices;
|
|
|
-
|
|
|
for (int i = 0; i < NLINES; ++i) {
|
|
|
for (int j = 0; j < NCOLUMNS; ++j) {
|
|
|
vertices.push_back(boost::add_vertex(g));
|