Add files via upload

rtackx · web-flow · commit 5fda23cb2b9d · 2017-12-03T11:23:25.000+01:00
diff --git a/community.cpp b/community.cpp
@@ -60,8 +60,6 @@ void Community::cycles(Graph*& graph_projection, vector<unsigned int>& list_inde
 		vec_depth->push_back(0);
 	}
 
-	srand(unsigned(time(NULL)));
-
 	int i = rand() % list_index_nodes.size();
 	bool new_node = true;
 
diff --git a/libs.h b/libs.h
@@ -41,9 +41,12 @@ struct comp_pair
 			return true;
 		if(lhs.second < rhs.second)
 			return false;
-		if(lhs.first < rhs.first)
-		    return true;
-		return false;
+
+		return true;
+
+		// if(lhs.first < rhs.first)
+		//     return true;
+		// return false;
 	}
 };
 
diff --git a/main.cpp b/main.cpp
@@ -51,7 +51,7 @@ Projection* select_similarity(string similarity_index)
 }
 
 int main(int argc, const char* argv[])
-{	
+{
 	string path_dataset, similarity_index;
 	int distance, depth_best;
 	static set<string> list_valid_similarities = {"cn", "aa", "ji"};
@@ -100,6 +100,8 @@ int main(int argc, const char* argv[])
 	main_graph->load_graph(path_dataset);
 	cerr << "   n = " << main_graph->n << endl << "   m = " << main_graph->m/2 << endl;
 	
+	srand(unsigned(time(NULL)));
+
 	Community* c = new Community(main_graph, depth_best);
 	Projection* p;
 	Graph* g;
@@ -131,11 +133,12 @@ int main(int argc, const char* argv[])
 	
 	cerr << endl << "--------------" << endl;
 
+	unsigned int i;
 	for(auto& e : c->community)
 	{
-		for(auto& node : e.second)
-			cout << node->id << " ";
-		cout << endl;
+		for(i=0; i<e.second.size()-1; i++)
+			cout << e.second[i]->id << " ";
+		cout << e.second[e.second.size()-1]->id << endl;
 	}
 	
 	for(auto& g : list_subgraphs)
diff --git a/projection.cpp b/projection.cpp
@@ -19,7 +19,8 @@ void Projection::project(Graph*& in_graph, unsigned int distance)
 	
 	unordered_map<unsigned int, Node*> map_node;
 	unordered_map<unsigned int, set<pair<unsigned int, float>, comp_pair>> map_neighbor;
-	
+	vector<unsigned int> shuffle;
+
 	index = 0;
 	while(index < in_graph->size_list_nodes)
 	{
@@ -30,14 +31,19 @@ void Projection::project(Graph*& in_graph, unsigned int distance)
 		map_node[index]->main_index = in_graph->list_nodes[index]->main_index;
 		
 		for(auto& n : list_distance_neighbors)
+			shuffle.push_back(n->index);
+		random_shuffle(shuffle.begin(), shuffle.end());
+
+		for(auto& index_neighbor : shuffle)
 		{
-			projection_weight = similarity_projection(in_graph, index, n->index);
+			projection_weight = similarity_projection(in_graph, index, index_neighbor);
 
 			if(projection_weight > 0.0)
-				map_neighbor[index].insert(make_pair(n->index, projection_weight));
+				map_neighbor[index].insert(make_pair(index_neighbor, projection_weight));
 		}
 		
 		index += in_graph->list_nodes[index]->nb_neighbors + 1;
+		shuffle.clear();
 	}
 
 	graph_projection->create_graph(map_node, map_neighbor);

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,6 @@ void Community::cycles(Graph*& graph_projection, vector<unsigned int>& list_inde`
`60`	`60`	`vec_depth->push_back(0);`
`61`	`61`	`}`
`62`	`62`
`63`		`- srand(unsigned(time(NULL)));`
`64`		`-`
`65`	`63`	`int i = rand() % list_index_nodes.size();`
`66`	`64`	`bool new_node = true;`
`67`	`65`